From 6c633a19eed61d5acd7533db72d29bbc10859024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 28 Mar 2024 11:05:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |   75 +
 src/api/bpm/activity/index.ts                 |    8 +
 src/api/bpm/definition/index.ts               |   21 +
 src/api/bpm/form/index.ts                     |   56 +
 src/api/bpm/leave/index.ts                    |   27 +
 src/api/bpm/model/index.ts                    |   59 +
 src/api/bpm/processInstance/index.ts          |   41 +
 src/api/bpm/task/index.ts                     |   53 +
 src/api/bpm/taskAssignRule/index.ts           |   29 +
 src/api/bpm/userGroup/index.ts                |   47 +
 src/api/home/index.ts                         |   22 +
 src/api/infra/apiAccessLog/index.ts           |   30 +
 src/api/infra/apiErrorLog/index.ts            |   48 +
 src/api/infra/codegen/index.ts                |  123 +
 src/api/infra/config/index.ts                 |   56 +
 src/api/infra/dataSourceConfig/index.ts       |   35 +
 src/api/infra/dbDoc/index.ts                  |   16 +
 src/api/infra/file/index.ts                   |   17 +
 src/api/infra/fileConfig/index.ts             |   61 +
 src/api/infra/job/index.ts                    |   63 +
 src/api/infra/jobLog/index.ts                 |   33 +
 src/api/infra/redis/index.ts                  |    8 +
 src/api/infra/redis/types.ts                  |  176 ++
 src/api/login/index.ts                        |   72 +
 src/api/login/oauth2/index.ts                 |   41 +
 src/api/login/types.ts                        |   28 +
 src/api/mes/processroute/index.ts             |   97 +
 src/api/mes/productionPlan/index.ts           |   61 +
 src/api/mes/teamSetting/index.ts              |   61 +
 src/api/mes/workstation/index.ts              |   92 +
 src/api/redis/index.ts                        |   21 +
 src/api/scp/index.ts                          |    0
 src/api/system/area/index.ts                  |   19 +
 src/api/system/dept/index.ts                  |   43 +
 src/api/system/dict/dict.data.ts              |   54 +
 src/api/system/dict/dict.type.ts              |   44 +
 src/api/system/errorCode/index.ts             |   40 +
 src/api/system/loginLog/index.ts              |   24 +
 src/api/system/mail/account/index.ts          |   41 +
 src/api/system/mail/log/index.ts              |   30 +
 src/api/system/mail/template/index.ts         |   50 +
 src/api/system/menu/index.ts                  |   49 +
 src/api/system/notice/index.ts                |   37 +
 src/api/system/notify/message/index.ts        |   48 +
 src/api/system/notify/template/index.ts       |   50 +
 src/api/system/oauth2/client.ts               |   47 +
 src/api/system/oauth2/token.ts                |   22 +
 src/api/system/operatelog/index.ts            |   33 +
 src/api/system/permission/index.ts            |   42 +
 src/api/system/post/index.ts                  |   46 +
 src/api/system/role/index.ts                  |   61 +
 src/api/system/sensitiveWord/index.ts         |   58 +
 src/api/system/serialNumber/index.ts          |   42 +
 src/api/system/sms/smsChannel/index.ts        |   43 +
 src/api/system/sms/smsLog/index.ts            |   39 +
 src/api/system/sms/smsTemplate/index.ts       |   60 +
 src/api/system/tenant/index.ts                |   62 +
 src/api/system/tenantPackage/index.ts         |   42 +
 src/api/system/user/index.ts                  |   76 +
 src/api/system/user/profile.ts                |   77 +
 src/api/system/user/socialUser.ts             |   31 +
 src/api/wms/accountcalendar/index.ts          |   60 +
 src/api/wms/areabasic/index.ts                |   63 +
 src/api/wms/backflushRecordDetailb/index.ts   |   66 +
 src/api/wms/backflushRequestDetailb/index.ts  |   60 +
 src/api/wms/balance/index.ts                  |  129 +
 src/api/wms/barbasic/index.ts                 |   56 +
 src/api/wms/barcode/index.ts                  |   59 +
 src/api/wms/bom/index.ts                      |   61 +
 src/api/wms/bomDismantle/index.ts             |   26 +
 src/api/wms/businesstype/index.ts             |   65 +
 src/api/wms/callmaterials/index.ts            |   53 +
 src/api/wms/carrier/index.ts                  |   68 +
 src/api/wms/condition/index.ts                |   56 +
 src/api/wms/configuration/index.ts            |   56 +
 src/api/wms/configurationsetting/index.ts     |   58 +
 src/api/wms/consumeRecordDetailb/index.ts     |   63 +
 src/api/wms/consumereRequestDetailb/index.ts  |   61 +
 .../wms/containerBindRecordDetail/index.ts    |   57 +
 src/api/wms/containerBindRecordMain/index.ts  |   69 +
 src/api/wms/containerDetail/index.ts          |   52 +
 .../wms/containerInitRecordDetail/index.ts    |   55 +
 src/api/wms/containerInitRecordMain/index.ts  |   68 +
 src/api/wms/containerMain/index.ts            |   61 +
 .../wms/containerRepairRecordDetail/index.ts  |   53 +
 .../wms/containerRepairRecordMain/index.ts    |   69 +
 .../wms/containerUnbindRecordDetail/index.ts  |   57 +
 .../wms/containerUnbindRecordMain/index.ts    |   69 +
 src/api/wms/countJobDetail/index.ts           |   62 +
 src/api/wms/countJobMain/index.ts             |   93 +
 src/api/wms/countPlanDetail/index.ts          |   52 +
 src/api/wms/countPlanMain/index.ts            |  110 +
 src/api/wms/countRecordDetail/index.ts        |   72 +
 src/api/wms/countRecordMain/index.ts          |   76 +
 src/api/wms/countRequestDetail/index.ts       |   67 +
 src/api/wms/countRequestMain/index.ts         |  118 +
 src/api/wms/countadjustRecordDetail/index.ts  |   69 +
 src/api/wms/countadjustRecordMain/index.ts    |   69 +
 src/api/wms/countadjustRequestDetail/index.ts |   68 +
 src/api/wms/countadjustRequestMain/index.ts   |   99 +
 src/api/wms/currencyexchange/index.ts         |   57 +
 src/api/wms/customer/index.ts                 |   71 +
 src/api/wms/customerdock/index.ts             |   86 +
 src/api/wms/customeritem/index.ts             |   64 +
 .../wms/customerreceiptRecordDetail/index.ts  |   78 +
 .../wms/customerreceiptRecordMain/index.ts    |   79 +
 .../wms/customerreceiptRequestDetail/index.ts |   68 +
 .../wms/customerreceiptRequestMain/index.ts   |  103 +
 src/api/wms/customerreturnJobDetail/index.ts  |   65 +
 src/api/wms/customerreturnJobMain/index.ts    |  115 +
 .../wms/customerreturnRecordDetail/index.ts   |   78 +
 src/api/wms/customerreturnRecordMain/index.ts |   81 +
 .../wms/customerreturnRequestDetail/index.ts  |   67 +
 .../wms/customerreturnRequestMain/index.ts    |  120 +
 .../wms/customersettleRecordDetail/index.ts   |   71 +
 src/api/wms/customersettleRecordMain/index.ts |   73 +
 .../wms/customersettleRequestDetail/index.ts  |   65 +
 .../wms/customersettleRequestMain/index.ts    |  102 +
 src/api/wms/deliverJobDetail/index.ts         |   65 +
 src/api/wms/deliverJobMain/index.ts           |  115 +
 src/api/wms/deliverPlanDetail/index.ts        |   53 +
 src/api/wms/deliverPlanMain/index.ts          |   99 +
 src/api/wms/deliverRecordDetail/index.ts      |   76 +
 src/api/wms/deliverRecordMain/index.ts        |   82 +
 src/api/wms/deliverRequestDetail/index.ts     |   67 +
 src/api/wms/deliverRequestMain/index.ts       |  109 +
 src/api/wms/demandforecastingDetail/index.ts  |   46 +
 src/api/wms/demandforecastingMain/index.ts    |   65 +
 src/api/wms/detail/index.ts                   |   35 +
 src/api/wms/dismantleRecordDetailb/index.ts   |   66 +
 src/api/wms/dismantleRequestDetailb/index.ts  |   61 +
 src/api/wms/dock/index.ts                     |   67 +
 src/api/wms/documentsetting/index.ts          |   60 +
 src/api/wms/enterprise/index.ts               |   64 +
 src/api/wms/expectin/index.ts                 |   55 +
 src/api/wms/expectout/index.ts                |   56 +
 src/api/wms/file/index.ts                     |   12 +
 src/api/wms/index.ts                          |    0
 src/api/wms/inspectJobDetail/index.ts         |   60 +
 src/api/wms/inspectJobMain/index.ts           |  101 +
 src/api/wms/inspectRecordDetail/index.ts      |   76 +
 src/api/wms/inspectRecordMain/index.ts        |   94 +
 src/api/wms/inspectRequestDetail/index.ts     |   58 +
 src/api/wms/inspectRequestMain/index.ts       |  111 +
 .../wms/inventorychangeRecordDetail/index.ts  |   82 +
 .../wms/inventorychangeRecordMain/index.ts    |   68 +
 .../wms/inventorychangeRequestDetail/index.ts |   81 +
 .../wms/inventorychangeRequestMain/index.ts   |   97 +
 .../wms/inventoryinitRecordDetail/index.ts    |   75 +
 src/api/wms/inventoryinitRecordMain/index.ts  |   67 +
 .../wms/inventoryinitRequestDetail/index.ts   |   72 +
 src/api/wms/inventoryinitRequestMain/index.ts |   94 +
 src/api/wms/inventorymoveJobDetail/index.ts   |   66 +
 src/api/wms/inventorymoveJobMain/index.ts     |  169 ++
 .../wms/inventorymoveRecordDetail/index.ts    |   76 +
 src/api/wms/inventorymoveRecordMain/index.ts  |  128 +
 .../wms/inventorymoveRequestDetail/index.ts   |   70 +
 src/api/wms/inventorymoveRequestMain/index.ts |  169 ++
 src/api/wms/issueJobDetail/index.ts           |   71 +
 src/api/wms/issueJobMain/index.ts             |  110 +
 src/api/wms/issueRecordDetail/index.ts        |   77 +
 src/api/wms/issueRecordMain/index.ts          |   75 +
 src/api/wms/issueRequestDetail/index.ts       |   67 +
 src/api/wms/issueRequestMain/index.ts         |  103 +
 src/api/wms/itemarea/index.ts                 |   69 +
 src/api/wms/itemareaDetail/index.ts           |   50 +
 src/api/wms/itembasic/index.ts                |  101 +
 src/api/wms/itempackage/index.ts              |   88 +
 src/api/wms/itemwarehouse/index.ts            |   59 +
 src/api/wms/jobsetting/index.ts               |   62 +
 src/api/wms/labeltype/index.ts                |   58 +
 src/api/wms/location/index.ts                 |   86 +
 src/api/wms/locationcapacity/index.ts         |   51 +
 src/api/wms/locationgroup/index.ts            |   63 +
 .../offlinesettlementRecordDetail/index.ts    |   64 +
 .../wms/offlinesettlementRecordMain/index.ts  |   68 +
 .../offlinesettlementRequestDetail/index.ts   |   63 +
 .../wms/offlinesettlementRequestMain/index.ts |   68 +
 .../wms/onlinesettlementRecordDetail/index.ts |   64 +
 .../wms/onlinesettlementRecordMain/index.ts   |   68 +
 .../onlinesettlementRequestDetail/index.ts    |   63 +
 .../wms/onlinesettlementRequestMain/index.ts  |   68 +
 src/api/wms/owner/index.ts                    |   71 +
 src/api/wms/package/index.ts                  |   96 +
 src/api/wms/packagemergeDetail/index.ts       |   67 +
 src/api/wms/packagemergeMain/index.ts         |   68 +
 src/api/wms/packageoverJobDetail/index.ts     |   71 +
 src/api/wms/packageoverJobMain/index.ts       |   76 +
 src/api/wms/packageoverRecordDetail/index.ts  |   67 +
 src/api/wms/packageoverRecordMain/index.ts    |   66 +
 src/api/wms/packageoverRequestDetail/index.ts |   70 +
 src/api/wms/packageoverRequestMain/index.ts   |   96 +
 src/api/wms/packageoverRetrospect/index.ts    |   83 +
 src/api/wms/packagesplitDetail/index.ts       |   67 +
 src/api/wms/packagesplitMain/index.ts         |   63 +
 src/api/wms/packageunit/index.ts              |   71 +
 src/api/wms/paramsetting/index.ts             |   59 +
 src/api/wms/pickJobDetail/index.ts            |   64 +
 src/api/wms/pickJobMain/index.ts              |   87 +
 src/api/wms/pickRecordDetail/index.ts         |   74 +
 src/api/wms/pickRecordMain/index.ts           |   74 +
 src/api/wms/pickRequestDetail/index.ts        |   62 +
 src/api/wms/pickRequestMain/index.ts          |   72 +
 src/api/wms/plansetting/index.ts              |   63 +
 src/api/wms/preparetoissueDetail/index.ts     |   47 +
 src/api/wms/preparetoissueMain/index.ts       |  109 +
 src/api/wms/process/index.ts                  |   60 +
 .../wms/productdismantleJobDetail/index.ts    |   70 +
 src/api/wms/productdismantleJobMain/index.ts  |   88 +
 .../productdismantleRecordDetaila/index.ts    |   72 +
 .../wms/productdismantleRecordMain/index.ts   |   73 +
 .../productdismantleRequestDetaila/index.ts   |   71 +
 .../wms/productdismantleRequestMain/index.ts  |  101 +
 src/api/wms/productionDetail/index.ts         |   47 +
 src/api/wms/productionMain/index.ts           |  192 ++
 src/api/wms/productionline/index.ts           |   61 +
 src/api/wms/productionlineitem/index.ts       |   69 +
 .../wms/productionreceiptJobDetail/index.ts   |   67 +
 src/api/wms/productionreceiptJobMain/index.ts |  108 +
 .../productionreceiptRecordDetail/index.ts    |   77 +
 .../wms/productionreceiptRecordMain/index.ts  |   70 +
 .../wms/productionreturnJobDetail/index.ts    |   66 +
 src/api/wms/productionreturnJobMain/index.ts  |  107 +
 .../wms/productionreturnRecordDetail/index.ts |   76 +
 .../wms/productionreturnRecordMain/index.ts   |   69 +
 .../productionreturnRequestDetail/index.ts    |   72 +
 .../productionreturnRequestDetailNo/index.ts  |   67 +
 .../wms/productionreturnRequestMain/index.ts  |  104 +
 .../productionreturnRequestMainNo/index.ts    |  104 +
 src/api/wms/productputawayJobDetail/index.ts  |   66 +
 src/api/wms/productputawayJobMain/index.ts    |  107 +
 .../wms/productputawayRecordDetail/index.ts   |   76 +
 src/api/wms/productputawayRecordMain/index.ts |   76 +
 .../wms/productputawayRequestDetail/index.ts  |   67 +
 .../wms/productputawayRequestMain/index.ts    |  104 +
 src/api/wms/productreceiptJobDetail/index.ts  |   71 +
 src/api/wms/productreceiptJobMain/index.ts    |  148 ++
 .../wms/productreceiptRecordDetail/index.ts   |   76 +
 src/api/wms/productreceiptRecordMain/index.ts |  113 +
 .../wms/productreceiptRequestDetail/index.ts  |   77 +
 .../wms/productreceiptRequestMain/index.ts    |  140 +
 src/api/wms/productredressJobDetail/index.ts  |   71 +
 src/api/wms/productredressJobMain/index.ts    |   87 +
 .../wms/productredressRecordDetail/index.ts   |   77 +
 src/api/wms/productredressRecordMain/index.ts |   70 +
 .../wms/productredressRequestDetail/index.ts  |   73 +
 .../wms/productredressRequestMain/index.ts    |  100 +
 .../wms/productrepairRecordDetail/index.ts    |   72 +
 src/api/wms/productrepairRecordMain/index.ts  |   73 +
 .../wms/productrepairRequestDetaila/index.ts  |   67 +
 src/api/wms/productrepairRequestMain/index.ts |  101 +
 src/api/wms/productscrapJobDetail/index.ts    |   63 +
 src/api/wms/productscrapJobMain/index.ts      |   79 +
 src/api/wms/productscrapRecordDetail/index.ts |   70 +
 src/api/wms/productscrapRecordMain/index.ts   |   72 +
 .../wms/productscrapRequestDetail/index.ts    |   65 +
 src/api/wms/productscrapRequestMain/index.ts  |  104 +
 src/api/wms/project/index.ts                  |   58 +
 src/api/wms/purchaseDetail/index.ts           |   91 +
 src/api/wms/purchaseMain/index.ts             |   81 +
 src/api/wms/purchasePlanDetail/index.ts       |   58 +
 src/api/wms/purchasePlanMain/index.ts         |   97 +
 .../wms/purchaseclaimRecordDetail/index.ts    |   66 +
 src/api/wms/purchaseclaimRecordMain/index.ts  |   64 +
 .../wms/purchaseclaimRequestDetail/index.ts   |   53 +
 src/api/wms/purchaseclaimRequestMain/index.ts |   86 +
 src/api/wms/purchaseprice/index.ts            |   58 +
 src/api/wms/purchasereceiptJobDetail/index.ts |   86 +
 src/api/wms/purchasereceiptJobMain/index.ts   |  126 +
 .../wms/purchasereceiptRecordDetail/index.ts  |  127 +
 .../wms/purchasereceiptRecordMain/index.ts    |  105 +
 .../wms/purchasereceiptRequestDetail/index.ts |   90 +
 .../wms/purchasereceiptRequestMain/index.ts   |  129 +
 src/api/wms/purchasereturnJobDetail/index.ts  |   68 +
 src/api/wms/purchasereturnJobMain/index.ts    |  100 +
 .../wms/purchasereturnRecordDetail/index.ts   |   80 +
 src/api/wms/purchasereturnRecordMain/index.ts |   81 +
 .../wms/purchasereturnRequestDetail/index.ts  |   69 +
 .../wms/purchasereturnRequestMain/index.ts    |  109 +
 src/api/wms/putawayJobDetail/index.ts         |   71 +
 src/api/wms/putawayJobMain/index.ts           |   93 +
 src/api/wms/putawayRecordDetail/index.ts      |   81 +
 src/api/wms/putawayRecordMain/index.ts        |   74 +
 src/api/wms/putawayRequestDetail/index.ts     |   72 +
 src/api/wms/putawayRequestMain/index.ts       |  102 +
 src/api/wms/recordsetting/index.ts            |   52 +
 src/api/wms/remark/index.ts                   |   14 +
 src/api/wms/repleinshJobDetail/index.ts       |   64 +
 src/api/wms/repleinshJobMain/index.ts         |  106 +
 src/api/wms/repleinshRecordDetail/index.ts    |   74 +
 src/api/wms/repleinshRecordMain/index.ts      |   68 +
 src/api/wms/repleinshRequestDetail/index.ts   |   62 +
 src/api/wms/repleinshRequestMain/index.ts     |  102 +
 src/api/wms/requestsetting/index.ts           |   56 +
 src/api/wms/rule/index.ts                     |   58 +
 src/api/wms/saleDetail/index.ts               |   56 +
 src/api/wms/saleMain/index.ts                 |   63 +
 src/api/wms/saleprice/index.ts                |   58 +
 src/api/wms/scrapJobDetail/index.ts           |   63 +
 src/api/wms/scrapJobMain/index.ts             |   85 +
 src/api/wms/scrapRecordDetail/index.ts        |   70 +
 src/api/wms/scrapRecordMain/index.ts          |   71 +
 src/api/wms/scrapRequestDetail/index.ts       |   65 +
 src/api/wms/scrapRequestMain/index.ts         |   98 +
 src/api/wms/shift/index.ts                    |   60 +
 src/api/wms/stdcostprice/index.ts             |   64 +
 src/api/wms/stockupDetailJob/index.ts         |   64 +
 src/api/wms/stockupDetailRecord/index.ts      |   76 +
 src/api/wms/stockupDetailRequest/index.ts     |   65 +
 src/api/wms/stockupMainJob/index.ts           |  116 +
 src/api/wms/stockupMainRecord/index.ts        |   78 +
 src/api/wms/stockupMainRequest/index.ts       |  108 +
 src/api/wms/strategy/index.ts                 |   53 +
 src/api/wms/supplier/index.ts                 |   72 +
 src/api/wms/supplierUser/index.ts             |   59 +
 .../wms/supplierdeliverRecordDetail/index.ts  |   98 +
 .../wms/supplierdeliverRecordMain/index.ts    |   88 +
 .../wms/supplierdeliverRequestDetail/index.ts |   75 +
 .../wms/supplierdeliverRequestMain/index.ts   |  117 +
 .../wms/supplierinvoiceRecordDeatil/index.ts  |   73 +
 .../wms/supplierinvoiceRecordMain/index.ts    |   63 +
 .../wms/supplierinvoiceRequestDetail/index.ts |   70 +
 .../wms/supplierinvoiceRequestMain/index.ts   |   91 +
 src/api/wms/supplieritem/index.ts             |   81 +
 src/api/wms/switch/index.ts                   |   50 +
 src/api/wms/systemcalendar/index.ts           |   57 +
 src/api/wms/team/index.ts                     |   58 +
 src/api/wms/transaction/index.ts              |   77 +
 src/api/wms/transactiontype/index.ts          |   61 +
 src/api/wms/transferissueJobDetail/index.ts   |   64 +
 src/api/wms/transferissueJobMain/index.ts     |  107 +
 .../wms/transferissueRecordDetail/index.ts    |   74 +
 src/api/wms/transferissueRecordMain/index.ts  |   78 +
 .../wms/transferissueRequestDetail/index.ts   |   67 +
 src/api/wms/transferissueRequestMain/index.ts |  106 +
 src/api/wms/transferlog/index.ts              |   86 +
 src/api/wms/transferreceiptJobDetail/index.ts |   64 +
 src/api/wms/transferreceiptJobMain/index.ts   |   91 +
 .../wms/transferreceiptRecordDetail/index.ts  |   74 +
 .../wms/transferreceiptRecordMain/index.ts    |   79 +
 .../wms/transferreceiptRequestDetail/index.ts |   65 +
 .../wms/transferreceiptRequestMain/index.ts   |  106 +
 src/api/wms/unplannedissueJobDetail/index.ts  |   63 +
 src/api/wms/unplannedissueJobMain/index.ts    |   85 +
 .../wms/unplannedissueRecordDetail/index.ts   |   70 +
 src/api/wms/unplannedissueRecordMain/index.ts |   72 +
 .../wms/unplannedissueRequestDetail/index.ts  |   65 +
 .../wms/unplannedissueRequestMain/index.ts    |   99 +
 .../wms/unplannedreceiptJobDetail/index.ts    |   67 +
 src/api/wms/unplannedreceiptJobMain/index.ts  |   85 +
 .../wms/unplannedreceiptRecordDetail/index.ts |   74 +
 .../wms/unplannedreceiptRecordMain/index.ts   |   71 +
 .../unplannedreceiptRequestDetail/index.ts    |   74 +
 .../wms/unplannedreceiptRequestMain/index.ts  |   98 +
 src/api/wms/warehouse/index.ts                |   61 +
 src/api/wms/workDetail/index.ts               |   47 +
 src/api/wms/workMain/index.ts                 |   59 +
 src/api/wms/workshop/index.ts                 |   58 +
 src/api/wms/workstation/index.ts              |   73 +
 src/assets/imgs/Eyes-closed.png               |  Bin 0 -> 6454 bytes
 src/assets/imgs/avatar.gif                    |  Bin 0 -> 6334 bytes
 src/assets/imgs/avatar.jpg                    |  Bin 0 -> 6264 bytes
 src/assets/imgs/code.png                      |  Bin 0 -> 4871 bytes
 src/assets/imgs/eye.png                       |  Bin 0 -> 8173 bytes
 src/assets/imgs/icon1.png                     |  Bin 0 -> 4141 bytes
 src/assets/imgs/icon2.png                     |  Bin 0 -> 5136 bytes
 src/assets/imgs/icon3.png                     |  Bin 0 -> 10459 bytes
 src/assets/imgs/icon4.png                     |  Bin 0 -> 10750 bytes
 src/assets/imgs/icon5.png                     |  Bin 0 -> 6387 bytes
 src/assets/imgs/icon6.png                     |  Bin 0 -> 5382 bytes
 src/assets/imgs/logo.png                      |  Bin 0 -> 16773 bytes
 src/assets/imgs/logo1.png                     |  Bin 0 -> 4927 bytes
 src/assets/imgs/logo_w.png                    |  Bin 0 -> 17324 bytes
 src/assets/imgs/profile.jpg                   |  Bin 0 -> 7885 bytes
 src/assets/imgs/wechat.png                    |  Bin 0 -> 1881 bytes
 src/assets/svgs/403.svg                       |    1 +
 src/assets/svgs/404.svg                       |    1 +
 src/assets/svgs/500.svg                       |    1 +
 src/assets/svgs/icon.svg                      |    1 +
 src/assets/svgs/login-bg.svg                  |    1 +
 src/assets/svgs/login-box-bg.svg              |    1 +
 src/assets/svgs/member_balance.svg            |    1 +
 .../svgs/member_expenditure_balance.svg       |    1 +
 src/assets/svgs/member_level.svg              |    1 +
 src/assets/svgs/member_point.svg              |    1 +
 src/assets/svgs/member_recharge_balance.svg   |    1 +
 src/assets/svgs/message.svg                   |    1 +
 src/assets/svgs/money.svg                     |    1 +
 src/assets/svgs/pay/icon/alipay_app.svg       |    1 +
 src/assets/svgs/pay/icon/alipay_bar.svg       |    2 +
 src/assets/svgs/pay/icon/alipay_pc.svg        |    1 +
 src/assets/svgs/pay/icon/alipay_qr.svg        |    2 +
 src/assets/svgs/pay/icon/alipay_wap.svg       |    1 +
 src/assets/svgs/pay/icon/mock.svg             |    1 +
 src/assets/svgs/pay/icon/wx_app.svg           |    2 +
 src/assets/svgs/pay/icon/wx_bar.svg           |    1 +
 src/assets/svgs/pay/icon/wx_lite.svg          |    1 +
 src/assets/svgs/pay/icon/wx_native.svg        |    1 +
 src/assets/svgs/pay/icon/wx_pub.svg           |    2 +
 src/assets/svgs/peoples.svg                   |    1 +
 src/assets/svgs/shopping.svg                  |    1 +
 src/components/Annex/index.ts                 |    3 +
 src/components/Annex/src/Annex.vue            |  127 +
 src/components/Backtop/index.ts               |    3 +
 src/components/Backtop/src/Backtop.vue        |   17 +
 src/components/BasicForm/index.ts             |    3 +
 src/components/BasicForm/src/BasicForm.vue    |  668 +++++
 src/components/Card/index.ts                  |    3 +
 src/components/Card/src/CardTitle.vue         |   37 +
 src/components/ChangeRecord/index.ts          |    3 +
 .../ChangeRecord/src/ChangeRecord.vue         |  128 +
 src/components/ConfigGlobal/index.ts          |    3 +
 .../ConfigGlobal/src/ConfigGlobal.vue         |   63 +
 src/components/ContentDetailWrap/index.ts     |    3 +
 .../src/ContentDetailWrap.vue                 |   58 +
 src/components/ContentWrap/index.ts           |    3 +
 .../ContentWrap/src/ContentWrap.vue           |   34 +
 src/components/CountTo/index.ts               |    3 +
 src/components/CountTo/src/CountTo.vue        |  182 ++
 src/components/Crontab/index.ts               |    2 +
 src/components/Crontab/src/Crontab.vue        | 1011 ++++++++
 src/components/Cropper/index.ts               |    4 +
 src/components/Cropper/src/CopperModal.vue    |  261 ++
 src/components/Cropper/src/Cropper.vue        |  183 ++
 src/components/Cropper/src/CropperAvatar.vue  |  142 ++
 src/components/Cropper/src/types.ts           |    8 +
 src/components/Descriptions/index.ts          |    4 +
 .../Descriptions/src/Descriptions.vue         |  186 ++
 .../src/DescriptionsItemLabel.vue             |   29 +
 src/components/Detail/index.ts                |    3 +
 src/components/Detail/src/Detail.vue          |  693 +++++
 src/components/DetailTable/index.ts           |    3 +
 .../DetailTable/src/DetailTable.vue           |  104 +
 src/components/Dialog/index.ts                |    3 +
 src/components/Dialog/src/Dialog.vue          |  165 ++
 src/components/DictTag/index.ts               |    3 +
 src/components/DictTag/src/DictTag.vue        |   84 +
 src/components/DocAlert/index.vue             |   34 +
 src/components/Echart/index.ts                |    3 +
 src/components/Echart/src/Echart.vue          |  115 +
 src/components/Editor/index.ts                |    8 +
 src/components/Editor/src/Editor.vue          |  202 ++
 src/components/Error/index.ts                 |    3 +
 src/components/Error/src/Error.vue            |   58 +
 src/components/Form/index.ts                  |   15 +
 src/components/Form/src/Form.vue              |  381 +++
 src/components/Form/src/componentMap.ts       |   55 +
 .../Form/src/components/useRenderCheckbox.tsx |   26 +
 .../Form/src/components/useRenderRadio.tsx    |   26 +
 .../Form/src/components/useRenderSelect.tsx   |   57 +
 src/components/Form/src/helper.ts             |  148 ++
 src/components/Form/src/types.ts              |   17 +
 src/components/Highlight/index.ts             |    3 +
 src/components/Highlight/src/Highlight.vue    |   65 +
 src/components/Icon/index.ts                  |    4 +
 src/components/Icon/src/Icon.vue              |   85 +
 src/components/Icon/src/IconSelect.vue        |  229 ++
 src/components/Icon/src/data.ts               | 1961 ++++++++++++++
 src/components/ImageViewer/index.ts           |   33 +
 .../ImageViewer/src/ImageViewer.vue           |   35 +
 src/components/ImageViewer/src/types.ts       |    9 +
 src/components/ImportForm/index.ts            |    3 +
 src/components/ImportForm/src/ImportForm.vue  |  338 +++
 src/components/Infotip/index.ts               |    3 +
 src/components/Infotip/src/Infotip.vue        |   54 +
 src/components/InputPassword/index.ts         |    3 +
 .../InputPassword/src/InputPassword.vue       |  152 ++
 src/components/Pagination/index.vue           |   87 +
 src/components/Qrcode/index.ts                |    3 +
 src/components/Qrcode/src/Qrcode.vue          |  253 ++
 src/components/Remarks/index.ts               |    3 +
 src/components/Remarks/src/Remarks.vue        |  119 +
 src/components/RouterSearch/index.vue         |  168 ++
 src/components/Search/index.ts                |    3 +
 src/components/Search/src/Search.vue          |  186 ++
 src/components/SearchHigh/index.ts            |    3 +
 src/components/SearchHigh/src/SearchHigh.vue  |  348 +++
 src/components/SearchTable/index.ts           |    3 +
 .../SearchTable/src/SearchTable.vue           |  177 ++
 src/components/SearchTableCount/index.ts      |    3 +
 .../SearchTableCount/src/SearchTableCount.vue |  222 ++
 src/components/Sticky/index.ts                |    3 +
 src/components/Sticky/src/Sticky.vue          |  143 ++
 src/components/Table/index.ts                 |   12 +
 src/components/Table/src/Table.vue            |  337 +++
 src/components/Table/src/helper.ts            |    8 +
 src/components/Table/src/types.ts             |   26 +
 src/components/TableForm/index.ts             |    3 +
 src/components/TableForm/src/TableForm.vue    |  492 ++++
 src/components/TableFormCountPlan/index.ts    |    3 +
 .../src/TableFormCountPlan.vue                |  203 ++
 src/components/TableHead/index.ts             |    3 +
 src/components/TableHead/src/TableHead.vue    |  160 ++
 src/components/Tabs/index.ts                  |    3 +
 src/components/Tabs/src/Tabs.vue              |   59 +
 src/components/Tooltip/index.ts               |    3 +
 src/components/Tooltip/src/Tooltip.vue        |   17 +
 src/components/UploadFile/index.ts            |    5 +
 src/components/UploadFile/src/Preview.vue     |   66 +
 src/components/UploadFile/src/UploadFile.vue  |  177 ++
 src/components/UploadFile/src/UploadImg.vue   |  272 ++
 src/components/UploadFile/src/UploadImgs.vue  |  310 +++
 src/components/Verifition/index.ts            |    3 +
 src/components/Verifition/src/Verify.vue      |  441 ++++
 .../Verifition/src/Verify/VerifyPoints.vue    |  250 ++
 .../Verifition/src/Verify/VerifySlide.vue     |  376 +++
 src/components/Verifition/src/Verify/index.ts |    4 +
 src/components/Verifition/src/utils/ase.ts    |   14 +
 src/components/Verifition/src/utils/util.ts   |   97 +
 src/components/XButton/index.ts               |    5 +
 src/components/XButton/src/ButtonBase.vue     |   97 +
 src/components/XButton/src/XButton.vue        |   50 +
 src/components/XButton/src/XTextButton.vue    |   49 +
 .../package/designer/ProcessDesigner.vue      |  704 ++++++
 .../package/designer/ProcessViewer.vue        |  635 +++++
 .../package/designer/index.ts                 |    8 +
 .../package/designer/index2.ts                |    8 +
 .../plugins/content-pad/contentPadProvider.js |  423 ++++
 .../designer/plugins/content-pad/index.js     |    6 +
 .../package/designer/plugins/defaultEmpty.js  |   24 +
 .../descriptor/activitiDescriptor.json        |  994 ++++++++
 .../plugins/descriptor/camundaDescriptor.json | 1010 ++++++++
 .../descriptor/flowableDescriptor.json        | 1207 +++++++++
 .../activiti/activitiExtension.js             |   83 +
 .../extension-moddle/activiti/index.js        |   11 +
 .../extension-moddle/camunda/extension.js     |  151 ++
 .../plugins/extension-moddle/camunda/index.js |    8 +
 .../flowable/flowableExtension.js             |   83 +
 .../extension-moddle/flowable/index.js        |   10 +
 .../designer/plugins/palette/CustomPalette.js |  221 ++
 .../package/designer/plugins/palette/index.js |   22 +
 .../plugins/palette/paletteProvider.js        |  213 ++
 .../plugins/translate/customTranslate.js      |   44 +
 .../package/designer/plugins/translate/zh.js  |  240 ++
 .../bpmnProcessDesigner/package/index.ts      |   11 +
 .../package/palette/ProcessPalette.vue        |   45 +
 .../package/penal/PropertiesPanel.vue         |  211 ++
 .../package/penal/base/ElementBaseInfo.vue    |  184 ++
 .../penal/flow-condition/FlowCondition.vue    |  191 ++
 .../package/penal/form/ElementForm.vue        |  465 ++++
 .../package/penal/index.js                    |    7 +
 .../penal/listeners/ElementListeners.vue      |  403 +++
 .../penal/listeners/UserTaskListeners.vue     |  451 ++++
 .../package/penal/listeners/template.js       |  178 ++
 .../package/penal/listeners/utilSelf.ts       |   62 +
 .../multi-instance/ElementMultiInstance.vue   |  254 ++
 .../penal/other/ElementOtherConfig.vue        |   55 +
 .../penal/properties/ElementProperties.vue    |  169 ++
 .../penal/signal-message/SignalAndMessage.vue |  113 +
 .../package/penal/task/ElementTask.vue        |   86 +
 .../task/task-components/ReceiveTask.vue      |  125 +
 .../penal/task/task-components/ScriptTask.vue |   99 +
 .../penal/task/task-components/UserTask.vue   |   98 +
 .../package/theme/element-variables.scss      |   70 +
 .../package/theme/index.scss                  |    2 +
 .../package/theme/process-designer.scss       |  161 ++
 .../package/theme/process-panel.scss          |  107 +
 .../bpmnProcessDesigner/package/utils.ts      |   77 +
 .../src/highlight/index.js                    |    5 +
 .../modules/custom-renderer/CustomRenderer.js |   14 +
 .../src/modules/custom-renderer/index.js      |    6 +
 .../src/modules/rules/CustomRules.js          |   16 +
 .../src/modules/rules/index.js                |    6 +
 .../bpmnProcessDesigner/src/translations.ts   |   25 +
 .../src/utils/directive/clickOutSide.js       |   39 +
 .../bpmnProcessDesigner/src/utils/index.js    |   10 +
 .../bpmnProcessDesigner/src/utils/xml2json.js |   50 +
 src/components/iFrame/index.ts                |    3 +
 src/components/iFrame/src/IFrame.vue          |   68 +
 src/components/index.ts                       |    6 +
 src/components/rowDrop/index.vue              |  236 ++
 src/components/workstationBind/index.ts       |    3 +
 src/components/workstationBind/src/Detail.vue |  693 +++++
 src/config/axios/config.ts                    |   28 +
 src/config/axios/errorCode.ts                 |    6 +
 src/config/axios/index.ts                     |   59 +
 src/config/axios/service.ts                   |  239 ++
 src/directives/index.ts                       |   13 +
 src/directives/permission/hasPermi.ts         |   27 +
 src/directives/permission/hasRole.ts          |   30 +
 src/hooks/event/useScrollTo.ts                |   60 +
 src/hooks/web/useCache.ts                     |   28 +
 src/hooks/web/useConfigGlobal.ts              |    9 +
 src/hooks/web/useCrudSchemas.ts               |  374 +++
 src/hooks/web/useDesign.ts                    |   18 +
 src/hooks/web/useEmitt.ts                     |   22 +
 src/hooks/web/useForm.ts                      |   94 +
 src/hooks/web/useI18n.ts                      |   53 +
 src/hooks/web/useIcon.ts                      |    8 +
 src/hooks/web/useIntro.ts                     |   47 +
 src/hooks/web/useLocale.ts                    |   35 +
 src/hooks/web/useMessage.ts                   |   95 +
 src/hooks/web/useNProgress.ts                 |   33 +
 src/hooks/web/usePageLoading.ts               |   18 +
 src/hooks/web/useTable.ts                     |  242 ++
 src/hooks/web/useTimeAgo.ts                   |   49 +
 src/hooks/web/useTitle.ts                     |   24 +
 src/hooks/web/useValidator.ts                 |   62 +
 src/hooks/web/useWatermark.ts                 |   55 +
 src/layout/Layout.vue                         |   78 +
 src/layout/components/AppView.vue             |   61 +
 src/layout/components/Breadcrumb/index.ts     |    3 +
 .../components/Breadcrumb/src/Breadcrumb.vue  |  128 +
 .../components/Breadcrumb/src/helper.ts       |   31 +
 src/layout/components/Collapse/index.ts       |    3 +
 .../components/Collapse/src/Collapse.vue      |   36 +
 src/layout/components/ContextMenu/index.ts    |   10 +
 .../ContextMenu/src/ContextMenu.vue           |   76 +
 src/layout/components/Footer/index.ts         |    3 +
 src/layout/components/Footer/src/Footer.vue   |   24 +
 src/layout/components/LocaleDropdown/index.ts |    3 +
 .../LocaleDropdown/src/LocaleDropdown.vue     |   52 +
 src/layout/components/Logo/index.ts           |    3 +
 src/layout/components/Logo/src/Logo.vue       |   88 +
 src/layout/components/Menu/index.ts           |    3 +
 src/layout/components/Menu/src/Menu.vue       |  290 +++
 .../Menu/src/components/useRenderMenuItem.tsx |   59 +
 .../src/components/useRenderMenuTitle.tsx     |   22 +
 src/layout/components/Menu/src/helper.ts      |   54 +
 src/layout/components/Message/index.ts        |    3 +
 src/layout/components/Message/src/Message.vue |  125 +
 src/layout/components/Screenfull/index.ts     |    3 +
 .../components/Screenfull/src/Screenfull.vue  |   32 +
 src/layout/components/Setting/index.ts        |    3 +
 src/layout/components/Setting/src/Setting.vue |  299 +++
 .../src/components/ColorRadioPicker.vue       |   67 +
 .../src/components/InterfaceDisplay.vue       |  224 ++
 .../src/components/LayoutRadioPicker.vue      |  172 ++
 src/layout/components/SizeDropdown/index.ts   |    3 +
 .../SizeDropdown/src/SizeDropdown.vue         |   40 +
 src/layout/components/TabMenu/index.ts        |    3 +
 src/layout/components/TabMenu/src/TabMenu.vue |  240 ++
 src/layout/components/TabMenu/src/helper.ts   |   51 +
 src/layout/components/TagsView/index.ts       |    3 +
 .../components/TagsView/src/TagsView.vue      |  585 +++++
 src/layout/components/TagsView/src/helper.ts  |   21 +
 src/layout/components/ThemeSwitch/index.ts    |    3 +
 .../ThemeSwitch/src/ThemeSwitch.vue           |   46 +
 src/layout/components/ToolHeader.vue          |   96 +
 src/layout/components/UserInfo/index.ts       |    3 +
 .../components/UserInfo/src/UserInfo.vue      |   78 +
 src/layout/components/useRenderLayout.tsx     |  306 +++
 src/locales/en-US.ts                          |  461 ++++
 src/locales/zh-CN.ts                          |  454 ++++
 src/main.ts                                   |   76 +
 src/permission.ts                             |   70 +
 src/plugins/animate.css/index.ts              |    1 +
 src/plugins/echarts/index.ts                  |   45 +
 src/plugins/elementPlus/index.ts              |   17 +
 src/plugins/formCreate/index.ts               |   43 +
 src/plugins/svgIcon/index.ts                  |    3 +
 src/plugins/tongji/index.ts                   |   23 +
 src/plugins/unocss/index.ts                   |    1 +
 src/plugins/vueI18n/helper.ts                 |    3 +
 src/plugins/vueI18n/index.ts                  |   42 +
 src/router/index.ts                           |   28 +
 src/router/modules/remaining.ts               |  370 +++
 src/store/index.ts                            |   10 +
 src/store/modules/app.ts                      |  276 ++
 src/store/modules/dict.ts                     |  104 +
 src/store/modules/locale.ts                   |   59 +
 src/store/modules/permission.ts               |   67 +
 src/store/modules/tagsView.ts                 |  140 +
 src/store/modules/user.ts                     |   91 +
 src/styles/global.module.scss                 |    6 +
 src/styles/index.scss                         |   35 +
 src/styles/theme.scss                         |    6 +
 src/styles/var.css                            |   66 +
 src/styles/variables.scss                     |    4 +
 src/types/components.d.ts                     |   56 +
 src/types/configGlobal.d.ts                   |    4 +
 src/types/contextMenu.d.ts                    |    7 +
 src/types/descriptions.d.ts                   |   13 +
 src/types/elementPlus.d.ts                    |    3 +
 src/types/form.d.ts                           |   44 +
 src/types/icon.d.ts                           |    5 +
 src/types/infoTip.d.ts                        |    4 +
 src/types/layout.d.ts                         |    1 +
 src/types/localeDropdown.d.ts                 |   10 +
 src/types/qrcode.d.ts                         |    9 +
 src/types/table.d.ts                          |   44 +
 src/types/tableForm.d.ts                      |   44 +
 src/types/theme.d.ts                          |   16 +
 src/utils/Logger.ts                           |  100 +
 src/utils/auth.ts                             |   92 +
 src/utils/color.ts                            |  153 ++
 src/utils/constants.ts                        |  360 +++
 src/utils/dict.ts                             |  282 +++
 src/utils/disposition/defaultButtons.ts       |  771 ++++++
 src/utils/disposition/formFields.ts           | 1954 ++++++++++++++
 src/utils/disposition/tableDetailsColumns.ts  | 1431 +++++++++++
 src/utils/disposition/tableSummaryColumns.ts  |  100 +
 src/utils/disposition/tabsList.ts             |   40 +
 src/utils/domUtils.ts                         |  289 +++
 src/utils/download.ts                         |   38 +
 src/utils/filt.ts                             |  157 ++
 src/utils/formCreate.ts                       |   54 +
 src/utils/formRules.ts                        |    7 +
 src/utils/formatTime.ts                       |  232 ++
 src/utils/formatter.ts                        |   12 +
 src/utils/index.ts                            |  245 ++
 src/utils/is.ts                               |  105 +
 src/utils/jsencrypt.ts                        |   31 +
 src/utils/permission.ts                       |   45 +
 src/utils/propTypes.ts                        |   28 +
 src/utils/routerHelper.ts                     |  238 ++
 src/utils/tree.ts                             |  399 +++
 src/utils/tsxHelper.ts                        |   16 +
 src/utils/validator.ts                        |  775 ++++++
 src/views/bpm/definition/index.vue            |  174 ++
 src/views/bpm/form/editor/index.vue           |  119 +
 src/views/bpm/form/index.vue                  |  165 ++
 src/views/bpm/group/UserGroupForm.vue         |  132 +
 src/views/bpm/group/index.vue                 |  149 ++
 src/views/bpm/model/ModelForm.vue             |  230 ++
 src/views/bpm/model/ModelImportForm.vue       |  140 +
 src/views/bpm/model/editor/index.vue          |  105 +
 src/views/bpm/model/index.vue                 |  314 +++
 src/views/bpm/oa/leave/create.vue             |   89 +
 src/views/bpm/oa/leave/detail.vue             |   51 +
 src/views/bpm/oa/leave/index.vue              |  175 ++
 .../bpm/processInstance/create/index.vue      |  133 +
 .../detail/ProcessInstanceBpmnViewer.vue      |   57 +
 .../detail/ProcessInstanceTaskList.vue        |   97 +
 .../detail/TaskReturnDialogForm.vue           |   90 +
 .../detail/TaskUpdateAssigneeForm.vue         |   83 +
 .../bpm/processInstance/detail/index.vue      |  285 +++
 src/views/bpm/processInstance/index.vue       |  186 ++
 src/views/bpm/task/done/TaskDetail.vue        |   51 +
 src/views/bpm/task/done/index.vue             |  125 +
 src/views/bpm/task/todo/index.vue             |  112 +
 .../bpm/taskAssignRule/TaskAssignRuleForm.vue |  250 ++
 src/views/bpm/taskAssignRule/index.vue        |  136 +
 src/views/error/403.vue                       |    8 +
 src/views/error/404.vue                       |    7 +
 src/views/error/500.vue                       |    7 +
 src/views/home/Index copy.vue                 |  381 +++
 src/views/home/Index2.vue                     |  319 +++
 src/views/home/components/material.vue        |  336 +++
 src/views/home/components/produce.vue         |  286 +++
 src/views/home/components/product.vue         |  313 +++
 src/views/home/components/supplierIndex.vue   |  452 ++++
 src/views/home/echarts-data.ts                |  286 +++
 src/views/home/index.vue                      |   14 +
 src/views/home/types.ts                       |   55 +
 .../infra/apiAccessLog/ApiAccessLogDetail.vue |   67 +
 src/views/infra/apiAccessLog/index.vue        |  167 ++
 .../infra/apiErrorLog/ApiErrorLogDetail.vue   |   81 +
 src/views/infra/apiErrorLog/index.vue         |  249 ++
 src/views/infra/build/index.vue               |  143 ++
 src/views/infra/codegen/PreviewCode.vue       |  222 ++
 .../codegen/components/BasicInfoForm.vue      |   87 +
 .../codegen/components/ColumInfoForm.vue      |  153 ++
 .../codegen/components/GenerateInfoForm.vue   |  391 +++
 src/views/infra/codegen/components/index.ts   |    4 +
 src/views/infra/codegen/editTable.vue         |   83 +
 src/views/infra/codegen/importTable.vue       |  151 ++
 src/views/infra/codegen/index.vue             |  258 ++
 src/views/infra/config/ConfigForm.vue         |  155 ++
 src/views/infra/config/index.vue              |  184 ++
 src/views/infra/customInterface/index.vue     |   21 +
 .../dataSourceConfig/DataSourceConfigForm.vue |  111 +
 src/views/infra/dataSourceConfig/index.vue    |   87 +
 src/views/infra/dbDoc/index.vue               |   57 +
 src/views/infra/druid/index.vue               |   25 +
 src/views/infra/file/FileForm.vue             |  104 +
 src/views/infra/file/index.vue                |  164 ++
 src/views/infra/fileConfig/FileConfigForm.vue |  195 ++
 src/views/infra/fileConfig/index.vue          |  168 ++
 src/views/infra/job/JobDetail.vue             |   73 +
 src/views/infra/job/JobForm.vue               |  131 +
 src/views/infra/job/index.vue                 |  255 ++
 src/views/infra/job/logger/JobLogDetail.vue   |   59 +
 src/views/infra/job/logger/index.vue          |  196 ++
 src/views/infra/redis/index.vue               |  266 ++
 src/views/infra/server/index.vue              |   28 +
 src/views/infra/skywalking/index.vue          |   25 +
 src/views/infra/swagger/index.vue             |   26 +
 src/views/infra/testDemo/index.vue            |    4 +
 src/views/infra/webSocket/index.vue           |  118 +
 src/views/login/components/LoginForm.vue      |  287 +++
 src/views/login/components/LoginFormTitle.vue |   26 +
 src/views/login/components/MobileForm.vue     |  225 ++
 src/views/login/components/QrCodeForm.vue     |   30 +
 src/views/login/components/RegisterForm.vue   |  142 ++
 src/views/login/components/SSOLogin.vue       |  199 ++
 src/views/login/components/index.ts           |    8 +
 src/views/login/components/useLogin.ts        |   42 +
 src/views/login/login.vue                     |  104 +
 src/views/mes/jobcalendar/index.vue           |   10 +
 .../processroute/components/configDialog.vue  |  294 +++
 .../processroute/components/graphbase.data.ts |  290 +++
 src/views/mes/processroute/index.vue          |  258 ++
 .../mes/processroute/processroute.data.ts     |  148 ++
 src/views/mes/productionPlan/index.vue        |  244 ++
 .../mes/productionPlan/productionPlan.data.ts |  182 ++
 src/views/mes/teamSetting/index.vue           |  244 ++
 src/views/mes/teamSetting/teamSetting.data.ts |  178 ++
 src/views/mes/workstation/index.vue           |  286 +++
 src/views/mes/workstation/workstation.data.ts |  170 ++
 src/views/profile/components/BasicInfo.vue    |   92 +
 src/views/profile/components/ProfileUser.vue  |   99 +
 src/views/profile/components/ResetPwd.vue     |   73 +
 src/views/profile/components/UserAvatar.vue   |   39 +
 src/views/profile/components/UserSocial.vue   |   94 +
 src/views/profile/components/index.ts         |    7 +
 src/views/profile/index.vue                   |   64 +
 src/views/redirect/redirect.vue               |   28 +
 src/views/report/goview/index.vue             |   10 +
 src/views/report/jmreport/index.vue           |   13 +
 src/views/system/area/AreaForm.vue            |   72 +
 src/views/system/area/index.vue               |   73 +
 src/views/system/dept/DeptForm.vue            |  173 ++
 src/views/system/dept/index.vue               |  149 ++
 src/views/system/dict/DictTypeForm.vue        |  124 +
 src/views/system/dict/data/DictDataForm.vue   |  183 ++
 src/views/system/dict/data/index.vue          |  210 ++
 src/views/system/dict/index.vue               |  175 ++
 src/views/system/errorCode/ErrorCodeForm.vue  |  112 +
 src/views/system/errorCode/index.vue          |  171 ++
 src/views/system/loginlog/LoginLogDetail.vue  |   51 +
 src/views/system/loginlog/index.vue           |  140 +
 .../system/mail/account/MailAccountDetail.vue |   28 +
 .../system/mail/account/MailAccountForm.vue   |   68 +
 src/views/system/mail/account/account.data.ts |   76 +
 src/views/system/mail/account/index.vue       |   80 +
 src/views/system/mail/log/MailLogDetail.vue   |   33 +
 src/views/system/mail/log/index.vue           |   62 +
 src/views/system/mail/log/log.data.ts         |  133 +
 .../system/mail/template/MailTemplateForm.vue |   74 +
 .../mail/template/MailTemplateSendForm.vue    |  115 +
 src/views/system/mail/template/index.vue      |   84 +
 .../system/mail/template/template.data.ts     |  113 +
 src/views/system/menu/MenuForm.vue            |  256 ++
 src/views/system/menu/index.vue               |  276 ++
 src/views/system/notice/NoticeForm.vue        |  132 +
 src/views/system/notice/index.vue             |  136 +
 .../notify/message/NotifyMessageDetail.vue    |   66 +
 src/views/system/notify/message/index.vue     |  142 ++
 .../notify/my/MyNotifyMessageDetail.vue       |   48 +
 src/views/system/notify/my/index.vue          |  216 ++
 .../notify/template/NotifyTemplateForm.vue    |  153 ++
 .../template/NotifyTemplateSendForm.vue       |  129 +
 src/views/system/notify/template/index.vue    |  164 ++
 src/views/system/oauth2/client/ClientForm.vue |  266 ++
 src/views/system/oauth2/client/index.vue      |  150 ++
 src/views/system/oauth2/token/index.vue       |  122 +
 .../system/operatelog/OperateLogDetail.vue    |   82 +
 src/views/system/operatelog/index.vue         |  159 ++
 src/views/system/post/PostForm.vue            |  125 +
 src/views/system/post/index.vue               |  157 ++
 src/views/system/role/RoleAssignMenuForm.vue  |  160 ++
 .../system/role/RoleDataPermissionForm.vue    |  167 ++
 src/views/system/role/RoleForm.vue            |  126 +
 src/views/system/role/index.vue               |  264 ++
 .../sensitiveWord/SensitiveWordForm.vue       |  131 +
 .../sensitiveWord/SensitiveWordTestForm.vue   |   91 +
 src/views/system/sensitiveWord/index.vue      |  191 ++
 .../system/serialNumber/SerialNumberForm.vue  |  124 +
 src/views/system/serialNumber/index.vue       |  182 ++
 .../system/sms/channel/SmsChannelForm.vue     |  144 ++
 src/views/system/sms/channel/index.vue        |  144 ++
 src/views/system/sms/log/SmsLogDetail.vue     |   89 +
 src/views/system/sms/log/index.vue            |  193 ++
 .../system/sms/template/SmsTemplateForm.vue   |  163 ++
 .../sms/template/SmsTemplateSendForm.vue      |  120 +
 src/views/system/sms/template/index.vue       |  213 ++
 src/views/system/tenant/TenantForm.vue        |  188 ++
 src/views/system/tenant/index.vue             |  192 ++
 .../tenantPackage/TenantPackageForm.vue       |  194 ++
 src/views/system/tenantPackage/index.vue      |  138 +
 src/views/system/user/DeptTree.vue            |   63 +
 src/views/system/user/UserAssignRoleForm.vue  |   96 +
 src/views/system/user/UserForm.vue            |  218 ++
 src/views/system/user/UserImportForm.vue      |  135 +
 src/views/system/user/index.vue               |  260 ++
 .../customerManage/customer/customer.data.ts  |  303 +++
 .../customerManage/customer/index.vue         |  266 ++
 .../customerdock/customerdock.data.ts         |  317 +++
 .../customerManage/customerdock/index.vue     |  277 ++
 .../customeritem/customeritem.data.ts         |  321 +++
 .../customerManage/customeritem/index.vue     |  282 +++
 .../customerManage/project/index.vue          |  274 ++
 .../customerManage/project/project.data.ts    |  182 ++
 .../customerManage/saleprice/index.vue        |  276 ++
 .../saleprice/saleprice.data.ts               |  236 ++
 .../businesstype/businesstype.data.ts         |  379 +++
 .../documentSetting/businesstype/index.vue    |  303 +++
 .../documentsetting/documentsetting.data.ts   |  274 ++
 .../documentSetting/documentsetting/index.vue |  243 ++
 .../documentSetting/jobsetting/index.vue      |  243 ++
 .../jobsetting/jobsetting.data.ts             |  408 +++
 .../documentSetting/plansetting/index.vue     |  242 ++
 .../plansetting/plansetting.data.ts           |  260 ++
 .../documentSetting/recordsetting/index.vue   |  243 ++
 .../recordsetting/recordsetting.data.ts       |  143 ++
 .../documentSetting/requestsetting/index.vue  |  243 ++
 .../requestsetting/requestsetting.data.ts     |  260 ++
 .../documentSetting/switch/index.vue          |  219 ++
 .../documentSetting/switch/switch.data.ts     |   89 +
 .../documentSetting/transactiontype/index.vue |  243 ++
 .../transactiontype/transactiontype.data.ts   |  200 ++
 .../areabasic/areabasic.data.ts               |  231 ++
 .../factoryModeling/areabasic/index.vue       |  275 ++
 .../factoryModeling/dock/dock.data.ts         |  284 +++
 .../factoryModeling/dock/index.vue            |  267 ++
 .../enterprise/enterprise.data.ts             |  156 ++
 .../factoryModeling/enterprise/index.vue      |  264 ++
 .../factoryModeling/location/index.vue        |  295 +++
 .../factoryModeling/location/location.data.ts |  408 +++
 .../factoryModeling/locationgroup/index.vue   |  275 ++
 .../locationgroup/locationgroup.data.ts       |  230 ++
 .../factoryModeling/process/index.vue         |  283 +++
 .../factoryModeling/process/process.data.ts   |  241 ++
 .../factoryModeling/productionline/index.vue  |  276 ++
 .../productionline/productionline.data.ts     |  257 ++
 .../factoryModeling/warehouse/index.vue       |  256 ++
 .../warehouse/warehouse.data.ts               |  187 ++
 .../factoryModeling/workshop/index.vue        |  257 ++
 .../factoryModeling/workshop/workshop.data.ts |  150 ++
 .../factoryModeling/workstation/index.vue     |  284 +++
 .../workstation/workstation.data.ts           |  315 +++
 .../itemManage/bom/bom.data.ts                |  264 ++
 .../basicDataManage/itemManage/bom/index.vue  |  286 +++
 .../itemManage/itemarea/index.vue             |  383 +++
 .../itemManage/itemarea/itemarea.data.ts      |  730 ++++++
 .../itemManage/itembasic/index.vue            |  347 +++
 .../itemManage/itembasic/itembasic.data.ts    |  481 ++++
 .../itemManage/itempackage/index.vue          |  284 +++
 .../itempackage/itempackage.data.ts           |  239 ++
 .../itemManage/itemwarehouse/index.vue        |  244 ++
 .../itemwarehouse/itemwarehouse.data.ts       |  215 ++
 .../itemManage/packageunit/index.vue          |  244 ++
 .../packageunit/packageunit.data.ts           |  585 +++++
 .../itemManage/productionlineitem/index.vue   |  278 ++
 .../productionlineitem.data.ts                |  247 ++
 .../itemManage/stdcostprice/index.vue         |  270 ++
 .../stdcostprice/stdcostprice.data.ts         |  223 ++
 .../labelManage/barbasic/barbasic.data.ts     |  101 +
 .../labelManage/barbasic/index.vue            |  239 ++
 .../labelManage/barcode/barcode.data.ts       |  155 ++
 .../labelManage/barcode/index.vue             |  248 ++
 .../callmaterials/callmaterials.data.ts       |  333 +++
 .../labelManage/callmaterials/index.vue       |  269 ++
 .../labelManage/labeltype/index.vue           |  244 ++
 .../labelManage/labeltype/labeltype.data.ts   |  190 ++
 .../labelManage/locationLabel/index.vue       |  203 ++
 .../locationLabel/locationLabel.data.ts       |  103 +
 .../labelManage/manufacturePackage/index.vue  |  307 +++
 .../manufacturePackage.data.ts                |  508 ++++
 .../labelManage/purchasePackage/index.vue     |  307 +++
 .../purchasePackage/purchasePackage.data.ts   |  659 +++++
 .../labelManage/utensilPackage/index.vue      |  277 ++
 .../utensilPackage/utensilPackage.data.ts     |  115 +
 .../orderManage/carrier/carrier.data.ts       |  301 +++
 .../orderManage/carrier/index.vue             |  262 ++
 .../orderManage/owner/index.vue               |  262 ++
 .../orderManage/owner/owner.data.ts           |  301 +++
 .../orderManage/shift/index.vue               |  267 ++
 .../orderManage/shift/shift.data.ts           |  252 ++
 .../orderManage/team/index.vue                |  256 ++
 .../orderManage/team/team.data.ts             |  158 ++
 .../condition/condition.data.ts               |   91 +
 .../strategySetting/condition/index.vue       |  219 ++
 .../configuration/configuration.data.ts       |   84 +
 .../strategySetting/configuration/index.vue   |  219 ++
 .../configurationsetting.data.ts              |  104 +
 .../configurationsetting/index.vue            |  252 ++
 .../strategySetting/paramsetting/index.vue    |  223 ++
 .../paramsetting/paramsetting.data.ts         |  137 +
 .../strategySetting/rule/index.vue            |  247 ++
 .../strategySetting/rule/rule.data.ts         |   77 +
 .../arrivalInspectionStrategy/AddForm.vue     |  449 ++++
 .../arrivalInspectionStrategy/index.vue       |  172 ++
 .../strategy/batchStrategy/AddForm.vue        |  636 +++++
 .../strategy/batchStrategy/index.vue          |  172 ++
 .../strategy/downShelfStrategy/AddForm.vue    | 1022 ++++++++
 .../strategy/downShelfStrategy/index.vue      |  174 ++
 .../strategy/inspectStrategy/AddForm.vue      |  633 +++++
 .../strategy/inspectStrategy/index.vue        |  170 ++
 .../manageAccuracyStrategy/AddForm.vue        |  685 +++++
 .../strategy/manageAccuracyStrategy/index.vue |  172 ++
 .../purchaseReceiptStrategy/AddForm.vue       |  491 ++++
 .../purchaseReceiptStrategy/index.vue         |  173 ++
 .../repairMaterialStrategy/AddForm.vue        |  644 +++++
 .../strategy/repairMaterialStrategy/index.vue |  172 ++
 .../storageCapacityStrategy/AddForm.vue       |  635 +++++
 .../storageCapacityStrategy/index.vue         |  172 ++
 .../supplieDeliveryStrategy/AddForm.vue       |  584 +++++
 .../supplieDeliveryStrategy/index.vue         |  173 ++
 .../strategy/upShelfStrategy/AddForm.vue      |  954 +++++++
 .../strategy/upShelfStrategy/index.vue        |  175 ++
 .../utensilCapacityStrategy/AddForm.vue       |  490 ++++
 .../utensilCapacityStrategy/index.vue         |  172 ++
 .../warehouseStorageStrategy/AddForm.vue      |  611 +++++
 .../warehouseStorageStrategy/index.vue        |  173 ++
 .../supplierManage/purchaseprice/index.vue    |  278 ++
 .../purchaseprice/purchaseprice.data.ts       |  236 ++
 .../supplierManage/supplier/index.vue         |  260 ++
 .../supplierManage/supplier/supplier.data.ts  |  310 +++
 .../supplierManage/supplieritem/index.vue     |  277 ++
 .../supplieritem/supplieritem.data.ts         |  336 +++
 .../accountcalendar/accountcalendar.data.ts   |  292 +++
 .../systemSetting/accountcalendar/index.vue   |  243 ++
 .../currencyexchange/currencyexchange.data.ts |  192 ++
 .../systemSetting/currencyexchange/index.vue  |  247 ++
 .../systemSetting/supplierUser/index.vue      |  254 ++
 .../supplierUser/supplierUser.data.ts         |  169 ++
 .../systemSetting/systemcalendar/index.vue    |  243 ++
 .../systemcalendar/systemcalendar.data.ts     |  211 ++
 .../count/countJobMain/countJobMain.data.ts   |  734 ++++++
 .../countManage/count/countJobMain/index.vue  |  251 ++
 .../count/countPlanMain/countPlanMain.data.ts |  749 ++++++
 .../countManage/count/countPlanMain/index.vue |  803 ++++++
 .../countRecordMain/countRecordMain.data.ts   |  618 +++++
 .../count/countRecordMain/index.vue           |  189 ++
 .../countRequestMain/countRequestMain.data.ts |  632 +++++
 .../count/countRequestMain/index.vue          |  560 ++++
 .../countadjustRecordMain.data.ts             |  535 ++++
 .../countadjustRecordMain/index.vue           |  174 ++
 .../countadjustRequestMain.data.ts            |  633 +++++
 .../countadjustRequestMain/index.vue          |  388 +++
 .../customerreceiptRecordMain.data.ts         |  746 ++++++
 .../customerreceiptRecordMain/index.vue       |  174 ++
 .../customerreceiptRequestMain.data.ts        |  734 ++++++
 .../customerreceiptRequestMain/index.vue      |  381 +++
 .../customerreturnJobMain.data.ts             |  878 +++++++
 .../customerreturnJobMain/index.vue           |  379 +++
 .../customerreturnRecordMain.data.ts          |  766 ++++++
 .../customerreturnRecordMain/index.vue        |  185 ++
 .../customerreturnRequestMain.data.ts         | 1001 ++++++++
 .../customerreturnRequestMain/index.vue       |  529 ++++
 .../customersettleRecordMain.data.ts          |  619 +++++
 .../customersettleRecordMain/index.vue        |  174 ++
 .../customersettleRequestMain.data.ts         |  749 ++++++
 .../customersettleRequestMain/index.vue       |  408 +++
 .../deliverJobMain/deliverJobMain.data.ts     |  882 +++++++
 .../deliver/deliverJobMain/index.vue          |  345 +++
 .../deliverRecordMain.data.ts                 |  741 ++++++
 .../deliver/deliverRecordMain/index.vue       |  185 ++
 .../deliverRequestMain.data.ts                | 1034 ++++++++
 .../deliver/deliverRequestMain/index.vue      |  571 +++++
 .../deliverPlanMain/deliverPlanMain.data.ts   |  748 ++++++
 .../deliverplan/deliverPlanMain/index.vue     |  459 ++++
 .../deliverplan/saleMain/index.vue            |  329 +++
 .../deliverplan/saleMain/saleMain.data.ts     |  749 ++++++
 .../stockup/stockupMainJob/index.vue          |  252 ++
 .../stockupMainJob/stockupMainJob.data.ts     |  588 +++++
 .../stockup/stockupMainRecord/index.vue       |  175 ++
 .../stockupMainRecord.data.ts                 |  577 +++++
 .../stockup/stockupMainRequest/index.vue      |  518 ++++
 .../stockupMainRequest.data.ts                |  742 ++++++
 .../inventoryManage/balance/balance.data.ts   |  457 ++++
 .../wms/inventoryManage/balance/index.vue     |  233 ++
 .../container/containerMain.data.ts           |  147 ++
 .../wms/inventoryManage/container/index.vue   |  171 ++
 .../containerBindRecordMain.data.ts           |  171 ++
 .../containerBindRecord/index.vue             |  294 +++
 .../containerRepairRecordMain.data.ts         |  145 ++
 .../containerinit/containerRepair/index.vue   |  293 +++
 .../containerUnbindRecordMain.data.ts         |  170 ++
 .../containerUnbindRecord/index.vue           |  293 +++
 .../containerinitadd/containerMain.data.ts    |  271 ++
 .../containerinit/containerinitadd/index.vue  |  324 +++
 .../containerInitRecordMain.data.ts           |  149 ++
 .../containerinitrecord/index.vue             |  293 +++
 .../inventoryManage/expectin/expectin.data.ts |  134 +
 .../wms/inventoryManage/expectin/index.vue    |  219 ++
 .../expectout/expectout.data.ts               |  145 ++
 .../wms/inventoryManage/expectout/index.vue   |  219 ++
 .../locationcapacity/index.vue                |  219 ++
 .../locationcapacity/locationcapacity.data.ts |   71 +
 .../wms/inventoryManage/package/index.vue     |  266 ++
 .../inventoryManage/package/package.data.ts   |  420 +++
 .../wms/inventoryManage/transaction/index.vue |  220 ++
 .../transaction/transaction.data.ts           |  349 +++
 .../wms/inventoryManage/transferlog/index.vue |  219 ++
 .../transferlog/transferlog.data.ts           |  380 +++
 .../inventoryinitRecordMain/index.vue         |  174 ++
 .../inventoryinitRecordMain.data.ts           |  639 +++++
 .../inventoryinitRequestMain/index.vue        |  413 +++
 .../inventoryinitRequestMain.data.ts          |  871 +++++++
 .../packageManage/packagemergeMain/index.vue  |  163 ++
 .../packagemergeMain/packagemergeMain.data.ts |  415 +++
 .../packageoverJobMain/index.vue              |  244 ++
 .../packageoverJobMain.data.ts                |  821 ++++++
 .../packageoverRecordMain/index.vue           |  196 ++
 .../packageoverRecordMain.data.ts             |  496 ++++
 .../packageoverRequestMain/index.vue          |  439 ++++
 .../packageoverRequestMain.data.ts            |  890 +++++++
 .../packageoverRetrospect/index.vue           |  129 +
 .../packageoverRetrospect.data.ts             |  409 +++
 .../packageManage/packagesplitMain/index.vue  |  163 ++
 .../packagesplitMain/packagesplitMain.data.ts |  417 +++
 .../scrap/scrapJobMain/index.vue              |  241 ++
 .../scrap/scrapJobMain/scrapJobMain.data.ts   |  768 ++++++
 .../scrap/scrapRecordMain/index.vue           |  174 ++
 .../scrapRecordMain/scrapRecordMain.data.ts   |  580 +++++
 .../scrap/scrapRequestMain/index.vue          |  493 ++++
 .../scrapRequestMain/scrapRequestMain.data.ts |  787 ++++++
 .../transferissueJobMain/index.vue            |  283 +++
 .../transferissueJobMain.data.ts              |  854 +++++++
 .../transferissueRecordMain/index.vue         |  174 ++
 .../transferissueRecordMain.data.ts           |  702 ++++++
 .../transferissueRequestMain/index.vue        |  477 ++++
 .../transferissueRequestMain.data.ts          |  910 +++++++
 .../transferreceiptJobMain/index.vue          |  241 ++
 .../transferreceiptJobMain.data.ts            |  846 +++++++
 .../transferreceiptRecordMain/index.vue       |  174 ++
 .../transferreceiptRecordMain.data.ts         |  710 ++++++
 .../transferreceiptRequestMain/index.vue      |  428 ++++
 .../transferreceiptRequestMain.data.ts        |  689 +++++
 .../unplannedissueJobMain/index.vue           |  241 ++
 .../unplannedissueJobMain.data.ts             |  769 ++++++
 .../unplannedissueRecordMain/index.vue        |  174 ++
 .../unplannedissueRecordMain.data.ts          |  592 +++++
 .../unplannedissueRequestMain/index.vue       |  461 ++++
 .../unplannedissueRequestMain.data.ts         |  669 +++++
 .../unplannedreceiptJobMain/index.vue         |  241 ++
 .../unplannedreceiptJobMain.data.ts           |  871 +++++++
 .../unplannedreceiptRecordMain/index.vue      |  174 ++
 .../unplannedreceiptRecordMain.data.ts        |  644 +++++
 .../unplannedreceiptRequestMain/index.vue     |  651 +++++
 .../unplannedreceiptRequestMain.data.ts       | 1166 +++++++++
 .../issueManage/issue/issueJobMain/index.vue  |  314 +++
 .../issue/issueJobMain/issueJobMain.data.ts   |  869 +++++++
 .../issue/issueRecordMain/index.vue           |  174 ++
 .../issueRecordMain/issueRecordMain.data.ts   |  697 +++++
 .../issue/issueRequestMain/index.vue          |  455 ++++
 .../issueRequestMain/issueRequestMain.data.ts |  879 +++++++
 .../onlinesettlementRecordMain/index.vue      |  174 ++
 .../onlinesettlementRecordMain.data.ts        |  463 ++++
 .../onlinesettlementRequestMain/index.vue     |  343 +++
 .../onlinesettlementRequestMain.data.ts       |  609 +++++
 .../issueManage/pick/pickJobMain/index.vue    |  238 ++
 .../pick/pickJobMain/pickJobMain.data.ts      |  785 ++++++
 .../issueManage/pick/pickRecordMain/index.vue |  171 ++
 .../pickRecordMain/pickRecordMain.data.ts     |  641 +++++
 .../pick/pickRequestMain/index.vue            |  348 +++
 .../pickRequestMain/pickRequestMain.data.ts   |  598 +++++
 .../preparetoissueMain/index.vue              |  506 ++++
 .../preparetoissueMain.data.ts                |  774 ++++++
 .../productionreceiptJobMain/index.vue        |  315 +++
 .../productionreceiptJobMain.data.ts          |  796 ++++++
 .../productionreceiptRecordMain/index.vue     |  174 ++
 .../productionreceiptRecordMain.data.ts       |  678 +++++
 .../productionreturnJobMain/index.vue         |  287 +++
 .../productionreturnJobMain.data.ts           |  808 ++++++
 .../productionreturnRecordMain/index.vue      |  174 ++
 .../productionreturnRecordMain.data.ts        |  650 +++++
 .../productionreturnRequestMain/index.vue     |  697 +++++
 .../productionreturnRequestMain.data.ts       | 1250 +++++++++
 .../productionreturnRequestMainNo/index.vue   |  666 +++++
 .../productionreturnRequestMainNo.data.ts     |  827 ++++++
 .../repleinsh/repleinshJobMain/index.vue      |  342 +++
 .../repleinshJobMain/repleinshJobMain.data.ts |  791 ++++++
 .../repleinsh/repleinshRecordMain/index.vue   |  171 ++
 .../repleinshRecordMain.data.ts               |  629 +++++
 .../repleinsh/repleinshRequestMain/index.vue  |  406 +++
 .../repleinshRequestMain.data.ts              |  742 ++++++
 .../inventorychangeRecordMain/index.vue       |  220 ++
 .../inventorychangeRecordMain.data.ts         |  704 ++++++
 .../inventorychangeRequestMain/index.vue      |  468 ++++
 .../inventorychangeRequestMain.data.ts        |  945 +++++++
 .../inventorymoveJobMain/index.vue            |  311 +++
 .../inventorymoveJobMain.data.ts              |  831 ++++++
 .../inventorymoveRecordMain/index.vue         |  246 ++
 .../inventorymoveRecordMain.data.ts           |  685 +++++
 .../inventorymoveRequestMain/index.vue        |  678 +++++
 .../inventorymoveRequestMain.data.ts          |  870 +++++++
 src/views/wms/moveManage/itemChange/index.vue |  232 ++
 .../moveManage/itemChange/itemChange.data.ts  |  490 ++++
 .../offlinesettlementRecordMain/index.vue     |  174 ++
 .../offlinesettlementRecordMain.data.ts       |  497 ++++
 .../offlinesettlementRequestMain/index.vue    |  351 +++
 .../offlinesettlementRequestMain.data.ts      |  579 +++++
 .../productdismantleJobMain/index.vue         |  241 ++
 .../productdismantleJobMain.data.ts           |  881 +++++++
 .../productdismantleRecordMain/index.vue      |  244 ++
 .../productdismantleRecordMain.data.ts        | 1008 ++++++++
 .../productdismantleRequestMain/index.vue     |  611 +++++
 .../productdismantleRequestMain.data.ts       | 1369 ++++++++++
 .../productionplan/productionMain/index.vue   |  493 ++++
 .../productionMain/productionMain.data.ts     |  912 +++++++
 .../productionMainAssemble/index.vue          |  492 ++++
 .../productionMainAssemble.data.ts            |  912 +++++++
 .../productionMainAssembleSparePart/index.vue |  492 ++++
 .../productionMainAssembleSparePart.data.ts   |  912 +++++++
 .../productionMainPredictSparePart/index.vue  |  492 ++++
 .../productionMainPredictSparePart.data.ts    |  912 +++++++
 .../productionplan/workMain/index.vue         |  316 +++
 .../productionplan/workMain/workMain.data.ts  |  510 ++++
 .../productputawayJobMain/index.vue           |  280 ++
 .../productputawayJobMain.data.ts             |  809 ++++++
 .../productputawayRecordMain/index.vue        |  174 ++
 .../productputawayRecordMain.data.ts          |  665 +++++
 .../productputawayRequestMain/index.vue       |  409 +++
 .../productputawayRequestMain.data.ts         |  752 ++++++
 .../productreceiptJobMain/index.vue           |  303 +++
 .../productreceiptJobMain.data.ts             |  914 +++++++
 .../productreceiptRecordMain/index.vue        |  231 ++
 .../productreceiptRecordMain.data.ts          |  956 +++++++
 .../productreceiptRequestMain/index.vue       |  671 +++++
 .../productreceiptRequestMain.data.ts         | 1774 +++++++++++++
 .../productreceiptAssembleJobMain/index.vue   |  302 +++
 .../productreceiptAssembleJobMain.data.ts     |  917 +++++++
 .../index.vue                                 |  230 ++
 .../productreceiptAssembleRecordMain.data.ts  |  959 +++++++
 .../index.vue                                 |  670 +++++
 .../productreceiptAssembleRequestMain.data.ts | 1774 +++++++++++++
 .../productreceiptscrapJobMain/index.vue      |  301 +++
 .../productreceiptscrapJobMain.data.ts        |  903 +++++++
 .../productreceiptscrapRecordMain/index.vue   |  229 ++
 .../productreceiptscrapRecordMain.data.ts     |  945 +++++++
 .../productreceiptscrapRequestMain/index.vue  |  670 +++++
 .../productreceiptscrapRequestMain.data.ts    | 1779 +++++++++++++
 .../productredressJobMain/index.vue           |  244 ++
 .../productredressJobMain.data.ts             |  523 ++++
 .../productredressRecordMain/index.vue        |  244 ++
 .../productredressRecordMain.data.ts          |  446 ++++
 .../productredressRequestMain/index.vue       |  501 ++++
 .../productredressRequestMain.data.ts         |  595 +++++
 .../productrepairRecordMain/index.vue         |  283 +++
 .../productrepairRecordMain.data.ts           |  854 +++++++
 .../productrepairRequestMain/index.vue        |  685 +++++
 .../productrepairRequestMain.data.ts          | 1343 ++++++++++
 .../productscrapJobMain/index.vue             |  241 ++
 .../productscrapJobMain.data.ts               |  757 ++++++
 .../productscrapRecordMain/index.vue          |  282 +++
 .../productscrapRecordMain.data.ts            |  811 ++++++
 .../productscrapRequestMain/index.vue         |  739 ++++++
 .../productscrapRequestMain.data.ts           | 1234 +++++++++
 .../inspect/inspectJobMain/index.vue          |  251 ++
 .../inspectJobMain/inspectJobMain.data.ts     |  835 ++++++
 .../inspect/inspectRecordMain/index.vue       |  201 ++
 .../inspectRecordMain.data.ts                 |  854 +++++++
 .../inspect/inspectRequestMain/index.vue      |  395 +++
 .../inspectRequestMain.data.ts                |  689 +++++
 .../purchasereceiptJobMain/index.vue          |  308 +++
 .../purchasereceiptJobMain.data.ts            | 1457 +++++++++++
 .../purchasereceiptRecordMain/index.vue       |  302 +++
 .../purchasereceiptRecordMain.data.ts         | 1669 ++++++++++++
 .../purchasereceiptRequestMain/index.vue      |  586 +++++
 .../purchasereceiptRequestMain.data.ts        | 2245 +++++++++++++++++
 .../purchasereturnJobMain/index.vue           |  252 ++
 .../purchasereturnJobMain.data.ts             |  867 +++++++
 .../purchasereturnRecordMain/index.vue        |  186 ++
 .../purchasereturnRecordMain.data.ts          |  741 ++++++
 .../purchasereturnRequestMain/index.vue       |  721 ++++++
 .../purchasereturnRequestMain.data.ts         | 1061 ++++++++
 .../putaway/putawayJobMain/index.vue          |  305 +++
 .../putawayJobMain/putawayJobMain.data.ts     | 1153 +++++++++
 .../putaway/putawayRecordMain/index.vue       |  229 ++
 .../putawayRecordMain.data.ts                 | 1168 +++++++++
 .../putaway/putawayRequestMain/index.vue      |  477 ++++
 .../putawayRequestMain.data.ts                | 1215 +++++++++
 .../sparereceiptJobMain/index.vue             |  276 ++
 .../sparereceiptJobMain.data.ts               | 1007 ++++++++
 .../sparereceiptRecordMain/index.vue          |  188 ++
 .../sparereceiptRecordMain.data.ts            |  930 +++++++
 .../sparereceiptRequestMain/index.vue         |  534 ++++
 .../sparereceiptRequestMain.data.ts           | 1646 ++++++++++++
 .../demandforecastingMain.data.ts             |  567 +++++
 .../demandforecastingMain/index.vue           |  338 +++
 .../supplierdeliver/purchaseMain/index.vue    |  474 ++++
 .../purchaseMain/purchaseMain.data.ts         |  866 +++++++
 .../purchasePlanMain/index.vue                |  549 ++++
 .../purchasePlanMain/purchasePlanMain.data.ts |  621 +++++
 .../supplierdeliver/supplierPackage/index.vue |  278 ++
 .../supplierPackage/supplierPackage.data.ts   |  424 ++++
 .../supplierdeliverRecordMain/index.vue       |  257 ++
 .../supplierdeliverRecordMain.data.ts         | 1329 ++++++++++
 .../supplierdeliverRequestMain/index.vue      |  718 ++++++
 .../supplierdeliverRequestMain.data.ts        | 1560 ++++++++++++
 src/views/wms/reportList/index.vue            |   14 +
 .../purchaseclaimRecordMain/index.vue         |  174 ++
 .../purchaseclaimRecordMain.data.ts           |  373 +++
 .../purchaseclaimRequestMain/index.vue        |  497 ++++
 .../purchaseclaimRequestMain.data.ts          |  582 +++++
 .../supplierinvoiceRecordMain/index.vue       |  174 ++
 .../supplierinvoiceRecordMain.data.ts         |  362 +++
 .../supplierinvoiceRequestMain/index.vue      |  442 ++++
 .../supplierinvoiceRequestMain.data.ts        |  708 ++++++
 1283 files changed, 280412 insertions(+)
 create mode 100644 src/App.vue
 create mode 100644 src/api/bpm/activity/index.ts
 create mode 100644 src/api/bpm/definition/index.ts
 create mode 100644 src/api/bpm/form/index.ts
 create mode 100644 src/api/bpm/leave/index.ts
 create mode 100644 src/api/bpm/model/index.ts
 create mode 100644 src/api/bpm/processInstance/index.ts
 create mode 100644 src/api/bpm/task/index.ts
 create mode 100644 src/api/bpm/taskAssignRule/index.ts
 create mode 100644 src/api/bpm/userGroup/index.ts
 create mode 100644 src/api/home/index.ts
 create mode 100644 src/api/infra/apiAccessLog/index.ts
 create mode 100644 src/api/infra/apiErrorLog/index.ts
 create mode 100644 src/api/infra/codegen/index.ts
 create mode 100644 src/api/infra/config/index.ts
 create mode 100644 src/api/infra/dataSourceConfig/index.ts
 create mode 100644 src/api/infra/dbDoc/index.ts
 create mode 100644 src/api/infra/file/index.ts
 create mode 100644 src/api/infra/fileConfig/index.ts
 create mode 100644 src/api/infra/job/index.ts
 create mode 100644 src/api/infra/jobLog/index.ts
 create mode 100644 src/api/infra/redis/index.ts
 create mode 100644 src/api/infra/redis/types.ts
 create mode 100644 src/api/login/index.ts
 create mode 100644 src/api/login/oauth2/index.ts
 create mode 100644 src/api/login/types.ts
 create mode 100644 src/api/mes/processroute/index.ts
 create mode 100644 src/api/mes/productionPlan/index.ts
 create mode 100644 src/api/mes/teamSetting/index.ts
 create mode 100644 src/api/mes/workstation/index.ts
 create mode 100644 src/api/redis/index.ts
 create mode 100644 src/api/scp/index.ts
 create mode 100644 src/api/system/area/index.ts
 create mode 100644 src/api/system/dept/index.ts
 create mode 100644 src/api/system/dict/dict.data.ts
 create mode 100644 src/api/system/dict/dict.type.ts
 create mode 100644 src/api/system/errorCode/index.ts
 create mode 100644 src/api/system/loginLog/index.ts
 create mode 100644 src/api/system/mail/account/index.ts
 create mode 100644 src/api/system/mail/log/index.ts
 create mode 100644 src/api/system/mail/template/index.ts
 create mode 100644 src/api/system/menu/index.ts
 create mode 100644 src/api/system/notice/index.ts
 create mode 100644 src/api/system/notify/message/index.ts
 create mode 100644 src/api/system/notify/template/index.ts
 create mode 100644 src/api/system/oauth2/client.ts
 create mode 100644 src/api/system/oauth2/token.ts
 create mode 100644 src/api/system/operatelog/index.ts
 create mode 100644 src/api/system/permission/index.ts
 create mode 100644 src/api/system/post/index.ts
 create mode 100644 src/api/system/role/index.ts
 create mode 100644 src/api/system/sensitiveWord/index.ts
 create mode 100644 src/api/system/serialNumber/index.ts
 create mode 100644 src/api/system/sms/smsChannel/index.ts
 create mode 100644 src/api/system/sms/smsLog/index.ts
 create mode 100644 src/api/system/sms/smsTemplate/index.ts
 create mode 100644 src/api/system/tenant/index.ts
 create mode 100644 src/api/system/tenantPackage/index.ts
 create mode 100644 src/api/system/user/index.ts
 create mode 100644 src/api/system/user/profile.ts
 create mode 100644 src/api/system/user/socialUser.ts
 create mode 100644 src/api/wms/accountcalendar/index.ts
 create mode 100644 src/api/wms/areabasic/index.ts
 create mode 100644 src/api/wms/backflushRecordDetailb/index.ts
 create mode 100644 src/api/wms/backflushRequestDetailb/index.ts
 create mode 100644 src/api/wms/balance/index.ts
 create mode 100644 src/api/wms/barbasic/index.ts
 create mode 100644 src/api/wms/barcode/index.ts
 create mode 100644 src/api/wms/bom/index.ts
 create mode 100644 src/api/wms/bomDismantle/index.ts
 create mode 100644 src/api/wms/businesstype/index.ts
 create mode 100644 src/api/wms/callmaterials/index.ts
 create mode 100644 src/api/wms/carrier/index.ts
 create mode 100644 src/api/wms/condition/index.ts
 create mode 100644 src/api/wms/configuration/index.ts
 create mode 100644 src/api/wms/configurationsetting/index.ts
 create mode 100644 src/api/wms/consumeRecordDetailb/index.ts
 create mode 100644 src/api/wms/consumereRequestDetailb/index.ts
 create mode 100644 src/api/wms/containerBindRecordDetail/index.ts
 create mode 100644 src/api/wms/containerBindRecordMain/index.ts
 create mode 100644 src/api/wms/containerDetail/index.ts
 create mode 100644 src/api/wms/containerInitRecordDetail/index.ts
 create mode 100644 src/api/wms/containerInitRecordMain/index.ts
 create mode 100644 src/api/wms/containerMain/index.ts
 create mode 100644 src/api/wms/containerRepairRecordDetail/index.ts
 create mode 100644 src/api/wms/containerRepairRecordMain/index.ts
 create mode 100644 src/api/wms/containerUnbindRecordDetail/index.ts
 create mode 100644 src/api/wms/containerUnbindRecordMain/index.ts
 create mode 100644 src/api/wms/countJobDetail/index.ts
 create mode 100644 src/api/wms/countJobMain/index.ts
 create mode 100644 src/api/wms/countPlanDetail/index.ts
 create mode 100644 src/api/wms/countPlanMain/index.ts
 create mode 100644 src/api/wms/countRecordDetail/index.ts
 create mode 100644 src/api/wms/countRecordMain/index.ts
 create mode 100644 src/api/wms/countRequestDetail/index.ts
 create mode 100644 src/api/wms/countRequestMain/index.ts
 create mode 100644 src/api/wms/countadjustRecordDetail/index.ts
 create mode 100644 src/api/wms/countadjustRecordMain/index.ts
 create mode 100644 src/api/wms/countadjustRequestDetail/index.ts
 create mode 100644 src/api/wms/countadjustRequestMain/index.ts
 create mode 100644 src/api/wms/currencyexchange/index.ts
 create mode 100644 src/api/wms/customer/index.ts
 create mode 100644 src/api/wms/customerdock/index.ts
 create mode 100644 src/api/wms/customeritem/index.ts
 create mode 100644 src/api/wms/customerreceiptRecordDetail/index.ts
 create mode 100644 src/api/wms/customerreceiptRecordMain/index.ts
 create mode 100644 src/api/wms/customerreceiptRequestDetail/index.ts
 create mode 100644 src/api/wms/customerreceiptRequestMain/index.ts
 create mode 100644 src/api/wms/customerreturnJobDetail/index.ts
 create mode 100644 src/api/wms/customerreturnJobMain/index.ts
 create mode 100644 src/api/wms/customerreturnRecordDetail/index.ts
 create mode 100644 src/api/wms/customerreturnRecordMain/index.ts
 create mode 100644 src/api/wms/customerreturnRequestDetail/index.ts
 create mode 100644 src/api/wms/customerreturnRequestMain/index.ts
 create mode 100644 src/api/wms/customersettleRecordDetail/index.ts
 create mode 100644 src/api/wms/customersettleRecordMain/index.ts
 create mode 100644 src/api/wms/customersettleRequestDetail/index.ts
 create mode 100644 src/api/wms/customersettleRequestMain/index.ts
 create mode 100644 src/api/wms/deliverJobDetail/index.ts
 create mode 100644 src/api/wms/deliverJobMain/index.ts
 create mode 100644 src/api/wms/deliverPlanDetail/index.ts
 create mode 100644 src/api/wms/deliverPlanMain/index.ts
 create mode 100644 src/api/wms/deliverRecordDetail/index.ts
 create mode 100644 src/api/wms/deliverRecordMain/index.ts
 create mode 100644 src/api/wms/deliverRequestDetail/index.ts
 create mode 100644 src/api/wms/deliverRequestMain/index.ts
 create mode 100644 src/api/wms/demandforecastingDetail/index.ts
 create mode 100644 src/api/wms/demandforecastingMain/index.ts
 create mode 100644 src/api/wms/detail/index.ts
 create mode 100644 src/api/wms/dismantleRecordDetailb/index.ts
 create mode 100644 src/api/wms/dismantleRequestDetailb/index.ts
 create mode 100644 src/api/wms/dock/index.ts
 create mode 100644 src/api/wms/documentsetting/index.ts
 create mode 100644 src/api/wms/enterprise/index.ts
 create mode 100644 src/api/wms/expectin/index.ts
 create mode 100644 src/api/wms/expectout/index.ts
 create mode 100644 src/api/wms/file/index.ts
 create mode 100644 src/api/wms/index.ts
 create mode 100644 src/api/wms/inspectJobDetail/index.ts
 create mode 100644 src/api/wms/inspectJobMain/index.ts
 create mode 100644 src/api/wms/inspectRecordDetail/index.ts
 create mode 100644 src/api/wms/inspectRecordMain/index.ts
 create mode 100644 src/api/wms/inspectRequestDetail/index.ts
 create mode 100644 src/api/wms/inspectRequestMain/index.ts
 create mode 100644 src/api/wms/inventorychangeRecordDetail/index.ts
 create mode 100644 src/api/wms/inventorychangeRecordMain/index.ts
 create mode 100644 src/api/wms/inventorychangeRequestDetail/index.ts
 create mode 100644 src/api/wms/inventorychangeRequestMain/index.ts
 create mode 100644 src/api/wms/inventoryinitRecordDetail/index.ts
 create mode 100644 src/api/wms/inventoryinitRecordMain/index.ts
 create mode 100644 src/api/wms/inventoryinitRequestDetail/index.ts
 create mode 100644 src/api/wms/inventoryinitRequestMain/index.ts
 create mode 100644 src/api/wms/inventorymoveJobDetail/index.ts
 create mode 100644 src/api/wms/inventorymoveJobMain/index.ts
 create mode 100644 src/api/wms/inventorymoveRecordDetail/index.ts
 create mode 100644 src/api/wms/inventorymoveRecordMain/index.ts
 create mode 100644 src/api/wms/inventorymoveRequestDetail/index.ts
 create mode 100644 src/api/wms/inventorymoveRequestMain/index.ts
 create mode 100644 src/api/wms/issueJobDetail/index.ts
 create mode 100644 src/api/wms/issueJobMain/index.ts
 create mode 100644 src/api/wms/issueRecordDetail/index.ts
 create mode 100644 src/api/wms/issueRecordMain/index.ts
 create mode 100644 src/api/wms/issueRequestDetail/index.ts
 create mode 100644 src/api/wms/issueRequestMain/index.ts
 create mode 100644 src/api/wms/itemarea/index.ts
 create mode 100644 src/api/wms/itemareaDetail/index.ts
 create mode 100644 src/api/wms/itembasic/index.ts
 create mode 100644 src/api/wms/itempackage/index.ts
 create mode 100644 src/api/wms/itemwarehouse/index.ts
 create mode 100644 src/api/wms/jobsetting/index.ts
 create mode 100644 src/api/wms/labeltype/index.ts
 create mode 100644 src/api/wms/location/index.ts
 create mode 100644 src/api/wms/locationcapacity/index.ts
 create mode 100644 src/api/wms/locationgroup/index.ts
 create mode 100644 src/api/wms/offlinesettlementRecordDetail/index.ts
 create mode 100644 src/api/wms/offlinesettlementRecordMain/index.ts
 create mode 100644 src/api/wms/offlinesettlementRequestDetail/index.ts
 create mode 100644 src/api/wms/offlinesettlementRequestMain/index.ts
 create mode 100644 src/api/wms/onlinesettlementRecordDetail/index.ts
 create mode 100644 src/api/wms/onlinesettlementRecordMain/index.ts
 create mode 100644 src/api/wms/onlinesettlementRequestDetail/index.ts
 create mode 100644 src/api/wms/onlinesettlementRequestMain/index.ts
 create mode 100644 src/api/wms/owner/index.ts
 create mode 100644 src/api/wms/package/index.ts
 create mode 100644 src/api/wms/packagemergeDetail/index.ts
 create mode 100644 src/api/wms/packagemergeMain/index.ts
 create mode 100644 src/api/wms/packageoverJobDetail/index.ts
 create mode 100644 src/api/wms/packageoverJobMain/index.ts
 create mode 100644 src/api/wms/packageoverRecordDetail/index.ts
 create mode 100644 src/api/wms/packageoverRecordMain/index.ts
 create mode 100644 src/api/wms/packageoverRequestDetail/index.ts
 create mode 100644 src/api/wms/packageoverRequestMain/index.ts
 create mode 100644 src/api/wms/packageoverRetrospect/index.ts
 create mode 100644 src/api/wms/packagesplitDetail/index.ts
 create mode 100644 src/api/wms/packagesplitMain/index.ts
 create mode 100644 src/api/wms/packageunit/index.ts
 create mode 100644 src/api/wms/paramsetting/index.ts
 create mode 100644 src/api/wms/pickJobDetail/index.ts
 create mode 100644 src/api/wms/pickJobMain/index.ts
 create mode 100644 src/api/wms/pickRecordDetail/index.ts
 create mode 100644 src/api/wms/pickRecordMain/index.ts
 create mode 100644 src/api/wms/pickRequestDetail/index.ts
 create mode 100644 src/api/wms/pickRequestMain/index.ts
 create mode 100644 src/api/wms/plansetting/index.ts
 create mode 100644 src/api/wms/preparetoissueDetail/index.ts
 create mode 100644 src/api/wms/preparetoissueMain/index.ts
 create mode 100644 src/api/wms/process/index.ts
 create mode 100644 src/api/wms/productdismantleJobDetail/index.ts
 create mode 100644 src/api/wms/productdismantleJobMain/index.ts
 create mode 100644 src/api/wms/productdismantleRecordDetaila/index.ts
 create mode 100644 src/api/wms/productdismantleRecordMain/index.ts
 create mode 100644 src/api/wms/productdismantleRequestDetaila/index.ts
 create mode 100644 src/api/wms/productdismantleRequestMain/index.ts
 create mode 100644 src/api/wms/productionDetail/index.ts
 create mode 100644 src/api/wms/productionMain/index.ts
 create mode 100644 src/api/wms/productionline/index.ts
 create mode 100644 src/api/wms/productionlineitem/index.ts
 create mode 100644 src/api/wms/productionreceiptJobDetail/index.ts
 create mode 100644 src/api/wms/productionreceiptJobMain/index.ts
 create mode 100644 src/api/wms/productionreceiptRecordDetail/index.ts
 create mode 100644 src/api/wms/productionreceiptRecordMain/index.ts
 create mode 100644 src/api/wms/productionreturnJobDetail/index.ts
 create mode 100644 src/api/wms/productionreturnJobMain/index.ts
 create mode 100644 src/api/wms/productionreturnRecordDetail/index.ts
 create mode 100644 src/api/wms/productionreturnRecordMain/index.ts
 create mode 100644 src/api/wms/productionreturnRequestDetail/index.ts
 create mode 100644 src/api/wms/productionreturnRequestDetailNo/index.ts
 create mode 100644 src/api/wms/productionreturnRequestMain/index.ts
 create mode 100644 src/api/wms/productionreturnRequestMainNo/index.ts
 create mode 100644 src/api/wms/productputawayJobDetail/index.ts
 create mode 100644 src/api/wms/productputawayJobMain/index.ts
 create mode 100644 src/api/wms/productputawayRecordDetail/index.ts
 create mode 100644 src/api/wms/productputawayRecordMain/index.ts
 create mode 100644 src/api/wms/productputawayRequestDetail/index.ts
 create mode 100644 src/api/wms/productputawayRequestMain/index.ts
 create mode 100644 src/api/wms/productreceiptJobDetail/index.ts
 create mode 100644 src/api/wms/productreceiptJobMain/index.ts
 create mode 100644 src/api/wms/productreceiptRecordDetail/index.ts
 create mode 100644 src/api/wms/productreceiptRecordMain/index.ts
 create mode 100644 src/api/wms/productreceiptRequestDetail/index.ts
 create mode 100644 src/api/wms/productreceiptRequestMain/index.ts
 create mode 100644 src/api/wms/productredressJobDetail/index.ts
 create mode 100644 src/api/wms/productredressJobMain/index.ts
 create mode 100644 src/api/wms/productredressRecordDetail/index.ts
 create mode 100644 src/api/wms/productredressRecordMain/index.ts
 create mode 100644 src/api/wms/productredressRequestDetail/index.ts
 create mode 100644 src/api/wms/productredressRequestMain/index.ts
 create mode 100644 src/api/wms/productrepairRecordDetail/index.ts
 create mode 100644 src/api/wms/productrepairRecordMain/index.ts
 create mode 100644 src/api/wms/productrepairRequestDetaila/index.ts
 create mode 100644 src/api/wms/productrepairRequestMain/index.ts
 create mode 100644 src/api/wms/productscrapJobDetail/index.ts
 create mode 100644 src/api/wms/productscrapJobMain/index.ts
 create mode 100644 src/api/wms/productscrapRecordDetail/index.ts
 create mode 100644 src/api/wms/productscrapRecordMain/index.ts
 create mode 100644 src/api/wms/productscrapRequestDetail/index.ts
 create mode 100644 src/api/wms/productscrapRequestMain/index.ts
 create mode 100644 src/api/wms/project/index.ts
 create mode 100644 src/api/wms/purchaseDetail/index.ts
 create mode 100644 src/api/wms/purchaseMain/index.ts
 create mode 100644 src/api/wms/purchasePlanDetail/index.ts
 create mode 100644 src/api/wms/purchasePlanMain/index.ts
 create mode 100644 src/api/wms/purchaseclaimRecordDetail/index.ts
 create mode 100644 src/api/wms/purchaseclaimRecordMain/index.ts
 create mode 100644 src/api/wms/purchaseclaimRequestDetail/index.ts
 create mode 100644 src/api/wms/purchaseclaimRequestMain/index.ts
 create mode 100644 src/api/wms/purchaseprice/index.ts
 create mode 100644 src/api/wms/purchasereceiptJobDetail/index.ts
 create mode 100644 src/api/wms/purchasereceiptJobMain/index.ts
 create mode 100644 src/api/wms/purchasereceiptRecordDetail/index.ts
 create mode 100644 src/api/wms/purchasereceiptRecordMain/index.ts
 create mode 100644 src/api/wms/purchasereceiptRequestDetail/index.ts
 create mode 100644 src/api/wms/purchasereceiptRequestMain/index.ts
 create mode 100644 src/api/wms/purchasereturnJobDetail/index.ts
 create mode 100644 src/api/wms/purchasereturnJobMain/index.ts
 create mode 100644 src/api/wms/purchasereturnRecordDetail/index.ts
 create mode 100644 src/api/wms/purchasereturnRecordMain/index.ts
 create mode 100644 src/api/wms/purchasereturnRequestDetail/index.ts
 create mode 100644 src/api/wms/purchasereturnRequestMain/index.ts
 create mode 100644 src/api/wms/putawayJobDetail/index.ts
 create mode 100644 src/api/wms/putawayJobMain/index.ts
 create mode 100644 src/api/wms/putawayRecordDetail/index.ts
 create mode 100644 src/api/wms/putawayRecordMain/index.ts
 create mode 100644 src/api/wms/putawayRequestDetail/index.ts
 create mode 100644 src/api/wms/putawayRequestMain/index.ts
 create mode 100644 src/api/wms/recordsetting/index.ts
 create mode 100644 src/api/wms/remark/index.ts
 create mode 100644 src/api/wms/repleinshJobDetail/index.ts
 create mode 100644 src/api/wms/repleinshJobMain/index.ts
 create mode 100644 src/api/wms/repleinshRecordDetail/index.ts
 create mode 100644 src/api/wms/repleinshRecordMain/index.ts
 create mode 100644 src/api/wms/repleinshRequestDetail/index.ts
 create mode 100644 src/api/wms/repleinshRequestMain/index.ts
 create mode 100644 src/api/wms/requestsetting/index.ts
 create mode 100644 src/api/wms/rule/index.ts
 create mode 100644 src/api/wms/saleDetail/index.ts
 create mode 100644 src/api/wms/saleMain/index.ts
 create mode 100644 src/api/wms/saleprice/index.ts
 create mode 100644 src/api/wms/scrapJobDetail/index.ts
 create mode 100644 src/api/wms/scrapJobMain/index.ts
 create mode 100644 src/api/wms/scrapRecordDetail/index.ts
 create mode 100644 src/api/wms/scrapRecordMain/index.ts
 create mode 100644 src/api/wms/scrapRequestDetail/index.ts
 create mode 100644 src/api/wms/scrapRequestMain/index.ts
 create mode 100644 src/api/wms/shift/index.ts
 create mode 100644 src/api/wms/stdcostprice/index.ts
 create mode 100644 src/api/wms/stockupDetailJob/index.ts
 create mode 100644 src/api/wms/stockupDetailRecord/index.ts
 create mode 100644 src/api/wms/stockupDetailRequest/index.ts
 create mode 100644 src/api/wms/stockupMainJob/index.ts
 create mode 100644 src/api/wms/stockupMainRecord/index.ts
 create mode 100644 src/api/wms/stockupMainRequest/index.ts
 create mode 100644 src/api/wms/strategy/index.ts
 create mode 100644 src/api/wms/supplier/index.ts
 create mode 100644 src/api/wms/supplierUser/index.ts
 create mode 100644 src/api/wms/supplierdeliverRecordDetail/index.ts
 create mode 100644 src/api/wms/supplierdeliverRecordMain/index.ts
 create mode 100644 src/api/wms/supplierdeliverRequestDetail/index.ts
 create mode 100644 src/api/wms/supplierdeliverRequestMain/index.ts
 create mode 100644 src/api/wms/supplierinvoiceRecordDeatil/index.ts
 create mode 100644 src/api/wms/supplierinvoiceRecordMain/index.ts
 create mode 100644 src/api/wms/supplierinvoiceRequestDetail/index.ts
 create mode 100644 src/api/wms/supplierinvoiceRequestMain/index.ts
 create mode 100644 src/api/wms/supplieritem/index.ts
 create mode 100644 src/api/wms/switch/index.ts
 create mode 100644 src/api/wms/systemcalendar/index.ts
 create mode 100644 src/api/wms/team/index.ts
 create mode 100644 src/api/wms/transaction/index.ts
 create mode 100644 src/api/wms/transactiontype/index.ts
 create mode 100644 src/api/wms/transferissueJobDetail/index.ts
 create mode 100644 src/api/wms/transferissueJobMain/index.ts
 create mode 100644 src/api/wms/transferissueRecordDetail/index.ts
 create mode 100644 src/api/wms/transferissueRecordMain/index.ts
 create mode 100644 src/api/wms/transferissueRequestDetail/index.ts
 create mode 100644 src/api/wms/transferissueRequestMain/index.ts
 create mode 100644 src/api/wms/transferlog/index.ts
 create mode 100644 src/api/wms/transferreceiptJobDetail/index.ts
 create mode 100644 src/api/wms/transferreceiptJobMain/index.ts
 create mode 100644 src/api/wms/transferreceiptRecordDetail/index.ts
 create mode 100644 src/api/wms/transferreceiptRecordMain/index.ts
 create mode 100644 src/api/wms/transferreceiptRequestDetail/index.ts
 create mode 100644 src/api/wms/transferreceiptRequestMain/index.ts
 create mode 100644 src/api/wms/unplannedissueJobDetail/index.ts
 create mode 100644 src/api/wms/unplannedissueJobMain/index.ts
 create mode 100644 src/api/wms/unplannedissueRecordDetail/index.ts
 create mode 100644 src/api/wms/unplannedissueRecordMain/index.ts
 create mode 100644 src/api/wms/unplannedissueRequestDetail/index.ts
 create mode 100644 src/api/wms/unplannedissueRequestMain/index.ts
 create mode 100644 src/api/wms/unplannedreceiptJobDetail/index.ts
 create mode 100644 src/api/wms/unplannedreceiptJobMain/index.ts
 create mode 100644 src/api/wms/unplannedreceiptRecordDetail/index.ts
 create mode 100644 src/api/wms/unplannedreceiptRecordMain/index.ts
 create mode 100644 src/api/wms/unplannedreceiptRequestDetail/index.ts
 create mode 100644 src/api/wms/unplannedreceiptRequestMain/index.ts
 create mode 100644 src/api/wms/warehouse/index.ts
 create mode 100644 src/api/wms/workDetail/index.ts
 create mode 100644 src/api/wms/workMain/index.ts
 create mode 100644 src/api/wms/workshop/index.ts
 create mode 100644 src/api/wms/workstation/index.ts
 create mode 100644 src/assets/imgs/Eyes-closed.png
 create mode 100644 src/assets/imgs/avatar.gif
 create mode 100644 src/assets/imgs/avatar.jpg
 create mode 100644 src/assets/imgs/code.png
 create mode 100644 src/assets/imgs/eye.png
 create mode 100644 src/assets/imgs/icon1.png
 create mode 100644 src/assets/imgs/icon2.png
 create mode 100644 src/assets/imgs/icon3.png
 create mode 100644 src/assets/imgs/icon4.png
 create mode 100644 src/assets/imgs/icon5.png
 create mode 100644 src/assets/imgs/icon6.png
 create mode 100644 src/assets/imgs/logo.png
 create mode 100644 src/assets/imgs/logo1.png
 create mode 100644 src/assets/imgs/logo_w.png
 create mode 100644 src/assets/imgs/profile.jpg
 create mode 100644 src/assets/imgs/wechat.png
 create mode 100644 src/assets/svgs/403.svg
 create mode 100644 src/assets/svgs/404.svg
 create mode 100644 src/assets/svgs/500.svg
 create mode 100644 src/assets/svgs/icon.svg
 create mode 100644 src/assets/svgs/login-bg.svg
 create mode 100644 src/assets/svgs/login-box-bg.svg
 create mode 100644 src/assets/svgs/member_balance.svg
 create mode 100644 src/assets/svgs/member_expenditure_balance.svg
 create mode 100644 src/assets/svgs/member_level.svg
 create mode 100644 src/assets/svgs/member_point.svg
 create mode 100644 src/assets/svgs/member_recharge_balance.svg
 create mode 100644 src/assets/svgs/message.svg
 create mode 100644 src/assets/svgs/money.svg
 create mode 100644 src/assets/svgs/pay/icon/alipay_app.svg
 create mode 100644 src/assets/svgs/pay/icon/alipay_bar.svg
 create mode 100644 src/assets/svgs/pay/icon/alipay_pc.svg
 create mode 100644 src/assets/svgs/pay/icon/alipay_qr.svg
 create mode 100644 src/assets/svgs/pay/icon/alipay_wap.svg
 create mode 100644 src/assets/svgs/pay/icon/mock.svg
 create mode 100644 src/assets/svgs/pay/icon/wx_app.svg
 create mode 100644 src/assets/svgs/pay/icon/wx_bar.svg
 create mode 100644 src/assets/svgs/pay/icon/wx_lite.svg
 create mode 100644 src/assets/svgs/pay/icon/wx_native.svg
 create mode 100644 src/assets/svgs/pay/icon/wx_pub.svg
 create mode 100644 src/assets/svgs/peoples.svg
 create mode 100644 src/assets/svgs/shopping.svg
 create mode 100644 src/components/Annex/index.ts
 create mode 100644 src/components/Annex/src/Annex.vue
 create mode 100644 src/components/Backtop/index.ts
 create mode 100644 src/components/Backtop/src/Backtop.vue
 create mode 100644 src/components/BasicForm/index.ts
 create mode 100644 src/components/BasicForm/src/BasicForm.vue
 create mode 100644 src/components/Card/index.ts
 create mode 100644 src/components/Card/src/CardTitle.vue
 create mode 100644 src/components/ChangeRecord/index.ts
 create mode 100644 src/components/ChangeRecord/src/ChangeRecord.vue
 create mode 100644 src/components/ConfigGlobal/index.ts
 create mode 100644 src/components/ConfigGlobal/src/ConfigGlobal.vue
 create mode 100644 src/components/ContentDetailWrap/index.ts
 create mode 100644 src/components/ContentDetailWrap/src/ContentDetailWrap.vue
 create mode 100644 src/components/ContentWrap/index.ts
 create mode 100644 src/components/ContentWrap/src/ContentWrap.vue
 create mode 100644 src/components/CountTo/index.ts
 create mode 100644 src/components/CountTo/src/CountTo.vue
 create mode 100644 src/components/Crontab/index.ts
 create mode 100644 src/components/Crontab/src/Crontab.vue
 create mode 100644 src/components/Cropper/index.ts
 create mode 100644 src/components/Cropper/src/CopperModal.vue
 create mode 100644 src/components/Cropper/src/Cropper.vue
 create mode 100644 src/components/Cropper/src/CropperAvatar.vue
 create mode 100644 src/components/Cropper/src/types.ts
 create mode 100644 src/components/Descriptions/index.ts
 create mode 100644 src/components/Descriptions/src/Descriptions.vue
 create mode 100644 src/components/Descriptions/src/DescriptionsItemLabel.vue
 create mode 100644 src/components/Detail/index.ts
 create mode 100644 src/components/Detail/src/Detail.vue
 create mode 100644 src/components/DetailTable/index.ts
 create mode 100644 src/components/DetailTable/src/DetailTable.vue
 create mode 100644 src/components/Dialog/index.ts
 create mode 100644 src/components/Dialog/src/Dialog.vue
 create mode 100644 src/components/DictTag/index.ts
 create mode 100644 src/components/DictTag/src/DictTag.vue
 create mode 100644 src/components/DocAlert/index.vue
 create mode 100644 src/components/Echart/index.ts
 create mode 100644 src/components/Echart/src/Echart.vue
 create mode 100644 src/components/Editor/index.ts
 create mode 100644 src/components/Editor/src/Editor.vue
 create mode 100644 src/components/Error/index.ts
 create mode 100644 src/components/Error/src/Error.vue
 create mode 100644 src/components/Form/index.ts
 create mode 100644 src/components/Form/src/Form.vue
 create mode 100644 src/components/Form/src/componentMap.ts
 create mode 100644 src/components/Form/src/components/useRenderCheckbox.tsx
 create mode 100644 src/components/Form/src/components/useRenderRadio.tsx
 create mode 100644 src/components/Form/src/components/useRenderSelect.tsx
 create mode 100644 src/components/Form/src/helper.ts
 create mode 100644 src/components/Form/src/types.ts
 create mode 100644 src/components/Highlight/index.ts
 create mode 100644 src/components/Highlight/src/Highlight.vue
 create mode 100644 src/components/Icon/index.ts
 create mode 100644 src/components/Icon/src/Icon.vue
 create mode 100644 src/components/Icon/src/IconSelect.vue
 create mode 100644 src/components/Icon/src/data.ts
 create mode 100644 src/components/ImageViewer/index.ts
 create mode 100644 src/components/ImageViewer/src/ImageViewer.vue
 create mode 100644 src/components/ImageViewer/src/types.ts
 create mode 100644 src/components/ImportForm/index.ts
 create mode 100644 src/components/ImportForm/src/ImportForm.vue
 create mode 100644 src/components/Infotip/index.ts
 create mode 100644 src/components/Infotip/src/Infotip.vue
 create mode 100644 src/components/InputPassword/index.ts
 create mode 100644 src/components/InputPassword/src/InputPassword.vue
 create mode 100644 src/components/Pagination/index.vue
 create mode 100644 src/components/Qrcode/index.ts
 create mode 100644 src/components/Qrcode/src/Qrcode.vue
 create mode 100644 src/components/Remarks/index.ts
 create mode 100644 src/components/Remarks/src/Remarks.vue
 create mode 100644 src/components/RouterSearch/index.vue
 create mode 100644 src/components/Search/index.ts
 create mode 100644 src/components/Search/src/Search.vue
 create mode 100644 src/components/SearchHigh/index.ts
 create mode 100644 src/components/SearchHigh/src/SearchHigh.vue
 create mode 100644 src/components/SearchTable/index.ts
 create mode 100644 src/components/SearchTable/src/SearchTable.vue
 create mode 100644 src/components/SearchTableCount/index.ts
 create mode 100644 src/components/SearchTableCount/src/SearchTableCount.vue
 create mode 100644 src/components/Sticky/index.ts
 create mode 100644 src/components/Sticky/src/Sticky.vue
 create mode 100644 src/components/Table/index.ts
 create mode 100644 src/components/Table/src/Table.vue
 create mode 100644 src/components/Table/src/helper.ts
 create mode 100644 src/components/Table/src/types.ts
 create mode 100644 src/components/TableForm/index.ts
 create mode 100644 src/components/TableForm/src/TableForm.vue
 create mode 100644 src/components/TableFormCountPlan/index.ts
 create mode 100644 src/components/TableFormCountPlan/src/TableFormCountPlan.vue
 create mode 100644 src/components/TableHead/index.ts
 create mode 100644 src/components/TableHead/src/TableHead.vue
 create mode 100644 src/components/Tabs/index.ts
 create mode 100644 src/components/Tabs/src/Tabs.vue
 create mode 100644 src/components/Tooltip/index.ts
 create mode 100644 src/components/Tooltip/src/Tooltip.vue
 create mode 100644 src/components/UploadFile/index.ts
 create mode 100644 src/components/UploadFile/src/Preview.vue
 create mode 100644 src/components/UploadFile/src/UploadFile.vue
 create mode 100644 src/components/UploadFile/src/UploadImg.vue
 create mode 100644 src/components/UploadFile/src/UploadImgs.vue
 create mode 100644 src/components/Verifition/index.ts
 create mode 100644 src/components/Verifition/src/Verify.vue
 create mode 100644 src/components/Verifition/src/Verify/VerifyPoints.vue
 create mode 100644 src/components/Verifition/src/Verify/VerifySlide.vue
 create mode 100644 src/components/Verifition/src/Verify/index.ts
 create mode 100644 src/components/Verifition/src/utils/ase.ts
 create mode 100644 src/components/Verifition/src/utils/util.ts
 create mode 100644 src/components/XButton/index.ts
 create mode 100644 src/components/XButton/src/ButtonBase.vue
 create mode 100644 src/components/XButton/src/XButton.vue
 create mode 100644 src/components/XButton/src/XTextButton.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/index.ts
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/index2.ts
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/contentPadProvider.js
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/index.js
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/defaultEmpty.js
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/activitiDescriptor.json
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/camundaDescriptor.json
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/activitiExtension.js
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/index.js
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/extension.js
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/index.js
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/flowableExtension.js
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/index.js
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/palette/index.js
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/translate/customTranslate.js
 create mode 100644 src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
 create mode 100644 src/components/bpmnProcessDesigner/package/index.ts
 create mode 100644 src/components/bpmnProcessDesigner/package/palette/ProcessPalette.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/index.js
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/listeners/template.js
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/listeners/utilSelf.ts
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/other/ElementOtherConfig.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
 create mode 100644 src/components/bpmnProcessDesigner/package/theme/element-variables.scss
 create mode 100644 src/components/bpmnProcessDesigner/package/theme/index.scss
 create mode 100644 src/components/bpmnProcessDesigner/package/theme/process-designer.scss
 create mode 100644 src/components/bpmnProcessDesigner/package/theme/process-panel.scss
 create mode 100644 src/components/bpmnProcessDesigner/package/utils.ts
 create mode 100644 src/components/bpmnProcessDesigner/src/highlight/index.js
 create mode 100644 src/components/bpmnProcessDesigner/src/modules/custom-renderer/CustomRenderer.js
 create mode 100644 src/components/bpmnProcessDesigner/src/modules/custom-renderer/index.js
 create mode 100644 src/components/bpmnProcessDesigner/src/modules/rules/CustomRules.js
 create mode 100644 src/components/bpmnProcessDesigner/src/modules/rules/index.js
 create mode 100644 src/components/bpmnProcessDesigner/src/translations.ts
 create mode 100644 src/components/bpmnProcessDesigner/src/utils/directive/clickOutSide.js
 create mode 100644 src/components/bpmnProcessDesigner/src/utils/index.js
 create mode 100644 src/components/bpmnProcessDesigner/src/utils/xml2json.js
 create mode 100644 src/components/iFrame/index.ts
 create mode 100644 src/components/iFrame/src/IFrame.vue
 create mode 100644 src/components/index.ts
 create mode 100644 src/components/rowDrop/index.vue
 create mode 100644 src/components/workstationBind/index.ts
 create mode 100644 src/components/workstationBind/src/Detail.vue
 create mode 100644 src/config/axios/config.ts
 create mode 100644 src/config/axios/errorCode.ts
 create mode 100644 src/config/axios/index.ts
 create mode 100644 src/config/axios/service.ts
 create mode 100644 src/directives/index.ts
 create mode 100644 src/directives/permission/hasPermi.ts
 create mode 100644 src/directives/permission/hasRole.ts
 create mode 100644 src/hooks/event/useScrollTo.ts
 create mode 100644 src/hooks/web/useCache.ts
 create mode 100644 src/hooks/web/useConfigGlobal.ts
 create mode 100644 src/hooks/web/useCrudSchemas.ts
 create mode 100644 src/hooks/web/useDesign.ts
 create mode 100644 src/hooks/web/useEmitt.ts
 create mode 100644 src/hooks/web/useForm.ts
 create mode 100644 src/hooks/web/useI18n.ts
 create mode 100644 src/hooks/web/useIcon.ts
 create mode 100644 src/hooks/web/useIntro.ts
 create mode 100644 src/hooks/web/useLocale.ts
 create mode 100644 src/hooks/web/useMessage.ts
 create mode 100644 src/hooks/web/useNProgress.ts
 create mode 100644 src/hooks/web/usePageLoading.ts
 create mode 100644 src/hooks/web/useTable.ts
 create mode 100644 src/hooks/web/useTimeAgo.ts
 create mode 100644 src/hooks/web/useTitle.ts
 create mode 100644 src/hooks/web/useValidator.ts
 create mode 100644 src/hooks/web/useWatermark.ts
 create mode 100644 src/layout/Layout.vue
 create mode 100644 src/layout/components/AppView.vue
 create mode 100644 src/layout/components/Breadcrumb/index.ts
 create mode 100644 src/layout/components/Breadcrumb/src/Breadcrumb.vue
 create mode 100644 src/layout/components/Breadcrumb/src/helper.ts
 create mode 100644 src/layout/components/Collapse/index.ts
 create mode 100644 src/layout/components/Collapse/src/Collapse.vue
 create mode 100644 src/layout/components/ContextMenu/index.ts
 create mode 100644 src/layout/components/ContextMenu/src/ContextMenu.vue
 create mode 100644 src/layout/components/Footer/index.ts
 create mode 100644 src/layout/components/Footer/src/Footer.vue
 create mode 100644 src/layout/components/LocaleDropdown/index.ts
 create mode 100644 src/layout/components/LocaleDropdown/src/LocaleDropdown.vue
 create mode 100644 src/layout/components/Logo/index.ts
 create mode 100644 src/layout/components/Logo/src/Logo.vue
 create mode 100644 src/layout/components/Menu/index.ts
 create mode 100644 src/layout/components/Menu/src/Menu.vue
 create mode 100644 src/layout/components/Menu/src/components/useRenderMenuItem.tsx
 create mode 100644 src/layout/components/Menu/src/components/useRenderMenuTitle.tsx
 create mode 100644 src/layout/components/Menu/src/helper.ts
 create mode 100644 src/layout/components/Message/index.ts
 create mode 100644 src/layout/components/Message/src/Message.vue
 create mode 100644 src/layout/components/Screenfull/index.ts
 create mode 100644 src/layout/components/Screenfull/src/Screenfull.vue
 create mode 100644 src/layout/components/Setting/index.ts
 create mode 100644 src/layout/components/Setting/src/Setting.vue
 create mode 100644 src/layout/components/Setting/src/components/ColorRadioPicker.vue
 create mode 100644 src/layout/components/Setting/src/components/InterfaceDisplay.vue
 create mode 100644 src/layout/components/Setting/src/components/LayoutRadioPicker.vue
 create mode 100644 src/layout/components/SizeDropdown/index.ts
 create mode 100644 src/layout/components/SizeDropdown/src/SizeDropdown.vue
 create mode 100644 src/layout/components/TabMenu/index.ts
 create mode 100644 src/layout/components/TabMenu/src/TabMenu.vue
 create mode 100644 src/layout/components/TabMenu/src/helper.ts
 create mode 100644 src/layout/components/TagsView/index.ts
 create mode 100644 src/layout/components/TagsView/src/TagsView.vue
 create mode 100644 src/layout/components/TagsView/src/helper.ts
 create mode 100644 src/layout/components/ThemeSwitch/index.ts
 create mode 100644 src/layout/components/ThemeSwitch/src/ThemeSwitch.vue
 create mode 100644 src/layout/components/ToolHeader.vue
 create mode 100644 src/layout/components/UserInfo/index.ts
 create mode 100644 src/layout/components/UserInfo/src/UserInfo.vue
 create mode 100644 src/layout/components/useRenderLayout.tsx
 create mode 100644 src/locales/en-US.ts
 create mode 100644 src/locales/zh-CN.ts
 create mode 100644 src/main.ts
 create mode 100644 src/permission.ts
 create mode 100644 src/plugins/animate.css/index.ts
 create mode 100644 src/plugins/echarts/index.ts
 create mode 100644 src/plugins/elementPlus/index.ts
 create mode 100644 src/plugins/formCreate/index.ts
 create mode 100644 src/plugins/svgIcon/index.ts
 create mode 100644 src/plugins/tongji/index.ts
 create mode 100644 src/plugins/unocss/index.ts
 create mode 100644 src/plugins/vueI18n/helper.ts
 create mode 100644 src/plugins/vueI18n/index.ts
 create mode 100644 src/router/index.ts
 create mode 100644 src/router/modules/remaining.ts
 create mode 100644 src/store/index.ts
 create mode 100644 src/store/modules/app.ts
 create mode 100644 src/store/modules/dict.ts
 create mode 100644 src/store/modules/locale.ts
 create mode 100644 src/store/modules/permission.ts
 create mode 100644 src/store/modules/tagsView.ts
 create mode 100644 src/store/modules/user.ts
 create mode 100644 src/styles/global.module.scss
 create mode 100644 src/styles/index.scss
 create mode 100644 src/styles/theme.scss
 create mode 100644 src/styles/var.css
 create mode 100644 src/styles/variables.scss
 create mode 100644 src/types/components.d.ts
 create mode 100644 src/types/configGlobal.d.ts
 create mode 100644 src/types/contextMenu.d.ts
 create mode 100644 src/types/descriptions.d.ts
 create mode 100644 src/types/elementPlus.d.ts
 create mode 100644 src/types/form.d.ts
 create mode 100644 src/types/icon.d.ts
 create mode 100644 src/types/infoTip.d.ts
 create mode 100644 src/types/layout.d.ts
 create mode 100644 src/types/localeDropdown.d.ts
 create mode 100644 src/types/qrcode.d.ts
 create mode 100644 src/types/table.d.ts
 create mode 100644 src/types/tableForm.d.ts
 create mode 100644 src/types/theme.d.ts
 create mode 100644 src/utils/Logger.ts
 create mode 100644 src/utils/auth.ts
 create mode 100644 src/utils/color.ts
 create mode 100644 src/utils/constants.ts
 create mode 100644 src/utils/dict.ts
 create mode 100644 src/utils/disposition/defaultButtons.ts
 create mode 100644 src/utils/disposition/formFields.ts
 create mode 100644 src/utils/disposition/tableDetailsColumns.ts
 create mode 100644 src/utils/disposition/tableSummaryColumns.ts
 create mode 100644 src/utils/disposition/tabsList.ts
 create mode 100644 src/utils/domUtils.ts
 create mode 100644 src/utils/download.ts
 create mode 100644 src/utils/filt.ts
 create mode 100644 src/utils/formCreate.ts
 create mode 100644 src/utils/formRules.ts
 create mode 100644 src/utils/formatTime.ts
 create mode 100644 src/utils/formatter.ts
 create mode 100644 src/utils/index.ts
 create mode 100644 src/utils/is.ts
 create mode 100644 src/utils/jsencrypt.ts
 create mode 100644 src/utils/permission.ts
 create mode 100644 src/utils/propTypes.ts
 create mode 100644 src/utils/routerHelper.ts
 create mode 100644 src/utils/tree.ts
 create mode 100644 src/utils/tsxHelper.ts
 create mode 100644 src/utils/validator.ts
 create mode 100644 src/views/bpm/definition/index.vue
 create mode 100644 src/views/bpm/form/editor/index.vue
 create mode 100644 src/views/bpm/form/index.vue
 create mode 100644 src/views/bpm/group/UserGroupForm.vue
 create mode 100644 src/views/bpm/group/index.vue
 create mode 100644 src/views/bpm/model/ModelForm.vue
 create mode 100644 src/views/bpm/model/ModelImportForm.vue
 create mode 100644 src/views/bpm/model/editor/index.vue
 create mode 100644 src/views/bpm/model/index.vue
 create mode 100644 src/views/bpm/oa/leave/create.vue
 create mode 100644 src/views/bpm/oa/leave/detail.vue
 create mode 100644 src/views/bpm/oa/leave/index.vue
 create mode 100644 src/views/bpm/processInstance/create/index.vue
 create mode 100644 src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue
 create mode 100644 src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue
 create mode 100644 src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue
 create mode 100644 src/views/bpm/processInstance/detail/TaskUpdateAssigneeForm.vue
 create mode 100644 src/views/bpm/processInstance/detail/index.vue
 create mode 100644 src/views/bpm/processInstance/index.vue
 create mode 100644 src/views/bpm/task/done/TaskDetail.vue
 create mode 100644 src/views/bpm/task/done/index.vue
 create mode 100644 src/views/bpm/task/todo/index.vue
 create mode 100644 src/views/bpm/taskAssignRule/TaskAssignRuleForm.vue
 create mode 100644 src/views/bpm/taskAssignRule/index.vue
 create mode 100644 src/views/error/403.vue
 create mode 100644 src/views/error/404.vue
 create mode 100644 src/views/error/500.vue
 create mode 100644 src/views/home/Index copy.vue
 create mode 100644 src/views/home/Index2.vue
 create mode 100644 src/views/home/components/material.vue
 create mode 100644 src/views/home/components/produce.vue
 create mode 100644 src/views/home/components/product.vue
 create mode 100644 src/views/home/components/supplierIndex.vue
 create mode 100644 src/views/home/echarts-data.ts
 create mode 100644 src/views/home/index.vue
 create mode 100644 src/views/home/types.ts
 create mode 100644 src/views/infra/apiAccessLog/ApiAccessLogDetail.vue
 create mode 100644 src/views/infra/apiAccessLog/index.vue
 create mode 100644 src/views/infra/apiErrorLog/ApiErrorLogDetail.vue
 create mode 100644 src/views/infra/apiErrorLog/index.vue
 create mode 100644 src/views/infra/build/index.vue
 create mode 100644 src/views/infra/codegen/PreviewCode.vue
 create mode 100644 src/views/infra/codegen/components/BasicInfoForm.vue
 create mode 100644 src/views/infra/codegen/components/ColumInfoForm.vue
 create mode 100644 src/views/infra/codegen/components/GenerateInfoForm.vue
 create mode 100644 src/views/infra/codegen/components/index.ts
 create mode 100644 src/views/infra/codegen/editTable.vue
 create mode 100644 src/views/infra/codegen/importTable.vue
 create mode 100644 src/views/infra/codegen/index.vue
 create mode 100644 src/views/infra/config/ConfigForm.vue
 create mode 100644 src/views/infra/config/index.vue
 create mode 100644 src/views/infra/customInterface/index.vue
 create mode 100644 src/views/infra/dataSourceConfig/DataSourceConfigForm.vue
 create mode 100644 src/views/infra/dataSourceConfig/index.vue
 create mode 100644 src/views/infra/dbDoc/index.vue
 create mode 100644 src/views/infra/druid/index.vue
 create mode 100644 src/views/infra/file/FileForm.vue
 create mode 100644 src/views/infra/file/index.vue
 create mode 100644 src/views/infra/fileConfig/FileConfigForm.vue
 create mode 100644 src/views/infra/fileConfig/index.vue
 create mode 100644 src/views/infra/job/JobDetail.vue
 create mode 100644 src/views/infra/job/JobForm.vue
 create mode 100644 src/views/infra/job/index.vue
 create mode 100644 src/views/infra/job/logger/JobLogDetail.vue
 create mode 100644 src/views/infra/job/logger/index.vue
 create mode 100644 src/views/infra/redis/index.vue
 create mode 100644 src/views/infra/server/index.vue
 create mode 100644 src/views/infra/skywalking/index.vue
 create mode 100644 src/views/infra/swagger/index.vue
 create mode 100644 src/views/infra/testDemo/index.vue
 create mode 100644 src/views/infra/webSocket/index.vue
 create mode 100644 src/views/login/components/LoginForm.vue
 create mode 100644 src/views/login/components/LoginFormTitle.vue
 create mode 100644 src/views/login/components/MobileForm.vue
 create mode 100644 src/views/login/components/QrCodeForm.vue
 create mode 100644 src/views/login/components/RegisterForm.vue
 create mode 100644 src/views/login/components/SSOLogin.vue
 create mode 100644 src/views/login/components/index.ts
 create mode 100644 src/views/login/components/useLogin.ts
 create mode 100644 src/views/login/login.vue
 create mode 100644 src/views/mes/jobcalendar/index.vue
 create mode 100644 src/views/mes/processroute/components/configDialog.vue
 create mode 100644 src/views/mes/processroute/components/graphbase.data.ts
 create mode 100644 src/views/mes/processroute/index.vue
 create mode 100644 src/views/mes/processroute/processroute.data.ts
 create mode 100644 src/views/mes/productionPlan/index.vue
 create mode 100644 src/views/mes/productionPlan/productionPlan.data.ts
 create mode 100644 src/views/mes/teamSetting/index.vue
 create mode 100644 src/views/mes/teamSetting/teamSetting.data.ts
 create mode 100644 src/views/mes/workstation/index.vue
 create mode 100644 src/views/mes/workstation/workstation.data.ts
 create mode 100644 src/views/profile/components/BasicInfo.vue
 create mode 100644 src/views/profile/components/ProfileUser.vue
 create mode 100644 src/views/profile/components/ResetPwd.vue
 create mode 100644 src/views/profile/components/UserAvatar.vue
 create mode 100644 src/views/profile/components/UserSocial.vue
 create mode 100644 src/views/profile/components/index.ts
 create mode 100644 src/views/profile/index.vue
 create mode 100644 src/views/redirect/redirect.vue
 create mode 100644 src/views/report/goview/index.vue
 create mode 100644 src/views/report/jmreport/index.vue
 create mode 100644 src/views/system/area/AreaForm.vue
 create mode 100644 src/views/system/area/index.vue
 create mode 100644 src/views/system/dept/DeptForm.vue
 create mode 100644 src/views/system/dept/index.vue
 create mode 100644 src/views/system/dict/DictTypeForm.vue
 create mode 100644 src/views/system/dict/data/DictDataForm.vue
 create mode 100644 src/views/system/dict/data/index.vue
 create mode 100644 src/views/system/dict/index.vue
 create mode 100644 src/views/system/errorCode/ErrorCodeForm.vue
 create mode 100644 src/views/system/errorCode/index.vue
 create mode 100644 src/views/system/loginlog/LoginLogDetail.vue
 create mode 100644 src/views/system/loginlog/index.vue
 create mode 100644 src/views/system/mail/account/MailAccountDetail.vue
 create mode 100644 src/views/system/mail/account/MailAccountForm.vue
 create mode 100644 src/views/system/mail/account/account.data.ts
 create mode 100644 src/views/system/mail/account/index.vue
 create mode 100644 src/views/system/mail/log/MailLogDetail.vue
 create mode 100644 src/views/system/mail/log/index.vue
 create mode 100644 src/views/system/mail/log/log.data.ts
 create mode 100644 src/views/system/mail/template/MailTemplateForm.vue
 create mode 100644 src/views/system/mail/template/MailTemplateSendForm.vue
 create mode 100644 src/views/system/mail/template/index.vue
 create mode 100644 src/views/system/mail/template/template.data.ts
 create mode 100644 src/views/system/menu/MenuForm.vue
 create mode 100644 src/views/system/menu/index.vue
 create mode 100644 src/views/system/notice/NoticeForm.vue
 create mode 100644 src/views/system/notice/index.vue
 create mode 100644 src/views/system/notify/message/NotifyMessageDetail.vue
 create mode 100644 src/views/system/notify/message/index.vue
 create mode 100644 src/views/system/notify/my/MyNotifyMessageDetail.vue
 create mode 100644 src/views/system/notify/my/index.vue
 create mode 100644 src/views/system/notify/template/NotifyTemplateForm.vue
 create mode 100644 src/views/system/notify/template/NotifyTemplateSendForm.vue
 create mode 100644 src/views/system/notify/template/index.vue
 create mode 100644 src/views/system/oauth2/client/ClientForm.vue
 create mode 100644 src/views/system/oauth2/client/index.vue
 create mode 100644 src/views/system/oauth2/token/index.vue
 create mode 100644 src/views/system/operatelog/OperateLogDetail.vue
 create mode 100644 src/views/system/operatelog/index.vue
 create mode 100644 src/views/system/post/PostForm.vue
 create mode 100644 src/views/system/post/index.vue
 create mode 100644 src/views/system/role/RoleAssignMenuForm.vue
 create mode 100644 src/views/system/role/RoleDataPermissionForm.vue
 create mode 100644 src/views/system/role/RoleForm.vue
 create mode 100644 src/views/system/role/index.vue
 create mode 100644 src/views/system/sensitiveWord/SensitiveWordForm.vue
 create mode 100644 src/views/system/sensitiveWord/SensitiveWordTestForm.vue
 create mode 100644 src/views/system/sensitiveWord/index.vue
 create mode 100644 src/views/system/serialNumber/SerialNumberForm.vue
 create mode 100644 src/views/system/serialNumber/index.vue
 create mode 100644 src/views/system/sms/channel/SmsChannelForm.vue
 create mode 100644 src/views/system/sms/channel/index.vue
 create mode 100644 src/views/system/sms/log/SmsLogDetail.vue
 create mode 100644 src/views/system/sms/log/index.vue
 create mode 100644 src/views/system/sms/template/SmsTemplateForm.vue
 create mode 100644 src/views/system/sms/template/SmsTemplateSendForm.vue
 create mode 100644 src/views/system/sms/template/index.vue
 create mode 100644 src/views/system/tenant/TenantForm.vue
 create mode 100644 src/views/system/tenant/index.vue
 create mode 100644 src/views/system/tenantPackage/TenantPackageForm.vue
 create mode 100644 src/views/system/tenantPackage/index.vue
 create mode 100644 src/views/system/user/DeptTree.vue
 create mode 100644 src/views/system/user/UserAssignRoleForm.vue
 create mode 100644 src/views/system/user/UserForm.vue
 create mode 100644 src/views/system/user/UserImportForm.vue
 create mode 100644 src/views/system/user/index.vue
 create mode 100644 src/views/wms/basicDataManage/customerManage/customer/customer.data.ts
 create mode 100644 src/views/wms/basicDataManage/customerManage/customer/index.vue
 create mode 100644 src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
 create mode 100644 src/views/wms/basicDataManage/customerManage/customerdock/index.vue
 create mode 100644 src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
 create mode 100644 src/views/wms/basicDataManage/customerManage/customeritem/index.vue
 create mode 100644 src/views/wms/basicDataManage/customerManage/project/index.vue
 create mode 100644 src/views/wms/basicDataManage/customerManage/project/project.data.ts
 create mode 100644 src/views/wms/basicDataManage/customerManage/saleprice/index.vue
 create mode 100644 src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
 create mode 100644 src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
 create mode 100644 src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
 create mode 100644 src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
 create mode 100644 src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
 create mode 100644 src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
 create mode 100644 src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts
 create mode 100644 src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
 create mode 100644 src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts
 create mode 100644 src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
 create mode 100644 src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts
 create mode 100644 src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
 create mode 100644 src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts
 create mode 100644 src/views/wms/basicDataManage/documentSetting/switch/index.vue
 create mode 100644 src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts
 create mode 100644 src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
 create mode 100644 src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/dock/index.vue
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/enterprise/enterprise.data.ts
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/location/index.vue
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/process/index.vue
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
 create mode 100644 src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
 create mode 100644 src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
 create mode 100644 src/views/wms/basicDataManage/itemManage/bom/index.vue
 create mode 100644 src/views/wms/basicDataManage/itemManage/itemarea/index.vue
 create mode 100644 src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
 create mode 100644 src/views/wms/basicDataManage/itemManage/itembasic/index.vue
 create mode 100644 src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
 create mode 100644 src/views/wms/basicDataManage/itemManage/itempackage/index.vue
 create mode 100644 src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
 create mode 100644 src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
 create mode 100644 src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts
 create mode 100644 src/views/wms/basicDataManage/itemManage/packageunit/index.vue
 create mode 100644 src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
 create mode 100644 src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
 create mode 100644 src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
 create mode 100644 src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
 create mode 100644 src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
 create mode 100644 src/views/wms/basicDataManage/labelManage/barbasic/barbasic.data.ts
 create mode 100644 src/views/wms/basicDataManage/labelManage/barbasic/index.vue
 create mode 100644 src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts
 create mode 100644 src/views/wms/basicDataManage/labelManage/barcode/index.vue
 create mode 100644 src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
 create mode 100644 src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
 create mode 100644 src/views/wms/basicDataManage/labelManage/labeltype/index.vue
 create mode 100644 src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts
 create mode 100644 src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
 create mode 100644 src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts
 create mode 100644 src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
 create mode 100644 src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
 create mode 100644 src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
 create mode 100644 src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
 create mode 100644 src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
 create mode 100644 src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts
 create mode 100644 src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts
 create mode 100644 src/views/wms/basicDataManage/orderManage/carrier/index.vue
 create mode 100644 src/views/wms/basicDataManage/orderManage/owner/index.vue
 create mode 100644 src/views/wms/basicDataManage/orderManage/owner/owner.data.ts
 create mode 100644 src/views/wms/basicDataManage/orderManage/shift/index.vue
 create mode 100644 src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
 create mode 100644 src/views/wms/basicDataManage/orderManage/team/index.vue
 create mode 100644 src/views/wms/basicDataManage/orderManage/team/team.data.ts
 create mode 100644 src/views/wms/basicDataManage/strategySetting/condition/condition.data.ts
 create mode 100644 src/views/wms/basicDataManage/strategySetting/condition/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/configuration/configuration.data.ts
 create mode 100644 src/views/wms/basicDataManage/strategySetting/configuration/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/configurationsetting/configurationsetting.data.ts
 create mode 100644 src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/paramsetting/paramsetting.data.ts
 create mode 100644 src/views/wms/basicDataManage/strategySetting/rule/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue
 create mode 100644 src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
 create mode 100644 src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
 create mode 100644 src/views/wms/basicDataManage/supplierManage/supplier/index.vue
 create mode 100644 src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
 create mode 100644 src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
 create mode 100644 src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
 create mode 100644 src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts
 create mode 100644 src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
 create mode 100644 src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
 create mode 100644 src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
 create mode 100644 src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
 create mode 100644 src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
 create mode 100644 src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
 create mode 100644 src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts
 create mode 100644 src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
 create mode 100644 src/views/wms/countManage/count/countJobMain/index.vue
 create mode 100644 src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
 create mode 100644 src/views/wms/countManage/count/countPlanMain/index.vue
 create mode 100644 src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
 create mode 100644 src/views/wms/countManage/count/countRecordMain/index.vue
 create mode 100644 src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
 create mode 100644 src/views/wms/countManage/count/countRequestMain/index.vue
 create mode 100644 src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
 create mode 100644 src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
 create mode 100644 src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
 create mode 100644 src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
 create mode 100644 src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
 create mode 100644 src/views/wms/inventoryManage/balance/balance.data.ts
 create mode 100644 src/views/wms/inventoryManage/balance/index.vue
 create mode 100644 src/views/wms/inventoryManage/container/containerMain.data.ts
 create mode 100644 src/views/wms/inventoryManage/container/index.vue
 create mode 100644 src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
 create mode 100644 src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
 create mode 100644 src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
 create mode 100644 src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts
 create mode 100644 src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue
 create mode 100644 src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue
 create mode 100644 src/views/wms/inventoryManage/expectin/expectin.data.ts
 create mode 100644 src/views/wms/inventoryManage/expectin/index.vue
 create mode 100644 src/views/wms/inventoryManage/expectout/expectout.data.ts
 create mode 100644 src/views/wms/inventoryManage/expectout/index.vue
 create mode 100644 src/views/wms/inventoryManage/locationcapacity/index.vue
 create mode 100644 src/views/wms/inventoryManage/locationcapacity/locationcapacity.data.ts
 create mode 100644 src/views/wms/inventoryManage/package/index.vue
 create mode 100644 src/views/wms/inventoryManage/package/package.data.ts
 create mode 100644 src/views/wms/inventoryManage/transaction/index.vue
 create mode 100644 src/views/wms/inventoryManage/transaction/transaction.data.ts
 create mode 100644 src/views/wms/inventoryManage/transferlog/index.vue
 create mode 100644 src/views/wms/inventoryManage/transferlog/transferlog.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
 create mode 100644 src/views/wms/issueManage/issue/issueJobMain/index.vue
 create mode 100644 src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
 create mode 100644 src/views/wms/issueManage/issue/issueRecordMain/index.vue
 create mode 100644 src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
 create mode 100644 src/views/wms/issueManage/issue/issueRequestMain/index.vue
 create mode 100644 src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
 create mode 100644 src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
 create mode 100644 src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts
 create mode 100644 src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
 create mode 100644 src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
 create mode 100644 src/views/wms/issueManage/pick/pickJobMain/index.vue
 create mode 100644 src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
 create mode 100644 src/views/wms/issueManage/pick/pickRecordMain/index.vue
 create mode 100644 src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts
 create mode 100644 src/views/wms/issueManage/pick/pickRequestMain/index.vue
 create mode 100644 src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
 create mode 100644 src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
 create mode 100644 src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
 create mode 100644 src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
 create mode 100644 src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
 create mode 100644 src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
 create mode 100644 src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
 create mode 100644 src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
 create mode 100644 src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
 create mode 100644 src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
 create mode 100644 src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
 create mode 100644 src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
 create mode 100644 src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
 create mode 100644 src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
 create mode 100644 src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
 create mode 100644 src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
 create mode 100644 src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
 create mode 100644 src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
 create mode 100644 src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
 create mode 100644 src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
 create mode 100644 src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
 create mode 100644 src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
 create mode 100644 src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
 create mode 100644 src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
 create mode 100644 src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
 create mode 100644 src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
 create mode 100644 src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
 create mode 100644 src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
 create mode 100644 src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
 create mode 100644 src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
 create mode 100644 src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
 create mode 100644 src/views/wms/moveManage/itemChange/index.vue
 create mode 100644 src/views/wms/moveManage/itemChange/itemChange.data.ts
 create mode 100644 src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
 create mode 100644 src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts
 create mode 100644 src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
 create mode 100644 src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
 create mode 100644 src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
 create mode 100644 src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
 create mode 100644 src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
 create mode 100644 src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
 create mode 100644 src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
 create mode 100644 src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
 create mode 100644 src/views/wms/productionManage/productionplan/productionMain/index.vue
 create mode 100644 src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
 create mode 100644 src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
 create mode 100644 src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
 create mode 100644 src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
 create mode 100644 src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
 create mode 100644 src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
 create mode 100644 src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
 create mode 100644 src/views/wms/productionManage/productionplan/workMain/index.vue
 create mode 100644 src/views/wms/productionManage/productionplan/workMain/workMain.data.ts
 create mode 100644 src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
 create mode 100644 src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
 create mode 100644 src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
 create mode 100644 src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
 create mode 100644 src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
 create mode 100644 src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
 create mode 100644 src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
 create mode 100644 src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
 create mode 100644 src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
 create mode 100644 src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
 create mode 100644 src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts
 create mode 100644 src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
 create mode 100644 src/views/wms/productionManage/productredress/productredressJobMain/index.vue
 create mode 100644 src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
 create mode 100644 src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
 create mode 100644 src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
 create mode 100644 src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
 create mode 100644 src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
 create mode 100644 src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
 create mode 100644 src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
 create mode 100644 src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
 create mode 100644 src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
 create mode 100644 src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
 create mode 100644 src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
 create mode 100644 src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
 create mode 100644 src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
 create mode 100644 src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
 create mode 100644 src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
 create mode 100644 src/views/wms/reportList/index.vue
 create mode 100644 src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
 create mode 100644 src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts
 create mode 100644 src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
 create mode 100644 src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
 create mode 100644 src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
 create mode 100644 src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
 create mode 100644 src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
 create mode 100644 src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

diff --git a/src/App.vue b/src/App.vue
new file mode 100644
index 000000000..c0d50c3af
--- /dev/null
+++ b/src/App.vue
@@ -0,0 +1,75 @@
+<script lang="ts" setup>
+import { isDark } from '@/utils/is'
+import { useAppStore } from '@/store/modules/app'
+import { useDesign } from '@/hooks/web/useDesign'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import routerSearch from '@/components/RouterSearch/index.vue'
+
+defineOptions({ name: 'APP' })
+
+const { getPrefixCls } = useDesign()
+const prefixCls = getPrefixCls('app')
+const appStore = useAppStore()
+const currentSize = computed(() => appStore.getCurrentSize)
+const greyMode = computed(() => appStore.getGreyMode)
+const { wsCache } = useCache()
+
+// 根据浏览器当前主题设置系统主题色
+const setDefaultTheme = () => {
+  // let isDarkTheme = wsCache.get(CACHE_KEY.IS_DARK)
+  let isDarkTheme = false
+  if (isDarkTheme === null) {
+    isDarkTheme = isDark()
+  }
+  appStore.setIsDark(isDarkTheme)
+}
+setDefaultTheme()
+</script>
+<template>
+  <ConfigGlobal :size="currentSize">
+    <RouterView :class="greyMode ? `${prefixCls}-grey-mode` : ''" />
+    <routerSearch />
+  </ConfigGlobal>
+</template>
+<style lang="scss">
+$prefix-cls: #{$namespace}-app;
+
+.size {
+  width: 100%;
+  height: 100%;
+}
+
+html,
+body {
+  @extend .size;
+
+  padding: 0 !important;
+  margin: 0;
+  overflow: hidden;
+
+  #app {
+    @extend .size;
+  }
+}
+
+.#{$prefix-cls}-grey-mode {
+  filter: grayscale(100%);
+}
+.el-select{
+  width: 100%;
+}
+/* 垂直滚动条样式 */
+/* 宽度 */
+::-webkit-scrollbar {
+    width: 12px;
+}
+/* 背景色 */
+::-webkit-scrollbar-track {
+    background-color: #f5f5f5;
+}
+/* 滑块颜色 */
+::-webkit-scrollbar-thumb {
+    background-color: #c1c1c1;
+    border-radius: 12px;
+}
+</style>
diff --git a/src/api/bpm/activity/index.ts b/src/api/bpm/activity/index.ts
new file mode 100644
index 000000000..870d0d6cd
--- /dev/null
+++ b/src/api/bpm/activity/index.ts
@@ -0,0 +1,8 @@
+import request from '@/config/axios'
+
+export const getActivityList = async (params) => {
+  return await request.get({
+    url: '/bpm/activity/list',
+    params
+  })
+}
diff --git a/src/api/bpm/definition/index.ts b/src/api/bpm/definition/index.ts
new file mode 100644
index 000000000..c0e51fab5
--- /dev/null
+++ b/src/api/bpm/definition/index.ts
@@ -0,0 +1,21 @@
+import request from '@/config/axios'
+
+export const getProcessDefinitionBpmnXML = async (id: number) => {
+  return await request.get({
+    url: '/bpm/process-definition/get-bpmn-xml?id=' + id
+  })
+}
+
+export const getProcessDefinitionPage = async (params) => {
+  return await request.get({
+    url: '/bpm/process-definition/page',
+    params
+  })
+}
+
+export const getProcessDefinitionList = async (params) => {
+  return await request.get({
+    url: '/bpm/process-definition/list',
+    params
+  })
+}
diff --git a/src/api/bpm/form/index.ts b/src/api/bpm/form/index.ts
new file mode 100644
index 000000000..142ed24c3
--- /dev/null
+++ b/src/api/bpm/form/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export type FormVO = {
+  id: number
+  name: string
+  conf: string
+  fields: string[]
+  status: number
+  remark: string
+  createTime: string
+}
+
+// 创建工作流的表单定义
+export const createForm = async (data: FormVO) => {
+  return await request.post({
+    url: '/bpm/form/create',
+    data: data
+  })
+}
+
+// 更新工作流的表单定义
+export const updateForm = async (data: FormVO) => {
+  return await request.put({
+    url: '/bpm/form/update',
+    data: data
+  })
+}
+
+// 删除工作流的表单定义
+export const deleteForm = async (id: number) => {
+  return await request.delete({
+    url: '/bpm/form/delete?id=' + id
+  })
+}
+
+// 获得工作流的表单定义
+export const getForm = async (id: number) => {
+  return await request.get({
+    url: '/bpm/form/get?id=' + id
+  })
+}
+
+// 获得工作流的表单定义分页
+export const getFormPage = async (params) => {
+  return await request.get({
+    url: '/bpm/form/page',
+    params
+  })
+}
+
+// 获得动态表单的精简列表
+export const getSimpleFormList = async () => {
+  return await request.get({
+    url: '/bpm/form/list-all-simple'
+  })
+}
diff --git a/src/api/bpm/leave/index.ts b/src/api/bpm/leave/index.ts
new file mode 100644
index 000000000..d4fe8d580
--- /dev/null
+++ b/src/api/bpm/leave/index.ts
@@ -0,0 +1,27 @@
+import request from '@/config/axios'
+
+export type LeaveVO = {
+  id: number
+  result: number
+  type: number
+  reason: string
+  processInstanceId: string
+  startTime: string
+  endTime: string
+  createTime: string
+}
+
+// 创建请假申请
+export const createLeave = async (data: LeaveVO) => {
+  return await request.post({ url: '/bpm/oa/leave/create', data: data })
+}
+
+// 获得请假申请
+export const getLeave = async (id: number) => {
+  return await request.get({ url: '/bpm/oa/leave/get?id=' + id })
+}
+
+// 获得请假申请分页
+export const getLeavePage = async (params: PageParam) => {
+  return await request.get({ url: '/bpm/oa/leave/page', params })
+}
diff --git a/src/api/bpm/model/index.ts b/src/api/bpm/model/index.ts
new file mode 100644
index 000000000..2e1d4e64b
--- /dev/null
+++ b/src/api/bpm/model/index.ts
@@ -0,0 +1,59 @@
+import request from '@/config/axios'
+
+export type ProcessDefinitionVO = {
+  id: string
+  version: number
+  deploymentTIme: string
+  suspensionState: number
+}
+
+export type ModelVO = {
+  id: number
+  formName: string
+  key: string
+  name: string
+  description: string
+  category: string
+  formType: number
+  formId: number
+  formCustomCreatePath: string
+  formCustomViewPath: string
+  processDefinition: ProcessDefinitionVO
+  status: number
+  remark: string
+  createTime: string
+  bpmnXml: string
+}
+
+export const getModelPage = async (params) => {
+  return await request.get({ url: '/bpm/model/page', params })
+}
+
+export const getModel = async (id: number) => {
+  return await request.get({ url: '/bpm/model/get?id=' + id })
+}
+
+export const updateModel = async (data: ModelVO) => {
+  return await request.put({ url: '/bpm/model/update', data: data })
+}
+
+// 任务状态修改
+export const updateModelState = async (id: number, state: number) => {
+  const data = {
+    id: id,
+    state: state
+  }
+  return await request.put({ url: '/bpm/model/update-state', data: data })
+}
+
+export const createModel = async (data: ModelVO) => {
+  return await request.post({ url: '/bpm/model/create', data: data })
+}
+
+export const deleteModel = async (id: number) => {
+  return await request.delete({ url: '/bpm/model/delete?id=' + id })
+}
+
+export const deployModel = async (id: number) => {
+  return await request.post({ url: '/bpm/model/deploy?id=' + id })
+}
diff --git a/src/api/bpm/processInstance/index.ts b/src/api/bpm/processInstance/index.ts
new file mode 100644
index 000000000..10cd3bc81
--- /dev/null
+++ b/src/api/bpm/processInstance/index.ts
@@ -0,0 +1,41 @@
+import request from '@/config/axios'
+
+export type Task = {
+  id: string
+  name: string
+}
+
+export type ProcessInstanceVO = {
+  id: number
+  name: string
+  processDefinitionId: string
+  category: string
+  result: number
+  tasks: Task[]
+  fields: string[]
+  status: number
+  remark: string
+  businessKey: string
+  createTime: string
+  endTime: string
+}
+
+export const getMyProcessInstancePage = async (params) => {
+  return await request.get({ url: '/bpm/process-instance/my-page', params })
+}
+
+export const createProcessInstance = async (data) => {
+  return await request.post({ url: '/bpm/process-instance/create', data: data })
+}
+
+export const cancelProcessInstance = async (id: number, reason: string) => {
+  const data = {
+    id: id,
+    reason: reason
+  }
+  return await request.delete({ url: '/bpm/process-instance/cancel', data: data })
+}
+
+export const getProcessInstance = async (id: number) => {
+  return await request.get({ url: '/bpm/process-instance/get?id=' + id })
+}
diff --git a/src/api/bpm/task/index.ts b/src/api/bpm/task/index.ts
new file mode 100644
index 000000000..e6478d31b
--- /dev/null
+++ b/src/api/bpm/task/index.ts
@@ -0,0 +1,53 @@
+import request from '@/config/axios'
+
+export type TaskVO = {
+  id: number
+}
+
+export const getTodoTaskPage = async (params) => {
+  return await request.get({ url: '/bpm/task/todo-page', params })
+}
+
+export const getDoneTaskPage = async (params) => {
+  return await request.get({ url: '/bpm/task/done-page', params })
+}
+
+export const completeTask = async (data) => {
+  return await request.put({ url: '/bpm/task/complete', data })
+}
+
+export const approveTask = async (data) => {
+  return await request.put({ url: '/bpm/task/approve', data })
+}
+
+export const rejectTask = async (data) => {
+  return await request.put({ url: '/bpm/task/reject', data })
+}
+export const backTask = async (data) => {
+  return await request.put({ url: '/bpm/task/back', data })
+}
+
+export const updateTaskAssignee = async (data) => {
+  return await request.put({ url: '/bpm/task/update-assignee', data })
+}
+
+export const getTaskListByProcessInstanceId = async (processInstanceId) => {
+  return await request.get({
+    url: '/bpm/task/list-by-process-instance-id?processInstanceId=' + processInstanceId
+  })
+}
+
+// 导出任务
+export const exportTask = async (params) => {
+  return await request.download({ url: '/bpm/task/export', params })
+}
+
+// 获取所有可回退的节点
+export const getReturnList = async (params) => {
+  return await request.get({ url: '/bpm/task/get-return-list', params })
+}
+
+// 回退
+export const returnTask = async (data) => {
+  return await request.put({ url: '/bpm/task/return', data })
+}
diff --git a/src/api/bpm/taskAssignRule/index.ts b/src/api/bpm/taskAssignRule/index.ts
new file mode 100644
index 000000000..5fbe342d4
--- /dev/null
+++ b/src/api/bpm/taskAssignRule/index.ts
@@ -0,0 +1,29 @@
+import request from '@/config/axios'
+
+export type TaskAssignVO = {
+  id: number
+  modelId: string
+  processDefinitionId: string
+  taskDefinitionKey: string
+  taskDefinitionName: string
+  options: string[]
+  type: number
+}
+
+export const getTaskAssignRuleList = async (params) => {
+  return await request.get({ url: '/bpm/task-assign-rule/list', params })
+}
+
+export const createTaskAssignRule = async (data: TaskAssignVO) => {
+  return await request.post({
+    url: '/bpm/task-assign-rule/create',
+    data: data
+  })
+}
+
+export const updateTaskAssignRule = async (data: TaskAssignVO) => {
+  return await request.put({
+    url: '/bpm/task-assign-rule/update',
+    data: data
+  })
+}
diff --git a/src/api/bpm/userGroup/index.ts b/src/api/bpm/userGroup/index.ts
new file mode 100644
index 000000000..035762bf1
--- /dev/null
+++ b/src/api/bpm/userGroup/index.ts
@@ -0,0 +1,47 @@
+import request from '@/config/axios'
+
+export type UserGroupVO = {
+  id: number
+  name: string
+  description: string
+  memberUserIds: number[]
+  status: number
+  remark: string
+  createTime: string
+}
+
+// 创建用户组
+export const createUserGroup = async (data: UserGroupVO) => {
+  return await request.post({
+    url: '/bpm/user-group/create',
+    data: data
+  })
+}
+
+// 更新用户组
+export const updateUserGroup = async (data: UserGroupVO) => {
+  return await request.put({
+    url: '/bpm/user-group/update',
+    data: data
+  })
+}
+
+// 删除用户组
+export const deleteUserGroup = async (id: number) => {
+  return await request.delete({ url: '/bpm/user-group/delete?id=' + id })
+}
+
+// 获得用户组
+export const getUserGroup = async (id: number) => {
+  return await request.get({ url: '/bpm/user-group/get?id=' + id })
+}
+
+// 获得用户组分页
+export const getUserGroupPage = async (params) => {
+  return await request.get({ url: '/bpm/user-group/page', params })
+}
+
+// 获取用户组精简信息列表
+export const getSimpleUserGroupList = async (): Promise<UserGroupVO[]> => {
+  return await request.get({ url: '/bpm/user-group/list-all-simple' })
+}
diff --git a/src/api/home/index.ts b/src/api/home/index.ts
new file mode 100644
index 000000000..aa8cb1388
--- /dev/null
+++ b/src/api/home/index.ts
@@ -0,0 +1,22 @@
+import request from '@/config/axios'
+
+// 供应商首页
+export const getSupplierData = async () => {
+  return await request.get({ url: `/wms/index/indexSupplier` })
+}
+
+// 原料管理员首页
+export const getMaterialData = async () => {
+  return await request.get({ url: `/wms/index/indexMaterial` })
+}
+
+// 生产管理员首页
+export const getProduceData = async () => {
+  return await request.get({ url: `/wms/index/indexProduce` })
+}
+
+// 成品管理员首页
+export const getProductData = async () => {
+  return await request.get({ url: `/wms/index/indexProduct` })
+}
+
diff --git a/src/api/infra/apiAccessLog/index.ts b/src/api/infra/apiAccessLog/index.ts
new file mode 100644
index 000000000..c6b4b45f0
--- /dev/null
+++ b/src/api/infra/apiAccessLog/index.ts
@@ -0,0 +1,30 @@
+import request from '@/config/axios'
+
+export interface ApiAccessLogVO {
+  id: number
+  traceId: string
+  userId: number
+  userType: number
+  applicationName: string
+  requestMethod: string
+  requestParams: string
+  requestUrl: string
+  userIp: string
+  userAgent: string
+  beginTime: Date
+  endTIme: Date
+  duration: number
+  resultCode: number
+  resultMsg: string
+  createTime: Date
+}
+
+// 查询列表API 访问日志
+export const getApiAccessLogPage = (params: PageParam) => {
+  return request.get({ url: '/infra/api-access-log/page', params })
+}
+
+// 导出API 访问日志
+export const exportApiAccessLog = (params) => {
+  return request.download({ url: '/infra/api-access-log/export-excel', params })
+}
diff --git a/src/api/infra/apiErrorLog/index.ts b/src/api/infra/apiErrorLog/index.ts
new file mode 100644
index 000000000..59ee21431
--- /dev/null
+++ b/src/api/infra/apiErrorLog/index.ts
@@ -0,0 +1,48 @@
+import request from '@/config/axios'
+
+export interface ApiErrorLogVO {
+  id: number
+  traceId: string
+  userId: number
+  userType: number
+  applicationName: string
+  requestMethod: string
+  requestParams: string
+  requestUrl: string
+  userIp: string
+  userAgent: string
+  exceptionTime: Date
+  exceptionName: string
+  exceptionMessage: string
+  exceptionRootCauseMessage: string
+  exceptionStackTrace: string
+  exceptionClassName: string
+  exceptionFileName: string
+  exceptionMethodName: string
+  exceptionLineNumber: number
+  processUserId: number
+  processStatus: number
+  processTime: Date
+  resultCode: number
+  createTime: Date
+}
+
+// 查询列表API 访问日志
+export const getApiErrorLogPage = (params: PageParam) => {
+  return request.get({ url: '/infra/api-error-log/page', params })
+}
+
+// 更新 API 错误日志的处理状态
+export const updateApiErrorLogPage = (id: number, processStatus: number) => {
+  return request.put({
+    url: '/infra/api-error-log/update-status?id=' + id + '&processStatus=' + processStatus
+  })
+}
+
+// 导出API 访问日志
+export const exportApiErrorLog = (params) => {
+  return request.download({
+    url: '/infra/api-error-log/export-excel',
+    params
+  })
+}
diff --git a/src/api/infra/codegen/index.ts b/src/api/infra/codegen/index.ts
new file mode 100644
index 000000000..64701efe4
--- /dev/null
+++ b/src/api/infra/codegen/index.ts
@@ -0,0 +1,123 @@
+import request from '@/config/axios'
+
+export type CodegenTableVO = {
+  id: number
+  tableId: number
+  isParentMenuIdValid: boolean
+  dataSourceConfigId: number
+  scene: number
+  tableName: string
+  tableComment: string
+  remark: string
+  moduleName: string
+  businessName: string
+  className: string
+  classComment: string
+  author: string
+  createTime: Date
+  updateTime: Date
+  templateType: number
+  parentMenuId: number
+}
+
+export type CodegenColumnVO = {
+  id: number
+  tableId: number
+  columnName: string
+  dataType: string
+  columnComment: string
+  nullable: number
+  primaryKey: number
+  autoIncrement: string
+  ordinalPosition: number
+  javaType: string
+  javaField: string
+  dictType: string
+  example: string
+  createOperation: number
+  updateOperation: number
+  listOperation: number
+  listOperationCondition: string
+  listOperationResult: number
+  htmlType: string
+}
+
+export type DatabaseTableVO = {
+  name: string
+  comment: string
+}
+
+export type CodegenDetailVO = {
+  table: CodegenTableVO
+  columns: CodegenColumnVO[]
+}
+
+export type CodegenPreviewVO = {
+  filePath: string
+  code: string
+}
+
+export type CodegenUpdateReqVO = {
+  table: CodegenTableVO | any
+  columns: CodegenColumnVO[]
+}
+
+export type CodegenCreateListReqVO = {
+  dataSourceConfigId: number
+  tableNames: string[]
+}
+
+// 查询列表代码生成表定义
+export const getCodegenTablePage = (params: PageParam) => {
+  return request.get({ url: '/infra/codegen/table/page', params })
+}
+
+// 查询详情代码生成表定义
+export const getCodegenTable = (id: number) => {
+  return request.get({ url: '/infra/codegen/detail?tableId=' + id })
+}
+
+// 新增代码生成表定义
+export const createCodegenTable = (data: CodegenCreateListReqVO) => {
+  return request.post({ url: '/infra/codegen/create', data })
+}
+
+// 修改代码生成表定义
+export const updateCodegenTable = (data: CodegenUpdateReqVO) => {
+  return request.put({ url: '/infra/codegen/update', data })
+}
+
+// 基于数据库的表结构，同步数据库的表和字段定义
+export const syncCodegenFromDB = (id: number) => {
+  return request.put({ url: '/infra/codegen/sync-from-db?tableId=' + id })
+}
+
+// 基于 SQL 建表语句，同步数据库的表和字段定义
+export const syncCodegenFromSQL = (id: number, sql: string) => {
+  return request.put({ url: '/infra/codegen/sync-from-sql?tableId=' + id + '&sql=' + sql })
+}
+
+// 预览生成代码
+export const previewCodegen = (id: number) => {
+  return request.get({ url: '/infra/codegen/preview?tableId=' + id })
+}
+
+// 下载生成代码
+export const downloadCodegen = (id: number) => {
+  return request.download({ url: '/infra/codegen/download?tableId=' + id })
+}
+
+// 获得表定义
+export const getSchemaTableList = (params) => {
+  return request.get({ url: '/infra/codegen/db/table/list', params })
+}
+
+// 基于数据库的表结构，创建代码生成器的表定义
+export const createCodegenList = (data) => {
+  return request.post({ url: '/infra/codegen/create-list', data })
+}
+
+// 删除代码生成表定义
+export const deleteCodegenTable = (id: number) => {
+  return request.delete({ url: '/infra/codegen/delete?tableId=' + id })
+}
diff --git a/src/api/infra/config/index.ts b/src/api/infra/config/index.ts
new file mode 100644
index 000000000..8942cde25
--- /dev/null
+++ b/src/api/infra/config/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface ConfigVO {
+  id: number | undefined
+  category: string
+  name: string
+  key: string
+  value: string
+  itemType: string
+  areaType: string
+  inventoryStatus: string
+  type: number
+  visible: boolean
+  remark: string
+  createTime: Date
+}
+
+// 查询参数列表
+export const getConfigPage = (params: PageParam) => {
+  return request.get({ url: '/infra/config/page', params })
+}
+
+// 查询参数详情
+export const getConfig = (id: number) => {
+  return request.get({ url: '/infra/config/get?id=' + id })
+}
+
+// 根据参数键名查询参数值
+export const getConfigKey = (configKey: string) => {
+  return request.get({ url: '/infra/config/get-value-by-key?key=' + configKey })
+}
+
+// 根据参数键名查询参数值
+export const queryByKey = (configKey: string) => {
+  return request.get({ url: '/infra/config/queryByKey?key=' + configKey })
+}
+
+// 新增参数
+export const createConfig = (data: ConfigVO) => {
+  return request.post({ url: '/infra/config/create', data })
+}
+
+// 修改参数
+export const updateConfig = (data: ConfigVO) => {
+  return request.put({ url: '/infra/config/update', data })
+}
+
+// 删除参数
+export const deleteConfig = (id: number) => {
+  return request.delete({ url: '/infra/config/delete?id=' + id })
+}
+
+// 导出参数
+export const exportConfig = (params) => {
+  return request.download({ url: '/infra/config/export', params })
+}
diff --git a/src/api/infra/dataSourceConfig/index.ts b/src/api/infra/dataSourceConfig/index.ts
new file mode 100644
index 000000000..b413f345d
--- /dev/null
+++ b/src/api/infra/dataSourceConfig/index.ts
@@ -0,0 +1,35 @@
+import request from '@/config/axios'
+
+export interface DataSourceConfigVO {
+  id: number | undefined
+  name: string
+  url: string
+  username: string
+  password: string
+  createTime?: Date
+}
+
+// 新增数据源配置
+export const createDataSourceConfig = (data: DataSourceConfigVO) => {
+  return request.post({ url: '/infra/data-source-config/create', data })
+}
+
+// 修改数据源配置
+export const updateDataSourceConfig = (data: DataSourceConfigVO) => {
+  return request.put({ url: '/infra/data-source-config/update', data })
+}
+
+// 删除数据源配置
+export const deleteDataSourceConfig = (id: number) => {
+  return request.delete({ url: '/infra/data-source-config/delete?id=' + id })
+}
+
+// 查询数据源配置详情
+export const getDataSourceConfig = (id: number) => {
+  return request.get({ url: '/infra/data-source-config/get?id=' + id })
+}
+
+// 查询数据源配置列表
+export const getDataSourceConfigList = () => {
+  return request.get({ url: '/infra/data-source-config/list' })
+}
diff --git a/src/api/infra/dbDoc/index.ts b/src/api/infra/dbDoc/index.ts
new file mode 100644
index 000000000..1a1a36b46
--- /dev/null
+++ b/src/api/infra/dbDoc/index.ts
@@ -0,0 +1,16 @@
+import request from '@/config/axios'
+
+// 导出Html
+export const exportHtml = () => {
+  return request.download({ url: '/infra/db-doc/export-html' })
+}
+
+// 导出Word
+export const exportWord = () => {
+  return request.download({ url: '/infra/db-doc/export-word' })
+}
+
+// 导出Markdown
+export const exportMarkdown = () => {
+  return request.download({ url: '/infra/db-doc/export-markdown' })
+}
diff --git a/src/api/infra/file/index.ts b/src/api/infra/file/index.ts
new file mode 100644
index 000000000..f64bc0d69
--- /dev/null
+++ b/src/api/infra/file/index.ts
@@ -0,0 +1,17 @@
+import request from '@/config/axios'
+
+export interface FilePageReqVO extends PageParam {
+  path?: string
+  type?: string
+  createTime?: Date[]
+}
+
+// 查询文件列表
+export const getFilePage = (params: FilePageReqVO) => {
+  return request.get({ url: '/infra/file/page', params })
+}
+
+// 删除文件
+export const deleteFile = (id: number) => {
+  return request.delete({ url: '/infra/file/delete?id=' + id })
+}
diff --git a/src/api/infra/fileConfig/index.ts b/src/api/infra/fileConfig/index.ts
new file mode 100644
index 000000000..b72f18b79
--- /dev/null
+++ b/src/api/infra/fileConfig/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface FileClientConfig {
+  basePath: string
+  host?: string
+  port?: number
+  username?: string
+  password?: string
+  mode?: string
+  endpoint?: string
+  bucket?: string
+  accessKey?: string
+  accessSecret?: string
+  domain: string
+}
+
+export interface FileConfigVO {
+  id: number
+  name: string
+  storage: any
+  master: boolean
+  visible: boolean
+  config: FileClientConfig
+  remark: string
+  createTime: Date
+}
+
+// 查询文件配置列表
+export const getFileConfigPage = (params: PageParam) => {
+  return request.get({ url: '/infra/file-config/page', params })
+}
+
+// 查询文件配置详情
+export const getFileConfig = (id: number) => {
+  return request.get({ url: '/infra/file-config/get?id=' + id })
+}
+
+// 更新文件配置为主配置
+export const updateFileConfigMaster = (id: number) => {
+  return request.put({ url: '/infra/file-config/update-master?id=' + id })
+}
+
+// 新增文件配置
+export const createFileConfig = (data: FileConfigVO) => {
+  return request.post({ url: '/infra/file-config/create', data })
+}
+
+// 修改文件配置
+export const updateFileConfig = (data: FileConfigVO) => {
+  return request.put({ url: '/infra/file-config/update', data })
+}
+
+// 删除文件配置
+export const deleteFileConfig = (id: number) => {
+  return request.delete({ url: '/infra/file-config/delete?id=' + id })
+}
+
+// 测试文件配置
+export const testFileConfig = (id: number) => {
+  return request.get({ url: '/infra/file-config/test?id=' + id })
+}
diff --git a/src/api/infra/job/index.ts b/src/api/infra/job/index.ts
new file mode 100644
index 000000000..033b2cbe8
--- /dev/null
+++ b/src/api/infra/job/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface JobVO {
+  id: number
+  name: string
+  status: number
+  handlerName: string
+  handlerParam: string
+  cronExpression: string
+  retryCount: number
+  retryInterval: number
+  monitorTimeout: number
+  createTime: Date
+}
+
+// 任务列表
+export const getJobPage = (params: PageParam) => {
+  return request.get({ url: '/infra/job/page', params })
+}
+
+// 任务详情
+export const getJob = (id: number) => {
+  return request.get({ url: '/infra/job/get?id=' + id })
+}
+
+// 新增任务
+export const createJob = (data: JobVO) => {
+  return request.post({ url: '/infra/job/create', data })
+}
+
+// 修改定时任务调度
+export const updateJob = (data: JobVO) => {
+  return request.put({ url: '/infra/job/update', data })
+}
+
+// 删除定时任务调度
+export const deleteJob = (id: number) => {
+  return request.delete({ url: '/infra/job/delete?id=' + id })
+}
+
+// 导出定时任务调度
+export const exportJob = (params) => {
+  return request.download({ url: '/infra/job/export-excel', params })
+}
+
+// 任务状态修改
+export const updateJobStatus = (id: number, status: number) => {
+  const params = {
+    id,
+    status
+  }
+  return request.put({ url: '/infra/job/update-status', params })
+}
+
+// 定时任务立即执行一次
+export const runJob = (id: number) => {
+  return request.put({ url: '/infra/job/trigger?id=' + id })
+}
+
+// 获得定时任务的下 n 次执行时间
+export const getJobNextTimes = (id: number) => {
+  return request.get({ url: '/infra/job/get_next_times?id=' + id })
+}
diff --git a/src/api/infra/jobLog/index.ts b/src/api/infra/jobLog/index.ts
new file mode 100644
index 000000000..f429cd9ea
--- /dev/null
+++ b/src/api/infra/jobLog/index.ts
@@ -0,0 +1,33 @@
+import request from '@/config/axios'
+
+export interface JobLogVO {
+  id: number
+  jobId: number
+  handlerName: string
+  handlerParam: string
+  cronExpression: string
+  executeIndex: string
+  beginTime: string
+  endTime: string
+  duration: string
+  status: number
+  createTime: string
+}
+
+// 任务日志列表
+export const getJobLogPage = (params: PageParam) => {
+  return request.get({ url: '/infra/job-log/page', params })
+}
+
+// 任务日志详情
+export const getJobLog = (id: number) => {
+  return request.get({ url: '/infra/job-log/get?id=' + id })
+}
+
+// 导出定时任务日志
+export const exportJobLog = (params) => {
+  return request.download({
+    url: '/infra/job-log/export-excel',
+    params
+  })
+}
diff --git a/src/api/infra/redis/index.ts b/src/api/infra/redis/index.ts
new file mode 100644
index 000000000..f27be77fb
--- /dev/null
+++ b/src/api/infra/redis/index.ts
@@ -0,0 +1,8 @@
+import request from '@/config/axios'
+
+/**
+ * 获取redis 监控信息
+ */
+export const getCache = () => {
+  return request.get({ url: '/infra/redis/get-monitor-info' })
+}
diff --git a/src/api/infra/redis/types.ts b/src/api/infra/redis/types.ts
new file mode 100644
index 000000000..548bfe967
--- /dev/null
+++ b/src/api/infra/redis/types.ts
@@ -0,0 +1,176 @@
+export interface RedisMonitorInfoVO {
+  info: RedisInfoVO
+  dbSize: number
+  commandStats: RedisCommandStatsVO[]
+}
+
+export interface RedisInfoVO {
+  io_threaded_reads_processed: string
+  tracking_clients: string
+  uptime_in_seconds: string
+  cluster_connections: string
+  current_cow_size: string
+  maxmemory_human: string
+  aof_last_cow_size: string
+  master_replid2: string
+  mem_replication_backlog: string
+  aof_rewrite_scheduled: string
+  total_net_input_bytes: string
+  rss_overhead_ratio: string
+  hz: string
+  current_cow_size_age: string
+  redis_build_id: string
+  errorstat_BUSYGROUP: string
+  aof_last_bgrewrite_status: string
+  multiplexing_api: string
+  client_recent_max_output_buffer: string
+  allocator_resident: string
+  mem_fragmentation_bytes: string
+  aof_current_size: string
+  repl_backlog_first_byte_offset: string
+  tracking_total_prefixes: string
+  redis_mode: string
+  redis_git_dirty: string
+  aof_delayed_fsync: string
+  allocator_rss_bytes: string
+  repl_backlog_histlen: string
+  io_threads_active: string
+  rss_overhead_bytes: string
+  total_system_memory: string
+  loading: string
+  evicted_keys: string
+  maxclients: string
+  cluster_enabled: string
+  redis_version: string
+  repl_backlog_active: string
+  mem_aof_buffer: string
+  allocator_frag_bytes: string
+  io_threaded_writes_processed: string
+  instantaneous_ops_per_sec: string
+  used_memory_human: string
+  total_error_replies: string
+  role: string
+  maxmemory: string
+  used_memory_lua: string
+  rdb_current_bgsave_time_sec: string
+  used_memory_startup: string
+  used_cpu_sys_main_thread: string
+  lazyfree_pending_objects: string
+  aof_pending_bio_fsync: string
+  used_memory_dataset_perc: string
+  allocator_frag_ratio: string
+  arch_bits: string
+  used_cpu_user_main_thread: string
+  mem_clients_normal: string
+  expired_time_cap_reached_count: string
+  unexpected_error_replies: string
+  mem_fragmentation_ratio: string
+  aof_last_rewrite_time_sec: string
+  master_replid: string
+  aof_rewrite_in_progress: string
+  lru_clock: string
+  maxmemory_policy: string
+  run_id: string
+  latest_fork_usec: string
+  tracking_total_items: string
+  total_commands_processed: string
+  expired_keys: string
+  errorstat_ERR: string
+  used_memory: string
+  module_fork_in_progress: string
+  errorstat_WRONGPASS: string
+  aof_buffer_length: string
+  dump_payload_sanitizations: string
+  mem_clients_slaves: string
+  keyspace_misses: string
+  server_time_usec: string
+  executable: string
+  lazyfreed_objects: string
+  db0: string
+  used_memory_peak_human: string
+  keyspace_hits: string
+  rdb_last_cow_size: string
+  aof_pending_rewrite: string
+  used_memory_overhead: string
+  active_defrag_hits: string
+  tcp_port: string
+  uptime_in_days: string
+  used_memory_peak_perc: string
+  current_save_keys_processed: string
+  blocked_clients: string
+  total_reads_processed: string
+  expire_cycle_cpu_milliseconds: string
+  sync_partial_err: string
+  used_memory_scripts_human: string
+  aof_current_rewrite_time_sec: string
+  aof_enabled: string
+  process_supervised: string
+  master_repl_offset: string
+  used_memory_dataset: string
+  used_cpu_user: string
+  rdb_last_bgsave_status: string
+  tracking_total_keys: string
+  atomicvar_api: string
+  allocator_rss_ratio: string
+  client_recent_max_input_buffer: string
+  clients_in_timeout_table: string
+  aof_last_write_status: string
+  mem_allocator: string
+  used_memory_scripts: string
+  used_memory_peak: string
+  process_id: string
+  master_failover_state: string
+  errorstat_NOAUTH: string
+  used_cpu_sys: string
+  repl_backlog_size: string
+  connected_slaves: string
+  current_save_keys_total: string
+  gcc_version: string
+  total_system_memory_human: string
+  sync_full: string
+  connected_clients: string
+  module_fork_last_cow_size: string
+  total_writes_processed: string
+  allocator_active: string
+  total_net_output_bytes: string
+  pubsub_channels: string
+  current_fork_perc: string
+  active_defrag_key_hits: string
+  rdb_changes_since_last_save: string
+  instantaneous_input_kbps: string
+  used_memory_rss_human: string
+  configured_hz: string
+  expired_stale_perc: string
+  active_defrag_misses: string
+  used_cpu_sys_children: string
+  number_of_cached_scripts: string
+  sync_partial_ok: string
+  used_memory_lua_human: string
+  rdb_last_save_time: string
+  pubsub_patterns: string
+  slave_expires_tracked_keys: string
+  redis_git_sha1: string
+  used_memory_rss: string
+  rdb_last_bgsave_time_sec: string
+  os: string
+  mem_not_counted_for_evict: string
+  active_defrag_running: string
+  rejected_connections: string
+  aof_rewrite_buffer_length: string
+  total_forks: string
+  active_defrag_key_misses: string
+  allocator_allocated: string
+  aof_base_size: string
+  instantaneous_output_kbps: string
+  second_repl_offset: string
+  rdb_bgsave_in_progress: string
+  used_cpu_user_children: string
+  total_connections_received: string
+  migrate_cached_sockets: string
+}
+
+export interface RedisCommandStatsVO {
+  command: string
+  calls: number
+  usec: number
+}
diff --git a/src/api/login/index.ts b/src/api/login/index.ts
new file mode 100644
index 000000000..444f0f27c
--- /dev/null
+++ b/src/api/login/index.ts
@@ -0,0 +1,72 @@
+import request from '@/config/axios'
+import { getRefreshToken } from '@/utils/auth'
+import type { UserLoginVO } from './types'
+
+export interface SmsCodeVO {
+  mobile: string
+  scene: number
+}
+
+export interface SmsLoginVO {
+  mobile: string
+  code: string
+}
+
+// 登录
+export const login = (data: UserLoginVO) => {
+  return request.post({ url: '/system/auth/login', data })
+}
+
+// 刷新访问令牌
+export const refreshToken = () => {
+  return request.post({ url: '/system/auth/refresh-token?refreshToken=' + getRefreshToken() })
+}
+
+// 使用租户名，获得租户编号
+export const getTenantIdByName = (name: string) => {
+  return request.get({ url: '/system/tenant/get-id-by-name?name=' + name })
+}
+
+// 登出
+export const loginOut = () => {
+  return request.post({ url: '/system/auth/logout' })
+}
+
+// 获取用户权限信息
+export const getInfo = () => {
+  return request.get({ url: '/system/auth/get-permission-info' })
+}
+
+//获取登录验证码
+export const sendSmsCode = (data: SmsCodeVO) => {
+  return request.post({ url: '/system/auth/send-sms-code', data })
+}
+
+// 短信验证码登录
+export const smsLogin = (data: SmsLoginVO) => {
+  return request.post({ url: '/system/auth/sms-login', data })
+}
+
+// 社交授权的跳转
+export const socialAuthRedirect = (type: number, redirectUri: string) => {
+  return request.get({
+    url: '/system/auth/social-auth-redirect?type=' + type + '&redirectUri=' + redirectUri
+  })
+}
+// 获取验证图片以及 token
+export const getCode = (data) => {
+  return request.postOriginal({ url: 'system/captcha/get', data })
+}
+
+// 滑动或者点选验证
+export const reqCheck = (data) => {
+  return request.postOriginal({ url: 'system/captcha/check', data })
+}
+
+// 获取验证码
+export const getCodeImg = () => {
+  return request.get({
+    url: 'system/captcha/captchaImage', headers: {
+      isToken: false
+    }})
+}
\ No newline at end of file
diff --git a/src/api/login/oauth2/index.ts b/src/api/login/oauth2/index.ts
new file mode 100644
index 000000000..aef1820d5
--- /dev/null
+++ b/src/api/login/oauth2/index.ts
@@ -0,0 +1,41 @@
+import request from '@/config/axios'
+
+// 获得授权信息
+export const getAuthorize = (clientId: string) => {
+  return request.get({ url: '/system/oauth2/authorize?clientId=' + clientId })
+}
+
+// 发起授权
+export const authorize = (
+  responseType: string,
+  clientId: string,
+  redirectUri: string,
+  state: string,
+  autoApprove: boolean,
+  checkedScopes: string[],
+  uncheckedScopes: string[]
+) => {
+  // 构建 scopes
+  const scopes = {}
+  for (const scope of checkedScopes) {
+    scopes[scope] = true
+  }
+  for (const scope of uncheckedScopes) {
+    scopes[scope] = false
+  }
+  // 发起请求
+  return request.post({
+    url: '/system/oauth2/authorize',
+    headers: {
+      'Content-type': 'application/x-www-form-urlencoded'
+    },
+    params: {
+      response_type: responseType,
+      client_id: clientId,
+      redirect_uri: redirectUri,
+      state: state,
+      auto_approve: autoApprove,
+      scope: JSON.stringify(scopes)
+    }
+  })
+}
diff --git a/src/api/login/types.ts b/src/api/login/types.ts
new file mode 100644
index 000000000..b2173f726
--- /dev/null
+++ b/src/api/login/types.ts
@@ -0,0 +1,28 @@
+export type UserLoginVO = {
+  username: string
+  password: string
+  captchaVerification: string
+}
+
+export type TokenType = {
+  id: number // 编号
+  accessToken: string // 访问令牌
+  refreshToken: string // 刷新令牌
+  userId: number // 用户编号
+  userType: number //用户类型
+  clientId: string //客户端编号
+  expiresTime: number //过期时间
+}
+
+export type UserVO = {
+  id: number
+  username: string
+  nickname: string
+  deptId: number
+  email: string
+  mobile: string
+  sex: number
+  avatar: string
+  loginIp: string
+  loginDate: string
+}
diff --git a/src/api/mes/processroute/index.ts b/src/api/mes/processroute/index.ts
new file mode 100644
index 000000000..be6648c4f
--- /dev/null
+++ b/src/api/mes/processroute/index.ts
@@ -0,0 +1,97 @@
+import request from '@/config/axios'
+
+export interface ProcessrouteVO {
+  deleteTime: Date
+  id: number
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  processrouteCode: string
+  processName: string
+  productCode: string
+  routeVersion: number
+
+}
+
+
+// 查询工艺路线定义列表
+export const getProcessroutePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/processroute/senior', data })
+  } else {
+    return await request.get({ url: `/mes/processroute/page`, params })
+  }
+}
+
+// 查询工艺路线定义详情
+export const getProcessroute = async (id: number) => {
+  return await request.get({ url: `/mes/processroute/get?id=` + id })
+}
+
+// 新增工艺路线定义
+export const createProcessroute = async (data: ProcessrouteVO) => {
+  return await request.post({ url: `/mes/processroute/create`, data })
+}
+//提交图形数据
+// 新增工艺路线定义
+export const saveGraphData = async (data: any) => {
+  return await request.post({ url: `/mes/processroute/updategraph`, data })
+}
+// 修改工艺路线定义
+export const updateProcessroute = async (data: ProcessrouteVO) => {
+  return await request.put({ url: `/mes/processroute/update`, data })
+}
+
+// 删除工艺路线定义
+export const deleteProcessroute = async (id: number) => {
+  return await request.delete({ url: `/mes/processroute/delete?id=` + id })
+}
+
+// 导出工艺路线定义 Excel
+export const exportProcessroute = async (params) => {
+  return await request.download({ url: `/mes/processroute/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/processroute/get-import-template' })
+}
+// 获取工序工序列表-
+export const getProcessList =async (params) => {
+  return await request.get({ url: `/wms/process/page`, params })
+}
+// 获取工序工序信息-
+export const getProcesInfo = async(code:String) => {
+  return await request.get({ url: `/wms/process/getByCode?code=`,code })
+}
+// 获取产品信息列表-
+export const getProductInfo =async (code:String) => {
+  return await request.get({ url: `/wms/itembasic/getProduct?code=`+code})
+}
+
+// 获取设备列表-参数为工序编码
+export const getDeviceList =async (code:String) => {
+  //return request.get({ url: `/wms/itembasic/getProduct?code=`+code})
+  return {code:0,data:[{name:"冲压设备1",code:"CY0001"},{name:"冲压设备2",code:"CY0002"}]}
+}
+// 获取工作人员信息--参数为工序编码
+export const getWorkerList =async (code:String) => {
+ // return request.get({ url: `/wms/itembasic/getProduct?code=`+code})
+ return {code:0,data:[{name:"张三",code:"冲压1班"},{name:"李四",code:"冲压1班"}]}
+}
+// 获取工位信息
+export const getWorkStation =async (code:String) => {
+  //return request.get({ url: `/wms/itembasic/getProduct?code=`+code})
+  return {code:0,data:{name:"冲压工位",code:"CYW0001"}}
+}
+// 获取车间信息列表-
+// export const getWorkInfoList = () => {
+//   return request.get({ url: '/wms/workshop?code=',code })
+// }
+// 获取产品信息列表-
+// export const getProductInfo = (code:String) => {
+//   return request.get({ url: '/wms/itembasic/getProduct?code=',code })
+// }
\ No newline at end of file
diff --git a/src/api/mes/productionPlan/index.ts b/src/api/mes/productionPlan/index.ts
new file mode 100644
index 000000000..de60663ba
--- /dev/null
+++ b/src/api/mes/productionPlan/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface ProductionPlanVO {
+  id: number
+  planCode: string
+  planName: string
+  teamType: string
+  endTime: Date
+  shiftMode: string
+  billState: number
+  deleteTime: Date
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+  textOne: string
+  textTwo: string
+  textThree: string
+}
+
+// 查询生产排产计划列表
+export const getProductionPlanPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/productionPlan/senior', data })
+  } else {
+    return await request.get({ url: `/mes/productionPlan/page`, params })
+  }
+}
+
+// 查询生产排产计划详情
+export const getProductionPlan = async (id: number) => {
+  return await request.get({ url: `/mes/productionPlan/get?id=` + id })
+}
+
+// 新增生产排产计划
+export const createProductionPlan = async (data: ProductionPlanVO) => {
+  return await request.post({ url: `/mes/productionPlan/create`, data })
+}
+
+// 修改生产排产计划
+export const updateProductionPlan = async (data: ProductionPlanVO) => {
+  return await request.put({ url: `/mes/productionPlan/update`, data })
+}
+
+// 删除生产排产计划
+export const deleteProductionPlan = async (id: number) => {
+  return await request.delete({ url: `/mes/productionPlan/delete?id=` + id })
+}
+
+// 导出生产排产计划 Excel
+export const exportProductionPlan = async (params) => {
+  return await request.download({ url: `/mes/productionPlan/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/productionPlan/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/mes/teamSetting/index.ts b/src/api/mes/teamSetting/index.ts
new file mode 100644
index 000000000..61224bc56
--- /dev/null
+++ b/src/api/mes/teamSetting/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface TeamSettingVO {
+  id: number
+  teamCode: string
+  teamName: string
+  teamType: string
+  endTime: Date
+  textOne: string
+  textTwo: string
+  textThree: string
+  textFour: string
+  textFive: string
+  deleteTime: Date
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+}
+
+// 查询班组人员管理列表
+export const getTeamSettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/teamSetting/senior', data })
+  } else {
+    return await request.get({ url: `/mes/teamSetting/page`, params })
+  }
+}
+
+// 查询班组人员管理详情
+export const getTeamSetting = async (id: number) => {
+  return await request.get({ url: `/mes/teamSetting/get?id=` + id })
+}
+
+// 新增班组人员管理
+export const createTeamSetting = async (data: TeamSettingVO) => {
+  return await request.post({ url: `/mes/teamSetting/create`, data })
+}
+
+// 修改班组人员管理
+export const updateTeamSetting = async (data: TeamSettingVO) => {
+  return await request.put({ url: `/mes/teamSetting/update`, data })
+}
+
+// 删除班组人员管理
+export const deleteTeamSetting = async (id: number) => {
+  return await request.delete({ url: `/mes/teamSetting/delete?id=` + id })
+}
+
+// 导出班组人员管理 Excel
+export const exportTeamSetting = async (params) => {
+  return await request.download({ url: `/mes/teamSetting/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/teamSetting/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
new file mode 100644
index 000000000..7fe301a2d
--- /dev/null
+++ b/src/api/mes/workstation/index.ts
@@ -0,0 +1,92 @@
+import request from '@/config/axios'
+
+export interface WorkstationVO {
+  code: string
+  activeTime: Date
+  expireTime: Date
+  name: string
+}
+export const goalParams = {
+  workstationCode:null
+}
+// 查询工位列表
+export const getWorkstationPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/workstation/senior', data })
+  } else {
+    return await request.get({ url: `/mes/workstation/page`, params })
+  }
+}
+
+// 查询工位详情
+export const getWorkstation = async (id: number) => {
+  return await request.get({ url: `/mes/workstation/get?id=` + id })
+}
+
+// 新增工位
+export const createWorkstation = async (data: WorkstationVO) => {
+  return await request.post({ url: `/mes/workstation/create`, data })
+}
+
+// 修改工位
+export const updateWorkstation = async (data: WorkstationVO) => {
+  return await request.put({ url: `/mes/workstation/update`, data })
+}
+
+// 删除工位
+export const deleteWorkstation = async (id: number) => {
+  return await request.delete({ url: `/mes/workstation/delete?id=` + id })
+}
+
+// 导出工位 Excel
+export const exportWorkstation = async (params) => {
+  return await request.download({ url: `/mes/workstation/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/workstation/get-import-template' })
+}
+// 查询班组列表
+export const getTeamPage = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/team/senior', data })
+  } else {
+    return await request.get({ url: `/mes/team/pageListByWorkstationCode`, params })
+  }
+}
+export const getEquipmentPage = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/equipment/senior', data })
+  } else {
+    return await request.get({ url: `/mes/equipment/pageListByWorkstationCode`, params })
+  }
+}
+export const getProcessPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/production-process/senior', data })
+  } else {
+    return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
+  }
+}
+export const getProductionPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/production-process/senior', data })
+  } else {
+    return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
+  }
+}
diff --git a/src/api/redis/index.ts b/src/api/redis/index.ts
new file mode 100644
index 000000000..b71635963
--- /dev/null
+++ b/src/api/redis/index.ts
@@ -0,0 +1,21 @@
+import request from '@/config/axios'
+
+export interface RedisVO {
+  key: string
+  value: string
+}
+
+// 加入缓存
+export const addRedis = async (data:RedisVO) => {
+  return await request.post({ url: `/infra/redis/set`, data })
+}
+
+// 获取缓存
+export const getRedis = async (key) => {
+  return await request.get({ url: `/infra/redis/get?key=` + key})
+}
+
+// 删除物料清单
+export const deleteRedis = async (key) => {
+  return await request.delete({ url: `/infra/redis/delete?key=` + key})
+}
\ No newline at end of file
diff --git a/src/api/scp/index.ts b/src/api/scp/index.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/api/system/area/index.ts b/src/api/system/area/index.ts
new file mode 100644
index 000000000..b7da941f6
--- /dev/null
+++ b/src/api/system/area/index.ts
@@ -0,0 +1,19 @@
+import request from '@/config/axios'
+
+// 获得地区树
+export const getAreaTree = async () => {
+  return await request.get({ url: '/system/area/tree' })
+}
+
+export const getChildrenArea = async (id: number) => {
+  return await request.get({ url: '/system/area/get-children?id=' + id })
+}
+
+export const getAreaListByIds = async (ids) => {
+  return await request.get({ url: '/system/area/get-by-ids?ids=' + ids })
+}
+
+// 获得 IP 对应的地区名
+export const getAreaByIp = async (ip: string) => {
+  return await request.get({ url: '/system/area/get-by-ip?ip=' + ip })
+}
diff --git a/src/api/system/dept/index.ts b/src/api/system/dept/index.ts
new file mode 100644
index 000000000..d995f13d1
--- /dev/null
+++ b/src/api/system/dept/index.ts
@@ -0,0 +1,43 @@
+import request from '@/config/axios'
+
+export interface DeptVO {
+  id?: number
+  name: string
+  parentId: number
+  status: number
+  sort: number
+  leaderUserId: number
+  phone: string
+  email: string
+  createTime: Date
+}
+
+// 查询部门（精简)列表
+export const getSimpleDeptList = async (): Promise<DeptVO[]> => {
+  return await request.get({ url: '/system/dept/list-all-simple' })
+}
+
+// 查询部门列表
+export const getDeptPage = async (params: PageParam) => {
+  return await request.get({ url: '/system/dept/list', params })
+}
+
+// 查询部门详情
+export const getDept = async (id: number) => {
+  return await request.get({ url: '/system/dept/get?id=' + id })
+}
+
+// 新增部门
+export const createDept = async (data: DeptVO) => {
+  return await request.post({ url: '/system/dept/create', data: data })
+}
+
+// 修改部门
+export const updateDept = async (params: DeptVO) => {
+  return await request.put({ url: '/system/dept/update', data: params })
+}
+
+// 删除部门
+export const deleteDept = async (id: number) => {
+  return await request.delete({ url: '/system/dept/delete?id=' + id })
+}
diff --git a/src/api/system/dict/dict.data.ts b/src/api/system/dict/dict.data.ts
new file mode 100644
index 000000000..faa0dca0f
--- /dev/null
+++ b/src/api/system/dict/dict.data.ts
@@ -0,0 +1,54 @@
+import request from '@/config/axios'
+
+export type DictDataVO = {
+  id: number | undefined
+  sort: number | undefined
+  label: string
+  value: string
+  dictType: string
+  status: number
+  colorType: string
+  cssClass: string
+  remark: string
+  createTime: Date
+}
+
+// 查询字典数据（精简)列表
+export const listSimpleDictData = () => {
+  return request.get({ url: '/system/dict-data/list-all-simple' })
+}
+
+// 查询字典数据列表
+export const getDictDataPage = (params: PageParam) => {
+  return request.get({ url: '/system/dict-data/page', params })
+}
+
+// 查询字典数据列表根据类型
+export const queryByDictType = (dictType: number) => {
+  return request.get({ url: '/system/dict-data/queryByDictType?dictType=' + dictType })
+}
+
+// 查询字典数据详情
+export const getDictData = (id: string) => {
+  return request.get({ url: '/system/dict-data/get?id=' + id })
+}
+
+// 新增字典数据
+export const createDictData = (data: DictDataVO) => {
+  return request.post({ url: '/system/dict-data/create', data })
+}
+
+// 修改字典数据
+export const updateDictData = (data: DictDataVO) => {
+  return request.put({ url: '/system/dict-data/update', data })
+}
+
+// 删除字典数据
+export const deleteDictData = (id: number) => {
+  return request.delete({ url: '/system/dict-data/delete?id=' + id })
+}
+
+// 导出字典类型数据
+export const exportDictData = (params) => {
+  return request.get({ url: '/system/dict-data/export', params })
+}
diff --git a/src/api/system/dict/dict.type.ts b/src/api/system/dict/dict.type.ts
new file mode 100644
index 000000000..ed2969f11
--- /dev/null
+++ b/src/api/system/dict/dict.type.ts
@@ -0,0 +1,44 @@
+import request from '@/config/axios'
+
+export type DictTypeVO = {
+  id: number | undefined
+  name: string
+  type: string
+  status: number
+  remark: string
+  createTime: Date
+}
+
+// 查询字典（精简)列表
+export const getSimpleDictTypeList = () => {
+  return request.get({ url: '/system/dict-type/list-all-simple' })
+}
+
+// 查询字典列表
+export const getDictTypePage = (params: PageParam) => {
+  return request.get({ url: '/system/dict-type/page', params })
+}
+
+// 查询字典详情
+export const getDictType = (id: number) => {
+  return request.get({ url: '/system/dict-type/get?id=' + id })
+}
+
+// 新增字典
+export const createDictType = (data: DictTypeVO) => {
+  return request.post({ url: '/system/dict-type/create', data })
+}
+
+// 修改字典
+export const updateDictType = (data: DictTypeVO) => {
+  return request.put({ url: '/system/dict-type/update', data })
+}
+
+// 删除字典
+export const deleteDictType = (id: number) => {
+  return request.delete({ url: '/system/dict-type/delete?id=' + id })
+}
+// 导出字典类型
+export const exportDictType = (params) => {
+  return request.get({ url: '/system/dict-type/export', params })
+}
diff --git a/src/api/system/errorCode/index.ts b/src/api/system/errorCode/index.ts
new file mode 100644
index 000000000..8a86a6395
--- /dev/null
+++ b/src/api/system/errorCode/index.ts
@@ -0,0 +1,40 @@
+import request from '@/config/axios'
+
+export interface ErrorCodeVO {
+  id: number | undefined
+  type: number
+  applicationName: string
+  code: number | undefined
+  message: string
+  memo: string
+  createTime: Date
+}
+
+// 查询错误码列表
+export const getErrorCodePage = (params: PageParam) => {
+  return request.get({ url: '/system/error-code/page', params })
+}
+
+// 查询错误码详情
+export const getErrorCode = (id: number) => {
+  return request.get({ url: '/system/error-code/get?id=' + id })
+}
+
+// 新增错误码
+export const createErrorCode = (data: ErrorCodeVO) => {
+  return request.post({ url: '/system/error-code/create', data })
+}
+
+// 修改错误码
+export const updateErrorCode = (data: ErrorCodeVO) => {
+  return request.put({ url: '/system/error-code/update', data })
+}
+
+// 删除错误码
+export const deleteErrorCode = (id: number) => {
+  return request.delete({ url: '/system/error-code/delete?id=' + id })
+}
+// 导出错误码
+export const excelErrorCode = (params) => {
+  return request.download({ url: '/system/error-code/export-excel', params })
+}
diff --git a/src/api/system/loginLog/index.ts b/src/api/system/loginLog/index.ts
new file mode 100644
index 000000000..f275c3e2c
--- /dev/null
+++ b/src/api/system/loginLog/index.ts
@@ -0,0 +1,24 @@
+import request from '@/config/axios'
+
+export interface LoginLogVO {
+  id: number
+  logType: number
+  traceId: number
+  userId: number
+  userType: number
+  username: string
+  status: number
+  userIp: string
+  userAgent: string
+  createTime: Date
+}
+
+// 查询登录日志列表
+export const getLoginLogPage = (params: PageParam) => {
+  return request.get({ url: '/system/login-log/page', params })
+}
+
+// 导出登录日志
+export const exportLoginLog = (params) => {
+  return request.download({ url: '/system/login-log/export', params })
+}
diff --git a/src/api/system/mail/account/index.ts b/src/api/system/mail/account/index.ts
new file mode 100644
index 000000000..9e10c92a1
--- /dev/null
+++ b/src/api/system/mail/account/index.ts
@@ -0,0 +1,41 @@
+import request from '@/config/axios'
+
+export interface MailAccountVO {
+  id: number
+  mail: string
+  username: string
+  password: string
+  host: string
+  port: number
+  sslEnable: boolean
+}
+
+// 查询邮箱账号列表
+export const getMailAccountPage = async (params: PageParam) => {
+  return await request.get({ url: '/system/mail-account/page', params })
+}
+
+// 查询邮箱账号详情
+export const getMailAccount = async (id: number) => {
+  return await request.get({ url: '/system/mail-account/get?id=' + id })
+}
+
+// 新增邮箱账号
+export const createMailAccount = async (data: MailAccountVO) => {
+  return await request.post({ url: '/system/mail-account/create', data })
+}
+
+// 修改邮箱账号
+export const updateMailAccount = async (data: MailAccountVO) => {
+  return await request.put({ url: '/system/mail-account/update', data })
+}
+
+// 删除邮箱账号
+export const deleteMailAccount = async (id: number) => {
+  return await request.delete({ url: '/system/mail-account/delete?id=' + id })
+}
+
+// 获得邮箱账号精简列表
+export const getSimpleMailAccountList = async () => {
+  return request.get({ url: '/system/mail-account/list-all-simple' })
+}
diff --git a/src/api/system/mail/log/index.ts b/src/api/system/mail/log/index.ts
new file mode 100644
index 000000000..13172a72d
--- /dev/null
+++ b/src/api/system/mail/log/index.ts
@@ -0,0 +1,30 @@
+import request from '@/config/axios'
+
+export interface MailLogVO {
+  id: number
+  userId: number
+  userType: number
+  toMail: string
+  accountId: number
+  fromMail: string
+  templateId: number
+  templateCode: string
+  templateNickname: string
+  templateTitle: string
+  templateContent: string
+  templateParams: string
+  sendStatus: number
+  sendTime: Date
+  sendMessageId: string
+  sendException: string
+}
+
+// 查询邮件日志列表
+export const getMailLogPage = async (params: PageParam) => {
+  return await request.get({ url: '/system/mail-log/page', params })
+}
+
+// 查询邮件日志详情
+export const getMailLog = async (id: number) => {
+  return await request.get({ url: '/system/mail-log/get?id=' + id })
+}
diff --git a/src/api/system/mail/template/index.ts b/src/api/system/mail/template/index.ts
new file mode 100644
index 000000000..fb7ce5ea7
--- /dev/null
+++ b/src/api/system/mail/template/index.ts
@@ -0,0 +1,50 @@
+import request from '@/config/axios'
+
+export interface MailTemplateVO {
+  id: number
+  name: string
+  code: string
+  accountId: number
+  nickname: string
+  title: string
+  content: string
+  params: string
+  status: number
+  remark: string
+}
+
+export interface MailSendReqVO {
+  mail: string
+  templateCode: string
+  templateParams: Map<String, Object>
+}
+
+// 查询邮件模版列表
+export const getMailTemplatePage = async (params: PageParam) => {
+  return await request.get({ url: '/system/mail-template/page', params })
+}
+
+// 查询邮件模版详情
+export const getMailTemplate = async (id: number) => {
+  return await request.get({ url: '/system/mail-template/get?id=' + id })
+}
+
+// 新增邮件模版
+export const createMailTemplate = async (data: MailTemplateVO) => {
+  return await request.post({ url: '/system/mail-template/create', data })
+}
+
+// 修改邮件模版
+export const updateMailTemplate = async (data: MailTemplateVO) => {
+  return await request.put({ url: '/system/mail-template/update', data })
+}
+
+// 删除邮件模版
+export const deleteMailTemplate = async (id: number) => {
+  return await request.delete({ url: '/system/mail-template/delete?id=' + id })
+}
+
+// 发送邮件
+export const sendMail = (data: MailSendReqVO) => {
+  return request.post({ url: '/system/mail-template/send-mail', data })
+}
diff --git a/src/api/system/menu/index.ts b/src/api/system/menu/index.ts
new file mode 100644
index 000000000..4bb9a8710
--- /dev/null
+++ b/src/api/system/menu/index.ts
@@ -0,0 +1,49 @@
+import request from '@/config/axios'
+
+export interface MenuVO {
+  id: number
+  name: string
+  permission: string
+  type: number
+  sort: number
+  parentId: number
+  path: string
+  icon: string
+  component: string
+  componentName?: string
+  status: number
+  visible: boolean
+  keepAlive: boolean
+  alwaysShow?: boolean
+  createTime: Date
+}
+
+// 查询菜单（精简）列表
+export const getSimpleMenusList = () => {
+  return request.get({ url: '/system/menu/list-all-simple' })
+}
+
+// 查询菜单列表
+export const getMenuList = (params) => {
+  return request.get({ url: '/system/menu/list', params })
+}
+
+// 获取菜单详情
+export const getMenu = (id: number) => {
+  return request.get({ url: '/system/menu/get?id=' + id })
+}
+
+// 新增菜单
+export const createMenu = (data: MenuVO) => {
+  return request.post({ url: '/system/menu/create', data })
+}
+
+// 修改菜单
+export const updateMenu = (data: MenuVO) => {
+  return request.put({ url: '/system/menu/update', data })
+}
+
+// 删除菜单
+export const deleteMenu = (id: number) => {
+  return request.delete({ url: '/system/menu/delete?id=' + id })
+}
diff --git a/src/api/system/notice/index.ts b/src/api/system/notice/index.ts
new file mode 100644
index 000000000..62bf5259d
--- /dev/null
+++ b/src/api/system/notice/index.ts
@@ -0,0 +1,37 @@
+import request from '@/config/axios'
+
+export interface NoticeVO {
+  id: number | undefined
+  title: string
+  type: number
+  content: string
+  status: number
+  remark: string
+  creator: string
+  createTime: Date
+}
+
+// 查询公告列表
+export const getNoticePage = (params: PageParam) => {
+  return request.get({ url: '/system/notice/page', params })
+}
+
+// 查询公告详情
+export const getNotice = (id: number) => {
+  return request.get({ url: '/system/notice/get?id=' + id })
+}
+
+// 新增公告
+export const createNotice = (data: NoticeVO) => {
+  return request.post({ url: '/system/notice/create', data })
+}
+
+// 修改公告
+export const updateNotice = (data: NoticeVO) => {
+  return request.put({ url: '/system/notice/update', data })
+}
+
+// 删除公告
+export const deleteNotice = (id: number) => {
+  return request.delete({ url: '/system/notice/delete?id=' + id })
+}
diff --git a/src/api/system/notify/message/index.ts b/src/api/system/notify/message/index.ts
new file mode 100644
index 000000000..29036b954
--- /dev/null
+++ b/src/api/system/notify/message/index.ts
@@ -0,0 +1,48 @@
+import request from '@/config/axios'
+import qs from 'qs'
+
+export interface NotifyMessageVO {
+  id: number
+  userId: number
+  userType: number
+  templateId: number
+  templateCode: string
+  templateNickname: string
+  templateContent: string
+  templateType: number
+  templateParams: string
+  readStatus: boolean
+  readTime: Date
+}
+
+// 查询站内信消息列表
+export const getNotifyMessagePage = async (params: PageParam) => {
+  return await request.get({ url: '/system/notify-message/page', params })
+}
+
+// 获得我的站内信分页
+export const getMyNotifyMessagePage = async (params: PageParam) => {
+  return await request.get({ url: '/system/notify-message/my-page', params })
+}
+
+// 批量标记已读
+export const updateNotifyMessageRead = async (ids) => {
+  return await request.put({
+    url: '/system/notify-message/update-read?' + qs.stringify({ ids: ids }, { indices: false })
+  })
+}
+
+// 标记所有站内信为已读
+export const updateAllNotifyMessageRead = async () => {
+  return await request.put({ url: '/system/notify-message/update-all-read' })
+}
+
+// 获取当前用户的最新站内信列表
+export const getUnreadNotifyMessageList = async () => {
+  return await request.get({ url: '/system/notify-message/get-unread-list' })
+}
+
+// 获得当前用户的未读站内信数量
+export const getUnreadNotifyMessageCount = async () => {
+  return await request.get({ url: '/system/notify-message/get-unread-count' })
+}
diff --git a/src/api/system/notify/template/index.ts b/src/api/system/notify/template/index.ts
new file mode 100644
index 000000000..b7ce8a2f3
--- /dev/null
+++ b/src/api/system/notify/template/index.ts
@@ -0,0 +1,50 @@
+import request from '@/config/axios'
+
+export interface NotifyTemplateVO {
+  id?: number
+  name: string
+  nickname: string
+  code: string
+  roleIds: []
+  content: string
+  type: number
+  params: string
+  status: number
+  remark: string
+}
+
+export interface NotifySendReqVO {
+  userId: number | null
+  templateCode: string
+  templateParams: Map<String, Object>
+}
+
+// 查询站内信模板列表
+export const getNotifyTemplatePage = async (params: PageParam) => {
+  return await request.get({ url: '/system/notify-template/page', params })
+}
+
+// 查询站内信模板详情
+export const getNotifyTemplate = async (id: number) => {
+  return await request.get({ url: '/system/notify-template/get?id=' + id })
+}
+
+// 新增站内信模板
+export const createNotifyTemplate = async (data: NotifyTemplateVO) => {
+  return await request.post({ url: '/system/notify-template/create', data })
+}
+
+// 修改站内信模板
+export const updateNotifyTemplate = async (data: NotifyTemplateVO) => {
+  return await request.put({ url: '/system/notify-template/update', data })
+}
+
+// 删除站内信模板
+export const deleteNotifyTemplate = async (id: number) => {
+  return await request.delete({ url: '/system/notify-template/delete?id=' + id })
+}
+
+// 发送站内信
+export const sendNotify = (data: NotifySendReqVO) => {
+  return request.post({ url: '/system/notify-template/send-notify', data })
+}
diff --git a/src/api/system/oauth2/client.ts b/src/api/system/oauth2/client.ts
new file mode 100644
index 000000000..6f71acad6
--- /dev/null
+++ b/src/api/system/oauth2/client.ts
@@ -0,0 +1,47 @@
+import request from '@/config/axios'
+
+export interface OAuth2ClientVO {
+  id: number
+  clientId: string
+  secret: string
+  name: string
+  logo: string
+  description: string
+  status: number
+  accessTokenValiditySeconds: number
+  refreshTokenValiditySeconds: number
+  redirectUris: string[]
+  autoApprove: boolean
+  authorizedGrantTypes: string[]
+  scopes: string[]
+  authorities: string[]
+  resourceIds: string[]
+  additionalInformation: string
+  isAdditionalInformationJson: boolean
+  createTime: Date
+}
+
+// 查询 OAuth2 客户端的列表
+export const getOAuth2ClientPage = (params: PageParam) => {
+  return request.get({ url: '/system/oauth2-client/page', params })
+}
+
+// 查询 OAuth2 客户端的详情
+export const getOAuth2Client = (id: number) => {
+  return request.get({ url: '/system/oauth2-client/get?id=' + id })
+}
+
+// 新增 OAuth2 客户端
+export const createOAuth2Client = (data: OAuth2ClientVO) => {
+  return request.post({ url: '/system/oauth2-client/create', data })
+}
+
+// 修改 OAuth2 客户端
+export const updateOAuth2Client = (data: OAuth2ClientVO) => {
+  return request.put({ url: '/system/oauth2-client/update', data })
+}
+
+// 删除 OAuth2
+export const deleteOAuth2Client = (id: number) => {
+  return request.delete({ url: '/system/oauth2-client/delete?id=' + id })
+}
diff --git a/src/api/system/oauth2/token.ts b/src/api/system/oauth2/token.ts
new file mode 100644
index 000000000..ac89ae898
--- /dev/null
+++ b/src/api/system/oauth2/token.ts
@@ -0,0 +1,22 @@
+import request from '@/config/axios'
+
+export interface OAuth2TokenVO {
+  id: number
+  accessToken: string
+  refreshToken: string
+  userId: number
+  userType: number
+  clientId: string
+  createTime: Date
+  expiresTime: Date
+}
+
+// 查询 token列表
+export const getAccessTokenPage = (params: PageParam) => {
+  return request.get({ url: '/system/oauth2-token/page', params })
+}
+
+// 删除 token
+export const deleteAccessToken = (accessToken: string) => {
+  return request.delete({ url: '/system/oauth2-token/delete?accessToken=' + accessToken })
+}
diff --git a/src/api/system/operatelog/index.ts b/src/api/system/operatelog/index.ts
new file mode 100644
index 000000000..848a53333
--- /dev/null
+++ b/src/api/system/operatelog/index.ts
@@ -0,0 +1,33 @@
+import request from '@/config/axios'
+
+export type OperateLogVO = {
+  id: number
+  userNickname: string
+  traceId: string
+  userId: number
+  module: string
+  name: string
+  type: number
+  content: string
+  exts: Map<String, Object>
+  requestMethod: string
+  requestUrl: string
+  userIp: string
+  userAgent: string
+  javaMethod: string
+  javaMethodArgs: string
+  startTime: Date
+  duration: number
+  resultCode: number
+  resultMsg: string
+  resultData: string
+}
+
+// 查询操作日志列表
+export const getOperateLogPage = (params: PageParam) => {
+  return request.get({ url: '/system/operate-log/page', params })
+}
+// 导出操作日志
+export const exportOperateLog = (params) => {
+  return request.download({ url: '/system/operate-log/export', params })
+}
diff --git a/src/api/system/permission/index.ts b/src/api/system/permission/index.ts
new file mode 100644
index 000000000..b3c7696b2
--- /dev/null
+++ b/src/api/system/permission/index.ts
@@ -0,0 +1,42 @@
+import request from '@/config/axios'
+
+export interface PermissionAssignUserRoleReqVO {
+  userId: number
+  roleIds: number[]
+}
+
+export interface PermissionAssignRoleMenuReqVO {
+  roleId: number
+  menuIds: number[]
+}
+
+export interface PermissionAssignRoleDataScopeReqVO {
+  roleId: number
+  dataScope: number
+  dataScopeDeptIds: number[]
+}
+
+// 查询角色拥有的菜单权限
+export const getRoleMenuList = async (roleId: number) => {
+  return await request.get({ url: '/system/permission/list-role-menus?roleId=' + roleId })
+}
+
+// 赋予角色菜单权限
+export const assignRoleMenu = async (data: PermissionAssignRoleMenuReqVO) => {
+  return await request.post({ url: '/system/permission/assign-role-menu', data })
+}
+
+// 赋予角色数据权限
+export const assignRoleDataScope = async (data: PermissionAssignRoleDataScopeReqVO) => {
+  return await request.post({ url: '/system/permission/assign-role-data-scope', data })
+}
+
+// 查询用户拥有的角色数组
+export const getUserRoleList = async (userId: number) => {
+  return await request.get({ url: '/system/permission/list-user-roles?userId=' + userId })
+}
+
+// 赋予用户角色
+export const assignUserRole = async (data: PermissionAssignUserRoleReqVO) => {
+  return await request.post({ url: '/system/permission/assign-user-role', data })
+}
diff --git a/src/api/system/post/index.ts b/src/api/system/post/index.ts
new file mode 100644
index 000000000..405db387e
--- /dev/null
+++ b/src/api/system/post/index.ts
@@ -0,0 +1,46 @@
+import request from '@/config/axios'
+
+export interface PostVO {
+  id?: number
+  name: string
+  code: string
+  sort: number
+  status: number
+  remark: string
+  createTime?: Date
+}
+
+// 查询岗位列表
+export const getPostPage = async (params: PageParam) => {
+  return await request.get({ url: '/system/post/page', params })
+}
+
+// 获取岗位精简信息列表
+export const getSimplePostList = async (): Promise<PostVO[]> => {
+  return await request.get({ url: '/system/post/list-all-simple' })
+}
+
+// 查询岗位详情
+export const getPost = async (id: number) => {
+  return await request.get({ url: '/system/post/get?id=' + id })
+}
+
+// 新增岗位
+export const createPost = async (data: PostVO) => {
+  return await request.post({ url: '/system/post/create', data })
+}
+
+// 修改岗位
+export const updatePost = async (data: PostVO) => {
+  return await request.put({ url: '/system/post/update', data })
+}
+
+// 删除岗位
+export const deletePost = async (id: number) => {
+  return await request.delete({ url: '/system/post/delete?id=' + id })
+}
+
+// 导出岗位
+export const exportPost = async (params) => {
+  return await request.download({ url: '/system/post/export', params })
+}
diff --git a/src/api/system/role/index.ts b/src/api/system/role/index.ts
new file mode 100644
index 000000000..93636ff0d
--- /dev/null
+++ b/src/api/system/role/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface RoleVO {
+  id: number
+  name: string
+  code: string
+  sort: number
+  status: number
+  type: number
+  dataScope: number
+  dataScopeDeptIds: number[]
+  createTime: Date
+}
+
+export interface UpdateStatusReqVO {
+  id: number
+  status: number
+}
+
+// 查询角色列表
+export const getRolePage = async (params: PageParam) => {
+  return await request.get({ url: '/system/role/page', params })
+}
+
+// 查询角色（精简)列表
+export const getSimpleRoleList = async (): Promise<RoleVO[]> => {
+  return await request.get({ url: '/system/role/list-all-simple' })
+}
+
+// 查询角色详情
+export const getRole = async (id: number) => {
+  return await request.get({ url: '/system/role/get?id=' + id })
+}
+
+// 新增角色
+export const createRole = async (data: RoleVO) => {
+  return await request.post({ url: '/system/role/create', data })
+}
+
+// 修改角色
+export const updateRole = async (data: RoleVO) => {
+  return await request.put({ url: '/system/role/update', data })
+}
+
+// 修改角色状态
+export const updateRoleStatus = async (data: UpdateStatusReqVO) => {
+  return await request.put({ url: '/system/role/update-status', data })
+}
+
+// 删除角色
+export const deleteRole = async (id: number) => {
+  return await request.delete({ url: '/system/role/delete?id=' + id })
+}
+
+// 导出角色
+export const exportRole = (params) => {
+  return request.download({
+    url: '/system/role/export-excel',
+    params
+  })
+}
diff --git a/src/api/system/sensitiveWord/index.ts b/src/api/system/sensitiveWord/index.ts
new file mode 100644
index 000000000..1116226f7
--- /dev/null
+++ b/src/api/system/sensitiveWord/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+import qs from 'qs'
+
+export interface SensitiveWordVO {
+  id: number
+  name: string
+  status: number
+  description: string
+  tags: string[]
+  createTime: Date
+}
+
+export interface SensitiveWordTestReqVO {
+  text: string
+  tag: string[]
+}
+
+// 查询敏感词列表
+export const getSensitiveWordPage = (params: PageParam) => {
+  return request.get({ url: '/system/sensitive-word/page', params })
+}
+
+// 查询敏感词详情
+export const getSensitiveWord = (id: number) => {
+  return request.get({ url: '/system/sensitive-word/get?id=' + id })
+}
+
+// 新增敏感词
+export const createSensitiveWord = (data: SensitiveWordVO) => {
+  return request.post({ url: '/system/sensitive-word/create', data })
+}
+
+// 修改敏感词
+export const updateSensitiveWord = (data: SensitiveWordVO) => {
+  return request.put({ url: '/system/sensitive-word/update', data })
+}
+
+// 删除敏感词
+export const deleteSensitiveWord = (id: number) => {
+  return request.delete({ url: '/system/sensitive-word/delete?id=' + id })
+}
+
+// 导出敏感词
+export const exportSensitiveWord = (params) => {
+  return request.download({ url: '/system/sensitive-word/export-excel', params })
+}
+
+// 获取所有敏感词的标签数组
+export const getSensitiveWordTagList = () => {
+  return request.get({ url: '/system/sensitive-word/get-tags' })
+}
+
+// 获得文本所包含的不合法的敏感词数组
+export const validateText = (query: SensitiveWordTestReqVO) => {
+  return request.get({
+    url: '/system/sensitive-word/validate-text?' + qs.stringify(query, { arrayFormat: 'repeat' })
+  })
+}
diff --git a/src/api/system/serialNumber/index.ts b/src/api/system/serialNumber/index.ts
new file mode 100644
index 000000000..33fa7544c
--- /dev/null
+++ b/src/api/system/serialNumber/index.ts
@@ -0,0 +1,42 @@
+import request from '@/config/axios'
+
+export interface SerialNumberVO {
+  id: number
+  ruleCode: string
+  ruleName: string
+  prefix: string
+  pattern: string
+  length: byte
+  separator: string
+  remark: string
+}
+
+// 查询流水号规则列表
+export const getSerialNumberPage = async (params) => {
+  return await request.get({ url: `/system/serial-number/page`, params })
+}
+
+// 查询流水号规则详情
+export const getSerialNumber = async (id: number) => {
+  return await request.get({ url: `/system/serial-number/get?id=` + id })
+}
+
+// 新增流水号规则
+export const createSerialNumber = async (data: SerialNumberVO) => {
+  return await request.post({ url: `/system/serial-number/create`, data })
+}
+
+// 修改流水号规则
+export const updateSerialNumber = async (data: SerialNumberVO) => {
+  return await request.put({ url: `/system/serial-number/update`, data })
+}
+
+// 删除流水号规则
+export const deleteSerialNumber = async (id: number) => {
+  return await request.delete({ url: `/system/serial-number/delete?id=` + id })
+}
+
+// 导出流水号规则 Excel
+export const exportSerialNumber = async (params) => {
+  return await request.download({ url: `/system/serial-number/export-excel`, params })
+}
diff --git a/src/api/system/sms/smsChannel/index.ts b/src/api/system/sms/smsChannel/index.ts
new file mode 100644
index 000000000..f335628f7
--- /dev/null
+++ b/src/api/system/sms/smsChannel/index.ts
@@ -0,0 +1,43 @@
+import request from '@/config/axios'
+
+export interface SmsChannelVO {
+  id: number
+  code: string
+  status: number
+  signature: string
+  remark: string
+  apiKey: string
+  apiSecret: string
+  callbackUrl: string
+  createTime: Date
+}
+
+// 查询短信渠道列表
+export const getSmsChannelPage = (params: PageParam) => {
+  return request.get({ url: '/system/sms-channel/page', params })
+}
+
+// 获得短信渠道精简列表
+export function getSimpleSmsChannelList() {
+  return request.get({ url: '/system/sms-channel/list-all-simple' })
+}
+
+// 查询短信渠道详情
+export const getSmsChannel = (id: number) => {
+  return request.get({ url: '/system/sms-channel/get?id=' + id })
+}
+
+// 新增短信渠道
+export const createSmsChannel = (data: SmsChannelVO) => {
+  return request.post({ url: '/system/sms-channel/create', data })
+}
+
+// 修改短信渠道
+export const updateSmsChannel = (data: SmsChannelVO) => {
+  return request.put({ url: '/system/sms-channel/update', data })
+}
+
+// 删除短信渠道
+export const deleteSmsChannel = (id: number) => {
+  return request.delete({ url: '/system/sms-channel/delete?id=' + id })
+}
diff --git a/src/api/system/sms/smsLog/index.ts b/src/api/system/sms/smsLog/index.ts
new file mode 100644
index 000000000..3d54fac17
--- /dev/null
+++ b/src/api/system/sms/smsLog/index.ts
@@ -0,0 +1,39 @@
+import request from '@/config/axios'
+
+export interface SmsLogVO {
+  id: number | null
+  channelId: number | null
+  channelCode: string
+  templateId: number | null
+  templateCode: string
+  templateType: number | null
+  templateContent: string
+  templateParams: Map<string, object> | null
+  apiTemplateId: string
+  mobile: string
+  userId: number | null
+  userType: number | null
+  sendStatus: number | null
+  sendTime: Date | null
+  sendCode: number | null
+  sendMsg: string
+  apiSendCode: string
+  apiSendMsg: string
+  apiRequestId: string
+  apiSerialNo: string
+  receiveStatus: number | null
+  receiveTime: Date | null
+  apiReceiveCode: string
+  apiReceiveMsg: string
+  createTime: Date | null
+}
+
+// 查询短信日志列表
+export const getSmsLogPage = (params: PageParam) => {
+  return request.get({ url: '/system/sms-log/page', params })
+}
+
+// 导出短信日志
+export const exportSmsLog = (params) => {
+  return request.download({ url: '/system/sms-log/export-excel', params })
+}
diff --git a/src/api/system/sms/smsTemplate/index.ts b/src/api/system/sms/smsTemplate/index.ts
new file mode 100644
index 000000000..35cb489dc
--- /dev/null
+++ b/src/api/system/sms/smsTemplate/index.ts
@@ -0,0 +1,60 @@
+import request from '@/config/axios'
+
+export interface SmsTemplateVO {
+  id: number | null
+  type: number | null
+  status: number
+  code: string
+  name: string
+  content: string
+  remark: string
+  apiTemplateId: string
+  channelId: number | null
+  channelCode?: string
+  params?: string[]
+  createTime?: Date
+}
+
+export interface SendSmsReqVO {
+  mobile: string
+  templateCode: string
+  templateParams: Map<String, Object>
+}
+
+// 查询短信模板列表
+export const getSmsTemplatePage = (params: PageParam) => {
+  return request.get({ url: '/system/sms-template/page', params })
+}
+
+// 查询短信模板详情
+export const getSmsTemplate = (id: number) => {
+  return request.get({ url: '/system/sms-template/get?id=' + id })
+}
+
+// 新增短信模板
+export const createSmsTemplate = (data: SmsTemplateVO) => {
+  return request.post({ url: '/system/sms-template/create', data })
+}
+
+// 修改短信模板
+export const updateSmsTemplate = (data: SmsTemplateVO) => {
+  return request.put({ url: '/system/sms-template/update', data })
+}
+
+// 删除短信模板
+export const deleteSmsTemplate = (id: number) => {
+  return request.delete({ url: '/system/sms-template/delete?id=' + id })
+}
+
+// 导出短信模板
+export const exportSmsTemplate = (params) => {
+  return request.download({
+    url: '/system/sms-template/export-excel',
+    params
+  })
+}
+
+// 发送短信
+export const sendSms = (data: SendSmsReqVO) => {
+  return request.post({ url: '/system/sms-template/send-sms', data })
+}
diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts
new file mode 100644
index 000000000..176c37579
--- /dev/null
+++ b/src/api/system/tenant/index.ts
@@ -0,0 +1,62 @@
+import request from '@/config/axios'
+
+export interface TenantVO {
+  id: number
+  name: string
+  contactName: string
+  contactMobile: string
+  status: number
+  domain: string
+  packageId: number
+  username: string
+  password: string
+  expireTime: Date
+  accountCount: number
+  createTime: Date
+}
+
+export interface TenantPageReqVO extends PageParam {
+  name?: string
+  contactName?: string
+  contactMobile?: string
+  status?: number
+  createTime?: Date[]
+}
+
+export interface TenantExportReqVO {
+  name?: string
+  contactName?: string
+  contactMobile?: string
+  status?: number
+  createTime?: Date[]
+}
+
+// 查询租户列表
+export const getTenantPage = (params: TenantPageReqVO) => {
+  return request.get({ url: '/system/tenant/page', params })
+}
+
+// 查询租户详情
+export const getTenant = (id: number) => {
+  return request.get({ url: '/system/tenant/get?id=' + id })
+}
+
+// 新增租户
+export const createTenant = (data: TenantVO) => {
+  return request.post({ url: '/system/tenant/create', data })
+}
+
+// 修改租户
+export const updateTenant = (data: TenantVO) => {
+  return request.put({ url: '/system/tenant/update', data })
+}
+
+// 删除租户
+export const deleteTenant = (id: number) => {
+  return request.delete({ url: '/system/tenant/delete?id=' + id })
+}
+
+// 导出租户
+export const exportTenant = (params: TenantExportReqVO) => {
+  return request.download({ url: '/system/tenant/export-excel', params })
+}
diff --git a/src/api/system/tenantPackage/index.ts b/src/api/system/tenantPackage/index.ts
new file mode 100644
index 000000000..01d139e22
--- /dev/null
+++ b/src/api/system/tenantPackage/index.ts
@@ -0,0 +1,42 @@
+import request from '@/config/axios'
+
+export interface TenantPackageVO {
+  id: number
+  name: string
+  status: number
+  remark: string
+  creator: string
+  updater: string
+  updateTime: string
+  menuIds: number[]
+  createTime: Date
+}
+
+// 查询租户套餐列表
+export const getTenantPackagePage = (params: PageParam) => {
+  return request.get({ url: '/system/tenant-package/page', params })
+}
+
+// 获得租户
+export const getTenantPackage = (id: number) => {
+  return request.get({ url: '/system/tenant-package/get?id=' + id })
+}
+
+// 新增租户套餐
+export const createTenantPackage = (data: TenantPackageVO) => {
+  return request.post({ url: '/system/tenant-package/create', data })
+}
+
+// 修改租户套餐
+export const updateTenantPackage = (data: TenantPackageVO) => {
+  return request.put({ url: '/system/tenant-package/update', data })
+}
+
+// 删除租户套餐
+export const deleteTenantPackage = (id: number) => {
+  return request.delete({ url: '/system/tenant-package/delete?id=' + id })
+}
+// 获取租户套餐精简信息列表
+export const getTenantPackageList = () => {
+  return request.get({ url: '/system/tenant-package/get-simple-list' })
+}
diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
new file mode 100644
index 000000000..6224f0e85
--- /dev/null
+++ b/src/api/system/user/index.ts
@@ -0,0 +1,76 @@
+import request from '@/config/axios'
+
+export interface UserVO {
+  id: number
+  username: string
+  nickname: string
+  deptId: number
+  postIds: string[]
+  email: string
+  mobile: string
+  sex: number
+  avatar: string
+  loginIp: string
+  status: number
+  remark: string
+  loginDate: Date
+  createTime: Date
+}
+
+// 查询用户管理列表
+export const getUserPage = (params: PageParam) => {
+  return request.get({ url: '/system/user/page', params })
+}
+
+// 查询用户详情
+export const getUser = (id: number) => {
+  return request.get({ url: '/system/user/get?id=' + id })
+}
+
+// 新增用户
+export const createUser = (data: UserVO) => {
+  return request.post({ url: '/system/user/create', data })
+}
+
+// 修改用户
+export const updateUser = (data: UserVO) => {
+  return request.put({ url: '/system/user/update', data })
+}
+
+// 删除用户
+export const deleteUser = (id: number) => {
+  return request.delete({ url: '/system/user/delete?id=' + id })
+}
+
+// 导出用户
+export const exportUser = (params) => {
+  return request.download({ url: '/system/user/export', params })
+}
+
+// 下载用户导入模板
+export const importUserTemplate = () => {
+  return request.download({ url: '/system/user/get-import-template' })
+}
+
+// 用户密码重置
+export const resetUserPwd = (id: number, password: string) => {
+  const data = {
+    id,
+    password
+  }
+  return request.put({ url: '/system/user/update-password', data: data })
+}
+
+// 用户状态修改
+export const updateUserStatus = (id: number, status: number) => {
+  const data = {
+    id,
+    status
+  }
+  return request.put({ url: '/system/user/update-status', data: data })
+}
+
+// 获取用户精简信息列表
+export const getSimpleUserList = (): Promise<UserVO[]> => {
+  return request.get({ url: '/system/user/list-all-simple' })
+}
diff --git a/src/api/system/user/profile.ts b/src/api/system/user/profile.ts
new file mode 100644
index 000000000..b2623c8b3
--- /dev/null
+++ b/src/api/system/user/profile.ts
@@ -0,0 +1,77 @@
+import request from '@/config/axios'
+
+export interface ProfileDept {
+  id: number
+  name: string
+}
+export interface ProfileRole {
+  id: number
+  name: string
+}
+export interface ProfilePost {
+  id: number
+  name: string
+}
+export interface SocialUser {
+  id: number
+  type: number
+  openid: string
+  token: string
+  rawTokenInfo: string
+  nickname: string
+  avatar: string
+  rawUserInfo: string
+  code: string
+  state: string
+}
+export interface ProfileVO {
+  id: number
+  username: string
+  nickname: string
+  dept: ProfileDept
+  roles: ProfileRole[]
+  posts: ProfilePost[]
+  socialUsers: SocialUser[]
+  email: string
+  mobile: string
+  sex: number
+  avatar: string
+  status: number
+  remark: string
+  loginIp: string
+  loginDate: Date
+  createTime: Date
+}
+
+export interface UserProfileUpdateReqVO {
+  nickname: string
+  email: string
+  mobile: string
+  sex: number
+}
+
+// 查询用户个人信息
+export const getUserProfile = () => {
+  return request.get({ url: '/system/user/profile/get' })
+}
+
+// 修改用户个人信息
+export const updateUserProfile = (data: UserProfileUpdateReqVO) => {
+  return request.put({ url: '/system/user/profile/update', data })
+}
+
+// 用户密码重置
+export const updateUserPassword = (oldPassword: string, newPassword: string) => {
+  return request.put({
+    url: '/system/user/profile/update-password',
+    data: {
+      oldPassword: oldPassword,
+      newPassword: newPassword
+    }
+  })
+}
+
+// 用户头像上传
+export const uploadAvatar = (data) => {
+  return request.upload({ url: '/system/user/profile/update-avatar', data: data })
+}
diff --git a/src/api/system/user/socialUser.ts b/src/api/system/user/socialUser.ts
new file mode 100644
index 000000000..79f4d4027
--- /dev/null
+++ b/src/api/system/user/socialUser.ts
@@ -0,0 +1,31 @@
+import request from '@/config/axios'
+
+// 社交绑定，使用 code 授权码
+export const socialBind = (type, code, state) => {
+  return request.post({
+    url: '/system/social-user/bind',
+    data: {
+      type,
+      code,
+      state
+    }
+  })
+}
+
+// 取消社交绑定
+export const socialUnbind = (type, openid) => {
+  return request.delete({
+    url: '/system/social-user/unbind',
+    data: {
+      type,
+      openid
+    }
+  })
+}
+
+// 社交授权的跳转
+export const socialAuthRedirect = (type, redirectUri) => {
+  return request.get({
+    url: '/system/auth/social-auth-redirect?type=' + type + '&redirectUri=' + redirectUri
+  })
+}
diff --git a/src/api/wms/accountcalendar/index.ts b/src/api/wms/accountcalendar/index.ts
new file mode 100644
index 000000000..984d36ba6
--- /dev/null
+++ b/src/api/wms/accountcalendar/index.ts
@@ -0,0 +1,60 @@
+import request from '@/config/axios'
+
+export interface AccountcalendarVO {
+  year: string
+  month: string
+  descriiption: string
+  beginTime: Date
+  endTime: Date
+  converttotime: Date
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询账期日历列表
+export const getAccountcalendarPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/accountcalendar/senior', data })
+  } else {
+    return await request.get({ url: `/wms/accountcalendar/page`, params })
+  }
+}
+
+// 查询账期日历详情
+export const getAccountcalendar = async (id: number) => {
+  return await request.get({ url: `/wms/accountcalendar/get?id=` + id })
+}
+
+// 新增账期日历
+export const createAccountcalendar = async (data: AccountcalendarVO) => {
+  return await request.post({ url: `/wms/accountcalendar/create`, data })
+}
+
+// 修改账期日历
+export const updateAccountcalendar = async (data: AccountcalendarVO) => {
+  return await request.put({ url: `/wms/accountcalendar/update`, data })
+}
+
+// 删除账期日历
+export const deleteAccountcalendar = async (id: number) => {
+  return await request.delete({ url: `/wms/accountcalendar/delete?id=` + id })
+}
+
+// 导出账期日历 Excel
+export const exportAccountcalendar = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/accountcalendar/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/accountcalendar/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/accountcalendar/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/areabasic/index.ts b/src/api/wms/areabasic/index.ts
new file mode 100644
index 000000000..b0e97fffb
--- /dev/null
+++ b/src/api/wms/areabasic/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface AreaVO {
+  code: string
+  name: string
+  description: string
+  warehouseCode: string
+  type: string
+  isFunctional: number
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询库区列表
+export const getAreaPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/areabasic/senior', data })
+  } else {
+    return await request.get({ url: `/wms/areabasic/page`, params })
+  }
+}
+// 查询库区列表
+export const getAreaList = async (params) => {
+  return await request.get({ url: `/wms/areabasic/list`, params })
+}
+// 查询库区详情
+export const getArea = async (id: number) => {
+  return await request.get({ url: `/wms/areabasic/get?id=` + id })
+}
+
+// 新增库区
+export const createArea = async (data: AreaVO) => {
+  return await request.post({ url: `/wms/areabasic/create`, data })
+}
+
+// 修改库区
+export const updateArea = async (data: AreaVO) => {
+  return await request.put({ url: `/wms/areabasic/update`, data })
+}
+
+// 删除库区
+export const deleteArea = async (id: number) => {
+  return await request.delete({ url: `/wms/areabasic/delete?id=` + id })
+}
+
+// 导出库区 Excel
+export const exportArea = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/areabasic/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/areabasic/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/areabasic/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/backflushRecordDetailb/index.ts b/src/api/wms/backflushRecordDetailb/index.ts
new file mode 100644
index 000000000..3b770a514
--- /dev/null
+++ b/src/api/wms/backflushRecordDetailb/index.ts
@@ -0,0 +1,66 @@
+import request from '@/config/axios'
+
+export interface BackflushRecordDetailbVO {
+  processCode: string
+  bomVersion: string
+  packingNumber: string
+  batch: string
+  inventoryStatus: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  uom: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+}
+
+// 查询制品收货记录子列表
+export const getBackflushRecordDetailbPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/backflush-record-detailb/senior', data })
+  } else {
+    return await request.get({ url: `/wms/backflush-record-detailb/page`, params })
+  }
+}
+
+// 查询制品收货记录子详情
+export const getBackflushRecordDetailb = async (id: number) => {
+  return await request.get({ url: `/wms/backflush-record-detailb/get?id=` + id })
+}
+
+// 新增制品收货记录子
+export const createBackflushRecordDetailb = async (data: BackflushRecordDetailbVO) => {
+  return await request.post({ url: `/wms/backflush-record-detailb/create`, data })
+}
+
+// 修改制品收货记录子
+export const updateBackflushRecordDetailb = async (data: BackflushRecordDetailbVO) => {
+  return await request.put({ url: `/wms/backflush-record-detailb/update`, data })
+}
+
+// 删除制品收货记录子
+export const deleteBackflushRecordDetailb = async (id: number) => {
+  return await request.delete({ url: `/wms/backflush-record-detailb/delete?id=` + id })
+}
+
+// 导出制品收货记录子 Excel
+export const exportBackflushRecordDetailb = async (params) => {
+  return await request.download({ url: `/wms/backflush-record-detailb/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/backflush-record-detailb/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/backflushRequestDetailb/index.ts b/src/api/wms/backflushRequestDetailb/index.ts
new file mode 100644
index 000000000..7e67a0989
--- /dev/null
+++ b/src/api/wms/backflushRequestDetailb/index.ts
@@ -0,0 +1,60 @@
+import request from '@/config/axios'
+
+export interface BackflushRequestDetailbVO {
+  processCode: string
+  bomVersion: string
+  itemCode: string
+  number: string
+  remark: string
+  createTime: Date
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  creator: string
+}
+
+// 查询制品收货申请子列表
+export const getBackflushRequestDetailbPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-request-detailb/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-request-detailb/page`, params })
+  }
+}
+
+// 查询制品收货申请子详情
+export const getBackflushRequestDetailb = async (id: number) => {
+  return await request.get({ url: `/wms/productreceipt-request-detailb/get?id=` + id })
+}
+
+// 新增制品收货申请子
+export const createBackflushRequestDetailb = async (data: BackflushRequestDetailbVO) => {
+  return await request.post({ url: `/wms/productreceipt-request-detailb/create`, data })
+}
+
+// 修改制品收货申请子
+export const updateBackflushRequestDetailb = async (data: BackflushRequestDetailbVO) => {
+  return await request.put({ url: `/wms/productreceipt-request-detailb/update`, data })
+}
+
+// 删除制品收货申请子
+export const deleteBackflushRequestDetailb = async (id: number) => {
+  return await request.delete({ url: `/wms/productreceipt-request-detailb/delete?id=` + id })
+}
+
+// 导出制品收货申请子 Excel
+export const exportBackflushRequestDetailb = async (params) => {
+  return await request.download({ url: `/wms/productreceipt-request-detailb/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productreceipt-request-detailb/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
new file mode 100644
index 000000000..58dc31c42
--- /dev/null
+++ b/src/api/wms/balance/index.ts
@@ -0,0 +1,129 @@
+import request from '@/config/axios'
+
+export interface BalanceVO {
+  packingNumber: string
+  containerNumber: string
+  itemCode: string
+  batch: string
+  altBatch: string
+  arriveDate: Date
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  locationCode: string
+  locationGroupCode: string
+  areaCode: string
+  warehouseCode: string
+  erpLocationCode: string
+  ownerCode: string
+  uom: string
+  qty: number
+  lockedQty: number
+  usableQty: number
+  singlePrice: number
+  amount: number
+  putInTime: Date
+  frozen: string
+  frozenReason: string
+  lastTransNumber: string
+  weight: number
+  area: number
+  volume: number
+}
+
+// 查询库存余额列表
+export const getBalancePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/senior', data })
+  } else {
+    return await request.get({ url: `/wms/balance/page`, params })
+  }
+}
+// 查询库存余额列表
+export const getBalancePageReturn= async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/senior', data })
+  } else {
+    return await request.get({ url: `/wms/balance/pageReturn`, params })
+  }
+}
+// 查询库存余额列表
+export const getBalancePagePutaway= async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/senior', data })
+  } else {
+    return await request.get({ url: `/wms/balance/pagePutaway`, params })
+  }
+}
+// 查询库存余额列表增加物料筛选条件
+export const getBalanceItemPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/seniorItems', data })
+  } else {
+    return await request.get({ url: `/wms/balance/pageItems`, params })
+  }
+}
+// 查询库存余额列表根据业务类型
+export const getBalancePageByBusinessType = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/seniorBusinessType', data })
+  } else {
+    return await request.get({ url: `/wms/balance/pageBusinessType`, params })
+  }
+}
+
+// 查询库存余额详情
+export const getBalance = async (id: number) => {
+  return await request.get({ url: `/wms/balance/get?id=` + id })
+}
+
+// 新增库存余额
+export const createBalance = async (data: BalanceVO) => {
+  return await request.post({ url: `/wms/balance/create`, data })
+}
+
+// 修改库存余额
+export const updateBalance = async (data: BalanceVO) => {
+  return await request.put({ url: `/wms/balance/update`, data })
+}
+
+// 删除库存余额
+export const deleteBalance = async (id: number) => {
+  return await request.delete({ url: `/wms/balance/delete?id=` + id })
+}
+
+// 导出库存余额 Excel
+export const exportBalance = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/balance/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/balance/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/balance/get-import-template' })
+}
+
+// 获得库位代码筛选出的库存余额分页
+export const selectLocationTypeToBalance = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/pageLocationCodeToBalanceSenior', data })
+  } else {
+    return request.get({ url: '/wms/balance/pageLocationCodeToBalance', params})
+  }
+}
diff --git a/src/api/wms/barbasic/index.ts b/src/api/wms/barbasic/index.ts
new file mode 100644
index 000000000..e5a23798d
--- /dev/null
+++ b/src/api/wms/barbasic/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface BarbasicVO {
+  id: number
+  number: string
+  type: string
+  template: string
+  status: string
+  relateNumber: string
+  barcodeString: string
+  printTimes: number
+  lastPrintTime: string
+  lastPrintUserId: string
+  lastPrintUserName: string
+}
+
+// 查询条码实体基类列表
+export const getBarbasicPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/barbasic/senior', data })
+  } else {
+    return await request.get({ url: `/wms/barbasic/page`, params })
+  }
+}
+
+// 查询条码实体基类详情
+export const getBarbasic = async (id: number) => {
+  return await request.get({ url: `/wms/barbasic/get?id=` + id })
+}
+
+// 新增条码实体基类
+export const createBarbasic = async (data: BarbasicVO) => {
+  return await request.post({ url: `/wms/barbasic/create`, data })
+}
+
+// 修改条码实体基类
+export const updateBarbasic = async (data: BarbasicVO) => {
+  return await request.put({ url: `/wms/barbasic/update`, data })
+}
+
+// 删除条码实体基类
+export const deleteBarbasic = async (id: number) => {
+  return await request.delete({ url: `/wms/barbasic/delete?id=` + id })
+}
+
+// 导出条码实体基类 Excel
+export const exportBarbasic = async (params) => {
+  return await request.download({ url: `/wms/barbasic/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/barbasic/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/barcode/index.ts b/src/api/wms/barcode/index.ts
new file mode 100644
index 000000000..80739036c
--- /dev/null
+++ b/src/api/wms/barcode/index.ts
@@ -0,0 +1,59 @@
+import request from '@/config/axios'
+
+export interface BarcodeVO {
+  id: number
+  code: string
+  name: string
+  description: string
+  order: number
+  length: number
+  prefixLenght: number
+  prefixChar: string
+  entityProperties: string
+  encyptMethod: string
+  masterId: number
+  trimEnd: string
+  isEncypt: string,
+  labelType: string,
+}
+
+// 查询条码片段列表
+export const getBarcodePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/label/barcode/senior', data })
+  } else {
+    return await request.get({ url: `/label/barcode/page`, params })
+  }
+}
+
+// 查询条码片段详情
+export const getBarcode = async (id: number) => {
+  return await request.get({ url: `/label/barcode/get?id=` + id })
+}
+
+// 新增条码片段
+export const createBarcode = async (data: BarcodeVO) => {
+  return await request.post({ url: `/label/barcode/create`, data })
+}
+
+// 修改条码片段
+export const updateBarcode = async (data: BarcodeVO) => {
+  return await request.put({ url: `/label/barcode/update`, data })
+}
+
+// 删除条码片段
+export const deleteBarcode = async (id: number) => {
+  return await request.delete({ url: `/label/barcode/delete?id=` + id })
+}
+
+// 导出条码片段 Excel
+export const exportBarcode = async (params) => {
+  return await request.download({ url: `/label/barcode/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/label/barcode/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/bom/index.ts b/src/api/wms/bom/index.ts
new file mode 100644
index 000000000..84fa225de
--- /dev/null
+++ b/src/api/wms/bom/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface BomVO {
+  productItemCode: string
+  componentItemCode: string
+  componentUom: string
+  componentQty: number
+  processCode: string
+  version: string
+  layer: number
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询物料清单列表
+export const getBomPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/bom/senior', data })
+  } else {
+    return await request.get({ url: `/wms/bom/page`, params })
+  }
+}
+
+// 查询物料清单详情
+export const getBom = async (id: number) => {
+  return await request.get({ url: `/wms/bom/get?id=` + id })
+}
+
+// 新增物料清单
+export const createBom = async (data: BomVO) => {
+  return await request.post({ url: `/wms/bom/create`, data })
+}
+
+// 修改物料清单
+export const updateBom = async (data: BomVO) => {
+  return await request.put({ url: `/wms/bom/update`, data })
+}
+
+// 删除物料清单
+export const deleteBom = async (id: number) => {
+  return await request.delete({ url: `/wms/bom/delete?id=` + id })
+}
+
+// 导出物料清单 Excel
+export const exportBom = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/bom/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/bom/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/bom/get-import-template' })
+}
diff --git a/src/api/wms/bomDismantle/index.ts b/src/api/wms/bomDismantle/index.ts
new file mode 100644
index 000000000..0a7a86196
--- /dev/null
+++ b/src/api/wms/bomDismantle/index.ts
@@ -0,0 +1,26 @@
+import request from '@/config/axios'
+
+// 查询制品返修申请子列表
+export const getBomDismantlePage = async (params) => {
+  return await request.get({ url: `/wms/productrepair-request-main/bomPage`, params })
+}
+
+// 查询制品返修记录子列表
+export const getBomDismantleRecordPage = async (params) => {
+  return await request.get({ url: `/wms/productrepair-record-main/bomPage`, params })
+}
+
+// 查询制品报废申请子列表
+export const getProductscrapBomDismantlePage = async (params) => {
+  return await request.get({ url: `/wms/productscrap-request-main/bomPage`, params })
+}
+
+// 查询制品报废申请子列表
+export const getProductscrapBomDismantleRecordPage = async (params) => {
+  return await request.get({ url: `/wms/productscrap-record-main/bomPage`, params })
+}
+
+// 查询制品拆解申请子列表
+export const getDetailbBomDismantlePage = async (params) => {
+  return await request.get({ url: `/wms/dismantle-request-detailb/bomPage`, params })
+}
\ No newline at end of file
diff --git a/src/api/wms/businesstype/index.ts b/src/api/wms/businesstype/index.ts
new file mode 100644
index 000000000..09f9dddef
--- /dev/null
+++ b/src/api/wms/businesstype/index.ts
@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface BusinesstypeVO {
+  code: string
+  name: string
+  description: string
+  itemTypes: string
+  itemStatuses: string
+  outAreaTypes: string
+  inAreaTypes: string
+  outAreaCodes: string
+  inAreaCodes: string
+  outInventoryStatuses: string
+  inInventoryStatuses: string
+  outTransactionType: string
+  inTransactionType: string
+  onTheWayArea: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  useOnTheWay: string
+  available: string
+  isSoftDeleted: string
+}
+
+// 查询业务类型列表
+export const getBusinesstypePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/businesstype/senior', data })
+  } else {
+    return await request.get({ url: `/wms/businesstype/page`, params })
+  }
+}
+
+// 查询业务类型详情
+export const getBusinesstype = async (id: number) => {
+  return await request.get({ url: `/wms/businesstype/get?id=` + id })
+}
+
+// 新增业务类型
+export const createBusinesstype = async (data: BusinesstypeVO) => {
+  return await request.post({ url: `/wms/businesstype/create`, data })
+}
+
+// 修改业务类型
+export const updateBusinesstype = async (data: BusinesstypeVO) => {
+  return await request.put({ url: `/wms/businesstype/update`, data })
+}
+
+// 删除业务类型
+export const deleteBusinesstype = async (id: number) => {
+  return await request.delete({ url: `/wms/businesstype/delete?id=` + id })
+}
+
+// 导出业务类型 Excel
+export const exportBusinesstype = async (params) => {
+  return await request.download({ url: `/wms/businesstype/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/businesstype/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/callmaterials/index.ts b/src/api/wms/callmaterials/index.ts
new file mode 100644
index 000000000..88f0f0cf6
--- /dev/null
+++ b/src/api/wms/callmaterials/index.ts
@@ -0,0 +1,53 @@
+import request from '@/config/axios'
+
+export interface CallmaterialsVO {
+  id: number
+  itemCode: string
+  batch: string
+  isRecive: string
+  packUnit: string
+  location: string
+  qty: number
+  uom: string
+}
+
+// 查询叫料标签列表
+export const getCallmaterialsPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/callmaterials/senior', data })
+  } else {
+    return await request.get({ url: `/wms/callmaterials/page`, params })
+  }
+}
+
+// 查询叫料标签详情
+export const getCallmaterials = async (id: number) => {
+  return await request.get({ url: `/wms/callmaterials/get?id=` + id })
+}
+
+// 新增叫料标签
+export const createCallmaterials = async (data: CallmaterialsVO) => {
+  return await request.post({ url: `/wms/callmaterials/create`, data })
+}
+
+// 修改叫料标签
+export const updateCallmaterials = async (data: CallmaterialsVO) => {
+  return await request.put({ url: `/wms/callmaterials/update`, data })
+}
+
+// 删除叫料标签
+export const deleteCallmaterials = async (id: number) => {
+  return await request.delete({ url: `/wms/callmaterials/delete?id=` + id })
+}
+
+// 导出叫料标签 Excel
+export const exportCallmaterials = async (params) => {
+  return await request.download({ url: `/wms/callmaterials/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/callmaterials/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/carrier/index.ts b/src/api/wms/carrier/index.ts
new file mode 100644
index 000000000..18d1c88fd
--- /dev/null
+++ b/src/api/wms/carrier/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface CarrierVO {
+  code: string
+  name: string
+  shortName: string
+  address: string
+  country: string
+  city: string
+  phone: string
+  fax: string
+  postId: string
+  contacts: string
+  bank: string
+  currency: string
+  taxRate: number
+  type: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  available: string
+}
+
+// 查询承运商列表
+export const getCarrierPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/carrier/senior', data })
+  } else {
+    return await request.get({ url: `/wms/carrier/page`, params })
+  }
+}
+
+// 查询承运商详情
+export const getCarrier = async (id: number) => {
+  return await request.get({ url: `/wms/carrier/get?id=` + id })
+}
+
+// 新增承运商
+export const createCarrier = async (data: CarrierVO) => {
+  return await request.post({ url: `/wms/carrier/create`, data })
+}
+
+// 修改承运商
+export const updateCarrier = async (data: CarrierVO) => {
+  return await request.put({ url: `/wms/carrier/update`, data })
+}
+
+// 删除承运商
+export const deleteCarrier = async (id: number) => {
+  return await request.delete({ url: `/wms/carrier/delete?id=` + id })
+}
+
+// 导出承运商 Excel
+export const exportCarrier = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/carrier/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/carrier/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/carrier/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/condition/index.ts b/src/api/wms/condition/index.ts
new file mode 100644
index 000000000..6e2acde9d
--- /dev/null
+++ b/src/api/wms/condition/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface ConditionVO {
+  strategyCode: string
+  ruleCode: string
+  paramCode: string
+  operator: string
+  value: string
+  groupCode: string
+}
+
+// 查询条件列表
+export const getConditionPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/condition/senior', data })
+  } else {
+    return await request.get({ url: `/wms/condition/page`, params })
+  }
+}
+
+// 查询条件详情
+export const getCondition = async (id: number) => {
+  return await request.get({ url: `/wms/condition/get?id=` + id })
+}
+
+// 新增条件
+export const createCondition = async (data: ConditionVO) => {
+  return await request.post({ url: `/wms/condition/create`, data })
+}
+
+// 修改条件
+export const updateCondition = async (data: ConditionVO) => {
+  return await request.put({ url: `/wms/condition/update`, data })
+}
+
+// 删除条件
+export const deleteCondition = async (id: number) => {
+  return await request.delete({ url: `/wms/condition/delete?id=` + id })
+}
+
+// 导出条件 Excel
+export const exportCondition = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/condition/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/condition/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/condition/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/configuration/index.ts b/src/api/wms/configuration/index.ts
new file mode 100644
index 000000000..65fc1adb6
--- /dev/null
+++ b/src/api/wms/configuration/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface ConfigurationVO {
+  strategyCode: string
+  ruleCode: string
+  configurationCode: string
+  configurationValue: string
+  description: string
+  groupCode: string
+}
+
+// 查询配置列表
+export const getConfigurationPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/configuration/senior', data })
+  } else {
+    return await request.get({ url: `/wms/configuration/page`, params })
+  }
+}
+
+// 查询配置详情
+export const getConfiguration = async (id: number) => {
+  return await request.get({ url: `/wms/configuration/get?id=` + id })
+}
+
+// 新增配置
+export const createConfiguration = async (data: ConfigurationVO) => {
+  return await request.post({ url: `/wms/configuration/create`, data })
+}
+
+// 修改配置
+export const updateConfiguration = async (data: ConfigurationVO) => {
+  return await request.put({ url: `/wms/configuration/update`, data })
+}
+
+// 删除配置
+export const deleteConfiguration = async (id: number) => {
+  return await request.delete({ url: `/wms/configuration/delete?id=` + id })
+}
+
+// 导出配置 Excel
+export const exportConfiguration = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/configuration/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/configuration/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/configuration/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/configurationsetting/index.ts b/src/api/wms/configurationsetting/index.ts
new file mode 100644
index 000000000..a1a063cce
--- /dev/null
+++ b/src/api/wms/configurationsetting/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface ConfigurationsettingVO {
+  strategyType: string
+  configurationCode: string
+  configurationName: string
+  dataType: string
+  valueScope: string
+  relatedTo: string
+  description: string
+  isRequired: string
+}
+
+// 查询配置设置列表
+export const getConfigurationsettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/configurationsetting/senior', data })
+  } else {
+    return await request.get({ url: `/wms/configurationsetting/page`, params })
+  }
+}
+
+// 查询配置设置详情
+export const getConfigurationsetting = async (id: number) => {
+  return await request.get({ url: `/wms/configurationsetting/get?id=` + id })
+}
+
+// 新增配置设置
+export const createConfigurationsetting = async (data: ConfigurationsettingVO) => {
+  return await request.post({ url: `/wms/configurationsetting/create`, data })
+}
+
+// 修改配置设置
+export const updateConfigurationsetting = async (data: ConfigurationsettingVO) => {
+  return await request.put({ url: `/wms/configurationsetting/update`, data })
+}
+
+// 删除配置设置
+export const deleteConfigurationsetting = async (id: number) => {
+  return await request.delete({ url: `/wms/configurationsetting/delete?id=` + id })
+}
+
+// 导出配置设置 Excel
+export const exportConfigurationsetting = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/configurationsetting/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/configurationsetting/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/configurationsetting/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/consumeRecordDetailb/index.ts b/src/api/wms/consumeRecordDetailb/index.ts
new file mode 100644
index 000000000..98745dfa7
--- /dev/null
+++ b/src/api/wms/consumeRecordDetailb/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface ConsumeRecordDetailbVO {
+  batch: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  inventoryStatus: string
+  packingNumber: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  uom: string
+  code: string
+  interfaceType: string
+}
+
+// 查询制品返修记录子列表
+export const getConsumeRecordDetailbPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/consume-record-detailb/senior', data })
+  } else {
+    return await request.get({ url: `/wms/consume-record-detailb/page`, params })
+  }
+}
+
+// 查询制品返修记录子详情
+export const getConsumeRecordDetailb = async (id: number) => {
+  return await request.get({ url: `/wms/consume-record-detailb/get?id=` + id })
+}
+
+// 新增制品返修记录子
+export const createConsumeRecordDetailb = async (data: ConsumeRecordDetailbVO) => {
+  return await request.post({ url: `/wms/consume-record-detailb/create`, data })
+}
+
+// 修改制品返修记录子
+export const updateConsumeRecordDetailb = async (data: ConsumeRecordDetailbVO) => {
+  return await request.put({ url: `/wms/consume-record-detailb/update`, data })
+}
+
+// 删除制品返修记录子
+export const deleteConsumeRecordDetailb = async (id: number) => {
+  return await request.delete({ url: `/wms/consume-record-detailb/delete?id=` + id })
+}
+
+// 导出制品返修记录子 Excel
+export const exportConsumeRecordDetailb = async (params) => {
+  return await request.download({ url: `/wms/consume-record-detailb/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/consume-record-detailb/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/consumereRequestDetailb/index.ts b/src/api/wms/consumereRequestDetailb/index.ts
new file mode 100644
index 000000000..9c0baa5eb
--- /dev/null
+++ b/src/api/wms/consumereRequestDetailb/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface ConsumereRequestDetailbVO {
+  inventoryStatus: string
+  packingNumber: string
+  batch: string
+  fromLocationCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  uom: string
+  updateTime: Date
+  updater: string
+}
+
+// 查询制品返修申请子列表
+export const getConsumereRequestDetailbPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/consumere-request-detailb/senior', data })
+  } else {
+    return await request.get({ url: `/wms/consumere-request-detailb/page`, params })
+  }
+}
+
+// 查询制品返修申请子详情
+export const getConsumereRequestDetailb = async (id: number) => {
+  return await request.get({ url: `/wms/consumere-request-detailb/get?id=` + id })
+}
+
+// 新增制品返修申请子
+export const createConsumereRequestDetailb = async (data: ConsumereRequestDetailbVO) => {
+  return await request.post({ url: `/wms/consumere-request-detailb/create`, data })
+}
+
+// 修改制品返修申请子
+export const updateConsumereRequestDetailb = async (data: ConsumereRequestDetailbVO) => {
+  return await request.put({ url: `/wms/consumere-request-detailb/update`, data })
+}
+
+// 删除制品返修申请子
+export const deleteConsumereRequestDetailb = async (id: number) => {
+  return await request.delete({ url: `/wms/consumere-request-detailb/delete?id=` + id })
+}
+
+// 导出制品返修申请子 Excel
+export const exportConsumereRequestDetailb = async (params) => {
+  return await request.download({ url: `/wms/consumere-request-detailb/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/consumere-request-detailb/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/containerBindRecordDetail/index.ts b/src/api/wms/containerBindRecordDetail/index.ts
new file mode 100644
index 000000000..6b702797c
--- /dev/null
+++ b/src/api/wms/containerBindRecordDetail/index.ts
@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface ContainerBindRecordDetailVO {
+  id: number
+  containerContentType: string
+  contentNumber: string
+  itemCode: string
+  batch: string
+  inventoryStatus: string
+  uom: string
+  qty: number
+  masterId: number
+  number: string
+  siteId: string
+  remark: string
+}
+
+// 查询器具绑定记录子列表
+export const getContainerBindRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/container-bind-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/container-bind-record-detail/page`, params })
+  }
+}
+
+// 查询器具绑定记录子详情
+export const getContainerBindRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/container-bind-record-detail/get?id=` + id })
+}
+
+// 新增器具绑定记录子
+export const createContainerBindRecordDetail = async (data: ContainerBindRecordDetailVO) => {
+  return await request.post({ url: `/wms/container-bind-record-detail/create`, data })
+}
+
+// 修改器具绑定记录子
+export const updateContainerBindRecordDetail = async (data: ContainerBindRecordDetailVO) => {
+  return await request.put({ url: `/wms/container-bind-record-detail/update`, data })
+}
+
+// 删除器具绑定记录子
+export const deleteContainerBindRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/container-bind-record-detail/delete?id=` + id })
+}
+
+// 导出器具绑定记录子 Excel
+export const exportContainerBindRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/container-bind-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/container-bind-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/containerBindRecordMain/index.ts b/src/api/wms/containerBindRecordMain/index.ts
new file mode 100644
index 000000000..be7cca676
--- /dev/null
+++ b/src/api/wms/containerBindRecordMain/index.ts
@@ -0,0 +1,69 @@
+import request from '@/config/axios'
+
+export interface ContainerBindRecordMainVO {
+  id: number
+  number: string
+  containerNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  available: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  userGroupCode: string
+  interfaceType: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: string
+  code: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  fromAreaCodes: string
+  toAreaCodes: string
+}
+
+// 查询器具绑定记录主列表
+export const getContainerBindRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/container-bind-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/container-bind-record-main/page`, params })
+  }
+}
+
+// 查询器具绑定记录主详情
+export const getContainerBindRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/container-bind-record-main/get?id=` + id })
+}
+
+// 新增器具绑定记录主
+export const createContainerBindRecordMain = async (data: ContainerBindRecordMainVO) => {
+  return await request.post({ url: `/wms/container-bind-record-main/create`, data })
+}
+
+// 修改器具绑定记录主
+export const updateContainerBindRecordMain = async (data: ContainerBindRecordMainVO) => {
+  return await request.put({ url: `/wms/container-bind-record-main/update`, data })
+}
+
+// 删除器具绑定记录主
+export const deleteContainerBindRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/container-bind-record-main/delete?id=` + id })
+}
+
+// 导出器具绑定记录主 Excel
+export const exportContainerBindRecordMain = async (params) => {
+  return await request.download({ url: `/wms/container-bind-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/container-bind-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/containerDetail/index.ts b/src/api/wms/containerDetail/index.ts
new file mode 100644
index 000000000..1be2d081c
--- /dev/null
+++ b/src/api/wms/containerDetail/index.ts
@@ -0,0 +1,52 @@
+import request from '@/config/axios'
+
+export interface ContainerDetailVO {
+  containerContentType: string
+  contentNumber: string
+  itemCode: string
+  batch: string
+  inventoryStatus: string
+  uom: string
+  qty: number
+}
+
+// 查询器具子列表
+export const getContainerDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/container-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/container-detail/page`, params })
+  }
+}
+
+// 查询器具子详情
+export const getContainerDetail = async (id: number) => {
+  return await request.get({ url: `/wms/container-detail/get?id=` + id })
+}
+
+// 新增器具子
+export const createContainerDetail = async (data: ContainerDetailVO) => {
+  return await request.post({ url: `/wms/container-detail/create`, data })
+}
+
+// 修改器具子
+export const updateContainerDetail = async (data: ContainerDetailVO) => {
+  return await request.put({ url: `/wms/container-detail/update`, data })
+}
+
+// 删除器具子
+export const deleteContainerDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/container-detail/delete?id=` + id })
+}
+
+// 导出器具子 Excel
+export const exportContainerDetail = async (params) => {
+  return await request.download({ url: `/wms/container-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/container-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/containerInitRecordDetail/index.ts b/src/api/wms/containerInitRecordDetail/index.ts
new file mode 100644
index 000000000..f998ec3bf
--- /dev/null
+++ b/src/api/wms/containerInitRecordDetail/index.ts
@@ -0,0 +1,55 @@
+import request from '@/config/axios'
+
+export interface ContainerInitRecordDetailVO {
+  id: number
+  containerNumber: string
+  type: string
+  capacity: number
+  status: string
+  ownerCode: string
+  masterId: number
+  number: string
+  siteId: string
+  remark: string
+}
+
+// 查询器具初始化记录子列表
+export const getContainerInitRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/container-init-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/container-init-record-detail/page`, params })
+  }
+}
+
+// 查询器具初始化记录子详情
+export const getContainerInitRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/container-init-record-detail/get?id=` + id })
+}
+
+// 新增器具初始化记录子
+export const createContainerInitRecordDetail = async (data: ContainerInitRecordDetailVO) => {
+  return await request.post({ url: `/wms/container-init-record-detail/create`, data })
+}
+
+// 修改器具初始化记录子
+export const updateContainerInitRecordDetail = async (data: ContainerInitRecordDetailVO) => {
+  return await request.put({ url: `/wms/container-init-record-detail/update`, data })
+}
+
+// 删除器具初始化记录子
+export const deleteContainerInitRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/container-init-record-detail/delete?id=` + id })
+}
+
+// 导出器具初始化记录子 Excel
+export const exportContainerInitRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/container-init-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/container-init-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/containerInitRecordMain/index.ts b/src/api/wms/containerInitRecordMain/index.ts
new file mode 100644
index 000000000..9bcb441d4
--- /dev/null
+++ b/src/api/wms/containerInitRecordMain/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface ContainerInitRecordMainVO {
+  id: number
+  number: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  available: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  userGroupCode: string
+  interfaceType: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: string
+  code: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  fromAreaCodes: string
+  toAreaCodes: string
+}
+
+// 查询器具初始化记录主列表
+export const getContainerInitRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/container-init-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/container-init-record-main/page`, params })
+  }
+}
+
+// 查询器具初始化记录主详情
+export const getContainerInitRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/container-init-record-main/get?id=` + id })
+}
+
+// 新增器具初始化记录主
+export const createContainerInitRecordMain = async (data: ContainerInitRecordMainVO) => {
+  return await request.post({ url: `/wms/container-init-record-main/create`, data })
+}
+
+// 修改器具初始化记录主
+export const updateContainerInitRecordMain = async (data: ContainerInitRecordMainVO) => {
+  return await request.put({ url: `/wms/container-init-record-main/update`, data })
+}
+
+// 删除器具初始化记录主
+export const deleteContainerInitRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/container-init-record-main/delete?id=` + id })
+}
+
+// 导出器具初始化记录主 Excel
+export const exportContainerInitRecordMain = async (params) => {
+  return await request.download({ url: `/wms/container-init-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/container-init-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/containerMain/index.ts b/src/api/wms/containerMain/index.ts
new file mode 100644
index 000000000..7e10ebf1b
--- /dev/null
+++ b/src/api/wms/containerMain/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface ContainerMainVO {
+  id: string
+  number: string
+  type: string
+  capacity: number
+  status: string
+  ownerCode: string
+}
+
+// 查询器具主列表
+export const getContainerMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/container-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/container-main/page`, params })
+  }
+}
+
+// 查询器具主详情
+export const getContainerMain = async (id: number) => {
+  return await request.get({ url: `/wms/container-main/get?id=` + id })
+}
+
+// 新增器具主
+export const createContainerMain = async (data: ContainerMainVO) => {
+  return await request.post({ url: `/wms/container-main/create`, data })
+}
+
+// 修改器具主
+export const updateContainerMain = async (data: ContainerMainVO) => {
+  return await request.put({ url: `/wms/container-main/update`, data })
+}
+
+// 删除器具主
+export const deleteContainerMain = async (id: number) => {
+  return await request.delete({ url: `/wms/container-main/delete?id=` + id })
+}
+
+// 导出器具主 Excel
+export const exportContainerMain = async (params) => {
+  return await request.download({ url: `/wms/container-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/container-main/get-import-template' })
+}
+
+// 器具维修
+export const repairSubmitContainerRequestMain = async (id) => {
+  return await request.put({ url: `/wms/container-main/repair?id=` + id })
+}
+
+// 器具报废
+export const scrapSubmitContainerRequestMain = async (id) => {
+  return await request.put({ url: `/wms/container-main/scrap?id=` + id })
+}
diff --git a/src/api/wms/containerRepairRecordDetail/index.ts b/src/api/wms/containerRepairRecordDetail/index.ts
new file mode 100644
index 000000000..379757fe8
--- /dev/null
+++ b/src/api/wms/containerRepairRecordDetail/index.ts
@@ -0,0 +1,53 @@
+import request from '@/config/axios'
+
+export interface ContainerRepairRecordDetailVO {
+  id: number
+  containerNumber: string
+  fromContainerStatus: string
+  toContainerStatus: string
+  masterId: number
+  number: string
+  siteId: string
+  remark: string
+}
+
+// 查询器具维修记录子列表
+export const getContainerRepairRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/container-repair-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/container-repair-record-detail/page`, params })
+  }
+}
+
+// 查询器具维修记录子详情
+export const getContainerRepairRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/container-repair-record-detail/get?id=` + id })
+}
+
+// 新增器具维修记录子
+export const createContainerRepairRecordDetail = async (data: ContainerRepairRecordDetailVO) => {
+  return await request.post({ url: `/wms/container-repair-record-detail/create`, data })
+}
+
+// 修改器具维修记录子
+export const updateContainerRepairRecordDetail = async (data: ContainerRepairRecordDetailVO) => {
+  return await request.put({ url: `/wms/container-repair-record-detail/update`, data })
+}
+
+// 删除器具维修记录子
+export const deleteContainerRepairRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/container-repair-record-detail/delete?id=` + id })
+}
+
+// 导出器具维修记录子 Excel
+export const exportContainerRepairRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/container-repair-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/container-repair-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/containerRepairRecordMain/index.ts b/src/api/wms/containerRepairRecordMain/index.ts
new file mode 100644
index 000000000..8754af5fd
--- /dev/null
+++ b/src/api/wms/containerRepairRecordMain/index.ts
@@ -0,0 +1,69 @@
+import request from '@/config/axios'
+
+export interface ContainerRepairRecordMainVO {
+  id: number
+  number: string
+  containerNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  available: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  userGroupCode: string
+  interfaceType: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: string
+  code: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  fromAreaCodes: string
+  toAreaCodes: string
+}
+
+// 查询器具维修记录主列表
+export const getContainerRepairRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/container-repair-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/container-repair-record-main/page`, params })
+  }
+}
+
+// 查询器具维修记录主详情
+export const getContainerRepairRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/container-repair-record-main/get?id=` + id })
+}
+
+// 新增器具维修记录主
+export const createContainerRepairRecordMain = async (data: ContainerRepairRecordMainVO) => {
+  return await request.post({ url: `/wms/container-repair-record-main/create`, data })
+}
+
+// 修改器具维修记录主
+export const updateContainerRepairRecordMain = async (data: ContainerRepairRecordMainVO) => {
+  return await request.put({ url: `/wms/container-repair-record-main/update`, data })
+}
+
+// 删除器具维修记录主
+export const deleteContainerRepairRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/container-repair-record-main/delete?id=` + id })
+}
+
+// 导出器具维修记录主 Excel
+export const exportContainerRepairRecordMain = async (params) => {
+  return await request.download({ url: `/wms/container-repair-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/container-repair-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/containerUnbindRecordDetail/index.ts b/src/api/wms/containerUnbindRecordDetail/index.ts
new file mode 100644
index 000000000..737f9f0b4
--- /dev/null
+++ b/src/api/wms/containerUnbindRecordDetail/index.ts
@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface ContainerUnbindRecordDetailVO {
+  id: number
+  containerContentType: string
+  contentNumber: string
+  itemCode: string
+  batch: string
+  inventoryStatus: string
+  uom: string
+  qty: number
+  masterId: number
+  number: string
+  siteId: string
+  remark: string
+}
+
+// 查询器具解绑记录子列表
+export const getContainerUnbindRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/container-unbind-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/container-unbind-record-detail/page`, params })
+  }
+}
+
+// 查询器具解绑记录子详情
+export const getContainerUnbindRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/container-unbind-record-detail/get?id=` + id })
+}
+
+// 新增器具解绑记录子
+export const createContainerUnbindRecordDetail = async (data: ContainerUnbindRecordDetailVO) => {
+  return await request.post({ url: `/wms/container-unbind-record-detail/create`, data })
+}
+
+// 修改器具解绑记录子
+export const updateContainerUnbindRecordDetail = async (data: ContainerUnbindRecordDetailVO) => {
+  return await request.put({ url: `/wms/container-unbind-record-detail/update`, data })
+}
+
+// 删除器具解绑记录子
+export const deleteContainerUnbindRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/container-unbind-record-detail/delete?id=` + id })
+}
+
+// 导出器具解绑记录子 Excel
+export const exportContainerUnbindRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/container-unbind-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/container-unbind-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/containerUnbindRecordMain/index.ts b/src/api/wms/containerUnbindRecordMain/index.ts
new file mode 100644
index 000000000..1dc49d431
--- /dev/null
+++ b/src/api/wms/containerUnbindRecordMain/index.ts
@@ -0,0 +1,69 @@
+import request from '@/config/axios'
+
+export interface ContainerUnbindRecordMainVO {
+  id: number
+  number: string
+  containerNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  available: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  userGroupCode: string
+  interfaceType: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: string
+  code: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  fromAreaCodes: string
+  toAreaCodes: string
+}
+
+// 查询器具解绑记录主列表
+export const getContainerUnbindRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/container-unbind-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/container-unbind-record-main/page`, params })
+  }
+}
+
+// 查询器具解绑记录主详情
+export const getContainerUnbindRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/container-unbind-record-main/get?id=` + id })
+}
+
+// 新增器具解绑记录主
+export const createContainerUnbindRecordMain = async (data: ContainerUnbindRecordMainVO) => {
+  return await request.post({ url: `/wms/container-unbind-record-main/create`, data })
+}
+
+// 修改器具解绑记录主
+export const updateContainerUnbindRecordMain = async (data: ContainerUnbindRecordMainVO) => {
+  return await request.put({ url: `/wms/container-unbind-record-main/update`, data })
+}
+
+// 删除器具解绑记录主
+export const deleteContainerUnbindRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/container-unbind-record-main/delete?id=` + id })
+}
+
+// 导出器具解绑记录主 Excel
+export const exportContainerUnbindRecordMain = async (params) => {
+  return await request.download({ url: `/wms/container-unbind-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/container-unbind-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/countJobDetail/index.ts b/src/api/wms/countJobDetail/index.ts
new file mode 100644
index 000000000..6b7e13244
--- /dev/null
+++ b/src/api/wms/countJobDetail/index.ts
@@ -0,0 +1,62 @@
+import request from '@/config/axios'
+
+export interface CountJobDetailVO {
+  countDetailNumber: string
+  ownerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+}
+
+// 查询盘点任务子列表
+export const getCountJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/count-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/count-job-detail/page`, params })
+  }
+}
+
+// 查询盘点任务子详情
+export const getCountJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/count-job-detail/get?id=` + id })
+}
+
+// 新增盘点任务子
+export const createCountJobDetail = async (data: CountJobDetailVO) => {
+  return await request.post({ url: `/wms/count-job-detail/create`, data })
+}
+
+// 修改盘点任务子
+export const updateCountJobDetail = async (data: CountJobDetailVO) => {
+  return await request.put({ url: `/wms/count-job-detail/update`, data })
+}
+
+// 删除盘点任务子
+export const deleteCountJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/count-job-detail/delete?id=` + id })
+}
+
+// 导出盘点任务子 Excel
+export const exportCountJobDetail = async (params) => {
+  return await request.download({ url: `/wms/count-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/count-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts
new file mode 100644
index 000000000..3d9c2a5e8
--- /dev/null
+++ b/src/api/wms/countJobMain/index.ts
@@ -0,0 +1,93 @@
+import request from '@/config/axios'
+
+export interface CountJobMainVO {
+  requestNumber: string
+  planNumber: string
+  stage: string
+  warehouseCode: string
+  locationCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  siteId: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询盘点任务主列表
+export const getCountJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/count-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/count-job-main/page`, params })
+  }
+}
+
+// 查询盘点任务主详情
+export const getCountJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/count-job-main/get?id=` + id })
+}
+
+// 新增盘点任务主
+export const createCountJobMain = async (data: CountJobMainVO) => {
+  return await request.post({ url: `/wms/count-job-main/create`, data })
+}
+
+// 修改盘点任务主
+export const updateCountJobMain = async (data: CountJobMainVO) => {
+  return await request.put({ url: `/wms/count-job-main/update`, data })
+}
+
+// 删除盘点任务主
+export const deleteCountJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/count-job-main/delete?id=` + id })
+}
+
+// 导出盘点任务主 Excel
+export const exportCountJobMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/count-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/count-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/count-job-main/get-import-template' })
+}
+
+// 关闭盘点任务主
+export const closeCountJobMain = (id: number) => {
+  return request.download({ url: '/wms/count-job-main/close?id=' + id })
+}
diff --git a/src/api/wms/countPlanDetail/index.ts b/src/api/wms/countPlanDetail/index.ts
new file mode 100644
index 000000000..5c4300bb7
--- /dev/null
+++ b/src/api/wms/countPlanDetail/index.ts
@@ -0,0 +1,52 @@
+import request from '@/config/axios'
+
+export interface CountPlanDetailVO {
+  type: string
+  value: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  planQty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  available: string
+}
+
+// 查询盘点计划子列表
+export const getCountPlanDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/count-plan-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/count-plan-detail/page`, params })
+  }
+}
+
+// 查询盘点计划子详情
+export const getCountPlanDetail = async (id: number) => {
+  return await request.get({ url: `/wms/count-plan-detail/get?id=` + id })
+}
+
+// 新增盘点计划子
+export const createCountPlanDetail = async (data: CountPlanDetailVO) => {
+  return await request.post({ url: `/wms/count-plan-detail/create`, data })
+}
+
+// 修改盘点计划子
+export const updateCountPlanDetail = async (data: CountPlanDetailVO) => {
+  return await request.put({ url: `/wms/count-plan-detail/update`, data })
+}
+
+// 删除盘点计划子
+export const deleteCountPlanDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/count-plan-detail/delete?id=` + id })
+}
+
+// 导出盘点计划子 Excel
+export const exportCountPlanDetail = async (params) => {
+  return await request.download({ url: `/wms/count-plan-detail/export-excel`, params })
+}
diff --git a/src/api/wms/countPlanMain/index.ts b/src/api/wms/countPlanMain/index.ts
new file mode 100644
index 000000000..0e3bc85fb
--- /dev/null
+++ b/src/api/wms/countPlanMain/index.ts
@@ -0,0 +1,110 @@
+import request from '@/config/axios'
+
+export interface CountPlanMainVO {
+  type: string
+  crontab: string
+  dimension: string
+  limitedValue: number
+  ignoreListOfItem: string
+  ignoreListOfLocation: string
+  scopeList: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  beginTime: Date
+  endTime: Date
+  status: string
+  updateTime: Date
+  updater: string
+  isSnapshot: string
+  isFreeze: string
+  isCountEmptyLocation: string
+  isCountZeroInventory: string
+  isCountNegativeInventory: string
+  isOpenCount: string
+  available: string
+}
+
+// 查询盘点计划主列表
+export const getCountPlanMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/count-plan-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/count-plan-main/page`, params })
+  }
+}
+
+// 查询盘点计划主详情
+export const getCountPlanMain = async (id: number) => {
+  return await request.get({ url: `/wms/count-plan-main/get?id=` + id })
+}
+
+// 新增盘点计划主
+export const createCountPlanMain = async (data: CountPlanMainVO) => {
+  return await request.post({ url: `/wms/count-plan-main/create`, data })
+}
+
+// 修改盘点计划主
+export const updateCountPlanMain = async (data: CountPlanMainVO) => {
+  return await request.put({ url: `/wms/count-plan-main/update`, data })
+}
+
+// 删除盘点计划主
+export const deleteCountPlanMain = async (id: number) => {
+  return await request.delete({ url: `/wms/count-plan-main/delete?id=` + id })
+}
+
+// 导出盘点计划主 Excel
+export const exportCountPlanMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/count-plan-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/count-plan-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/count-plan-main/get-import-template' })
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/count-plan-main/close?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/count-plan-main/submit?id=' + id })
+}
+
+// 打开
+export const open = (id) => {
+  return request.put({ url: '/wms/count-plan-main/open?id=' + id })
+}
+
+// 驳回
+export const reject = (id) => {
+  return request.put({ url: '/wms/count-plan-main/reject?id=' + id })
+}
+
+// 通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/count-plan-main/agree?id=' + id })
+}
+
+// 发布
+export const publish = (id) => {
+  return request.put({ url: '/wms/count-plan-main/publish?id=' + id })
+}
+
+// 重置
+export const resetting = (id) => {
+  return request.put({ url: '/wms/count-plan-main/resetting?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/countRecordDetail/index.ts b/src/api/wms/countRecordDetail/index.ts
new file mode 100644
index 000000000..3a350689d
--- /dev/null
+++ b/src/api/wms/countRecordDetail/index.ts
@@ -0,0 +1,72 @@
+import request from '@/config/axios'
+
+export interface CountRecordDetailVO {
+  countDetailNumber: string
+  ownerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  locationCode: string
+  locationGroupCode: string
+  areaCode: string
+  inventoryStatus: string
+  countQty: number
+  countTime: Date
+  countUser: string
+  countDescription: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creatorId: string
+  jobDetailId: string
+}
+
+// 查询盘点记录子列表
+export const getCountRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/count-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/count-record-detail/page`, params })
+  }
+}
+
+// 查询盘点记录子详情
+export const getCountRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/count-record-detail/get?id=` + id })
+}
+
+// 新增盘点记录子
+export const createCountRecordDetail = async (data: CountRecordDetailVO) => {
+  return await request.post({ url: `/wms/count-record-detail/create`, data })
+}
+
+// 修改盘点记录子
+export const updateCountRecordDetail = async (data: CountRecordDetailVO) => {
+  return await request.put({ url: `/wms/count-record-detail/update`, data })
+}
+
+// 删除盘点记录子
+export const deleteCountRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/count-record-detail/delete?id=` + id })
+}
+
+// 导出盘点记录子 Excel
+export const exportCountRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/count-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/count-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/countRecordMain/index.ts b/src/api/wms/countRecordMain/index.ts
new file mode 100644
index 000000000..35d2ef3db
--- /dev/null
+++ b/src/api/wms/countRecordMain/index.ts
@@ -0,0 +1,76 @@
+import request from '@/config/axios'
+
+export interface CountRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  planNumber: string
+  stage: string
+  warehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  code: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  available: string
+}
+
+// 查询盘点记录主列表
+export const getCountRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/count-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/count-record-main/page`, params })
+  }
+}
+
+// 查询盘点记录主详情
+export const getCountRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/count-record-main/get?id=` + id })
+}
+
+// 新增盘点记录主
+export const createCountRecordMain = async (data: CountRecordMainVO) => {
+  return await request.post({ url: `/wms/count-record-main/create`, data })
+}
+
+// 修改盘点记录主
+export const updateCountRecordMain = async (data: CountRecordMainVO) => {
+  return await request.put({ url: `/wms/count-record-main/update`, data })
+}
+
+// 删除盘点记录主
+export const deleteCountRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/count-record-main/delete?id=` + id })
+}
+
+// 导出盘点记录主 Excel
+export const exportCountRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/count-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/count-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/count-record-main/get-import-template' })
+}
+
+// 生成盘点调整
+export const generateCountRecordMain = async (id) => {
+  return await request.put({ url: `/wms/count-record-main/generate?id=` + id})
+}
\ No newline at end of file
diff --git a/src/api/wms/countRequestDetail/index.ts b/src/api/wms/countRequestDetail/index.ts
new file mode 100644
index 000000000..96ed644f4
--- /dev/null
+++ b/src/api/wms/countRequestDetail/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface CountRequestDetailVO {
+  countDetailNumber: string
+  ownerCode: string
+  batch: string
+  locationCode: string
+  inventoryStatus: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  itemCode: string
+  fromPackingNumber: string
+  toPackingNumber: string
+  fromContainerNumber: string
+  toContainerNumber: string
+}
+
+// 查询盘点申请子列表
+export const getCountRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/count-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/count-request-detail/page`, params })
+  }
+}
+
+// 查询盘点申请子详情
+export const getCountRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/count-request-detail/get?id=` + id })
+}
+
+// 新增盘点申请子
+export const createCountRequestDetail = async (data: CountRequestDetailVO) => {
+  return await request.post({ url: `/wms/count-request-detail/create`, data })
+}
+
+// 修改盘点申请子
+export const updateCountRequestDetail = async (data: CountRequestDetailVO) => {
+  return await request.put({ url: `/wms/count-request-detail/update`, data })
+}
+
+// 删除盘点申请子
+export const deleteCountRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/count-request-detail/delete?id=` + id })
+}
+
+// 导出盘点申请子 Excel
+export const exportCountRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/count-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/count-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/countRequestMain/index.ts b/src/api/wms/countRequestMain/index.ts
new file mode 100644
index 000000000..b353bf0f9
--- /dev/null
+++ b/src/api/wms/countRequestMain/index.ts
@@ -0,0 +1,118 @@
+import request from '@/config/axios'
+
+export interface CountRequestMainVO {
+  requestNumber: string
+  planNumber: string
+  stage: string
+  warehouseCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询盘点申请主列表
+export const getCountRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/count-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/count-request-main/page`, params })
+  }
+}
+
+// 查询盘点申请主详情
+export const getCountRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/count-request-main/get?id=` + id })
+}
+
+// 新增盘点申请主
+export const createCountRequestMain = async (data: CountRequestMainVO) => {
+  return await request.post({ url: `/wms/count-request-main/create`, data })
+}
+
+// 修改盘点申请主
+export const updateCountRequestMain = async (data: CountRequestMainVO) => {
+  return await request.put({ url: `/wms/count-request-main/update`, data })
+}
+
+// 删除盘点申请主
+export const deleteCountRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/count-request-main/delete?id=` + id })
+}
+
+// 导出盘点申请主 Excel
+export const exportCountRequestMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/count-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/count-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/count-request-main/get-import-template' })
+}
+
+// 关闭盘点申请主 Excel
+export const close = async (id) => {
+  return await request.put({ url: `/wms/count-request-main/close?id=` + id })
+}
+
+// 重新添加盘点申请主 Excel
+export const reAdd = async (id) => {
+  return await request.put({ url: `/wms/count-request-main/reAdd?id=` + id })
+}
+
+// 提交盘点申请主 Excel
+export const submit = async (id) => {
+  return await request.put({ url: `/wms/count-request-main/submit?id=` + id })
+}
+
+// 审批通过盘点申请主 Excel
+export const agree = async (id) => {
+  return await request.put({ url: `/wms/count-request-main/agree?id=` + id })
+}
+
+// 审批驳回盘点申请主 Excel
+export const refused = async (id) => {
+  return await request.put({ url: `/wms/count-request-main/refused?id=` + id })
+}
+
+// 处理盘点申请主 Excel
+export const handle = async (id) => {
+  return await request.put({ url: `/wms/count-request-main/handle?id=` + id })
+}
+
+//重盘
+export const reCount = async (data) => {
+  return await request.put({ url: `/wms/count-request-main/reCount`,data})
+}
+
+//监盘
+export const superviseCount = async (data) => {
+  return await request.put({ url: `/wms/count-request-main/supervise`,data})
+}
+//生成盘点调整申请
+export const generateCountadjustRequest = async (id) => {
+  return await request.put({ url: `/wms/count-request-main/generateCountadjustRequest?id=` + id })
+}
+//解冻
+export const thaw = async (id) => {
+  return await request.put({ url: `/wms/count-request-main/thaw?id=` + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/countadjustRecordDetail/index.ts b/src/api/wms/countadjustRecordDetail/index.ts
new file mode 100644
index 000000000..ab86020bf
--- /dev/null
+++ b/src/api/wms/countadjustRecordDetail/index.ts
@@ -0,0 +1,69 @@
+import request from '@/config/axios'
+
+export interface CountadjustRecordDetailVO {
+  countDetailNumber: string
+  ownerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  locationCode: string
+  inventoryStatus: string
+  inventoryQty: number
+  countQty: number
+  adjustQty: number
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  jobDetailId: string
+}
+
+// 查询盘点调整记录子列表
+export const getCountadjustRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/countadjust-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/countadjust-record-detail/page`, params })
+  }
+}
+
+// 查询盘点调整记录子详情
+export const getCountadjustRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/countadjust-record-detail/get?id=` + id })
+}
+
+// 新增盘点调整记录子
+export const createCountadjustRecordDetail = async (data: CountadjustRecordDetailVO) => {
+  return await request.post({ url: `/wms/countadjust-record-detail/create`, data })
+}
+
+// 修改盘点调整记录子
+export const updateCountadjustRecordDetail = async (data: CountadjustRecordDetailVO) => {
+  return await request.put({ url: `/wms/countadjust-record-detail/update`, data })
+}
+
+// 删除盘点调整记录子
+export const deleteCountadjustRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/countadjust-record-detail/delete?id=` + id })
+}
+
+// 导出盘点调整记录子 Excel
+export const exportCountadjustRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/countadjust-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/countadjust-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/countadjustRecordMain/index.ts b/src/api/wms/countadjustRecordMain/index.ts
new file mode 100644
index 000000000..02dc4ed60
--- /dev/null
+++ b/src/api/wms/countadjustRecordMain/index.ts
@@ -0,0 +1,69 @@
+import request from '@/config/axios'
+
+export interface CountadjustRecordMainVO {
+  requestNumber: string
+  countRecordNumber: string
+  warehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  code: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  available: string
+}
+
+// 查询盘点调整记录主列表
+export const getCountadjustRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/countadjust-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/countadjust-record-main/page`, params })
+  }
+}
+
+// 查询盘点调整记录主详情
+export const getCountadjustRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/countadjust-record-main/get?id=` + id })
+}
+
+// 新增盘点调整记录主
+export const createCountadjustRecordMain = async (data: CountadjustRecordMainVO) => {
+  return await request.post({ url: `/wms/countadjust-record-main/create`, data })
+}
+
+// 修改盘点调整记录主
+export const updateCountadjustRecordMain = async (data: CountadjustRecordMainVO) => {
+  return await request.put({ url: `/wms/countadjust-record-main/update`, data })
+}
+
+// 删除盘点调整记录主
+export const deleteCountadjustRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/countadjust-record-main/delete?id=` + id })
+}
+
+// 导出盘点调整记录主 Excel
+export const exportCountadjustRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/countadjust-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/countadjust-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/countadjust-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/countadjustRequestDetail/index.ts b/src/api/wms/countadjustRequestDetail/index.ts
new file mode 100644
index 000000000..1bb9805c5
--- /dev/null
+++ b/src/api/wms/countadjustRequestDetail/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface CountadjustRequestDetailVO {
+  countDetailNumber: string
+  ownerlCode: string
+  packinglNumber: string
+  containerlNumber: string
+  batch: string
+  locationlCode: string
+  inventorylStatus: string
+  inventorylQty: number
+  countlQty: number
+  adjustlQty: number
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemlName: string
+  itemlDesc1: string
+  itemlDesc2: string
+  projectlCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  itemlCode: string
+}
+
+// 查询盘点调整申请子列表
+export const getCountadjustRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/countadjust-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/countadjust-request-detail/page`, params })
+  }
+}
+
+// 查询盘点调整申请子详情
+export const getCountadjustRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/countadjust-request-detail/get?id=` + id })
+}
+
+// 新增盘点调整申请子
+export const createCountadjustRequestDetail = async (data: CountadjustRequestDetailVO) => {
+  return await request.post({ url: `/wms/countadjust-request-detail/create`, data })
+}
+
+// 修改盘点调整申请子
+export const updateCountadjustRequestDetail = async (data: CountadjustRequestDetailVO) => {
+  return await request.put({ url: `/wms/countadjust-request-detail/update`, data })
+}
+
+// 删除盘点调整申请子
+export const deleteCountadjustRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/countadjust-request-detail/delete?id=` + id })
+}
+
+// 导出盘点调整申请子 Excel
+export const exportCountadjustRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/countadjust-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/countadjust-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/countadjustRequestMain/index.ts b/src/api/wms/countadjustRequestMain/index.ts
new file mode 100644
index 000000000..4cc19ee4d
--- /dev/null
+++ b/src/api/wms/countadjustRequestMain/index.ts
@@ -0,0 +1,99 @@
+import request from '@/config/axios'
+
+export interface CountadjustRequestMainVO {
+  requestNumber: string
+  countRecordNumber: string
+  warehouseCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询盘点调整申请主列表
+export const getCountadjustRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/countadjust-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/countadjust-request-main/page`, params })
+  }
+}
+
+// 查询盘点调整申请主详情
+export const getCountadjustRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/countadjust-request-main/get?id=` + id })
+}
+
+// 新增盘点调整申请主
+export const createCountadjustRequestMain = async (data: CountadjustRequestMainVO) => {
+  return await request.post({ url: `/wms/countadjust-request-main/create`, data })
+}
+
+// 修改盘点调整申请主
+export const updateCountadjustRequestMain = async (data: CountadjustRequestMainVO) => {
+  return await request.put({ url: `/wms/countadjust-request-main/update`, data })
+}
+
+// 删除盘点调整申请主
+export const deleteCountadjustRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/countadjust-request-main/delete?id=` + id })
+}
+
+// 导出盘点调整申请主 Excel
+export const exportCountadjustRequestMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/countadjust-request-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/countadjust-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/countadjust-request-main/get-import-template' })
+}
+
+// 关闭盘点申请主 Excel
+export const close = async (id) => {
+  return await request.put({ url: `/wms/countadjust-request-main/close?id=` + id })
+}
+
+// 重新添加盘点申请主 Excel
+export const reAdd = async (id) => {
+  return await request.put({ url: `/wms/countadjust-request-main/reAdd?id=` + id })
+}
+
+// 提交盘点申请主 Excel
+export const submit = async (id) => {
+  return await request.put({ url: `/wms/countadjust-request-main/submit?id=` + id })
+}
+
+// 审批通过盘点申请主 Excel
+export const agree = async (id) => {
+  return await request.put({ url: `/wms/countadjust-request-main/agree?id=` + id })
+}
+
+// 审批驳回盘点申请主 Excel
+export const refused = async (id) => {
+  return await request.put({ url: `/wms/countadjust-request-main/refused?id=` + id })
+}
+
+// 处理盘点申请主 Excel
+export const handle = async (id) => {
+  return await request.put({ url: `/wms/countadjust-request-main/handle?id=` + id })
+}
diff --git a/src/api/wms/currencyexchange/index.ts b/src/api/wms/currencyexchange/index.ts
new file mode 100644
index 000000000..6e0777715
--- /dev/null
+++ b/src/api/wms/currencyexchange/index.ts
@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface CurrencyexchangeVO {
+  currency: string
+  basiccurrency: string
+  rate: number
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询货币转换列表
+export const getCurrencyexchangePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/currencyexchange/senior', data })
+  } else {
+    return await request.get({ url: `/wms/currencyexchange/page`, params })
+  }
+}
+
+// 查询货币转换详情
+export const getCurrencyexchange = async (id: number) => {
+  return await request.get({ url: `/wms/currencyexchange/get?id=` + id })
+}
+
+// 新增货币转换
+export const createCurrencyexchange = async (data: CurrencyexchangeVO) => {
+  return await request.post({ url: `/wms/currencyexchange/create`, data })
+}
+
+// 修改货币转换
+export const updateCurrencyexchange = async (data: CurrencyexchangeVO) => {
+  return await request.put({ url: `/wms/currencyexchange/update`, data })
+}
+
+// 删除货币转换
+export const deleteCurrencyexchange = async (id: number) => {
+  return await request.delete({ url: `/wms/currencyexchange/delete?id=` + id })
+}
+
+// 导出货币转换 Excel
+export const exportCurrencyexchange = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/currencyexchange/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/currencyexchange/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/currencyexchange/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/customer/index.ts b/src/api/wms/customer/index.ts
new file mode 100644
index 000000000..7cc18302d
--- /dev/null
+++ b/src/api/wms/customer/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface CustomerVO {
+  code: string
+  name: string
+  shortName: string
+  address: string
+  country: string
+  city: string
+  phone: string
+  fax: string
+  postId: string
+  contacts: string
+  bank: string
+  currency: string
+  taxRate: number
+  type: string
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询客户列表
+export const getCustomerPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/customer/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customer/page`, params })
+  }
+}
+// 查询客户列表
+export const getCustomerList = async (params) => {
+  return await request.get({ url: `/wms/customer/list`, params })
+}
+// 查询客户详情
+export const getCustomer = async (id: number) => {
+  return await request.get({ url: `/wms/customer/get?id=` + id })
+}
+
+// 新增客户
+export const createCustomer = async (data: CustomerVO) => {
+  return await request.post({ url: `/wms/customer/create`, data })
+}
+
+// 修改客户
+export const updateCustomer = async (data: CustomerVO) => {
+  return await request.put({ url: `/wms/customer/update`, data })
+}
+
+// 删除客户
+export const deleteCustomer = async (id: number) => {
+  return await request.delete({ url: `/wms/customer/delete?id=` + id })
+}
+
+// 导出客户 Excel
+export const exportCustomer = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/customer/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/customer/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customer/get-import-template' })
+}
diff --git a/src/api/wms/customerdock/index.ts b/src/api/wms/customerdock/index.ts
new file mode 100644
index 000000000..a7e631080
--- /dev/null
+++ b/src/api/wms/customerdock/index.ts
@@ -0,0 +1,86 @@
+import request from '@/config/axios'
+
+export interface CustomerdockVO {
+  code: string
+  name: string
+  description: string
+  city: string
+  address: string
+  contactPerson: string
+  contactPhone: string
+  customerCode: string
+  warehouseCode: string
+  defaultLocationCode: string
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询客户月台列表
+export const getCustomerdockPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/customerdock/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customerdock/page`, params })
+  }
+}
+
+// 查询客户月台详情
+export const getCustomerdock = async (id: number) => {
+  return await request.get({ url: `/wms/customerdock/get?id=` + id })
+}
+
+// 新增客户月台
+export const createCustomerdock = async (data: CustomerdockVO) => {
+  return await request.post({ url: `/wms/customerdock/create`, data })
+}
+
+// 修改客户月台
+export const updateCustomerdock = async (data: CustomerdockVO) => {
+  return await request.put({ url: `/wms/customerdock/update`, data })
+}
+
+// 删除客户月台
+export const deleteCustomerdock = async (id: number) => {
+  return await request.delete({ url: `/wms/customerdock/delete?id=` + id })
+}
+
+// 导出客户月台 Excel
+export const exportCustomerdock = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/customerdock/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/customerdock/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customerdock/get-import-template' })
+}
+
+// 查询客户月台发货口列表
+export const pageCustomerCodeToCustomerDock = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/customerdock/pageCustomerCodeToCustomerDockSenior', data })
+  } 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/api/wms/customeritem/index.ts b/src/api/wms/customeritem/index.ts
new file mode 100644
index 000000000..d4b636c5b
--- /dev/null
+++ b/src/api/wms/customeritem/index.ts
@@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+export interface CustomeritemVO {
+  customerCode: string
+  itemCode: string
+  customerItemCode: string
+  cusotmerUom: string
+  convertRate: number
+  packUnit: string
+  packQty: number
+  altPackUnit: string
+  altPackQty: number
+  packQtyOfContainer: number
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询客户物料列表
+export const getCustomeritemPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/customeritem/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customeritem/page`, params })
+  }
+}
+
+// 查询客户物料详情
+export const getCustomeritem = async (id: number) => {
+  return await request.get({ url: `/wms/customeritem/get?id=` + id })
+}
+
+// 新增客户物料
+export const createCustomeritem = async (data: CustomeritemVO) => {
+  return await request.post({ url: `/wms/customeritem/create`, data })
+}
+
+// 修改客户物料
+export const updateCustomeritem = async (data: CustomeritemVO) => {
+  return await request.put({ url: `/wms/customeritem/update`, data })
+}
+
+// 删除客户物料
+export const deleteCustomeritem = async (id: number) => {
+  return await request.delete({ url: `/wms/customeritem/delete?id=` + id })
+}
+
+// 导出客户物料 Excel
+export const exportCustomeritem = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/customeritem/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/customeritem/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customeritem/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/customerreceiptRecordDetail/index.ts b/src/api/wms/customerreceiptRecordDetail/index.ts
new file mode 100644
index 000000000..037bf8e28
--- /dev/null
+++ b/src/api/wms/customerreceiptRecordDetail/index.ts
@@ -0,0 +1,78 @@
+import request from '@/config/axios'
+
+export interface CustomerreceiptRecordDetailVO {
+  soNumber: string
+  soLine: string
+  fromBatch: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  fromContainerNumber: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  toOwnerCode: string
+  toContainerNumber: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  singlePrice: number
+  amount: number
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+  fromPackingNumber: string
+  toPackingNumber: string
+  toBatch: string
+}
+
+// 查询客户收货记录子列表
+export const getCustomerreceiptRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customerreceipt-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customerreceipt-record-detail/page`, params })
+  }
+}
+
+// 查询客户收货记录子详情
+export const getCustomerreceiptRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/customerreceipt-record-detail/get?id=` + id })
+}
+
+// 新增客户收货记录子
+export const createCustomerreceiptRecordDetail = async (data: CustomerreceiptRecordDetailVO) => {
+  return await request.post({ url: `/wms/customerreceipt-record-detail/create`, data })
+}
+
+// 修改客户收货记录子
+export const updateCustomerreceiptRecordDetail = async (data: CustomerreceiptRecordDetailVO) => {
+  return await request.put({ url: `/wms/customerreceipt-record-detail/update`, data })
+}
+
+// 删除客户收货记录子
+export const deleteCustomerreceiptRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/customerreceipt-record-detail/delete?id=` + id })
+}
+
+// 导出客户收货记录子 Excel
+export const exportCustomerreceiptRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/customerreceipt-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customerreceipt-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/customerreceiptRecordMain/index.ts b/src/api/wms/customerreceiptRecordMain/index.ts
new file mode 100644
index 000000000..73e8e3475
--- /dev/null
+++ b/src/api/wms/customerreceiptRecordMain/index.ts
@@ -0,0 +1,79 @@
+import request from '@/config/axios'
+
+export interface CustomerreceiptRecordMainVO {
+  requestNumber: string
+  deliverRecordNumber: string
+  deliverPlanNumber: string
+  customerCode: string
+  customerDockCode: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  available: string
+}
+
+// 查询客户收货记录主列表
+export const getCustomerreceiptRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customerreceipt-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customerreceipt-record-main/page`, params })
+  }
+}
+
+// 查询客户收货记录主详情
+export const getCustomerreceiptRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/customerreceipt-record-main/get?id=` + id })
+}
+
+// 新增客户收货记录主
+export const createCustomerreceiptRecordMain = async (data: CustomerreceiptRecordMainVO) => {
+  return await request.post({ url: `/wms/customerreceipt-record-main/create`, data })
+}
+
+// 修改客户收货记录主
+export const updateCustomerreceiptRecordMain = async (data: CustomerreceiptRecordMainVO) => {
+  return await request.put({ url: `/wms/customerreceipt-record-main/update`, data })
+}
+
+// 删除客户收货记录主
+export const deleteCustomerreceiptRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/customerreceipt-record-main/delete?id=` + id })
+}
+
+// 导出客户收货记录主 Excel
+export const exportCustomerreceiptRecordMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/customerreceipt-record-main/export-excel-senior`, data })
+  } else {
+   return await request.download({ url: `/wms/customerreceipt-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customerreceipt-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/customerreceiptRequestDetail/index.ts b/src/api/wms/customerreceiptRequestDetail/index.ts
new file mode 100644
index 000000000..f370f6242
--- /dev/null
+++ b/src/api/wms/customerreceiptRequestDetail/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface CustomerreceiptRequestDetailVO {
+  soNumber: string
+  soLine: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  fromLocationCode: string
+  toLocationCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询客户收货申请子列表
+export const getCustomerreceiptRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customerreceipt-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customerreceipt-request-detail/page`, params })
+  }
+}
+
+// 查询客户收货申请子详情
+export const getCustomerreceiptRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/customerreceipt-request-detail/get?id=` + id })
+}
+
+// 新增客户收货申请子
+export const createCustomerreceiptRequestDetail = async (data: CustomerreceiptRequestDetailVO) => {
+  return await request.post({ url: `/wms/customerreceipt-request-detail/create`, data })
+}
+
+// 修改客户收货申请子
+export const updateCustomerreceiptRequestDetail = async (data: CustomerreceiptRequestDetailVO) => {
+  return await request.put({ url: `/wms/customerreceipt-request-detail/update`, data })
+}
+
+// 删除客户收货申请子
+export const deleteCustomerreceiptRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/customerreceipt-request-detail/delete?id=` + id })
+}
+
+// 导出客户收货申请子 Excel
+export const exportCustomerreceiptRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/customerreceipt-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customerreceipt-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/customerreceiptRequestMain/index.ts b/src/api/wms/customerreceiptRequestMain/index.ts
new file mode 100644
index 000000000..a933b873c
--- /dev/null
+++ b/src/api/wms/customerreceiptRequestMain/index.ts
@@ -0,0 +1,103 @@
+import request from '@/config/axios'
+
+export interface CustomerreceiptRequestMainVO {
+  customerreceiptRequestNumber: string
+  customerreceiptPlanNumber: string
+  customerCode: string
+  customerDockCode: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询客户收货申请主列表
+export const getCustomerreceiptRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customerreceipt-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customerreceipt-request-main/page`, params })
+  }
+}
+
+// 查询客户收货申请主详情
+export const getCustomerreceiptRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/customerreceipt-request-main/get?id=` + id })
+}
+
+// 新增客户收货申请主
+export const createCustomerreceiptRequestMain = async (data: CustomerreceiptRequestMainVO) => {
+  return await request.post({ url: `/wms/customerreceipt-request-main/create`, data })
+}
+
+// 修改客户收货申请主
+export const updateCustomerreceiptRequestMain = async (data: CustomerreceiptRequestMainVO) => {
+  return await request.put({ url: `/wms/customerreceipt-request-main/update`, data })
+}
+
+// 删除客户收货申请主
+export const deleteCustomerreceiptRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/customerreceipt-request-main/delete?id=` + id })
+}
+
+// 导出客户收货申请主 Excel
+export const exportCustomerreceiptRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/customerreceipt-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/customerreceipt-request-main/export-excel`, params })
+  }
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/customerreceipt-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/customerreceipt-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/customerreceipt-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/customerreceipt-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/customerreceipt-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/customerreceipt-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/customerreturnJobDetail/index.ts b/src/api/wms/customerreturnJobDetail/index.ts
new file mode 100644
index 000000000..526c63adc
--- /dev/null
+++ b/src/api/wms/customerreturnJobDetail/index.ts
@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface CustomerreturnJobDetailVO {
+  soNumber: string
+  soLine: string
+  packingNumber: string
+  batch: string
+  inventoryStatus: string
+  ownerCode: string
+  containerNumber: string
+  fromLocationCode: string
+  toLocationCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createtime: Date
+  creator: string
+}
+
+// 查询客户退货任务子列表
+export const getCustomerreturnJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customerreturn-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customerreturn-job-detail/page`, params })
+  }
+}
+
+// 查询客户退货任务子详情
+export const getCustomerreturnJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/customerreturn-job-detail/get?id=` + id })
+}
+
+// 新增客户退货任务子
+export const createCustomerreturnJobDetail = async (data: CustomerreturnJobDetailVO) => {
+  return await request.post({ url: `/wms/customerreturn-job-detail/create`, data })
+}
+
+// 修改客户退货任务子
+export const updateCustomerreturnJobDetail = async (data: CustomerreturnJobDetailVO) => {
+  return await request.put({ url: `/wms/customerreturn-job-detail/update`, data })
+}
+
+// 删除客户退货任务子
+export const deleteCustomerreturnJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/customerreturn-job-detail/delete?id=` + id })
+}
+
+// 导出客户退货任务子 Excel
+export const exportCustomerreturnJobDetail = async (params) => {
+  return await request.download({ url: `/wms/customerreturn-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customerreturn-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/customerreturnJobMain/index.ts b/src/api/wms/customerreturnJobMain/index.ts
new file mode 100644
index 000000000..cc2ca4f54
--- /dev/null
+++ b/src/api/wms/customerreturnJobMain/index.ts
@@ -0,0 +1,115 @@
+import request from '@/config/axios'
+
+export interface CustomerreturnJobMainVO {
+  requestNumber: string
+  deliverRecordNumber: string
+  deliverPlanNumber: string
+  customerCode: string
+  customerDockCode: string
+  receiptDock: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  toDockCode: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询客户退货任务主列表
+export const getCustomerreturnJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customerreturn-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customerreturn-job-main/page`, params })
+  }
+}
+
+// 查询客户退货任务主详情
+export const getCustomerreturnJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/customerreturn-job-main/get?id=` + id })
+}
+
+// 新增客户退货任务主
+export const createCustomerreturnJobMain = async (data: CustomerreturnJobMainVO) => {
+  return await request.post({ url: `/wms/customerreturn-job-main/create`, data })
+}
+
+// 修改客户退货任务主
+export const updateCustomerreturnJobMain = async (data: CustomerreturnJobMainVO) => {
+  return await request.put({ url: `/wms/customerreturn-job-main/update`, data })
+}
+
+// 删除客户退货任务主
+export const deleteCustomerreturnJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/customerreturn-job-main/delete?id=` + id })
+}
+
+// 导出客户退货任务主 Excel
+export const exportCustomerreturnJobMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/customerreturn-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/customerreturn-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customerreturn-job-main/get-import-template' })
+}
+
+// 承接客户退货任务主 Excel
+export const acceptCustomerreturnJobMain = async (id) => {
+  return await request.put({ url: `/wms/customerreturn-job-main/accept?id=` + id })
+}
+
+// 取消承接客户退货任务主 Excel
+export const abandonCustomerreturnJobMain = async (id) => {
+  return await request.put({ url: `/wms/customerreturn-job-main/abandon?id=` + id })
+}
+
+// 关闭客户退货任务主 Excel
+export const closeCustomerreturnJobMain = async (id) => {
+  return await request.put({ url: `/wms/customerreturn-job-main/close?id=` + id })
+}
+
+// 执行客户退货任务主
+export const executeCustomerreturnJobMain = async (data: CustomerreturnJobMainVO) => {
+  return await request.put({ url: `/wms/customerreturn-job-main/execute`, data })
+}
\ No newline at end of file
diff --git a/src/api/wms/customerreturnRecordDetail/index.ts b/src/api/wms/customerreturnRecordDetail/index.ts
new file mode 100644
index 000000000..e139bd670
--- /dev/null
+++ b/src/api/wms/customerreturnRecordDetail/index.ts
@@ -0,0 +1,78 @@
+import request from '@/config/axios'
+
+export interface CustomerreturnRecordDetailVO {
+  soNumber: string
+  soLine: string
+  fromBatch: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  fromContainerNumber: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  toOwnerCode: string
+  toContainerNumber: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  singlePrice: number
+  amount: number
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+  fromPackingNumber: string
+  toPackingNumber: string
+  toBatch: string
+}
+
+// 查询客户退货记录子列表
+export const getCustomerreturnRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customerreturn-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customerreturn-record-detail/page`, params })
+  }
+}
+
+// 查询客户退货记录子详情
+export const getCustomerreturnRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/customerreturn-record-detail/get?id=` + id })
+}
+
+// 新增客户退货记录子
+export const createCustomerreturnRecordDetail = async (data: CustomerreturnRecordDetailVO) => {
+  return await request.post({ url: `/wms/customerreturn-record-detail/create`, data })
+}
+
+// 修改客户退货记录子
+export const updateCustomerreturnRecordDetail = async (data: CustomerreturnRecordDetailVO) => {
+  return await request.put({ url: `/wms/customerreturn-record-detail/update`, data })
+}
+
+// 删除客户退货记录子
+export const deleteCustomerreturnRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/customerreturn-record-detail/delete?id=` + id })
+}
+
+// 导出客户退货记录子 Excel
+export const exportCustomerreturnRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/customerreturn-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customerreturn-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/customerreturnRecordMain/index.ts b/src/api/wms/customerreturnRecordMain/index.ts
new file mode 100644
index 000000000..7dc032395
--- /dev/null
+++ b/src/api/wms/customerreturnRecordMain/index.ts
@@ -0,0 +1,81 @@
+import request from '@/config/axios'
+
+export interface CustomerreturnRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  deliverRecordNumber: string
+  deliverPlanNumber: string
+  customerCode: string
+  customerDockCode: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creatorId: string
+  code: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  toAreaCodes: string
+  toDockCode: string
+  available: string
+  fromAreaCodes: string
+}
+
+// 查询客户退货记录主列表
+export const getCustomerreturnRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customerreturn-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customerreturn-record-main/page`, params })
+  }
+}
+
+// 查询客户退货记录主详情
+export const getCustomerreturnRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/customerreturn-record-main/get?id=` + id })
+}
+
+// 新增客户退货记录主
+export const createCustomerreturnRecordMain = async (data: CustomerreturnRecordMainVO) => {
+  return await request.post({ url: `/wms/customerreturn-record-main/create`, data })
+}
+
+// 修改客户退货记录主
+export const updateCustomerreturnRecordMain = async (data: CustomerreturnRecordMainVO) => {
+  return await request.put({ url: `/wms/customerreturn-record-main/update`, data })
+}
+
+// 删除客户退货记录主
+export const deleteCustomerreturnRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/customerreturn-record-main/delete?id=` + id })
+}
+
+// 导出客户退货记录主 Excel
+export const exportCustomerreturnRecordMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/customerreturn-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/customerreturn-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customerreturn-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/customerreturnRequestDetail/index.ts b/src/api/wms/customerreturnRequestDetail/index.ts
new file mode 100644
index 000000000..28f2b0292
--- /dev/null
+++ b/src/api/wms/customerreturnRequestDetail/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface CustomerreturnRequestDetailVO {
+  soNumber: string
+  soLine: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  fromLocationCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  toOwnerCode: string
+}
+
+// 查询客户退货申请子列表
+export const getCustomerreturnRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customerreturn-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customerreturn-request-detail/page`, params })
+  }
+}
+
+// 查询客户退货申请子详情
+export const getCustomerreturnRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/customerreturn-request-detail/get?id=` + id })
+}
+
+// 新增客户退货申请子
+export const createCustomerreturnRequestDetail = async (data: CustomerreturnRequestDetailVO) => {
+  return await request.post({ url: `/wms/customerreturn-request-detail/create`, data })
+}
+
+// 修改客户退货申请子
+export const updateCustomerreturnRequestDetail = async (data: CustomerreturnRequestDetailVO) => {
+  return await request.put({ url: `/wms/customerreturn-request-detail/update`, data })
+}
+
+// 删除客户退货申请子
+export const deleteCustomerreturnRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/customerreturn-request-detail/delete?id=` + id })
+}
+
+// 导出客户退货申请子 Excel
+export const exportCustomerreturnRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/customerreturn-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customerreturn-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/customerreturnRequestMain/index.ts b/src/api/wms/customerreturnRequestMain/index.ts
new file mode 100644
index 000000000..35a99a1fc
--- /dev/null
+++ b/src/api/wms/customerreturnRequestMain/index.ts
@@ -0,0 +1,120 @@
+import request from '@/config/axios'
+
+export interface CustomerreturnRequestMainVO {
+  requestNumber: string
+  deliverRecordNumber: string
+  deliverPlanNumber: string
+  customerCode: string
+  customerDockCode: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  toDockCode: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询客户退货申请主列表
+export const getCustomerreturnRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customerreturn-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customerreturn-request-main/page`, params })
+  }
+}
+
+// 查询客户退货申请主详情
+export const getCustomerreturnRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/customerreturn-request-main/get?id=` + id })
+}
+
+// 新增客户退货申请主
+export const createCustomerreturnRequestMain = async (data: CustomerreturnRequestMainVO) => {
+  return await request.post({ url: `/wms/customerreturn-request-main/create`, data })
+}
+
+// 修改客户退货申请主
+export const updateCustomerreturnRequestMain = async (data: CustomerreturnRequestMainVO) => {
+  return await request.put({ url: `/wms/customerreturn-request-main/update`, data })
+}
+
+// 删除客户退货申请主
+export const deleteCustomerreturnRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/customerreturn-request-main/delete?id=` + id })
+}
+
+// 导出客户退货申请主 Excel
+export const exportCustomerreturnRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/customerreturn-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/customerreturn-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customerreturn-request-main/get-import-template' })
+}
+
+// 关闭客户退货申请主 Excel
+export const close = async (id) => {
+  return await request.put({ url: `/wms/customerreturn-request-main/close?id=` + id })
+}
+
+// 重新添加客户退货申请主 Excel
+export const reAdd = async (id) => {
+  return await request.put({ url: `/wms/customerreturn-request-main/reAdd?id=` + id })
+}
+
+// 提交客户退货申请主 Excel
+export const submit = async (id) => {
+  return await request.put({ url: `/wms/customerreturn-request-main/submit?id=` + id })
+}
+
+// 审批通过客户退货申请主 Excel
+export const agree = async (id) => {
+  return await request.put({ url: `/wms/customerreturn-request-main/agree?id=` + id })
+}
+
+// 审批驳回客户退货申请主 Excel
+export const refused = async (id) => {
+  return await request.put({ url: `/wms/customerreturn-request-main/refused?id=` + id })
+}
+
+// 处理驳回客户退货申请主 Excel
+export const handle = async (id) => {
+  return await request.put({ url: `/wms/customerreturn-request-main/handle?id=` + id })
+}
+
+export const pageItemCodeToBalance = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customerreturn-request-main/pageItemCodeToBalanceSenior', data })
+  } else {
+    return request.get({ url: `/wms/customerreturn-request-main/pageItemCodeToBalance`, params })
+  }
+}
\ No newline at end of file
diff --git a/src/api/wms/customersettleRecordDetail/index.ts b/src/api/wms/customersettleRecordDetail/index.ts
new file mode 100644
index 000000000..3932fed41
--- /dev/null
+++ b/src/api/wms/customersettleRecordDetail/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface CustomersettleRecordDetailVO {
+  soNumber: string
+  soLine: string
+  ownerCode: string
+  packingNumber: string
+  batch: string
+  inventoryStatus: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  singlePrice: number
+  amount: number
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  interfaceType: string
+  code: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  siteId: string
+  jobDetailId: string
+}
+
+// 查询客户结算记录子列表
+export const getCustomersettleRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customersettle-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customersettle-record-detail/page`, params })
+  }
+}
+
+// 查询客户结算记录子详情
+export const getCustomersettleRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/customersettle-record-detail/get?id=` + id })
+}
+
+// 新增客户结算记录子
+export const createCustomersettleRecordDetail = async (data: CustomersettleRecordDetailVO) => {
+  return await request.post({ url: `/wms/customersettle-record-detail/create`, data })
+}
+
+// 修改客户结算记录子
+export const updateCustomersettleRecordDetail = async (data: CustomersettleRecordDetailVO) => {
+  return await request.put({ url: `/wms/customersettle-record-detail/update`, data })
+}
+
+// 删除客户结算记录子
+export const deleteCustomersettleRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/customersettle-record-detail/delete?id=` + id })
+}
+
+// 导出客户结算记录子 Excel
+export const exportCustomersettleRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/customersettle-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customersettle-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/customersettleRecordMain/index.ts b/src/api/wms/customersettleRecordMain/index.ts
new file mode 100644
index 000000000..daaa33fce
--- /dev/null
+++ b/src/api/wms/customersettleRecordMain/index.ts
@@ -0,0 +1,73 @@
+import request from '@/config/axios'
+
+export interface CustomersettleRecordMainVO {
+  requestNumber: string
+  deliverRecordNumber: string
+  deliverPlanNumber: string
+  customerCode: string
+  outTransactionType: string
+  inTransactionYpe: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  code: string
+  number: string
+  businessType: string
+  createTime: Date
+  creator: string
+  remark: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  available: string
+}
+
+// 查询客户结算记录主列表
+export const getCustomersettleRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customersettle-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customersettle-record-main/page`, params })
+  }
+}
+
+// 查询客户结算记录主详情
+export const getCustomersettleRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/customersettle-record-main/get?id=` + id })
+}
+
+// 新增客户结算记录主
+export const createCustomersettleRecordMain = async (data: CustomersettleRecordMainVO) => {
+  return await request.post({ url: `/wms/customersettle-record-main/create`, data })
+}
+
+// 修改客户结算记录主
+export const updateCustomersettleRecordMain = async (data: CustomersettleRecordMainVO) => {
+  return await request.put({ url: `/wms/customersettle-record-main/update`, data })
+}
+
+// 删除客户结算记录主
+export const deleteCustomersettleRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/customersettle-record-main/delete?id=` + id })
+}
+
+// 导出客户结算记录主 Excel
+export const exportCustomersettleRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customersettle-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/customersettle-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customersettle-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/customersettleRequestDetail/index.ts b/src/api/wms/customersettleRequestDetail/index.ts
new file mode 100644
index 000000000..9877bd9b8
--- /dev/null
+++ b/src/api/wms/customersettleRequestDetail/index.ts
@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface CustomersettleRequestDetailVO {
+  soNumber: string
+  soLine: string
+  fromOwnerCode: string
+  packingNumber: string
+  batch: string
+  inventoryStatus: string
+  fromLocationCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+}
+
+// 查询客户结算申请子列表
+export const getCustomersettleRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customersettle-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customersettle-request-detail/page`, params })
+  }
+}
+
+// 查询客户结算申请子详情
+export const getCustomersettleRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/customersettle-request-detail/get?id=` + id })
+}
+
+// 新增客户结算申请子
+export const createCustomersettleRequestDetail = async (data: CustomersettleRequestDetailVO) => {
+  return await request.post({ url: `/wms/customersettle-request-detail/create`, data })
+}
+
+// 修改客户结算申请子
+export const updateCustomersettleRequestDetail = async (data: CustomersettleRequestDetailVO) => {
+  return await request.put({ url: `/wms/customersettle-request-detail/update`, data })
+}
+
+// 删除客户结算申请子
+export const deleteCustomersettleRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/customersettle-request-detail/delete?id=` + id })
+}
+
+// 导出客户结算申请子 Excel
+export const exportCustomersettleRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/customersettle-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customersettle-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/customersettleRequestMain/index.ts b/src/api/wms/customersettleRequestMain/index.ts
new file mode 100644
index 000000000..a291458e3
--- /dev/null
+++ b/src/api/wms/customersettleRequestMain/index.ts
@@ -0,0 +1,102 @@
+import request from '@/config/axios'
+
+export interface CustomersettleRequestMainVO {
+  deliverRecordNumber: string
+  deliverPlanNumber: string
+  customerCode: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询客户结算申请主列表
+export const getCustomersettleRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customersettle-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customersettle-request-main/page`, params })
+  }
+}
+
+// 查询客户结算申请主详情
+export const getCustomersettleRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/customersettle-request-main/get?id=` + id })
+}
+
+// 新增客户结算申请主
+export const createCustomersettleRequestMain = async (data: CustomersettleRequestMainVO) => {
+  return await request.post({ url: `/wms/customersettle-request-main/create`, data })
+}
+
+// 修改客户结算申请主
+export const updateCustomersettleRequestMain = async (data: CustomersettleRequestMainVO) => {
+  return await request.put({ url: `/wms/customersettle-request-main/update`, data })
+}
+
+// 删除客户结算申请主
+export const deleteCustomersettleRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/customersettle-request-main/delete?id=` + id })
+}
+
+// 导出客户结算申请主 Excel
+export const exportCustomersettleRequestMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/customersettle-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/customersettle-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/customersettle-request-main/get-import-template' })
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/customersettle-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/customersettle-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/customersettle-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/customersettle-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/customersettle-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/customersettle-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/deliverJobDetail/index.ts b/src/api/wms/deliverJobDetail/index.ts
new file mode 100644
index 000000000..9e54e572f
--- /dev/null
+++ b/src/api/wms/deliverJobDetail/index.ts
@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface DeliverJobDetailVO {
+  soNumber: string
+  soLine: string
+  packingNumber: string
+  batch: string
+  inventoryStatus: string
+  ownerCode: string
+  containerNumber: string
+  fromLocationCode: string
+  toLocationCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+}
+
+// 查询发货任务子列表
+export const getDeliverJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/deliver-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/deliver-job-detail/page`, params })
+  }
+}
+
+// 查询发货任务子详情
+export const getDeliverJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/deliver-job-detail/get?id=` + id })
+}
+
+// 新增发货任务子
+export const createDeliverJobDetail = async (data: DeliverJobDetailVO) => {
+  return await request.post({ url: `/wms/deliver-job-detail/create`, data })
+}
+
+// 修改发货任务子
+export const updateDeliverJobDetail = async (data: DeliverJobDetailVO) => {
+  return await request.put({ url: `/wms/deliver-job-detail/update`, data })
+}
+
+// 删除发货任务子
+export const deleteDeliverJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/deliver-job-detail/delete?id=` + id })
+}
+
+// 导出发货任务子 Excel
+export const exportDeliverJobDetail = async (params) => {
+  return await request.download({ url: `/wms/deliver-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/deliver-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/deliverJobMain/index.ts b/src/api/wms/deliverJobMain/index.ts
new file mode 100644
index 000000000..5be903729
--- /dev/null
+++ b/src/api/wms/deliverJobMain/index.ts
@@ -0,0 +1,115 @@
+import request from '@/config/axios'
+
+export interface DeliverJobMainVO {
+  requestNumber: string
+  deliverPlanNumber: string
+  customerDeliverNumber: string
+  customerCode: string
+  customerDockCode: string
+  deliverDock: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityincrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  ruleUserId: number
+  fromAreaCodes: string
+  toAreaCodes: string
+  fromDockCode: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询发货任务主列表
+export const getDeliverJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/deliver-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/deliver-job-main/page`, params })
+  }
+}
+
+// 查询发货任务主详情
+export const getDeliverJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/deliver-job-main/get?id=` + id })
+}
+
+// 新增发货任务主
+export const createDeliverJobMain = async (data: DeliverJobMainVO) => {
+  return await request.post({ url: `/wms/deliver-job-main/create`, data })
+}
+
+// 修改发货任务主
+export const updateDeliverJobMain = async (data: DeliverJobMainVO) => {
+  return await request.put({ url: `/wms/deliver-job-main/update`, data })
+}
+
+// 删除发货任务主
+export const deleteDeliverJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/deliver-job-main/delete?id=` + id })
+}
+
+// 导出发货任务主 Excel
+export const exportDeliverJobMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/deliver-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/deliver-job-main/export-excel`, params })  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/deliver-job-main/get-import-template' })
+}
+
+// 承接发货任务 Excel
+export const acceptDeliverJobMain = async (id) => {
+  return await request.put({ url: `/wms/deliver-job-main/accept?id=` + id })
+}
+
+// 取消承接发货任务 Excel
+export const abandonDeliverJobMain = async (id) => {
+  return await request.put({ url: `/wms/deliver-job-main/abandon?id=` + id })
+}
+
+// 关闭发货任务主 Excel
+export const closeDeliverJobMain = async (id) => {
+  return await request.put({ url: `/wms/deliver-job-main/close?id=` + id })
+}
+
+// 执行发货任务主
+export const executeDeliverJobMain = async (data: DeliverJobMainVO) => {
+  return await request.put({ url: `/wms/deliver-job-main/execute`, data })
+}
\ No newline at end of file
diff --git a/src/api/wms/deliverPlanDetail/index.ts b/src/api/wms/deliverPlanDetail/index.ts
new file mode 100644
index 000000000..33aeffdb9
--- /dev/null
+++ b/src/api/wms/deliverPlanDetail/index.ts
@@ -0,0 +1,53 @@
+import request from '@/config/axios'
+
+export interface DeliverPlanDetailVO {
+  soNumber: string
+  soLine: string
+  customerDockCode: string
+  project: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  planQty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  available: string
+}
+
+// 查询发货计划子列表
+export const selectDetailByMasterID = async (id: number) => {
+  return await request.get({ url: `/wms/deliver-plan-detail/detailList?id=` + id })
+}
+
+// 查询发货计划子列表
+export const getDeliverPlanDetailPage = async (params) => {
+  return await request.get({ url: `/wms/deliver-plan-detail/page`, params })
+}
+
+// 查询发货计划子详情
+export const getDeliverPlanDetail = async (id: number) => {
+  return await request.get({ url: `/wms/deliver-plan-detail/get?id=` + id })
+}
+
+// 新增发货计划子
+export const createDeliverPlanDetail = async (data: DeliverPlanDetailVO) => {
+  return await request.post({ url: `/wms/deliver-plan-detail/create`, data })
+}
+
+// 修改发货计划子
+export const updateDeliverPlanDetail = async (data: DeliverPlanDetailVO) => {
+  return await request.put({ url: `/wms/deliver-plan-detail/update`, data })
+}
+
+// 删除发货计划子
+export const deleteDeliverPlanDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/deliver-plan-detail/delete?id=` + id })
+}
+
+// 导出发货计划子 Excel
+export const exportDeliverPlanDetail = async (params) => {
+  return await request.download({ url: `/wms/deliver-plan-detail/export-excel`, params })
+}
diff --git a/src/api/wms/deliverPlanMain/index.ts b/src/api/wms/deliverPlanMain/index.ts
new file mode 100644
index 000000000..46277041e
--- /dev/null
+++ b/src/api/wms/deliverPlanMain/index.ts
@@ -0,0 +1,99 @@
+import request from '@/config/axios'
+
+export interface DeliverPlanMainVO {
+  customerCode: string
+  planDate: Date
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  beginTime: Date
+  endTime: Date
+  status: string
+  updateTime: Date
+  updater: string
+  available: string
+}
+
+// 查询发货计划主列表
+export const getDeliverPlanMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/deliver-plan-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/deliver-plan-main/page`, params })
+  }
+}
+
+// 查询发货计划主详情
+export const getDeliverPlanMain = async (id: number) => {
+  return await request.get({ url: `/wms/deliver-plan-main/get?id=` + id })
+}
+
+// 新增发货计划主
+export const createDeliverPlanMain = async (data: DeliverPlanMainVO) => {
+  return await request.post({ url: `/wms/deliver-plan-main/create`, data })
+}
+
+// 修改发货计划主
+export const updateDeliverPlanMain = async (data: DeliverPlanMainVO) => {
+  return await request.put({ url: `/wms/deliver-plan-main/update`, data })
+}
+
+// 删除发货计划主
+export const deleteDeliverPlanMain = async (id: number) => {
+  return await request.delete({ url: `/wms/deliver-plan-main/delete?id=` + id })
+}
+
+// 导出发货计划主 Excel
+export const exportDeliverPlanMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/deliver-plan-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/deliver-plan-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/deliver-plan-main/get-import-template' })
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/deliver-plan-main/close?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/deliver-plan-main/submit?id=' + id })
+}
+
+// 打开
+export const open = (id) => {
+  return request.put({ url: '/wms/deliver-plan-main/open?id=' + id })
+}
+
+// 驳回
+export const reject = (id) => {
+  return request.put({ url: '/wms/deliver-plan-main/reject?id=' + id })
+}
+
+// 通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/deliver-plan-main/agree?id=' + id })
+}
+
+// 发布
+export const publish = (id) => {
+  return request.put({ url: '/wms/deliver-plan-main/publish?id=' + id })
+}
+
+// 重置
+export const resetting = (id) => {
+  return request.put({ url: '/wms/deliver-plan-main/resetting?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/deliverRecordDetail/index.ts b/src/api/wms/deliverRecordDetail/index.ts
new file mode 100644
index 000000000..2c6eaa2c1
--- /dev/null
+++ b/src/api/wms/deliverRecordDetail/index.ts
@@ -0,0 +1,76 @@
+import request from '@/config/axios'
+
+export interface DeliverRecordDetailVO {
+  soNumber: string
+  soLine: string
+  packingNumber: string
+  batch: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  fromContainerNumber: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  toOwnerCode: string
+  toContainerNumber: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  singlePrice: number
+  amount: number
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+}
+
+// 查询发货记录子列表
+export const getDeliverRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/deliver-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/deliver-record-detail/page`, params })
+  }
+}
+
+// 查询发货记录子详情
+export const getDeliverRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/deliver-record-detail/get?id=` + id })
+}
+
+// 新增发货记录子
+export const createDeliverRecordDetail = async (data: DeliverRecordDetailVO) => {
+  return await request.post({ url: `/wms/deliver-record-detail/create`, data })
+}
+
+// 修改发货记录子
+export const updateDeliverRecordDetail = async (data: DeliverRecordDetailVO) => {
+  return await request.put({ url: `/wms/deliver-record-detail/update`, data })
+}
+
+// 删除发货记录子
+export const deleteDeliverRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/deliver-record-detail/delete?id=` + id })
+}
+
+// 导出发货记录子 Excel
+export const exportDeliverRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/deliver-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/deliver-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/deliverRecordMain/index.ts b/src/api/wms/deliverRecordMain/index.ts
new file mode 100644
index 000000000..405efa539
--- /dev/null
+++ b/src/api/wms/deliverRecordMain/index.ts
@@ -0,0 +1,82 @@
+import request from '@/config/axios'
+
+export interface DeliverRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  deliverPlanNumber: string
+  customerDeliverNumber: string
+  customerCode: string
+  customerDockCode: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toAreaTypes: string
+  toAreaCodes: string
+  fromDockCode: string
+  available: string
+}
+
+// 查询发货记录主列表
+export const getDeliverRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/deliver-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/deliver-record-main/page`, params })
+  }
+}
+
+// 查询发货记录主详情
+export const getDeliverRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/deliver-record-main/get?id=` + id })
+}
+
+// 新增发货记录主
+export const createDeliverRecordMain = async (data: DeliverRecordMainVO) => {
+  return await request.post({ url: `/wms/deliver-record-main/create`, data })
+}
+
+// 修改发货记录主
+export const updateDeliverRecordMain = async (data: DeliverRecordMainVO) => {
+  return await request.put({ url: `/wms/deliver-record-main/update`, data })
+}
+
+// 删除发货记录主
+export const deleteDeliverRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/deliver-record-main/delete?id=` + id })
+}
+
+// 导出发货记录主 Excel
+export const exportDeliverRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/deliver-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/deliver-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/deliver-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/deliverRequestDetail/index.ts b/src/api/wms/deliverRequestDetail/index.ts
new file mode 100644
index 000000000..2022edee6
--- /dev/null
+++ b/src/api/wms/deliverRequestDetail/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface DeliverRequestDetailVO {
+  soNumber: string
+  soLine: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  toOwnerCode: string
+  toLocationCode: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  itemCode: string
+  fromOwnerCode: string
+}
+
+// 查询发货申请子列表
+export const getDeliverRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/deliver-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/deliver-request-detail/page`, params })
+  }
+}
+
+// 查询发货申请子详情
+export const getDeliverRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/deliver-request-detail/get?id=` + id })
+}
+
+// 新增发货申请子
+export const createDeliverRequestDetail = async (data: DeliverRequestDetailVO) => {
+  return await request.post({ url: `/wms/deliver-request-detail/create`, data })
+}
+
+// 修改发货申请子
+export const updateDeliverRequestDetail = async (data: DeliverRequestDetailVO) => {
+  return await request.put({ url: `/wms/deliver-request-detail/update`, data })
+}
+
+// 删除发货申请子
+export const deleteDeliverRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/deliver-request-detail/delete?id=` + id })
+}
+
+// 导出发货申请子 Excel
+export const exportDeliverRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/deliver-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/deliver-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/deliverRequestMain/index.ts b/src/api/wms/deliverRequestMain/index.ts
new file mode 100644
index 000000000..03f544ed9
--- /dev/null
+++ b/src/api/wms/deliverRequestMain/index.ts
@@ -0,0 +1,109 @@
+import request from '@/config/axios'
+
+export interface DeliverRequestMainVO {
+  deliverPlanNumber: string
+  customerDeliverNumber: string
+  customerCode: string
+  customerDockCode: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  toAreaTypes: string
+  toAreaCodes: string
+  fromDockCode: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询发货申请主列表
+export const getDeliverRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/deliver-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/deliver-request-main/page`, params })
+  }
+}
+
+// 查询发货申请主详情
+export const getDeliverRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/deliver-request-main/get?id=` + id })
+}
+
+// 新增发货申请主
+export const createDeliverRequestMain = async (data: DeliverRequestMainVO) => {
+  return await request.post({ url: `/wms/deliver-request-main/create`, data })
+}
+
+// 修改发货申请主
+export const updateDeliverRequestMain = async (data: DeliverRequestMainVO) => {
+  return await request.put({ url: `/wms/deliver-request-main/update`, data })
+}
+
+// 删除发货申请主
+export const deleteDeliverRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/deliver-request-main/delete?id=` + id })
+}
+
+// 导出发货申请主 Excel
+export const exportDeliverRequestMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/deliver-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/deliver-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/deliver-request-main/get-import-template' })
+}
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/deliver-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/deliver-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/deliver-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/deliver-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/deliver-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/deliver-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
new file mode 100644
index 000000000..bfed743f0
--- /dev/null
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -0,0 +1,46 @@
+import request from '@/config/axios'
+
+export interface DemandforecastingDetailVO {
+  predictTimeType: string
+  predictTime: Date
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  planQty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  available: string
+}
+
+// 查询要货预测子列表
+export const getDemandforecastingDetailPage = async (params) => {
+  return await request.get({ url: `/wms/demandforecasting-detail/page`, params })
+}
+
+// 查询要货预测子详情
+export const getDemandforecastingDetail = async (id: number) => {
+  return await request.get({ url: `/wms/demandforecasting-detail/get?id=` + id })
+}
+
+// 新增要货预测子
+export const createDemandforecastingDetail = async (data: DemandforecastingDetailVO) => {
+  return await request.post({ url: `/wms/demandforecasting-detail/create`, data })
+}
+
+// 修改要货预测子
+export const updateDemandforecastingDetail = async (data: DemandforecastingDetailVO) => {
+  return await request.put({ url: `/wms/demandforecasting-detail/update`, data })
+}
+
+// 删除要货预测子
+export const deleteDemandforecastingDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/demandforecasting-detail/delete?id=` + id })
+}
+
+// 导出要货预测子 Excel
+export const exportDemandforecastingDetail = async (params) => {
+  return await request.download({ url: `/wms/demandforecasting-detail/export-excel`, params })
+}
diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts
new file mode 100644
index 000000000..38b2e1f9e
--- /dev/null
+++ b/src/api/wms/demandforecastingMain/index.ts
@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface DemandforecastingMainVO {
+  supplierCode: string
+  version: string
+  publishTime: Date
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  beginTime: Date
+  endTime: Date
+  status: string
+  updateTime: Date
+  updater: string
+  available: string
+}
+
+// 查询要货预测主列表
+export const getDemandforecastingMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/demandforecasting-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/demandforecasting-main/page`, params })
+  }
+}
+
+// 查询要货预测主详情
+export const getDemandforecastingMain = async (id: number) => {
+  return await request.get({ url: `/wms/demandforecasting-main/get?id=` + id })
+}
+
+// 新增要货预测主
+export const createDemandforecastingMain = async (data: DemandforecastingMainVO) => {
+  return await request.post({ url: `/wms/demandforecasting-main/create`, data })
+}
+
+// 修改要货预测主
+export const updateDemandforecastingMain = async (data: DemandforecastingMainVO) => {
+  return await request.put({ url: `/wms/demandforecasting-main/update`, data })
+}
+
+// 删除要货预测主
+export const deleteDemandforecastingMain = async (id: number) => {
+  return await request.delete({ url: `/wms/demandforecasting-main/delete?id=` + id })
+}
+
+// 导出要货预测主 Excel
+export const exportDemandforecastingMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/demandforecasting-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/demandforecasting-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/demandforecasting-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/detail/index.ts b/src/api/wms/detail/index.ts
new file mode 100644
index 000000000..9bf57f699
--- /dev/null
+++ b/src/api/wms/detail/index.ts
@@ -0,0 +1,35 @@
+import request from '@/config/axios'
+
+
+// 查询备注列表
+export const getRemarkPage = async (params) => {
+  return await request.get({ url: `/infra/remark/list`, params })
+}
+
+// // 查询库区详情
+// export const getArea = async (id: number) => {
+//   return await request.get({ url: `/wms/areabasic/get?id=` + id })
+// }
+
+// 新增备注
+export const createRemark= async (data) => {
+  return await request.post({ url: `/infra/remark/create`, data })
+}
+// 查询变更记录列表
+export const getChangeRecordPage = async (params) => {
+  return await request.get({ url: `/infra/trends/list`, params })
+}
+// // 修改库区
+// export const updateArea = async (data: AreaVO) => {
+//   return await request.put({ url: `/wms/areabasic/update`, data })
+// }
+
+// // 删除库区
+// export const deleteArea = async (id: number) => {
+//   return await request.delete({ url: `/wms/areabasic/delete?id=` + id })
+// }
+
+// // 导出库区 Excel
+// export const exportArea = async (params) => {
+//   return await request.download({ url: `/wms/areabasic/export-excel`, params })
+// }
diff --git a/src/api/wms/dismantleRecordDetailb/index.ts b/src/api/wms/dismantleRecordDetailb/index.ts
new file mode 100644
index 000000000..e1aaa043d
--- /dev/null
+++ b/src/api/wms/dismantleRecordDetailb/index.ts
@@ -0,0 +1,66 @@
+import request from '@/config/axios'
+
+export interface DismantleRecordDetailbVO {
+  processCode: string
+  bomVersion: string
+  batch: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  inventoryStatus: string
+  packingNumber: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+}
+
+// 查询制品拆解记录子列表
+export const getDismantleRecordDetailbPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/dismantle-record-detailb/senior', data })
+  } else {
+    return await request.get({ url: `/wms/dismantle-record-detailb/page`, params })
+  }
+}
+
+// 查询制品拆解记录子详情
+export const getDismantleRecordDetailb = async (id: number) => {
+  return await request.get({ url: `/wms/dismantle-record-detailb/get?id=` + id })
+}
+
+// 新增制品拆解记录子
+export const createDismantleRecordDetailb = async (data: DismantleRecordDetailbVO) => {
+  return await request.post({ url: `/wms/dismantle-record-detailb/create`, data })
+}
+
+// 修改制品拆解记录子
+export const updateDismantleRecordDetailb = async (data: DismantleRecordDetailbVO) => {
+  return await request.put({ url: `/wms/dismantle-record-detailb/update`, data })
+}
+
+// 删除制品拆解记录子
+export const deleteDismantleRecordDetailb = async (id: number) => {
+  return await request.delete({ url: `/wms/dismantle-record-detailb/delete?id=` + id })
+}
+
+// 导出制品拆解记录子 Excel
+export const exportDismantleRecordDetailb = async (params) => {
+  return await request.download({ url: `/wms/dismantle-record-detailb/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/dismantle-record-detailb/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/dismantleRequestDetailb/index.ts b/src/api/wms/dismantleRequestDetailb/index.ts
new file mode 100644
index 000000000..4603fb305
--- /dev/null
+++ b/src/api/wms/dismantleRequestDetailb/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface DismantleRequestDetailbVO {
+  processCode: string
+  bomVersion: string
+  itemCode: string
+  number: string
+  remark: string
+  createTime: Date
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  creator: string
+  siteId: string
+}
+
+// 查询制品拆解申请子列表
+export const getDismantleRequestDetailbPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/dismantle-request-detailb/senior', data })
+  } else {
+    return await request.get({ url: `/wms/dismantle-request-detailb/page`, params })
+  }
+}
+
+// 查询制品拆解申请子详情
+export const getDismantleRequestDetailb = async (id: number) => {
+  return await request.get({ url: `/wms/dismantle-request-detailb/get?id=` + id })
+}
+
+// 新增制品拆解申请子
+export const createDismantleRequestDetailb = async (data: DismantleRequestDetailbVO) => {
+  return await request.post({ url: `/wms/dismantle-request-detailb/create`, data })
+}
+
+// 修改制品拆解申请子
+export const updateDismantleRequestDetailb = async (id, data) => {
+  return await request.post({ url: `/wms/dismantle-request-detailb/update?id=`+id, data })
+}
+
+// 删除制品拆解申请子
+export const deleteDismantleRequestDetailb = async (id: number) => {
+  return await request.delete({ url: `/wms/dismantle-request-detailb/delete?id=` + id })
+}
+
+// 导出制品拆解申请子 Excel
+export const exportDismantleRequestDetailb = async (params) => {
+  return await request.download({ url: `/wms/dismantle-request-detailb/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/dismantle-request-detailb/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/dock/index.ts b/src/api/wms/dock/index.ts
new file mode 100644
index 000000000..ece07e8e2
--- /dev/null
+++ b/src/api/wms/dock/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface DockVO {
+  code: string
+  name: string
+  description: string
+  city: string
+  address: string
+  type: string
+  warehouseCode: string
+  defaultLocationCode: string
+  contactPerson: string
+  contactPhone: string
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询月台列表
+export const getDockPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/dock/senior', data })
+  } else {
+    return await request.get({ url: `/wms/dock/page`, params })
+  }
+}
+// 查询月台列表
+export const getDockList = async (params) => {
+  return await request.get({ url: `/wms/dock/list`, params })
+}
+// 查询月台详情
+export const getDock = async (id: number) => {
+  return await request.get({ url: `/wms/dock/get?id=` + id })
+}
+
+// 新增月台
+export const createDock = async (data: DockVO) => {
+  return await request.post({ url: `/wms/dock/create`, data })
+}
+
+// 修改月台
+export const updateDock = async (data: DockVO) => {
+  return await request.put({ url: `/wms/dock/update`, data })
+}
+
+// 删除月台
+export const deleteDock = async (id: number) => {
+  return await request.delete({ url: `/wms/dock/delete?id=` + id })
+}
+
+// 导出月台 Excel
+export const exportDock = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/dock/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/dock/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/dock/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/documentsetting/index.ts b/src/api/wms/documentsetting/index.ts
new file mode 100644
index 000000000..6d9dc6b00
--- /dev/null
+++ b/src/api/wms/documentsetting/index.ts
@@ -0,0 +1,60 @@
+import request from '@/config/axios'
+
+export interface DocumentsettingVO {
+  code: string
+  name: string
+  description: string
+  type: string
+  businessType: string
+  numberPrefix: string
+  dateFormat: string
+  serialLength: number
+  separatorStr: string
+  resetPeriod: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  available: string
+  isSoftDeleted: string
+}
+
+// 查询单据设置列表
+export const getDocumentsettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/documentsetting/senior', data })
+  } else {
+    return await request.get({ url: `/wms/documentsetting/page`, params })
+  }
+}
+
+// 查询单据设置详情
+export const getDocumentsetting = async (id: number) => {
+  return await request.get({ url: `/wms/documentsetting/get?id=` + id })
+}
+
+// 新增单据设置
+export const createDocumentsetting = async (data: DocumentsettingVO) => {
+  return await request.post({ url: `/wms/documentsetting/create`, data })
+}
+
+// 修改单据设置
+export const updateDocumentsetting = async (data: DocumentsettingVO) => {
+  return await request.put({ url: `/wms/documentsetting/update`, data })
+}
+
+// 删除单据设置
+export const deleteDocumentsetting = async (id: number) => {
+  return await request.delete({ url: `/wms/documentsetting/delete?id=` + id })
+}
+
+// 导出单据设置 Excel
+export const exportDocumentsetting = async (params) => {
+  return await request.download({ url: `/wms/documentsetting/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/documentsetting/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/enterprise/index.ts b/src/api/wms/enterprise/index.ts
new file mode 100644
index 000000000..87cf0ff26
--- /dev/null
+++ b/src/api/wms/enterprise/index.ts
@@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+export interface EnterpriseVO {
+  id: number
+  code: string
+  name: string
+  shortName: string
+  address: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: string
+  siteId: string
+}
+
+// 查询企业列表
+export const getEnterprisePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/enterprise/senior', data })
+  } else {
+    return await request.get({ url: `/wms/enterprise/page`, params })
+  }
+}
+
+// 查询企业详情
+export const getEnterprise = async (id: number) => {
+  return await request.get({ url: `/wms/enterprise/get?id=` + id })
+}
+
+// 新增企业
+export const createEnterprise = async (data: EnterpriseVO) => {
+  return await request.post({ url: `/wms/enterprise/create`, data })
+}
+
+// 修改企业
+export const updateEnterprise = async (data: EnterpriseVO) => {
+  return await request.put({ url: `/wms/enterprise/update`, data })
+}
+
+// 删除企业
+export const deleteEnterprise = async (id: number) => {
+  return await request.delete({ url: `/wms/enterprise/delete?id=` + id })
+}
+
+// 导出企业 Excel
+export const exportEnterprise = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/enterprise/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/enterprise/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/enterprise/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/expectin/index.ts b/src/api/wms/expectin/index.ts
new file mode 100644
index 000000000..2c4d72908
--- /dev/null
+++ b/src/api/wms/expectin/index.ts
@@ -0,0 +1,55 @@
+import request from '@/config/axios'
+
+export interface ExpectinVO {
+  jobNumber: string
+  businessType: string
+  itemCode: string
+  batch: string
+  inventoryStatus: string
+  uom: string
+  qty: number
+  locationCode: string
+  warehouseCode: string
+  ownerCode: string
+}
+
+// 查询预计入库存列表
+export const getExpectinPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/expectin/senior', data })
+  } else {
+    return await request.get({ url: `/wms/expectin/page`, params })
+  }
+}
+
+// 查询预计入库存详情
+export const getExpectin = async (id: number) => {
+  return await request.get({ url: `/wms/expectin/get?id=` + id })
+}
+
+// 新增预计入库存
+export const createExpectin = async (data: ExpectinVO) => {
+  return await request.post({ url: `/wms/expectin/create`, data })
+}
+
+// 修改预计入库存
+export const updateExpectin = async (data: ExpectinVO) => {
+  return await request.put({ url: `/wms/expectin/update`, data })
+}
+
+// 删除预计入库存
+export const deleteExpectin = async (id: number) => {
+  return await request.delete({ url: `/wms/expectin/delete?id=` + id })
+}
+
+// 导出预计入库存 Excel
+export const exportExpectin = async (params) => {
+  return await request.download({ url: `/wms/expectin/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/expectin/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/expectout/index.ts b/src/api/wms/expectout/index.ts
new file mode 100644
index 000000000..0ebab0b96
--- /dev/null
+++ b/src/api/wms/expectout/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface ExpectoutVO {
+  jobNumber: string
+  businessType: string
+  packingNumber: string
+  itemCode: string
+  batch: string
+  inventoryStatus: string
+  uom: string
+  qty: number
+  locationCode: string
+  warehouseCode: string
+  ownerCode: string
+}
+
+// 查询预计出库存列表
+export const getExpectoutPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/expectout/senior', data })
+  } else {
+    return await request.get({ url: `/wms/expectout/page`, params })
+  }
+}
+
+// 查询预计出库存详情
+export const getExpectout = async (id: number) => {
+  return await request.get({ url: `/wms/expectout/get?id=` + id })
+}
+
+// 新增预计出库存
+export const createExpectout = async (data: ExpectoutVO) => {
+  return await request.post({ url: `/wms/expectout/create`, data })
+}
+
+// 修改预计出库存
+export const updateExpectout = async (data: ExpectoutVO) => {
+  return await request.put({ url: `/wms/expectout/update`, data })
+}
+
+// 删除预计出库存
+export const deleteExpectout = async (id: number) => {
+  return await request.delete({ url: `/wms/expectout/delete?id=` + id })
+}
+
+// 导出预计出库存 Excel
+export const exportExpectout = async (params) => {
+  return await request.download({ url: `/wms/expectout/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/expectout/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/file/index.ts b/src/api/wms/file/index.ts
new file mode 100644
index 000000000..f81718173
--- /dev/null
+++ b/src/api/wms/file/index.ts
@@ -0,0 +1,12 @@
+import request from '@/config/axios'
+
+// 查询变更记录列表
+export const getFileList = async (params) => {
+  return await request.get({ url: `/infra/file/list`, params })
+}
+
+// 删除库区
+export const deleteFile = async (id: number) => {
+  return await request.delete({ url: `/infra/file/delete?id=` + id })
+}
+
diff --git a/src/api/wms/index.ts b/src/api/wms/index.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/api/wms/inspectJobDetail/index.ts b/src/api/wms/inspectJobDetail/index.ts
new file mode 100644
index 000000000..64fcb3262
--- /dev/null
+++ b/src/api/wms/inspectJobDetail/index.ts
@@ -0,0 +1,60 @@
+import request from '@/config/axios'
+
+export interface InspectJobDetailVO {
+  packingNumber: string
+  containerNumber: string
+  inventoryStatus: string
+  fromLocationCode: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+}
+
+// 查询检验任务子列表
+export const getInspectJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inspect-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inspect-job-detail/page`, params })
+  }
+}
+
+// 查询检验任务子详情
+export const getInspectJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/inspect-job-detail/get?id=` + id })
+}
+
+// 新增检验任务子
+export const createInspectJobDetail = async (data: InspectJobDetailVO) => {
+  return await request.post({ url: `/wms/inspect-job-detail/create`, data })
+}
+
+// 修改检验任务子
+export const updateInspectJobDetail = async (data: InspectJobDetailVO) => {
+  return await request.put({ url: `/wms/inspect-job-detail/update`, data })
+}
+
+// 删除检验任务子
+export const deleteInspectJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/inspect-job-detail/delete?id=` + id })
+}
+
+// 导出检验任务子 Excel
+export const exportInspectJobDetail = async (params) => {
+  return await request.download({ url: `/wms/inspect-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inspect-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/inspectJobMain/index.ts b/src/api/wms/inspectJobMain/index.ts
new file mode 100644
index 000000000..54e95146c
--- /dev/null
+++ b/src/api/wms/inspectJobMain/index.ts
@@ -0,0 +1,101 @@
+import request from '@/config/axios'
+
+export interface InspectJobMainVO {
+  requestNumber: string
+  purchaseReceiptRecordNumber: string
+  supplierCode: string
+  warehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  poUmber: string
+  poLine: string
+  batch: string
+  itemCode: string
+  inspectType: string
+  nextAction: string
+  sampleMethod: string
+  uom: string
+  receiveQty: number
+  sampleQty: number
+  owner: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询检验任务主列表
+export const getInspectJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inspect-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inspect-job-main/page`, params })
+  }
+}
+
+// 查询检验任务主详情
+export const getInspectJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/inspect-job-main/get?id=` + id })
+}
+
+// 新增检验任务主
+export const createInspectJobMain = async (data: InspectJobMainVO) => {
+  return await request.post({ url: `/wms/inspect-job-main/create`, data })
+}
+
+// 修改检验任务主
+export const updateInspectJobMain = async (data: InspectJobMainVO) => {
+  return await request.put({ url: `/wms/inspect-job-main/update`, data })
+}
+
+// 删除检验任务主
+export const deleteInspectJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/inspect-job-main/delete?id=` + id })
+}
+
+// 导出检验任务主 Excel
+export const exportInspectJobMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/inspect-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/inspect-job-main/export-excel`, params})
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inspect-job-main/get-import-template' })
+}
+
+// 关闭检验任务主
+export const closeInspectJobMain = (id: number) => {
+  return request.put({ url: '/wms/inspect-job-main/close?id=' + id })
+}
diff --git a/src/api/wms/inspectRecordDetail/index.ts b/src/api/wms/inspectRecordDetail/index.ts
new file mode 100644
index 000000000..5bda8668a
--- /dev/null
+++ b/src/api/wms/inspectRecordDetail/index.ts
@@ -0,0 +1,76 @@
+import request from '@/config/axios'
+
+export interface InspectRecordDetailVO {
+  packingNumber: string
+  containerNumber: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  sampleQty: number
+  goodQty: number
+  failedQty: number
+  crackQty: number
+  notPassedQty: number
+  failedReason: string
+  photos: string
+  inspectUser: string
+  inspectResult: string
+  appearance: string
+  volume: string
+  weight: string
+  otherProperties: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+}
+
+// 查询检验记录子列表
+export const getInspectRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inspect-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inspect-record-detail/page`, params })
+  }
+}
+
+// 查询检验记录子详情
+export const getInspectRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/inspect-record-detail/get?id=` + id })
+}
+
+// 新增检验记录子
+export const createInspectRecordDetail = async (data: InspectRecordDetailVO) => {
+  return await request.post({ url: `/wms/inspect-record-detail/create`, data })
+}
+
+// 修改检验记录子
+export const updateInspectRecordDetail = async (data: InspectRecordDetailVO) => {
+  return await request.put({ url: `/wms/inspect-record-detail/update`, data })
+}
+
+// 删除检验记录子
+export const deleteInspectRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/inspect-record-detail/delete?id=` + id })
+}
+
+// 导出检验记录子 Excel
+export const exportInspectRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/inspect-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inspect-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/inspectRecordMain/index.ts b/src/api/wms/inspectRecordMain/index.ts
new file mode 100644
index 000000000..3de2e0b1f
--- /dev/null
+++ b/src/api/wms/inspectRecordMain/index.ts
@@ -0,0 +1,94 @@
+import request from '@/config/axios'
+
+export interface InspectRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  purchaseReceiptRecordNumber: string
+  supplierCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  poNumber: string
+  poLine: string
+  batch: string
+  inspectType: string
+  nextAction: string
+  sampleMethod: string
+  uom: string
+  receiveQty: number
+  batchGoodQty: number
+  batchFaildQty: number
+  batchCrackQty: number
+  batchNotPassedQty: number
+  itemCode: string
+  fromWarehouseCode: string
+  fromAreaCodes: string
+  ownerCode: string
+  available: string
+  sampleQty: number
+  fromAreaTypes: string
+  putawayRequestFlag: boolean
+}
+
+// 查询检验记录主列表
+export const getInspectRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inspect-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inspect-record-main/page`, params })
+  }
+}
+
+// 查询检验记录主详情
+export const getInspectRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/inspect-record-main/get?id=` + id })
+}
+
+// 新增检验记录主
+export const createInspectRecordMain = async (data: InspectRecordMainVO) => {
+  return await request.post({ url: `/wms/inspect-record-main/create`, data })
+}
+
+// 修改检验记录主
+export const updateInspectRecordMain = async (data: InspectRecordMainVO) => {
+  return await request.put({ url: `/wms/inspect-record-main/update`, data })
+}
+
+// 删除检验记录主
+export const deleteInspectRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/inspect-record-main/delete?id=` + id })
+}
+
+// 导出检验记录主 Excel
+export const exportInspectRecordMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/inspect-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/inspect-record-main/export-excel`, params})
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inspect-record-main/get-import-template' })
+}
+
+
+// 创建上架申请
+export const createPutAwayRequest = async (number:string) => {
+  return await request.post({ url: `/wms/inspect-record-main/createPutAwayRequestPC?number=`+number })
+}
\ No newline at end of file
diff --git a/src/api/wms/inspectRequestDetail/index.ts b/src/api/wms/inspectRequestDetail/index.ts
new file mode 100644
index 000000000..d3a1a0ffa
--- /dev/null
+++ b/src/api/wms/inspectRequestDetail/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface InspectRequestDetailVO {
+  packingNumber: string
+  containerNumber: string
+  inventoryStatus: string
+  fromLocationCode: string
+  updateTime: Date
+  updater: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+}
+
+// 查询检验申请子列表
+export const getInspectRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inspect-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inspect-request-detail/page`, params })
+  }
+}
+
+// 查询检验申请子详情
+export const getInspectRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/inspect-request-detail/get?id=` + id })
+}
+
+// 新增检验申请子
+export const createInspectRequestDetail = async (data: InspectRequestDetailVO) => {
+  return await request.post({ url: `/wms/inspect-request-detail/create`, data })
+}
+
+// 修改检验申请子
+export const updateInspectRequestDetail = async (data: InspectRequestDetailVO) => {
+  return await request.put({ url: `/wms/inspect-request-detail/update`, data })
+}
+
+// 删除检验申请子
+export const deleteInspectRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/inspect-request-detail/delete?id=` + id })
+}
+
+// 导出检验申请子 Excel
+export const exportInspectRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/inspect-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inspect-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/inspectRequestMain/index.ts b/src/api/wms/inspectRequestMain/index.ts
new file mode 100644
index 000000000..c4f71cc48
--- /dev/null
+++ b/src/api/wms/inspectRequestMain/index.ts
@@ -0,0 +1,111 @@
+import request from '@/config/axios'
+
+export interface InspectRequestMainVO {
+  purchaseReceiptRecordNumber: string
+  supplierCode: string
+  number: string
+  businessType: string
+  fromWarehouseCode: string
+  fromAreaCodes: string
+  fromAreaTypes: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  poNumber: string
+  poLine: string
+  batch: string
+  itemCode: string
+  inspectType: string
+  nextAction: string
+  sampleMethod: string
+  uom: string
+  receiveQty: number
+  sampleQty: number
+  ownerCode: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询检验申请主列表
+export const getInspectRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inspect-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inspect-request-main/page`, params })
+  }
+}
+
+// 查询检验申请主详情
+export const getInspectRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/inspect-request-main/get?id=` + id })
+}
+
+// 新增检验申请主
+export const createInspectRequestMain = async (data: InspectRequestMainVO) => {
+  return await request.post({ url: `/wms/inspect-request-main/create`, data })
+}
+
+// 修改检验申请主
+export const updateInspectRequestMain = async (data: InspectRequestMainVO) => {
+  return await request.put({ url: `/wms/inspect-request-main/update`, data })
+}
+
+// 删除检验申请主
+export const deleteInspectRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/inspect-request-main/delete?id=` + id })
+}
+
+// 导出检验申请主 Excel
+export const exportInspectRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/inspect-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/inspect-request-main/export-excel`, params})
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inspect-request-main/get-import-template' })
+}
+
+// 关闭检验申请主 Excel
+export const closeInspectRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inspect-request-main/close?id=` + id })
+}
+
+// 重新添加检验申请主 Excel
+export const reAddInspectRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inspect-request-main/reAdd?id=` + id })
+}
+
+// 提交检验申请主 Excel
+export const submitInspectRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inspect-request-main/submit?id=` + id })
+}
+
+// 审批通过检验申请主 Excel
+export const agreeInspectRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inspect-request-main/agree?id=` + id })
+}
+
+// 审批驳回检验申请主 Excel
+export const refusedInspectRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inspect-request-main/refused?id=` + id })
+}
+
+// 处理检验申请主 Excel
+export const handleInspectRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inspect-request-main/handle?id=` + id })
+}
diff --git a/src/api/wms/inventorychangeRecordDetail/index.ts b/src/api/wms/inventorychangeRecordDetail/index.ts
new file mode 100644
index 000000000..3c68f0469
--- /dev/null
+++ b/src/api/wms/inventorychangeRecordDetail/index.ts
@@ -0,0 +1,82 @@
+import request from '@/config/axios'
+
+export interface InventorychangeRecordDetailVO {
+  locationCode: string
+  locationGroupCode: string
+  areaCode: string
+  fromQty: number
+  fromOwnerCode: string
+  fromPackingNumber: string
+  fromContainerNumber: string
+  fromBatch: string
+  fromAltBatch: string
+  fromArriveDate: Date
+  fromProduceDate: Date
+  fromExpireDate: Date
+  fromInventoryStatus: string
+  toQty: number
+  toOwnerCode: string
+  toPackingNumber: string
+  toContainerNumber: string
+  toBatch: string
+  toAltBatch: string
+  toArriveDate: Date
+  toProduceDate: Date
+  toExpireDate: Date
+  toInventoryStatus: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  jobDetailId: string
+}
+
+// 查询库存修改记录子列表
+export const getInventorychangeRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorychange-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inventorychange-record-detail/page`, params })
+  }
+}
+
+// 查询库存修改记录子详情
+export const getInventorychangeRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/inventorychange-record-detail/get?id=` + id })
+}
+
+// 新增库存修改记录子
+export const createInventorychangeRecordDetail = async (data: InventorychangeRecordDetailVO) => {
+  return await request.post({ url: `/wms/inventorychange-record-detail/create`, data })
+}
+
+// 修改库存修改记录子
+export const updateInventorychangeRecordDetail = async (data: InventorychangeRecordDetailVO) => {
+  return await request.put({ url: `/wms/inventorychange-record-detail/update`, data })
+}
+
+// 删除库存修改记录子
+export const deleteInventorychangeRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/inventorychange-record-detail/delete?id=` + id })
+}
+
+// 导出库存修改记录子 Excel
+export const exportInventorychangeRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/inventorychange-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inventorychange-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/inventorychangeRecordMain/index.ts b/src/api/wms/inventorychangeRecordMain/index.ts
new file mode 100644
index 000000000..afdc21151
--- /dev/null
+++ b/src/api/wms/inventorychangeRecordMain/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface InventorychangeRecordMainVO {
+  requestNumber: string
+  warehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  code: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  available: string
+}
+
+// 查询库存修改记录主列表
+export const getInventorychangeRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorychange-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inventorychange-record-main/page`, params })
+  }
+}
+
+// 查询库存修改记录主详情
+export const getInventorychangeRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/inventorychange-record-main/get?id=` + id })
+}
+
+// 新增库存修改记录主
+export const createInventorychangeRecordMain = async (data: InventorychangeRecordMainVO) => {
+  return await request.post({ url: `/wms/inventorychange-record-main/create`, data })
+}
+
+// 修改库存修改记录主
+export const updateInventorychangeRecordMain = async (data: InventorychangeRecordMainVO) => {
+  return await request.put({ url: `/wms/inventorychange-record-main/update`, data })
+}
+
+// 删除库存修改记录主
+export const deleteInventorychangeRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/inventorychange-record-main/delete?id=` + id })
+}
+
+// 导出库存修改记录主 Excel
+export const exportInventorychangeRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorychange-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/inventorychange-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inventorychange-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/inventorychangeRequestDetail/index.ts b/src/api/wms/inventorychangeRequestDetail/index.ts
new file mode 100644
index 000000000..3a36cade0
--- /dev/null
+++ b/src/api/wms/inventorychangeRequestDetail/index.ts
@@ -0,0 +1,81 @@
+import request from '@/config/axios'
+
+export interface InventorychangeRequestDetailVO {
+  locationGroupCode: string
+  locationCode: string
+  areaCode: string
+  fromQty: number
+  fromOwnerCode: string
+  fromPackingNumber: string
+  fromContainerNumber: string
+  fromBatch: string
+  fromAltbatch: string
+  fromArriveDate: Date
+  fromProduceDate: Date
+  fromExpireDate: Date
+  frominventoryStatus: string
+  toQty: number
+  toOwnerCode: string
+  toPackingNumber: string
+  toContainerNumber: string
+  toBatch: string
+  toAltBatch: string
+  toArrivdAte: Date
+  toProduceDate: Date
+  toExpireDate: Date
+  toInventoryStatus: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  itemCode: string
+}
+
+// 查询库存修改申请子列表
+export const getInventorychangeRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorychange-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inventorychange-request-detail/page`, params })
+  }
+}
+
+// 查询库存修改申请子详情
+export const getInventorychangeRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/inventorychange-request-detail/get?id=` + id })
+}
+
+// 新增库存修改申请子
+export const createInventorychangeRequestDetail = async (data: InventorychangeRequestDetailVO) => {
+  return await request.post({ url: `/wms/inventorychange-request-detail/create`, data })
+}
+
+// 修改库存修改申请子
+export const updateInventorychangeRequestDetail = async (data: InventorychangeRequestDetailVO) => {
+  return await request.put({ url: `/wms/inventorychange-request-detail/update`, data })
+}
+
+// 删除库存修改申请子
+export const deleteInventorychangeRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/inventorychange-request-detail/delete?id=` + id })
+}
+
+// 导出库存修改申请子 Excel
+export const exportInventorychangeRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/inventorychange-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inventorychange-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/inventorychangeRequestMain/index.ts b/src/api/wms/inventorychangeRequestMain/index.ts
new file mode 100644
index 000000000..0bfea72fc
--- /dev/null
+++ b/src/api/wms/inventorychangeRequestMain/index.ts
@@ -0,0 +1,97 @@
+import request from '@/config/axios'
+
+export interface InventorychangeRequestMainVO {
+  warehouseCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询库存修改申请主列表
+export const getInventorychangeRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorychange-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inventorychange-request-main/page`, params })
+  }
+}
+
+// 查询库存修改申请主详情
+export const getInventorychangeRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/inventorychange-request-main/get?id=` + id })
+}
+
+// 新增库存修改申请主
+export const createInventorychangeRequestMain = async (data: InventorychangeRequestMainVO) => {
+  return await request.post({ url: `/wms/inventorychange-request-main/create`, data })
+}
+
+// 修改库存修改申请主
+export const updateInventorychangeRequestMain = async (data: InventorychangeRequestMainVO) => {
+  return await request.put({ url: `/wms/inventorychange-request-main/update`, data })
+}
+
+// 删除库存修改申请主
+export const deleteInventorychangeRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/inventorychange-request-main/delete?id=` + id })
+}
+
+// 导出库存修改申请主 Excel
+export const exportInventorychangeRequestMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorychange-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/inventorychange-request-main/export-excel`, params })
+  }
+  }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inventorychange-request-main/get-import-template' })
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/inventorychange-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/inventorychange-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/inventorychange-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/inventorychange-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/inventorychange-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/inventorychange-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/inventoryinitRecordDetail/index.ts b/src/api/wms/inventoryinitRecordDetail/index.ts
new file mode 100644
index 000000000..c789ca497
--- /dev/null
+++ b/src/api/wms/inventoryinitRecordDetail/index.ts
@@ -0,0 +1,75 @@
+import request from '@/config/axios'
+
+export interface InventoryinitRecordDetailVO {
+  ownerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  altBatch: string
+  arriveDate: Date
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  locationCode: string
+  locationGroupCode: string
+  areaCode: string
+  packQty: number
+  packUnit: string
+  qty: number
+  singlePrice: number
+  amount: number
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  uom: string
+  code: string
+  interfaceType: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  jobDetailId: string
+}
+
+// 查询库存初始化记录子列表
+export const getInventoryinitRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventoryinit-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inventoryinit-record-detail/page`, params })
+  }
+}
+
+// 查询库存初始化记录子详情
+export const getInventoryinitRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/inventoryinit-record-detail/get?id=` + id })
+}
+
+// 新增库存初始化记录子
+export const createInventoryinitRecordDetail = async (data: InventoryinitRecordDetailVO) => {
+  return await request.post({ url: `/wms/inventoryinit-record-detail/create`, data })
+}
+
+// 修改库存初始化记录子
+export const updateInventoryinitRecordDetail = async (data: InventoryinitRecordDetailVO) => {
+  return await request.put({ url: `/wms/inventoryinit-record-detail/update`, data })
+}
+
+// 删除库存初始化记录子
+export const deleteInventoryinitRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/inventoryinit-record-detail/delete?id=` + id })
+}
+
+// 导出库存初始化记录子 Excel
+export const exportInventoryinitRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/inventoryinit-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inventoryinit-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/inventoryinitRecordMain/index.ts b/src/api/wms/inventoryinitRecordMain/index.ts
new file mode 100644
index 000000000..173941d31
--- /dev/null
+++ b/src/api/wms/inventoryinitRecordMain/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface InventoryinitRecordMainVO {
+  requestNumber: string
+  warehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  code: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  available: string
+}
+
+// 查询库存初始化记录主列表
+export const getInventoryinitRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventoryinit-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inventoryinit-record-main/page`, params })
+  }
+}
+
+// 查询库存初始化记录主详情
+export const getInventoryinitRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/inventoryinit-record-main/get?id=` + id })
+}
+
+// 新增库存初始化记录主
+export const createInventoryinitRecordMain = async (data: InventoryinitRecordMainVO) => {
+  return await request.post({ url: `/wms/inventoryinit-record-main/create`, data })
+}
+
+// 修改库存初始化记录主
+export const updateInventoryinitRecordMain = async (data: InventoryinitRecordMainVO) => {
+  return await request.put({ url: `/wms/inventoryinit-record-main/update`, data })
+}
+
+// 删除库存初始化记录主
+export const deleteInventoryinitRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/inventoryinit-record-main/delete?id=` + id })
+}
+
+// 导出库存初始化记录主 Excel
+export const exportInventoryinitRecordMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/inventoryinit-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/inventoryinit-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inventoryinit-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/inventoryinitRequestDetail/index.ts b/src/api/wms/inventoryinitRequestDetail/index.ts
new file mode 100644
index 000000000..8962c3a06
--- /dev/null
+++ b/src/api/wms/inventoryinitRequestDetail/index.ts
@@ -0,0 +1,72 @@
+import request from '@/config/axios'
+
+export interface InventoryinitRequestDetailVO {
+  ownerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  altBatch: string
+  arriveDate: Date
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  locationCode: string
+  locationGroupCode: string
+  areaCode: string
+  packQty: number
+  packUnit: string
+  qty: number
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  uom: string
+  updateTime: Date
+  updater: string
+  itemCode: string
+}
+
+// 查询库存初始化申请子列表
+export const getInventoryinitRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventoryinit-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inventoryinit-request-detail/page`, params })
+  }
+}
+
+// 查询库存初始化申请子详情
+export const getInventoryinitRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/inventoryinit-request-detail/get?id=` + id })
+}
+
+// 新增库存初始化申请子
+export const createInventoryinitRequestDetail = async (data: InventoryinitRequestDetailVO) => {
+  return await request.post({ url: `/wms/inventoryinit-request-detail/create`, data })
+}
+
+// 修改库存初始化申请子
+export const updateInventoryinitRequestDetail = async (data: InventoryinitRequestDetailVO) => {
+  return await request.put({ url: `/wms/inventoryinit-request-detail/update`, data })
+}
+
+// 删除库存初始化申请子
+export const deleteInventoryinitRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/inventoryinit-request-detail/delete?id=` + id })
+}
+
+// 导出库存初始化申请子 Excel
+export const exportInventoryinitRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/inventoryinit-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inventoryinit-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/inventoryinitRequestMain/index.ts b/src/api/wms/inventoryinitRequestMain/index.ts
new file mode 100644
index 000000000..1cab338b4
--- /dev/null
+++ b/src/api/wms/inventoryinitRequestMain/index.ts
@@ -0,0 +1,94 @@
+import request from '@/config/axios'
+
+export interface InventoryinitRequestMainVO {
+  warehouseCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询库存初始化申请主列表
+export const getInventoryinitRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventoryinit-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inventoryinit-request-main/page`, params })
+  }
+}
+
+// 查询库存初始化申请主详情
+export const getInventoryinitRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/inventoryinit-request-main/get?id=` + id })
+}
+
+// 新增库存初始化申请主
+export const createInventoryinitRequestMain = async (data: InventoryinitRequestMainVO) => {
+  return await request.post({ url: `/wms/inventoryinit-request-main/create`, data })
+}
+
+// 修改库存初始化申请主
+export const updateInventoryinitRequestMain = async (data: InventoryinitRequestMainVO) => {
+  return await request.put({ url: `/wms/inventoryinit-request-main/update`, data })
+}
+// 关闭库存初始化申请主 Excel
+export const closeInventoryinitRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inventoryinit-request-main/close?id=` + id })
+}
+// 重新添加库存初始化申请主 Excel
+export const reAddInventoryinitRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inventoryinit-request-main/reAdd?id=` + id })
+}
+
+// 审批驳回库存初始化申请主 Excel
+export const refusedInventoryinitRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inventoryinit-request-main/refused?id=` + id })
+}
+
+// 审批通过库存初始化申请主 Excel
+export const agreeInventoryinitRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inventoryinit-request-main/agree?id=` + id })
+}
+
+// 提交库存初始化申请主 Excel
+export const submitInventoryinitRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inventoryinit-request-main/submit?id=` + id })
+}
+
+// 删除库存初始化申请主
+export const deleteInventoryinitRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/inventoryinit-request-main/delete?id=` + id })
+}
+
+// 导出库存初始化申请主 Excel
+export const exportInventoryinitRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/inventoryinit-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/inventoryinit-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inventoryinit-request-main/get-import-template' })
+}
+
+// 处理采购收货申请主 Excel
+export const handleInventoryinitRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inventoryinit-request-main/handle?id=` + id })
+}
diff --git a/src/api/wms/inventorymoveJobDetail/index.ts b/src/api/wms/inventorymoveJobDetail/index.ts
new file mode 100644
index 000000000..f3821de51
--- /dev/null
+++ b/src/api/wms/inventorymoveJobDetail/index.ts
@@ -0,0 +1,66 @@
+import request from '@/config/axios'
+
+export interface InventorymoveJobDetailVO {
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createtime: Date
+  creator: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  poNumber: string
+  poLine: string
+  fromLocationCode: string
+  toLocationCode: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询库存转移任务子列表
+export const getInventorymoveJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inventorymove-job-detail/page`, params })
+  }
+}
+
+// 查询库存转移任务子详情
+export const getInventorymoveJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/inventorymove-job-detail/get?id=` + id })
+}
+
+// 新增库存转移任务子
+export const createInventorymoveJobDetail = async (data: InventorymoveJobDetailVO) => {
+  return await request.post({ url: `/wms/inventorymove-job-detail/create`, data })
+}
+
+// 修改库存转移任务子
+export const updateInventorymoveJobDetail = async (data: InventorymoveJobDetailVO) => {
+  return await request.put({ url: `/wms/inventorymove-job-detail/update`, data })
+}
+
+// 删除库存转移任务子
+export const deleteInventorymoveJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/inventorymove-job-detail/delete?id=` + id })
+}
+
+// 导出库存转移任务子 Excel
+export const exportInventorymoveJobDetail = async (params) => {
+  return await request.download({ url: `/wms/inventorymove-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inventorymove-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/inventorymoveJobMain/index.ts b/src/api/wms/inventorymoveJobMain/index.ts
new file mode 100644
index 000000000..83eb4f4e5
--- /dev/null
+++ b/src/api/wms/inventorymoveJobMain/index.ts
@@ -0,0 +1,169 @@
+import request from '@/config/axios'
+
+export interface InventorymoveJobMainVO {
+  requestNumber: string
+  useOnTheWayLocation: string
+  fromWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  creatorName: string
+  toWarehouseCode: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询库存转移任务主列表
+export const getInventorymoveJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inventorymove-job-main/page`, params })
+  }
+}
+
+// 查询库存转移任务主详情
+export const getInventorymoveJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/inventorymove-job-main/get?id=` + id })
+}
+
+// 新增库存转移任务主
+export const createInventorymoveJobMain = async (data: InventorymoveJobMainVO) => {
+  return await request.post({ url: `/wms/inventorymove-job-main/create`, data })
+}
+
+// 修改库存转移任务主
+export const updateInventorymoveJobMain = async (data: InventorymoveJobMainVO) => {
+  return await request.put({ url: `/wms/inventorymove-job-main/update`, data })
+}
+
+// 删除库存转移任务主
+export const deleteInventorymoveJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/inventorymove-job-main/delete?id=` + id })
+}
+
+// 导出库存转移任务主 Excel
+export const exportInventorymoveJobMain = async (params) => {
+  params.businessType = 'Move'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params })
+  }
+}
+
+// 导出合格转隔离任务主 Excel
+export const exportOkToHoldJobMain = async (params) => {
+  params.businessType = 'OkToHold'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params })
+  }
+}
+
+// 导出隔离转合格任务主 Excel
+export const exportHoldToOkJobMain = async (params) => {
+  params.businessType = 'HoldToOk'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params })
+  }
+}
+
+// 导出隔离转报废任务主 Excel
+export const exportHoldToScrapJobMain = async (params) => {
+  params.businessType = 'HoldToScrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params })
+  }
+}
+
+// 导出合格转报废任务主 Excel
+export const exportOkToScrapJobMain = async (params) => {
+  params.businessType = 'OkToScrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params })
+  }
+}
+
+// 导出报废转隔离任务主 Excel
+export const exportScrapToHoldJobMain = async (params) => {
+  params.businessType = 'ScrapToHold'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params })
+  }
+}
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inventorymove-job-main/get-import-template' })
+}
+
+// 承接库存转移任务
+export const acceptInventorymoveMain = async (id) => {
+  return await request.put({ url: `/wms/inventorymove-job-main/accept?id=` + id })
+}
+
+// 放弃库存转移任务
+export const abandonInventorymoveMain = async (id) => {
+  return await request.put({ url: `/wms/inventorymove-job-main/abandon?id=` + id })
+}
+
+// 关闭库存转移任务
+export const closeInventorymoveMain = async (id) => {
+  return await request.put({ url: `/wms/inventorymove-job-main/close?id=` + id })
+}
+
+// 执行库存转移任务
+export const executeInventorymoveMain = async (data) => {
+  return await request.put({ url: `/wms/inventorymove-job-main/execute`, data})
+}
\ No newline at end of file
diff --git a/src/api/wms/inventorymoveRecordDetail/index.ts b/src/api/wms/inventorymoveRecordDetail/index.ts
new file mode 100644
index 000000000..4a3928c30
--- /dev/null
+++ b/src/api/wms/inventorymoveRecordDetail/index.ts
@@ -0,0 +1,76 @@
+import request from '@/config/axios'
+
+export interface InventorymoveRecordDetailVO {
+  onTheWayLocationCode: string
+  fromOwnerCode: string
+  fromPackingNumber: string
+  fromContainerNumber: string
+  fromBatch: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  fromInventoryStatus: string
+  toOwnerCode: string
+  toPackingNumber: string
+  toContainerNumber: string
+  toBatch: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  toInventoryStatus: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  jobDetailId: string
+}
+
+// 查询库存转移记录子列表
+export const getInventorymoveRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inventorymove-record-detail/page`, params })
+  }
+}
+
+// 查询库存转移记录子详情
+export const getInventorymoveRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/inventorymove-record-detail/get?id=` + id })
+}
+
+// 新增库存转移记录子
+export const createInventorymoveRecordDetail = async (data: InventorymoveRecordDetailVO) => {
+  return await request.post({ url: `/wms/inventorymove-record-detail/create`, data })
+}
+
+// 修改库存转移记录子
+export const updateInventorymoveRecordDetail = async (data: InventorymoveRecordDetailVO) => {
+  return await request.put({ url: `/wms/inventorymove-record-detail/update`, data })
+}
+
+// 删除库存转移记录子
+export const deleteInventorymoveRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/inventorymove-record-detail/delete?id=` + id })
+}
+
+// 导出库存转移记录子 Excel
+export const exportInventorymoveRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/inventorymove-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inventorymove-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/inventorymoveRecordMain/index.ts b/src/api/wms/inventorymoveRecordMain/index.ts
new file mode 100644
index 000000000..2f351b719
--- /dev/null
+++ b/src/api/wms/inventorymoveRecordMain/index.ts
@@ -0,0 +1,128 @@
+import request from '@/config/axios'
+
+export interface InventorymoveRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  useOnTheWayLocation: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  code: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  available: string
+}
+
+// 查询库存转移记录主列表
+export const getInventorymoveRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inventorymove-record-main/page`, params })
+  }
+}
+
+// 查询库存转移记录主详情
+export const getInventorymoveRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/inventorymove-record-main/get?id=` + id })
+}
+
+// 新增库存转移记录主
+export const createInventorymoveRecordMain = async (data: InventorymoveRecordMainVO) => {
+  return await request.post({ url: `/wms/inventorymove-record-main/create`, data })
+}
+
+// 修改库存转移记录主
+export const updateInventorymoveRecordMain = async (data: InventorymoveRecordMainVO) => {
+  return await request.put({ url: `/wms/inventorymove-record-main/update`, data })
+}
+
+// 删除库存转移记录主
+export const deleteInventorymoveRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/inventorymove-record-main/delete?id=` + id })
+}
+
+// 导出库存转移记录主 Excel
+export const exportInventorymoveRecordMain = async (params) => {
+  return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params })
+}
+
+// 导出合格转隔离记录主 Excel
+export const exportOkToHoldRecordMain = async (params) => {
+  params.businessType = 'OkToHold'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params })
+  }
+}
+
+// 导出隔离转合格记录主 Excel
+export const exportHoldToOkRecordMain = async (params) => {
+  params.businessType = 'HoldToOk'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params })
+  }
+}
+
+// 导出隔离转报废记录主 Excel
+export const exportHoldToScrapRecordMain = async (params) => {
+  params.businessType = 'HoldToScrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params })
+  }
+}
+
+// 导出合格转报废记录主 Excel
+export const exportOkToScrapRecordMain = async (params) => {
+  params.businessType = 'OkToScrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params })
+  }
+}
+
+// 导出报废转隔离记录主 Excel
+export const exportScrapToHoldRecordMain = async (params) => {
+  params.businessType = 'ScrapToHold'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params })
+  }
+}
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inventorymove-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/inventorymoveRequestDetail/index.ts b/src/api/wms/inventorymoveRequestDetail/index.ts
new file mode 100644
index 000000000..ad896ce09
--- /dev/null
+++ b/src/api/wms/inventorymoveRequestDetail/index.ts
@@ -0,0 +1,70 @@
+import request from '@/config/axios'
+
+export interface InventorymoveRequestDetailVO {
+  fromOwnerCode: string
+  fromPackingNumber: string
+  fromContainerNumber: string
+  fromBatch: string
+  fromLocationCode: string
+  fromInventoryStatus: string
+  toOwnerCode: string
+  toPackingNumber: string
+  toContainerNumber: string
+  toBatch: string
+  toLocationCode: string
+  toInventoryStatus: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  itemCode: string
+}
+
+// 查询库存转移申请子列表
+export const getInventorymoveRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inventorymove-request-detail/page`, params })
+  }
+}
+
+// 查询库存转移申请子详情
+export const getInventorymoveRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/inventorymove-request-detail/get?id=` + id })
+}
+
+// 新增库存转移申请子
+export const createInventorymoveRequestDetail = async (data: InventorymoveRequestDetailVO) => {
+  return await request.post({ url: `/wms/inventorymove-request-detail/create`, data })
+}
+
+// 修改库存转移申请子
+export const updateInventorymoveRequestDetail = async (data: InventorymoveRequestDetailVO) => {
+  return await request.put({ url: `/wms/inventorymove-request-detail/update`, data })
+}
+
+// 删除库存转移申请子
+export const deleteInventorymoveRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/inventorymove-request-detail/delete?id=` + id })
+}
+
+// 导出库存转移申请子 Excel
+export const exportInventorymoveRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/inventorymove-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inventorymove-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/inventorymoveRequestMain/index.ts b/src/api/wms/inventorymoveRequestMain/index.ts
new file mode 100644
index 000000000..55e3537bc
--- /dev/null
+++ b/src/api/wms/inventorymoveRequestMain/index.ts
@@ -0,0 +1,169 @@
+import request from '@/config/axios'
+
+export interface InventorymoveRequestMainVO {
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  fromWarehouseOde: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  useOnTheWayLocation: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询库存转移申请主列表
+export const getInventorymoveRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/inventorymove-request-main/page`, params })
+  }
+}
+
+// 查询库存转移申请主详情
+export const getInventorymoveRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/inventorymove-request-main/get?id=` + id })
+}
+
+// 新增库存转移申请主
+export const createInventorymoveRequestMain = async (data: InventorymoveRequestMainVO) => {
+  return await request.post({ url: `/wms/inventorymove-request-main/create`, data })
+}
+
+// 修改库存转移申请主
+export const updateInventorymoveRequestMain = async (data: InventorymoveRequestMainVO) => {
+  return await request.put({ url: `/wms/inventorymove-request-main/update`, data })
+}
+
+// 删除库存转移申请主
+export const deleteInventorymoveRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/inventorymove-request-main/delete?id=` + id })
+}
+
+// 导出库存转移申请主 Excel
+export const exportInventorymoveRequestMain = async (params) => {
+  params.businessType = 'Move'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params })
+  }
+}
+
+// 导出合格转隔离申请主 Excel
+export const exportOkToHoldRequestMain = async (params) => {
+  params.businessType = 'OkToHold'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params })
+  }
+}
+
+// 导出隔离转合格申请主 Excel
+export const exportHoldToOkRequestMain = async (params) => {
+  params.businessType = 'HoldToOk'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params })
+  }
+}
+
+// 导出隔离转报废申请主 Excel
+export const exportHoldToScrapRequestMain = async (params) => {
+  params.businessType = 'HoldToScrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params })
+  }
+}
+
+// 导出合格转报废申请主 Excel
+export const exportOkToScrapRequestMain = async (params) => {
+  params.businessType = 'OkToScrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params })
+  }
+}
+
+// 导出报废转隔离申请主 Excel
+export const exportScrapToHoldRequestMain = async (params) => {
+  params.businessType = 'ScrapToHold'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/inventorymove-request-main/get-import-template' })
+}
+
+// 下载用户导入模板（除库存移动外）
+export const importTemplateExceptMove = () => {
+  return request.download({ url: '/wms/inventorymove-request-main/get-import-template-exceptMove' })
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/inventorymove-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/inventorymove-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/inventorymove-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/inventorymove-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/inventorymove-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/inventorymove-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/issueJobDetail/index.ts b/src/api/wms/issueJobDetail/index.ts
new file mode 100644
index 000000000..ab43085f0
--- /dev/null
+++ b/src/api/wms/issueJobDetail/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface IssueJobDetailVO {
+  productionLineCode: string
+  workStationCode: string
+  inventoryStatus: string
+  onTheWayLocationCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  fromLocationCode: string
+  toLocationCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  packQty: number
+  packUnit: string
+  supplierQty: number
+  supplierUom: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询发料任务子列表
+export const getIssueJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/issue-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/issue-job-detail/page`, params })
+  }
+}
+
+// 查询发料任务子详情
+export const getIssueJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/issue-job-detail/get?id=` + id })
+}
+
+// 新增发料任务子
+export const createIssueJobDetail = async (data: IssueJobDetailVO) => {
+  return await request.post({ url: `/wms/issue-job-detail/create`, data })
+}
+
+// 修改发料任务子
+export const updateIssueJobDetail = async (data: IssueJobDetailVO) => {
+  return await request.put({ url: `/wms/issue-job-detail/update`, data })
+}
+
+// 删除发料任务子
+export const deleteIssueJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/issue-job-detail/delete?id=` + id })
+}
+
+// 导出发料任务子 Excel
+export const exportIssueJobDetail = async (params) => {
+  return await request.download({ url: `/wms/issue-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/issue-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/issueJobMain/index.ts b/src/api/wms/issueJobMain/index.ts
new file mode 100644
index 000000000..d47210412
--- /dev/null
+++ b/src/api/wms/issueJobMain/index.ts
@@ -0,0 +1,110 @@
+import request from '@/config/axios'
+
+export interface IssueJobMainVO {
+  requestNumber: string
+  workShopCode: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserName: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  useOnTheWayLocation: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyPackingNumber: string
+  allowModifyBatch: string
+}
+
+// 查询发料任务主列表
+export const getIssueJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/issue-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/issue-job-main/page`, params })
+  }
+}
+
+// 查询发料任务主详情
+export const getIssueJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/issue-job-main/get?id=` + id })
+}
+
+// 新增发料任务主
+export const createIssueJobMain = async (data: IssueJobMainVO) => {
+  return await request.post({ url: `/wms/issue-job-main/create`, data })
+}
+
+// 修改发料任务主
+export const updateIssueJobMain = async (data: IssueJobMainVO) => {
+  return await request.put({ url: `/wms/issue-job-main/update`, data })
+}
+
+// 删除发料任务主
+export const deleteIssueJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/issue-job-main/delete?id=` + id })
+}
+
+// 导出发料任务主 Excel
+export const exportIssueJobMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/issue-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/issue-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/issue-job-main/get-import-template' })
+}
+
+// 承接发料任务
+export const acceptIssueMain = async (id) => {
+  return await request.get({ url: `/wms/issue-job-main/accept?id=` + id })
+}
+
+// 放弃发料任务
+export const abandonIssueMain = async (id) => {
+  return await request.get({ url: `/wms/issue-job-main/abandon?id=` + id })
+}
+
+// 关闭发料任务
+export const closeIssueMain = async (id) => {
+  return await request.get({ url: `/wms/issue-job-main/close?id=` + id })
+}
+
+// 执行发料任务
+export const executeIssueMain = async (data) => {
+  return await request.put({ url: `/wms/issue-job-main/execute`, data})
+}
+
+
diff --git a/src/api/wms/issueRecordDetail/index.ts b/src/api/wms/issueRecordDetail/index.ts
new file mode 100644
index 000000000..ba5498b95
--- /dev/null
+++ b/src/api/wms/issueRecordDetail/index.ts
@@ -0,0 +1,77 @@
+import request from '@/config/axios'
+
+export interface IssueRecordDetailVO {
+  productionLineCode: string
+  workStationCode: string
+  onTheWayLocationCode: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  toOwnerCode: string
+  fromPackingNumber: string
+  toPackingNumber: string
+  fromContainerNumber: string
+  toContainerNumber: string
+  fromBatch: string
+  toBatch: string
+  fromLocationCode: string
+  toLocationCode: string
+  fromLocationGroupCode: string
+  toLocationGroupCode: string
+  fromAreaCode: string
+  toAreaCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+}
+
+// 查询发料记录子列表
+export const getIssueRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/issue-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/issue-record-detail/page`, params })
+  }
+}
+
+// 查询发料记录子详情
+export const getIssueRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/issue-record-detail/get?id=` + id })
+}
+
+// 新增发料记录子
+export const createIssueRecordDetail = async (data: IssueRecordDetailVO) => {
+  return await request.post({ url: `/wms/issue-record-detail/create`, data })
+}
+
+// 修改发料记录子
+export const updateIssueRecordDetail = async (data: IssueRecordDetailVO) => {
+  return await request.put({ url: `/wms/issue-record-detail/update`, data })
+}
+
+// 删除发料记录子
+export const deleteIssueRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/issue-record-detail/delete?id=` + id })
+}
+
+// 导出发料记录子 Excel
+export const exportIssueRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/issue-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/issue-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/issueRecordMain/index.ts b/src/api/wms/issueRecordMain/index.ts
new file mode 100644
index 000000000..634893289
--- /dev/null
+++ b/src/api/wms/issueRecordMain/index.ts
@@ -0,0 +1,75 @@
+import request from '@/config/axios'
+
+export interface IssueRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  workshopCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  useOnTheWayLocation: string
+  available: string
+}
+
+// 查询发料记录主列表
+export const getIssueRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/issue-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/issue-record-main/page`, params })
+  }
+}
+
+// 查询发料记录主详情
+export const getIssueRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/issue-record-main/get?id=` + id })
+}
+
+// 新增发料记录主
+export const createIssueRecordMain = async (data: IssueRecordMainVO) => {
+  return await request.post({ url: `/wms/issue-record-main/create`, data })
+}
+
+// 修改发料记录主
+export const updateIssueRecordMain = async (data: IssueRecordMainVO) => {
+  return await request.put({ url: `/wms/issue-record-main/update`, data })
+}
+
+// 删除发料记录主
+export const deleteIssueRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/issue-record-main/delete?id=` + id })
+}
+
+// 导出发料记录主 Excel
+export const exportIssueRecordMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/issue-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/issue-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/issue-record-main/get-import-template' })
+}
diff --git a/src/api/wms/issueRequestDetail/index.ts b/src/api/wms/issueRequestDetail/index.ts
new file mode 100644
index 000000000..19ce6560c
--- /dev/null
+++ b/src/api/wms/issueRequestDetail/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface IssueRequestDetailVO {
+  productionLineCode: string
+  workStationCode: string
+  inventoryStatus: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  toLocationCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询发料申请子列表
+export const getIssueRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/issue-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/issue-request-detail/page`, params })
+  }
+}
+
+// 查询发料申请子详情
+export const getIssueRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/issue-request-detail/get?id=` + id })
+}
+
+// 新增发料申请子
+export const createIssueRequestDetail = async (data: IssueRequestDetailVO) => {
+  return await request.post({ url: `/wms/issue-request-detail/create`, data })
+}
+
+// 修改发料申请子
+export const updateIssueRequestDetail = async (data: IssueRequestDetailVO) => {
+  return await request.put({ url: `/wms/issue-request-detail/update`, data })
+}
+
+// 删除发料申请子
+export const deleteIssueRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/issue-request-detail/delete?id=` + id })
+}
+
+// 导出发料申请子 Excel
+export const exportIssueRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/issue-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/issue-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/issueRequestMain/index.ts b/src/api/wms/issueRequestMain/index.ts
new file mode 100644
index 000000000..efaf03d24
--- /dev/null
+++ b/src/api/wms/issueRequestMain/index.ts
@@ -0,0 +1,103 @@
+import request from '@/config/axios'
+
+export interface IssueRequestMainVO {
+  workshopCode: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  useOnTheWayLocation: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询发料申请主列表
+export const getIssueRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/issue-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/issue-request-main/page`, params })
+  }
+}
+
+// 查询发料申请主详情
+export const getIssueRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/issue-request-main/get?id=` + id })
+}
+
+// 新增发料申请主
+export const createIssueRequestMain = async (data: IssueRequestMainVO) => {
+  return await request.post({ url: `/wms/issue-request-main/create`, data })
+}
+
+// 修改发料申请主
+export const updateIssueRequestMain = async (data: IssueRequestMainVO) => {
+  return await request.put({ url: `/wms/issue-request-main/update`, data })
+}
+
+// 删除发料申请主
+export const deleteIssueRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/issue-request-main/delete?id=` + id })
+}
+
+// 导出发料申请主 Excel
+export const exportIssueRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/issue-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/issue-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/issue-request-main/get-import-template' })
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/issue-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/issue-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/issue-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/issue-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/issue-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/issue-request-main/handle?id=' + id })
+}
diff --git a/src/api/wms/itemarea/index.ts b/src/api/wms/itemarea/index.ts
new file mode 100644
index 000000000..bf4973755
--- /dev/null
+++ b/src/api/wms/itemarea/index.ts
@@ -0,0 +1,69 @@
+import request from '@/config/axios'
+
+export interface ItemareaVO {
+  id: number
+  itemCode: string
+  areaCode: string
+  inPackUnit: string
+  outPackUnit: string
+  maxQty: number
+  minQty: number
+  safeQty: number
+  autoRepleinsh: string
+  repleinshFromArea: string
+  repleinshQty: number
+  needReceive: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  manageMode: string
+  newlyToOutpackunit: string
+  surplusToOutpackunit: string
+}
+
+// 查询物料库区配置列表
+export const getItemareaPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/itemarea/senior', data })
+  } else {
+    return await request.get({ url: `/wms/itemarea/page`, params })
+  }
+}
+
+// 查询物料库区配置详情
+export const getItemarea = async (id: number) => {
+  return await request.get({ url: `/wms/itemarea/get?id=` + id })
+}
+
+// 新增物料库区配置
+export const createItemarea = async (data: ItemareaVO) => {
+  return await request.post({ url: `/wms/itemarea/create`, data })
+}
+
+// 修改物料库区配置
+export const updateItemarea = async (data: ItemareaVO) => {
+  return await request.put({ url: `/wms/itemarea/update`, data })
+}
+
+// 删除物料库区配置
+export const deleteItemarea = async (id: number) => {
+  return await request.delete({ url: `/wms/itemarea/delete?id=` + id })
+}
+
+// 导出物料库区配置 Excel
+export const exportItemarea = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/itemarea/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/itemarea/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/itemarea/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/itemareaDetail/index.ts b/src/api/wms/itemareaDetail/index.ts
new file mode 100644
index 000000000..1b0cfcdd4
--- /dev/null
+++ b/src/api/wms/itemareaDetail/index.ts
@@ -0,0 +1,50 @@
+import request from '@/config/axios'
+
+export interface ItemareaDetailVO {
+  id: number
+  masterId: number
+  remark: string
+  locationGroup: string
+  locationCode: string
+}
+
+// 查询物料库区配置表子列表
+export const getItemareaDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/itemarea-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/itemarea-detail/page`, params })
+  }
+}
+
+// 查询物料库区配置表子详情
+export const getItemareaDetail = async (id: number) => {
+  return await request.get({ url: `/wms/itemarea-detail/get?id=` + id })
+}
+
+// 新增物料库区配置表子
+export const createItemareaDetail = async (data: ItemareaDetailVO) => {
+  return await request.post({ url: `/wms/itemarea-detail/create`, data })
+}
+
+// 修改物料库区配置表子
+export const updateItemareaDetail = async (data: ItemareaDetailVO) => {
+  return await request.put({ url: `/wms/itemarea-detail/update`, data })
+}
+
+// 删除物料库区配置表子
+export const deleteItemareaDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/itemarea-detail/delete?id=` + id })
+}
+
+// 导出物料库区配置表子 Excel
+export const exportItemareaDetail = async (params) => {
+  return await request.download({ url: `/wms/itemarea-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/itemarea-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts
new file mode 100644
index 000000000..20f58f85c
--- /dev/null
+++ b/src/api/wms/itembasic/index.ts
@@ -0,0 +1,101 @@
+import request from '@/config/axios'
+
+export interface ItembasicVO {
+  code: string
+  name: string
+  desc1: string
+  desc2: string
+  status: string
+  uom: string
+  altUom: string
+  isStdPack: number
+  enableBuy: number
+  enableMake: number
+  enableOutsourcing: number
+  isRecycled: number
+  isPhantom: number
+  abcClass: string
+  type: string
+  category: string
+  itemGroup: string
+  color: string
+  configuration: string
+  project: string
+  eqLevel: string
+  validityDays: number
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询物料基本信息列表
+export const getItembasicPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/itembasic/senior', data })
+  } else {
+    return await request.get({ url: `/wms/itembasic/page`, params })
+  }
+}
+// 查询物料基本信息列表
+export const getItembasicList = async (params) => {
+  return await request.get({ url: `/wms/itembasic/list`, params })
+}
+// 查询物料基本信息详情
+export const getItembasic = async (id: number) => {
+  return await request.get({ url: `/wms/itembasic/get?id=` + id })
+}
+
+// 新增物料基本信息
+export const createItembasic = async (data: ItembasicVO) => {
+  return await request.post({ url: `/wms/itembasic/create`, data })
+}
+
+// 修改物料基本信息
+export const updateItembasic = async (data: ItembasicVO) => {
+  return await request.put({ url: `/wms/itembasic/update`, data })
+}
+
+// 删除物料基本信息
+export const deleteItembasic = async (id: number) => {
+  return await request.delete({ url: `/wms/itembasic/delete?id=` + id })
+}
+
+// 导出物料基本信息 Excel
+export const exportItembasic = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/itembasic/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/itembasic/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/itembasic/get-import-template' })
+}
+// 导入地址
+export const importUrl = '/wms/itembasic/import'
+
+// 查询物料类型为成品/半成品的信息列表 
+export const selectItembasicPageToFgAndSemibasicPage = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return request.post({ url: '/wms/itembasic/itembasicPageToFgAndSemiSenior', data })
+  } else {
+    return await request.get({ url: `/wms/itembasic/itembasicPageToFgAndSemi`, params })
+  }
+}
+
+// 查询物料类型为原料/半成品的信息列表 
+export const selectTypeToItembasic = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return request.post({ url: '/wms/itembasic/pageTypeToItembasicSenior', data })
+  } else {
+    return await request.get({ url: `/wms/itembasic/pageTypeToItembasic`, params })
+  }
+}
\ No newline at end of file
diff --git a/src/api/wms/itempackage/index.ts b/src/api/wms/itempackage/index.ts
new file mode 100644
index 000000000..97eb8348e
--- /dev/null
+++ b/src/api/wms/itempackage/index.ts
@@ -0,0 +1,88 @@
+import request from '@/config/axios'
+
+export interface ItempackagingVO {
+  itemCode: string
+  uom: string
+  packUnit: string
+  packQty: number
+  altPackUnit1: string
+  altPackQty1: number
+  altPackUnit2: string
+  altPackQty2: number
+  altPackUnit3: string
+  altPackQty3: number
+  altPackUnit4: string
+  altPackQty4: number
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询物料包装信息 列表
+export const getItempackagingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/itempackage/senior', data })
+  } else {
+    return await request.get({ url: `/wms/itempackage/page`, params })
+  }
+}
+
+// 查询物料包装信息 列表--供应商发货申请
+export const getItempackagingPageBySupplierdeliver = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/itempackage/seniorBySupplierdeliver', data })
+  } else {
+    return await request.get({ url: `/wms/itempackage/pageBySupplierdeliver`, params })
+  }
+}
+
+// 查询物料包装信息 列表--制品收货申请
+export const getItempackagingPageByProductreceipt = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/itempackage/seniorByProductreceipt', data })
+  } else {
+    return await request.get({ url: `/wms/itempackage/pageByProductreceipt`, params })
+  }
+}
+
+
+// 查询物料包装信息 详情
+export const getItempackaging = async (id: number) => {
+  return await request.get({ url: `/wms/itempackage/get?id=` + id })
+}
+
+// 新增物料包装信息 
+export const createItempackaging = async (data: ItempackagingVO) => {
+  return await request.post({ url: `/wms/itempackage/create`, data })
+}
+
+// 修改物料包装信息 
+export const updateItempackaging = async (data: ItempackagingVO) => {
+  return await request.put({ url: `/wms/itempackage/update`, data })
+}
+
+// 删除物料包装信息 
+export const deleteItempackaging = async (id: number) => {
+  return await request.delete({ url: `/wms/itempackage/delete?id=` + id })
+}
+
+// 导出物料包装信息  Excel
+export const exportItempackaging = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/itempackage/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/itempackage/export-excel`, params })
+  }
+}
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/itempackage/get-import-template' })
+}
diff --git a/src/api/wms/itemwarehouse/index.ts b/src/api/wms/itemwarehouse/index.ts
new file mode 100644
index 000000000..85ea4ba9c
--- /dev/null
+++ b/src/api/wms/itemwarehouse/index.ts
@@ -0,0 +1,59 @@
+import request from '@/config/axios'
+
+export interface ItemwarehouseVO {
+  id: number
+  itemCode: string
+  warehouseCode: string
+  manageMode: string
+  packUnit: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询物料仓库默认配置列表
+export const getItemwarehousePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/itemwarehouse/senior', data })
+  } else {
+    return await request.get({ url: `/wms/itemwarehouse/page`, params })
+  }
+}
+
+// 查询物料仓库默认配置详情
+export const getItemwarehouse = async (id: number) => {
+  return await request.get({ url: `/wms/itemwarehouse/get?id=` + id })
+}
+
+// 新增物料仓库默认配置
+export const createItemwarehouse = async (data: ItemwarehouseVO) => {
+  return await request.post({ url: `/wms/itemwarehouse/create`, data })
+}
+
+// 修改物料仓库默认配置
+export const updateItemwarehouse = async (data: ItemwarehouseVO) => {
+  return await request.put({ url: `/wms/itemwarehouse/update`, data })
+}
+
+// 删除物料仓库默认配置
+export const deleteItemwarehouse = async (id: number) => {
+  return await request.delete({ url: `/wms/itemwarehouse/delete?id=` + id })
+}
+
+// 导出物料仓库默认配置 Excel
+export const exportItemwarehouse = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/itemwarehouse/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/itemwarehouse/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/itemwarehouse/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/jobsetting/index.ts b/src/api/wms/jobsetting/index.ts
new file mode 100644
index 000000000..c7807e04f
--- /dev/null
+++ b/src/api/wms/jobsetting/index.ts
@@ -0,0 +1,62 @@
+import request from '@/config/axios'
+
+export interface JobsettingVO {
+  code: string
+  validMinutes: number
+  activeTime: Date
+  remark: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBach: string
+  allowModifyPackingNumber: string
+  available: string
+  isSoftDeleted: string
+  expireTime: Date
+}
+
+// 查询任务设置列表
+export const getJobsettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/jobsetting/senior', data })
+  } else {
+    return await request.get({ url: `/wms/jobsetting/page`, params })
+  }
+}
+
+// 查询任务设置详情
+export const getJobsetting = async (id: number) => {
+  return await request.get({ url: `/wms/jobsetting/get?id=` + id })
+}
+
+// 新增任务设置
+export const createJobsetting = async (data: JobsettingVO) => {
+  return await request.post({ url: `/wms/jobsetting/create`, data })
+}
+
+// 修改任务设置
+export const updateJobsetting = async (data: JobsettingVO) => {
+  return await request.put({ url: `/wms/jobsetting/update`, data })
+}
+
+// 删除任务设置
+export const deleteJobsetting = async (id: number) => {
+  return await request.delete({ url: `/wms/jobsetting/delete?id=` + id })
+}
+
+// 导出任务设置 Excel
+export const exportJobsetting = async (params) => {
+  return await request.download({ url: `/wms/jobsetting/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/jobsetting/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/labeltype/index.ts b/src/api/wms/labeltype/index.ts
new file mode 100644
index 000000000..148a1b95b
--- /dev/null
+++ b/src/api/wms/labeltype/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface LabeltypeVO {
+  id: number
+  labelType: string
+  description: string
+  dataProtocol: string
+  splitMehod: string
+  header: string
+  version: string
+  separators: string
+  validateMethod: string
+  validateNumber: number
+  encyptEthod: string
+  compressMethod: string
+  templateName: string
+  templateFile: string
+  barcodeSegments: string
+  labelCode: string
+  isEncypt: string
+  isCompress: string
+}
+
+// 查询标签定义列表
+export const getLabeltypePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/labeltype/senior', data })
+  } else {
+    return await request.get({ url: `/wms/labeltype/page`, params })
+  }
+}
+
+// 查询标签定义详情
+export const getLabeltype = async (id: number) => {
+  return await request.get({ url: `/wms/labeltype/get?id=` + id })
+}
+
+// 新增标签定义
+export const createLabeltype = async (data: LabeltypeVO) => {
+  return await request.post({ url: `/wms/labeltype/create`, data })
+}
+
+// 修改标签定义
+export const updateLabeltype = async (data: LabeltypeVO) => {
+  return await request.put({ url: `/wms/labeltype/update`, data })
+}
+
+// 删除标签定义
+export const deleteLabeltype = async (id: number) => {
+  return await request.delete({ url: `/wms/labeltype/delete?id=` + id })
+}
+
+// 导出标签定义 Excel
+export const exportLabeltype = async (params) => {
+  return await request.download({ url: `/wms/labeltype/export-excel`, params })
+}
diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts
new file mode 100644
index 000000000..1960d423a
--- /dev/null
+++ b/src/api/wms/location/index.ts
@@ -0,0 +1,86 @@
+import request from '@/config/axios'
+
+export interface LocationVO {
+  code: string
+  name: string
+  description: string
+  warehouseCode: string
+  areaCode: string
+  locationGroupCode: string
+  erpLocationCode: string
+  type: string
+  aisle: string
+  shelf: string
+  locationRow: number
+  locationColum: number
+  pickPriority: number
+  maxWeight: number
+  maxArea: number
+  maxVolume: number
+  userGroupCode: string
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询库位列表
+export const getLocationPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/location/senior', data })
+  } else {
+    return await request.get({ url: `/wms/location/page`, params })
+  }
+}
+// 查询库位所有列表
+export const getLocationList = async (params) => {
+  return await request.get({ url: `/wms/location/list`, params })
+}
+
+// 查询库位详情
+export const getLocation = async (id: number) => {
+  return await request.get({ url: `/wms/location/get?id=` + id })
+}
+
+// 新增库位
+export const createLocation = async (data: LocationVO) => {
+  return await request.post({ url: `/wms/location/create`, data })
+}
+
+// 修改库位
+export const updateLocation = async (data: LocationVO) => {
+  return await request.put({ url: `/wms/location/update`, data })
+}
+
+// 删除库位
+export const deleteLocation = async (id: number) => {
+  return await request.delete({ url: `/wms/location/delete?id=` + id })
+}
+
+// 导出库位 Excel
+export const exportLocation = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/location/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/location/export-excel`, params })
+  }
+  
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/location/get-import-template' })
+}
+
+export const selectBusinessTypeToLocation = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/location/pageBusinessTypeToLocationSenior', data })
+  } else {
+    return request.get({ url: `/wms/location/pageBusinessTypeToLocation`, params })
+  }
+}
\ No newline at end of file
diff --git a/src/api/wms/locationcapacity/index.ts b/src/api/wms/locationcapacity/index.ts
new file mode 100644
index 000000000..40df8ca47
--- /dev/null
+++ b/src/api/wms/locationcapacity/index.ts
@@ -0,0 +1,51 @@
+import request from '@/config/axios'
+
+export interface LocationcapacityVO {
+  locationCode: string
+  warehouseCode: string
+  usedCapacity: number
+  availableCapacity: number
+  bearableOverloadCapacity: number
+  isInfinity: string
+}
+
+// 查询库位容量列表
+export const getLocationcapacityPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/locationcapacity/senior', data })
+  } else {
+    return await request.get({ url: `/wms/locationcapacity/page`, params })
+  }
+}
+
+// 查询库位容量详情
+export const getLocationcapacity = async (id: number) => {
+  return await request.get({ url: `/wms/locationcapacity/get?id=` + id })
+}
+
+// 新增库位容量
+export const createLocationcapacity = async (data: LocationcapacityVO) => {
+  return await request.post({ url: `/wms/locationcapacity/create`, data })
+}
+
+// 修改库位容量
+export const updateLocationcapacity = async (data: LocationcapacityVO) => {
+  return await request.put({ url: `/wms/locationcapacity/update`, data })
+}
+
+// 删除库位容量
+export const deleteLocationcapacity = async (id: number) => {
+  return await request.delete({ url: `/wms/locationcapacity/delete?id=` + id })
+}
+
+// 导出库位容量 Excel
+export const exportLocationcapacity = async (params) => {
+  return await request.download({ url: `/wms/locationcapacity/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/locationcapacity/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/locationgroup/index.ts b/src/api/wms/locationgroup/index.ts
new file mode 100644
index 000000000..3aa976b9c
--- /dev/null
+++ b/src/api/wms/locationgroup/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface LocationgroupVO {
+  code: string
+  name: string
+  description: string
+  warehouseCode: string
+  areaCode: string
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询库位组列表
+export const getLocationgroupPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/locationgroup/senior', data })
+  } else {
+    return await request.get({ url: `/wms/locationgroup/page`, params })
+  }
+}
+// 查询库位组列表
+export const getLocationgroupList = async (params) => {
+  return await request.get({ url: `/wms/locationgroup/list`, params })
+}
+
+// 查询库位组详情
+export const getLocationgroup = async (id: number) => {
+  return await request.get({ url: `/wms/locationgroup/get?id=` + id })
+}
+
+// 新增库位组
+export const createLocationgroup = async (data: LocationgroupVO) => {
+  return await request.post({ url: `/wms/locationgroup/create`, data })
+}
+
+// 修改库位组
+export const updateLocationgroup = async (data: LocationgroupVO) => {
+  return await request.put({ url: `/wms/locationgroup/update`, data })
+}
+
+// 删除库位组
+export const deleteLocationgroup = async (id: number) => {
+  return await request.delete({ url: `/wms/locationgroup/delete?id=` + id })
+}
+
+// 导出库位组 Excel
+export const exportLocationgroup = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/locationgroup/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/locationgroup/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/locationgroup/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/offlinesettlementRecordDetail/index.ts b/src/api/wms/offlinesettlementRecordDetail/index.ts
new file mode 100644
index 000000000..b19d5646b
--- /dev/null
+++ b/src/api/wms/offlinesettlementRecordDetail/index.ts
@@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+export interface OfflinesettlementRecordDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  locationCode: string
+  locationGroupCode: string
+  areaCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  jobDetailId: string
+}
+
+// 查询下线结算记录子列表
+export const getOfflinesettlementRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/offlinesettlement-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/offlinesettlement-record-detail/page`, params })
+  }
+}
+
+// 查询下线结算记录子详情
+export const getOfflinesettlementRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/offlinesettlement-record-detail/get?id=` + id })
+}
+
+// 新增下线结算记录子
+export const createOfflinesettlementRecordDetail = async (data: OfflinesettlementRecordDetailVO) => {
+  return await request.post({ url: `/wms/offlinesettlement-record-detail/create`, data })
+}
+
+// 修改下线结算记录子
+export const updateOfflinesettlementRecordDetail = async (data: OfflinesettlementRecordDetailVO) => {
+  return await request.put({ url: `/wms/offlinesettlement-record-detail/update`, data })
+}
+
+// 删除下线结算记录子
+export const deleteOfflinesettlementRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/offlinesettlement-record-detail/delete?id=` + id })
+}
+
+// 导出下线结算记录子 Excel
+export const exportOfflinesettlementRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/offlinesettlement-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/offlinesettlement-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/offlinesettlementRecordMain/index.ts b/src/api/wms/offlinesettlementRecordMain/index.ts
new file mode 100644
index 000000000..da771ba9a
--- /dev/null
+++ b/src/api/wms/offlinesettlementRecordMain/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface OfflinesettlementRecordMainVO {
+  requestNumber: string
+  productReceiptRecordNumber: string
+  warehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  available: string
+}
+
+// 查询下线结算记录主列表
+export const getOfflinesettlementRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/offlinesettlement-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/offlinesettlement-record-main/page`, params })
+  }
+}
+
+// 查询下线结算记录主详情
+export const getOfflinesettlementRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/offlinesettlement-record-main/get?id=` + id })
+}
+
+// 新增下线结算记录主
+export const createOfflinesettlementRecordMain = async (data: OfflinesettlementRecordMainVO) => {
+  return await request.post({ url: `/wms/offlinesettlement-record-main/create`, data })
+}
+
+// 修改下线结算记录主
+export const updateOfflinesettlementRecordMain = async (data: OfflinesettlementRecordMainVO) => {
+  return await request.put({ url: `/wms/offlinesettlement-record-main/update`, data })
+}
+
+// 删除下线结算记录主
+export const deleteOfflinesettlementRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/offlinesettlement-record-main/delete?id=` + id })
+}
+
+// 导出下线结算记录主 Excel
+export const exportOfflinesettlementRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/offlinesettlement-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/offlinesettlement-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/offlinesettlement-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/offlinesettlementRequestDetail/index.ts b/src/api/wms/offlinesettlementRequestDetail/index.ts
new file mode 100644
index 000000000..c4561b4db
--- /dev/null
+++ b/src/api/wms/offlinesettlementRequestDetail/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface OfflinesettlementRequestDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  locationCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+}
+
+// 查询下线结算申请子列表
+export const getOfflinesettlementRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/offlinesettlement-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/offlinesettlement-request-detail/page`, params })
+  }
+}
+
+// 查询下线结算申请子详情
+export const getOfflinesettlementRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/offlinesettlement-request-detail/get?id=` + id })
+}
+
+// 新增下线结算申请子
+export const createOfflinesettlementRequestDetail = async (data: OfflinesettlementRequestDetailVO) => {
+  return await request.post({ url: `/wms/offlinesettlement-request-detail/create`, data })
+}
+
+// 修改下线结算申请子
+export const updateOfflinesettlementRequestDetail = async (data: OfflinesettlementRequestDetailVO) => {
+  return await request.put({ url: `/wms/offlinesettlement-request-detail/update`, data })
+}
+
+// 删除下线结算申请子
+export const deleteOfflinesettlementRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/offlinesettlement-request-detail/delete?id=` + id })
+}
+
+// 导出下线结算申请子 Excel
+export const exportOfflinesettlementRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/offlinesettlement-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/offlinesettlement-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/offlinesettlementRequestMain/index.ts b/src/api/wms/offlinesettlementRequestMain/index.ts
new file mode 100644
index 000000000..0dcbb20bc
--- /dev/null
+++ b/src/api/wms/offlinesettlementRequestMain/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface OfflinesettlementRequestMainVO {
+  productReceiptRecordNumber: string
+  warehouseCode: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询下线结算申请主列表
+export const getOfflinesettlementRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/offlinesettlement-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/offlinesettlement-request-main/page`, params })
+  }
+}
+
+// 查询下线结算申请主详情
+export const getOfflinesettlementRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/offlinesettlement-request-main/get?id=` + id })
+}
+
+// 新增下线结算申请主
+export const createOfflinesettlementRequestMain = async (data: OfflinesettlementRequestMainVO) => {
+  return await request.post({ url: `/wms/offlinesettlement-request-main/create`, data })
+}
+
+// 修改下线结算申请主
+export const updateOfflinesettlementRequestMain = async (data: OfflinesettlementRequestMainVO) => {
+  return await request.put({ url: `/wms/offlinesettlement-request-main/update`, data })
+}
+
+// 删除下线结算申请主
+export const deleteOfflinesettlementRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/offlinesettlement-request-main/delete?id=` + id })
+}
+
+// 导出下线结算申请主 Excel
+export const exportOfflinesettlementRequestMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/offlinesettlement-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/offlinesettlement-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/offlinesettlement-request-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/onlinesettlementRecordDetail/index.ts b/src/api/wms/onlinesettlementRecordDetail/index.ts
new file mode 100644
index 000000000..08eb9d606
--- /dev/null
+++ b/src/api/wms/onlinesettlementRecordDetail/index.ts
@@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+export interface OnlinesettlementRecordDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  locationCode: string
+  locationGroupCode: string
+  areaCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  jobDetailId: string
+}
+
+// 查询上线结算记录子列表
+export const getOnlinesettlementRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/onlinesettlement-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/onlinesettlement-record-detail/page`, params })
+  }
+}
+
+// 查询上线结算记录子详情
+export const getOnlinesettlementRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/onlinesettlement-record-detail/get?id=` + id })
+}
+
+// 新增上线结算记录子
+export const createOnlinesettlementRecordDetail = async (data: OnlinesettlementRecordDetailVO) => {
+  return await request.post({ url: `/wms/onlinesettlement-record-detail/create`, data })
+}
+
+// 修改上线结算记录子
+export const updateOnlinesettlementRecordDetail = async (data: OnlinesettlementRecordDetailVO) => {
+  return await request.put({ url: `/wms/onlinesettlement-record-detail/update`, data })
+}
+
+// 删除上线结算记录子
+export const deleteOnlinesettlementRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/onlinesettlement-record-detail/delete?id=` + id })
+}
+
+// 导出上线结算记录子 Excel
+export const exportOnlinesettlementRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/onlinesettlement-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/onlinesettlement-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/onlinesettlementRecordMain/index.ts b/src/api/wms/onlinesettlementRecordMain/index.ts
new file mode 100644
index 000000000..31018c0e9
--- /dev/null
+++ b/src/api/wms/onlinesettlementRecordMain/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface OnlinesettlementRecordMainVO {
+  requestNumber: string
+  issueRecordNumber: string
+  warehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  available: string
+}
+
+// 查询上线结算记录主列表
+export const getOnlinesettlementRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/onlinesettlement-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/onlinesettlement-record-main/page`, params })
+  }
+}
+
+// 查询上线结算记录主详情
+export const getOnlinesettlementRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/onlinesettlement-record-main/get?id=` + id })
+}
+
+// 新增上线结算记录主
+export const createOnlinesettlementRecordMain = async (data: OnlinesettlementRecordMainVO) => {
+  return await request.post({ url: `/wms/onlinesettlement-record-main/create`, data })
+}
+
+// 修改上线结算记录主
+export const updateOnlinesettlementRecordMain = async (data: OnlinesettlementRecordMainVO) => {
+  return await request.put({ url: `/wms/onlinesettlement-record-main/update`, data })
+}
+
+// 删除上线结算记录主
+export const deleteOnlinesettlementRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/onlinesettlement-record-main/delete?id=` + id })
+}
+
+// 导出上线结算记录主 Excel
+export const exportOnlinesettlementRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/onlinesettlement-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/onlinesettlement-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/onlinesettlement-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/onlinesettlementRequestDetail/index.ts b/src/api/wms/onlinesettlementRequestDetail/index.ts
new file mode 100644
index 000000000..b6ccf2227
--- /dev/null
+++ b/src/api/wms/onlinesettlementRequestDetail/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface OnlinesettlementRequestDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  locationCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+}
+
+// 查询上线结算申请子列表
+export const getOnlinesettlementRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/onlinesettlement-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/onlinesettlement-request-detail/page`, params })
+  }
+}
+
+// 查询上线结算申请子详情
+export const getOnlinesettlementRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/onlinesettlement-request-detail/get?id=` + id })
+}
+
+// 新增上线结算申请子
+export const createOnlinesettlementRequestDetail = async (data: OnlinesettlementRequestDetailVO) => {
+  return await request.post({ url: `/wms/onlinesettlement-request-detail/create`, data })
+}
+
+// 修改上线结算申请子
+export const updateOnlinesettlementRequestDetail = async (data: OnlinesettlementRequestDetailVO) => {
+  return await request.put({ url: `/wms/onlinesettlement-request-detail/update`, data })
+}
+
+// 删除上线结算申请子
+export const deleteOnlinesettlementRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/onlinesettlement-request-detail/delete?id=` + id })
+}
+
+// 导出上线结算申请子 Excel
+export const exportOnlinesettlementRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/onlinesettlement-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/onlinesettlement-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/onlinesettlementRequestMain/index.ts b/src/api/wms/onlinesettlementRequestMain/index.ts
new file mode 100644
index 000000000..6f6238f40
--- /dev/null
+++ b/src/api/wms/onlinesettlementRequestMain/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface OnlinesettlementRequestMainVO {
+  issueRecordNumber: string
+  warehouseCode: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询上线结算申请主列表
+export const getOnlinesettlementRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/onlinesettlement-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/onlinesettlement-request-main/page`, params })
+  }
+}
+
+// 查询上线结算申请主详情
+export const getOnlinesettlementRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/onlinesettlement-request-main/get?id=` + id })
+}
+
+// 新增上线结算申请主
+export const createOnlinesettlementRequestMain = async (data: OnlinesettlementRequestMainVO) => {
+  return await request.post({ url: `/wms/onlinesettlement-request-main/create`, data })
+}
+
+// 修改上线结算申请主
+export const updateOnlinesettlementRequestMain = async (data: OnlinesettlementRequestMainVO) => {
+  return await request.put({ url: `/wms/onlinesettlement-request-main/update`, data })
+}
+
+// 删除上线结算申请主
+export const deleteOnlinesettlementRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/onlinesettlement-request-main/delete?id=` + id })
+}
+
+// 导出上线结算申请主 Excel
+export const exportOnlinesettlementRequestMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/onlinesettlement-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/onlinesettlement-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/onlinesettlement-request-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/owner/index.ts b/src/api/wms/owner/index.ts
new file mode 100644
index 000000000..64ccb4470
--- /dev/null
+++ b/src/api/wms/owner/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface OwnerVO {
+  code: string
+  name: string
+  shortName: string
+  address: string
+  country: string
+  city: string
+  phone: string
+  fax: string
+  postId: string
+  contacts: string
+  bank: string
+  currency: string
+  taxRate: number
+  type: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  available: string
+}
+
+// 查询货主列表
+export const getOwnerPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/owner/senior', data })
+  } else {
+    return await request.get({ url: `/wms/owner/page`, params })
+  }
+}
+// 查询所有货主列表
+export const getOwnerList = async (params) => {
+  return await request.get({ url: `/wms/owner/list`, params })
+}
+// 查询货主详情
+export const getOwner = async (id: number) => {
+  return await request.get({ url: `/wms/owner/get?id=` + id })
+}
+
+// 新增货主
+export const createOwner = async (data: OwnerVO) => {
+  return await request.post({ url: `/wms/owner/create`, data })
+}
+
+// 修改货主
+export const updateOwner = async (data: OwnerVO) => {
+  return await request.put({ url: `/wms/owner/update`, data })
+}
+
+// 删除货主
+export const deleteOwner = async (id: number) => {
+  return await request.delete({ url: `/wms/owner/delete?id=` + id })
+}
+
+// 导出货主 Excel
+export const exportOwner = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/owner/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/owner/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/owner/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts
new file mode 100644
index 000000000..d43f45766
--- /dev/null
+++ b/src/api/wms/package/index.ts
@@ -0,0 +1,96 @@
+import request from '@/config/axios'
+
+export interface PackageVO {
+  number: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  batch: string
+  altBatch: string
+  produceDate: Date
+  validityDays: number
+  expireDate: Date
+  uom: string
+  qty: number
+  altUom: string
+  altQty: number
+  convertRate: number
+  packQty: number
+  packUnit: string
+  toWarehouseCode: string
+  toDockCode: string
+  toLocationCode: string
+  supplierCode: string
+  supplierItemCode: string
+  poNumber: string
+  poLine: string
+  rpNumber: string
+  asnNumber: string
+  woNumber: string
+  woLine: string
+  productionLineCode: string
+  teamCode: string
+  shiftCode: string
+  customerCode: string
+  customerDockCode: string
+  customerItemCode: string
+  soNumber: string
+  soLine: string
+  eqLevel: string
+  ownerCode: string
+  weight: string
+  area: string
+  volume: string
+}
+
+// 查询包装列表
+export const getPackagePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/package/senior', data })
+  } else {
+    return await request.get({ url: `/wms/package/page`, params })
+  }
+}
+
+// 查询包装详情
+export const getPackage = async (id: number) => {
+  return await request.get({ url: `/wms/package/get?id=` + id })
+}
+
+// 新增包装
+export const createPackage = async (data: PackageVO) => {
+  return await request.post({ url: `/wms/package/create`, data })
+}
+
+// 修改包装
+export const updatePackage = async (data: PackageVO) => {
+  return await request.put({ url: `/wms/package/update`, data })
+}
+
+// 删除包装
+export const deletePackage = async (id: number) => {
+  return await request.delete({ url: `/wms/package/delete?id=` + id })
+}
+
+// 导出包装 Excel
+export const exportPackage = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.download({ url: `/wms/package/export-excel-senior`, data })
+  } else {
+      return await request.download({ url: `/wms/package/export-excel`, params })
+    }
+  }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/package/get-import-template' })
+}
+
+// 创建标签
+export const createPackageLabel = async (data: PackageVO) => {
+  return await request.post({ url: `/wms/package/createLabel`, data })
+}
diff --git a/src/api/wms/packagemergeDetail/index.ts b/src/api/wms/packagemergeDetail/index.ts
new file mode 100644
index 000000000..3322cfe52
--- /dev/null
+++ b/src/api/wms/packagemergeDetail/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface PackagemergeDetailVO {
+                    id: number
+                    locationCode: string
+                    locationGroupCode: string
+                    areaCode: string
+                    fromPackingNumber: string
+                    toPackingNumber: string
+                    fromBatch: string
+                    toBatch: string
+                    fromInventoryStatus: string
+                    toInventoryStatus: string
+                    fromContainerNumber: string
+                    toContainerNumber: string
+                    fromOwnerCode: string
+                    toOwnerCode: string
+                    masterId: number
+                    number: string
+                    itemCode: string
+                    remark: string
+                    siteId: string
+                    itemName: string
+                    itemDesc1: string
+                    itemDesc2: string
+                    projectCode: string
+                    toQty: number
+                    fromQty: number
+                    uom: string
+                    interfaceType: string
+}
+
+// 查询合包记录子列表
+export const getPackagemergeDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packagemerge-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/packagemerge-detail/page`, params })
+  }
+}
+
+// 查询合包记录子详情
+export const getPackagemergeDetail = async (id: number) => {
+  return await request.get({ url: '/wms/packagemerge-detail/get?id=' + id })
+}
+
+// 新增合包记录子
+export const createPackagemergeDetail = async (data: PackagemergeDetailVO) => {
+  return await request.post({ url: '/wms/packagemerge-detail/create', data })
+}
+
+// 修改合包记录子
+export const updatePackagemergeDetail = async (data: PackagemergeDetailVO) => {
+  return await request.put({ url: '/wms/packagemerge-detail/update', data })
+}
+
+// 删除合包记录子
+export const deletePackagemergeDetail = async (id: number) => {
+  return await request.delete({ url: '/wms/packagemerge-detail/delete?id=' + id })
+}
+
+// 导出合包记录子 Excel
+export const exportPackagemergeDetailApi = async (params) => {
+  return await request.download({ url: '/wms/packagemerge-detail/export-excel', params })
+}
diff --git a/src/api/wms/packagemergeMain/index.ts b/src/api/wms/packagemergeMain/index.ts
new file mode 100644
index 000000000..263829285
--- /dev/null
+++ b/src/api/wms/packagemergeMain/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface PackagemergeMainVO {
+  id: number
+  warehouseCode: string
+  details: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  available: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  userGroupCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: string
+}
+
+// 查询合包记录主列表
+export const getPackagemergeMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packagemerge-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/packagemerge-main/page`, params })
+  }
+}
+
+// 查询合包记录主详情
+export const getPackagemergeMain = async (id: number) => {
+  return await request.get({ url: `/wms/packagemerge-main/get?id=` + id })
+}
+
+// 新增合包记录主
+export const createPackagemergeMain = async (data: PackagemergeMainVO) => {
+  return await request.post({ url: `/wms/packagemerge-main/create`, data })
+}
+
+// 修改合包记录主
+export const updatePackagemergeMain = async (data: PackagemergeMainVO) => {
+  return await request.put({ url: `/wms/packagemerge-main/update`, data })
+}
+
+// 删除合包记录主
+export const deletePackagemergeMain = async (id: number) => {
+  return await request.delete({ url: `/wms/packagemerge-main/delete?id=` + id })
+}
+
+// 导出合包记录主 Excel
+export const exportPackagemergeMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/packagemerge-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/packagemerge-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/packagemerge-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/packageoverJobDetail/index.ts b/src/api/wms/packageoverJobDetail/index.ts
new file mode 100644
index 000000000..41043f087
--- /dev/null
+++ b/src/api/wms/packageoverJobDetail/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface PackageoverJobDetailVO {
+  id: number
+  number: string
+  batch: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  fromPackingNumber: string
+  toPackingNumber: string
+  fromPackUnit: string
+  toPackUnit: string
+  fromPackQty: number
+  toPackQty: number
+  fromLocationGroupCode: string
+  toLocationGroupCode: string
+  fromAreaCode: string
+  toAreaCode: string
+  fromLocationCode: string
+  toLocationCode: string
+  fromOwnerCode: string
+  toOwnerCode: string
+  inventoryStatus: string
+  remark: string
+}
+
+// 查询翻包任务子列表
+export const getPackageoverJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageover-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/packageover-job-detail/page`, params })
+  }
+}
+
+// 查询翻包任务子详情
+export const getPackageoverJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/packageover-job-detail/get?id=` + id })
+}
+
+// 新增翻包任务子
+export const createPackageoverJobDetail = async (data: PackageoverJobDetailVO) => {
+  return await request.post({ url: `/wms/packageover-job-detail/create`, data })
+}
+
+// 修改翻包任务子
+export const updatePackageoverJobDetail = async (data: PackageoverJobDetailVO) => {
+  return await request.put({ url: `/wms/packageover-job-detail/update`, data })
+}
+
+// 删除翻包任务子
+export const deletePackageoverJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/packageover-job-detail/delete?id=` + id })
+}
+
+// 导出翻包任务子 Excel
+export const exportPackageoverJobDetail = async (params) => {
+  return await request.download({ url: `/wms/packageover-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/packageover-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/packageoverJobMain/index.ts b/src/api/wms/packageoverJobMain/index.ts
new file mode 100644
index 000000000..dcd1df373
--- /dev/null
+++ b/src/api/wms/packageoverJobMain/index.ts
@@ -0,0 +1,76 @@
+import request from '@/config/axios'
+
+export interface PackageoverJobMainVO {
+  id: number
+  requestNumber: string
+  status: string
+  requestTime: Date
+  requestDueTime: Date
+  expiredTime: Date
+  number: string
+  priority: number
+  priorityIncrement: number
+  acceptUserId: string
+  acceptUserName: string
+  acceptTime: Date
+  completeUserId: string
+  completeUserName: string
+  completeTime: Date
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  inInventoryStatuses: string
+  outInventoryStatuses: string
+  businessType: string
+  departmentCode: string
+  remark: string
+}
+
+// 查询翻包任务主列表
+export const getPackageoverJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageover-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/packageover-job-main/page`, params })
+  }
+}
+
+// 查询翻包任务主详情
+export const getPackageoverJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/packageover-job-main/get?id=` + id })
+}
+
+// 新增翻包任务主
+export const createPackageoverJobMain = async (data: PackageoverJobMainVO) => {
+  return await request.post({ url: `/wms/packageover-job-main/create`, data })
+}
+
+// 修改翻包任务主
+export const updatePackageoverJobMain = async (data: PackageoverJobMainVO) => {
+  return await request.put({ url: `/wms/packageover-job-main/update`, data })
+}
+
+// 删除翻包任务主
+export const deletePackageoverJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/packageover-job-main/delete?id=` + id })
+}
+
+// 导出翻包任务主 Excel
+export const exportPackageoverJobMain = async (params) => {
+  return await request.download({ url: `/wms/packageover-job-main/export-excel`, params })
+}
diff --git a/src/api/wms/packageoverRecordDetail/index.ts b/src/api/wms/packageoverRecordDetail/index.ts
new file mode 100644
index 000000000..3286e826a
--- /dev/null
+++ b/src/api/wms/packageoverRecordDetail/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface PackageoverDetailVO {
+                    id: number
+                    locationCode: string
+                    locationGroupCode: string
+                    areaCode: string
+                    fromPackingNumber: string
+                    toPackingNumber: string
+                    fromBatch: string
+                    toBatch: string
+                    fromInventoryStatus: string
+                    toInventoryStatus: string
+                    fromContainerNumber: string
+                    toContainerNumber: string
+                    fromOwnerCode: string
+                    toOwnerCode: string
+                    masterId: number
+                    number: string
+                    itemCode: string
+                    remark: string
+                    siteId: string
+                    itemName: string
+                    itemDesc1: string
+                    itemDesc2: string
+                    projectCode: string
+                    toQty: number
+                    fromQty: number
+                    uom: string
+                    interfaceType: string
+}
+
+// 查询翻包记录子列表
+export const getPackageoverDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageover-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/packageover-record-detail/page`, params })
+  }
+}
+
+// 查询翻包记录子详情
+export const getPackageoverDetail = async (id: number) => {
+  return await request.get({ url: '/wms/packageover-record-detail/get?id=' + id })
+}
+
+// 新增翻包记录子
+export const createPackageoverDetail = async (data: PackageoverDetailVO) => {
+  return await request.post({ url: '/wms/packageover-record-detail/create', data })
+}
+
+// 修改翻包记录子
+export const updatePackageoverDetail = async (data: PackageoverDetailVO) => {
+  return await request.put({ url: '/wms/packageover-record-detail/update', data })
+}
+
+// 删除翻包记录子
+export const deletePackageoverDetail = async (id: number) => {
+  return await request.delete({ url: '/wms/packageover-record-detail/delete?id=' + id })
+}
+
+// 导出翻包记录子 Excel
+export const exportPackageoverDetailApi = async (params) => {
+  return await request.download({ url: '/wms/packageover-record-detail/export-excel', params })
+}
diff --git a/src/api/wms/packageoverRecordMain/index.ts b/src/api/wms/packageoverRecordMain/index.ts
new file mode 100644
index 000000000..398cdeaa6
--- /dev/null
+++ b/src/api/wms/packageoverRecordMain/index.ts
@@ -0,0 +1,66 @@
+import request from '@/config/axios'
+
+export interface PackageoverMainVO {
+  id: number
+  number: string
+  status: string
+  requestTime: Date
+  dueTime: Date
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  inInventoryStatuses: string
+  outInventoryStatuses: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+  departmentCode: string
+  remark: string
+  businessType: string
+  concurrencyStamp: number
+}
+
+// 查询翻包申请主列表
+export const getPackageoverMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageover-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/packageover-record-main/page`, params })
+  }
+}
+
+// 查询翻包申请主详情
+export const getPackageoverMain = async (id: number) => {
+  return await request.get({ url: `/wms/packageover-record-main/get?id=` + id })
+}
+
+// 新增翻包申请主
+export const createPackageoverMain = async (data: PackageoverMainVO) => {
+  return await request.post({ url: `/wms/packageover-record-main/create`, data })
+}
+
+// 修改翻包申请主
+export const updatePackageoverMain = async (data: PackageoverMainVO) => {
+  return await request.put({ url: `/wms/packageover-record-main/update`, data })
+}
+
+// 删除翻包申请主
+export const deletePackageoverMain = async (id: number) => {
+  return await request.delete({ url: `/wms/packageover-record-main/delete?id=` + id })
+}
+
+// 导出翻包申请主 Excel
+export const exportPackageoverMain = async (params) => {
+  return await request.download({ url: `/wms/packageover-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/packageover-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/packageoverRequestDetail/index.ts b/src/api/wms/packageoverRequestDetail/index.ts
new file mode 100644
index 000000000..0be98182f
--- /dev/null
+++ b/src/api/wms/packageoverRequestDetail/index.ts
@@ -0,0 +1,70 @@
+import request from '@/config/axios'
+
+export interface PackageoverRequestDetailVO {
+  id: number
+  number: string
+  batch: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  fromPackUnit: string
+  toPackUnit: string
+  fromPackQty: number
+  toPackQty: number
+  fromLocationCode: string
+  toLocationCode: string
+  fromLocationGroupCode: string
+  toLocationGroupCode: string
+  fromAreaCode: string
+  toAreaCode: string
+  inventoryStatus: string
+  remark: string
+  masterId: number
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询翻包申请子列表
+export const getPackageoverRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageover-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/packageover-request-detail/page`, params })
+  }
+}
+
+// 查询翻包申请子详情
+export const getPackageoverRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/packageover-request-detail/get?id=` + id })
+}
+
+// 新增翻包申请子
+export const createPackageoverRequestDetail = async (data: PackageoverRequestDetailVO) => {
+  return await request.post({ url: `/wms/packageover-request-detail/create`, data })
+}
+
+// 修改翻包申请子
+export const updatePackageoverRequestDetail = async (data: PackageoverRequestDetailVO) => {
+  return await request.put({ url: `/wms/packageover-request-detail/update`, data })
+}
+
+// 删除翻包申请子
+export const deletePackageoverRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/packageover-request-detail/delete?id=` + id })
+}
+
+// 导出翻包申请子 Excel
+export const exportPackageoverRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/packageover-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/packageover-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/packageoverRequestMain/index.ts b/src/api/wms/packageoverRequestMain/index.ts
new file mode 100644
index 000000000..94b376bdf
--- /dev/null
+++ b/src/api/wms/packageoverRequestMain/index.ts
@@ -0,0 +1,96 @@
+import request from '@/config/axios'
+
+export interface PackageoverRequestMainVO {
+  id: number
+  number: string
+  status: string
+  requestTime: Date
+  dueTime: Date
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  inInventoryStatuses: string
+  outInventoryStatuses: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+  departmentCode: string
+  remark: string
+  businessType: string
+  concurrencyStamp: number
+}
+
+// 查询翻包申请主列表
+export const getPackageoverRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageover-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/packageover-request-main/page`, params })
+  }
+}
+
+// 查询翻包申请主详情
+export const getPackageoverRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/packageover-request-main/get?id=` + id })
+}
+
+// 新增翻包申请主
+export const createPackageoverRequestMain = async (data: PackageoverRequestMainVO) => {
+  return await request.post({ url: `/wms/packageover-request-main/create`, data })
+}
+
+// 修改翻包申请主
+export const updatePackageoverRequestMain = async (data: PackageoverRequestMainVO) => {
+  return await request.put({ url: `/wms/packageover-request-main/update`, data })
+}
+
+// 删除翻包申请主
+export const deletePackageoverRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/packageover-request-main/delete?id=` + id })
+}
+
+// 导出翻包申请主 Excel
+export const exportPackageoverRequestMain = async (params) => {
+  return await request.download({ url: `/wms/packageover-request-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/packageover-request-main/get-import-template' })
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/packageover-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/packageover-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/packageover-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/packageover-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/packageover-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/packageover-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/packageoverRetrospect/index.ts b/src/api/wms/packageoverRetrospect/index.ts
new file mode 100644
index 000000000..9641a1472
--- /dev/null
+++ b/src/api/wms/packageoverRetrospect/index.ts
@@ -0,0 +1,83 @@
+import request from '@/config/axios'
+
+export interface PackageoverRetrospectVO {
+  id: number
+  number: string
+  jobNumber: string
+  warehouseCode: string
+  areaCode: string
+  locationGroupCode: string
+  locationCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  requestTime: Date
+  dueTime: Date
+  fromPackingNumber: string
+  toPackingNumber: string
+  fromBatch: string
+  toBatch: string
+  fromPackUnit: string
+  toPackUnit: string
+  fromPackQty: number
+  toPackQty: number
+  fromInventoryStatus: string
+  toInventoryStatus: string
+  fromContainerNumber: string
+  toContainerNumber: string
+  businessType: string
+  departmentCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  fromOwnerCode: string
+  toOwnerCode: string
+  remark: string
+  available: string
+}
+
+// 查询翻包记录主列表
+export const getPackageoverRetrospectPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageover-retrospect/senior', data })
+  } else {
+    return await request.get({ url: `/wms/packageover-retrospect/page`, params })
+  }
+}
+
+// 查询翻包记录主详情
+export const getPackageoverRetrospect = async (id: number) => {
+  return await request.get({ url: `/wms/packageover-retrospect/get?id=` + id })
+}
+
+// 新增翻包记录主
+export const createPackageoverRetrospect = async (data: PackageoverRetrospectVO) => {
+  return await request.post({ url: `/wms/packageover-retrospect/create`, data })
+}
+
+// 修改翻包记录主
+export const updatePackageoverRetrospect = async (data: PackageoverRetrospectVO) => {
+  return await request.put({ url: `/wms/packageover-retrospect/update`, data })
+}
+
+// 删除翻包记录主
+export const deletePackageoverRetrospect = async (id: number) => {
+  return await request.delete({ url: `/wms/packageover-retrospect/delete?id=` + id })
+}
+
+// 导出翻包记录主 Excel
+export const exportPackageoverRetrospect = async (params) => {
+  return await request.download({ url: `/wms/packageover-retrospect/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/packageover-retrospect/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/packagesplitDetail/index.ts b/src/api/wms/packagesplitDetail/index.ts
new file mode 100644
index 000000000..23f787622
--- /dev/null
+++ b/src/api/wms/packagesplitDetail/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface PackagesplitDetailVO {
+                    id: number
+                    locationCode: string
+                    locationGroupCode: string
+                    areaCode: string
+                    fromPackingNumber: string
+                    toPackingNumber: string
+                    fromBatch: string
+                    toBatch: string
+                    fromInventoryStatus: string
+                    toInventoryStatus: string
+                    fromContainerNumber: string
+                    toContainerNumber: string
+                    fromOwnerCode: string
+                    toOwnerCode: string
+                    masterId: number
+                    number: string
+                    itemCode: string
+                    remark: string
+                    siteId: string
+                    itemName: string
+                    itemDesc1: string
+                    itemDesc2: string
+                    projectCode: string
+                    toQty: number
+                    fromQty: number
+                    uom: string
+                    interfaceType: string
+}
+
+// 查询拆包记录子列表
+export const getPackagesplitDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packagesplit-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/packagesplit-detail/page`, params })
+  }
+}
+
+// 查询拆包记录子详情
+export const getPackagesplitDetail = async (id: number) => {
+  return await request.get({ url: '/wms/packagesplit-detail/get?id=' + id })
+}
+
+// 新增拆包记录子
+export const createPackagesplitDetail = async (data: PackagesplitDetailVO) => {
+  return await request.post({ url: '/wms/packagesplit-detail/create', data })
+}
+
+// 修改拆包记录子
+export const updatePackagesplitDetail = async (data: PackagesplitDetailVO) => {
+  return await request.put({ url: '/wms/packagesplit-detail/update', data })
+}
+
+// 删除拆包记录子
+export const deletePackagesplitDetail = async (id: number) => {
+  return await request.delete({ url: '/wms/packagesplit-detail/delete?id=' + id })
+}
+
+// 导出拆包记录子 Excel
+export const exportPackagesplitDetailApi = async (params) => {
+  return await request.download({ url: '/wms/packagesplit-detail/export-excel', params })
+}
diff --git a/src/api/wms/packagesplitMain/index.ts b/src/api/wms/packagesplitMain/index.ts
new file mode 100644
index 000000000..37fbedd40
--- /dev/null
+++ b/src/api/wms/packagesplitMain/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface PackagesplitMainVO {
+                    id: number
+                    warehouseCode: string
+                    details: string
+                    outTransactionType: string
+                    inTransactionType: string
+                    executeTime: Date
+                    activeDate: Date
+                    available: string
+                    requestTime: Date
+                    dueTime: Date
+                    departmentCode: string
+                    userGroupCode: string
+                    interfaceType: string
+                    number: string
+                    businessType: string
+                    remark: string
+                    extraProperties: string
+                    siteId: string
+}
+
+// 查询拆包记录主列表
+export const getPackagesplitMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packagesplit-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/packagesplit-main/page`, params })
+  }
+}
+
+// 查询拆包记录主详情
+export const getPackagesplitMain = async (id: number) => {
+  return await request.get({ url: '/wms/packagesplit-main/get?id=' + id })
+}
+
+// 新增拆包记录主
+export const createPackagesplitMain = async (data: PackagesplitMainVO) => {
+  return await request.post({ url: '/wms/packagesplit-main/create', data })
+}
+
+// 修改拆包记录主
+export const updatePackagesplitMain = async (data: PackagesplitMainVO) => {
+  return await request.put({ url: '/wms/packagesplit-main/update', data })
+}
+
+// 删除拆包记录主
+export const deletePackagesplitMain = async (id: number) => {
+  return await request.delete({ url: '/wms/packagesplit-main/delete?id=' + id })
+}
+
+// 导出拆包记录主 Excel
+export const exportPackagesplitMainApi = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/packagesplit-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/packagesplit-main/export-excel`, params })
+  }
+}
diff --git a/src/api/wms/packageunit/index.ts b/src/api/wms/packageunit/index.ts
new file mode 100644
index 000000000..ae9b04f92
--- /dev/null
+++ b/src/api/wms/packageunit/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface PackageunitVO {
+  id: number
+  code: string
+  name: string
+  length: number
+  width: number
+  height: number
+  weight: number
+  unit: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+  desc: string
+  reuse: string
+  manageBalance: string
+}
+
+// 查询物品包装规格信息 列表
+export const getPackageunitPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageunit/senior', data })
+  } else {
+    return await request.get({ url: `/wms/packageunit/page`, params })
+  }
+}
+
+// 查询物品包装规格信息 详情
+export const getPackageunit = async (id: number) => {
+  return await request.get({ url: `/wms/packageunit/get?id=` + id })
+}
+
+// 新增物品包装规格信息 
+export const createPackageunit = async (data: PackageunitVO) => {
+  return await request.post({ url: `/wms/packageunit/create`, data })
+}
+
+// 修改物品包装规格信息 
+export const updatePackageunit = async (data: PackageunitVO) => {
+  return await request.put({ url: `/wms/packageunit/update`, data })
+}
+
+// 删除物品包装规格信息 
+export const deletePackageunit = async (id: number) => {
+  return await request.delete({ url: `/wms/packageunit/delete?id=` + id })
+}
+
+// 导出物品包装规格信息  Excel
+export const exportPackageunit = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageunit/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/packageunit/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/packageunit/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/paramsetting/index.ts b/src/api/wms/paramsetting/index.ts
new file mode 100644
index 000000000..c4549f2b1
--- /dev/null
+++ b/src/api/wms/paramsetting/index.ts
@@ -0,0 +1,59 @@
+import request from '@/config/axios'
+
+export interface ParamsettingVO {
+  strategyType: string
+  paramCode: string
+  paramName: string
+  usableOpeartors: string
+  dataType: string
+  valueScope: string
+  relatedTo: string
+  description: string
+  isRequired: string
+}
+
+// 查询参数设置列表
+export const getParamsettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/paramsetting/senior', data })
+  } else {
+    return await request.get({ url: `/wms/paramsetting/page`, params })
+  }
+}
+
+// 查询参数设置详情
+export const getParamsetting = async (id: number) => {
+  return await request.get({ url: `/wms/paramsetting/get?id=` + id })
+}
+
+// 新增参数设置
+export const createParamsetting = async (data: ParamsettingVO) => {
+  return await request.post({ url: `/wms/paramsetting/create`, data })
+}
+
+// 修改参数设置
+export const updateParamsetting = async (data: ParamsettingVO) => {
+  return await request.put({ url: `/wms/paramsetting/update`, data })
+}
+
+// 删除参数设置
+export const deleteParamsetting = async (id: number) => {
+  return await request.delete({ url: `/wms/paramsetting/delete?id=` + id })
+}
+
+// 导出参数设置 Excel
+export const exportParamsetting = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/paramsetting/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/paramsetting/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/paramsetting/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/pickJobDetail/index.ts b/src/api/wms/pickJobDetail/index.ts
new file mode 100644
index 000000000..b15045502
--- /dev/null
+++ b/src/api/wms/pickJobDetail/index.ts
@@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+export interface PickJobDetailVO {
+  packingNumber: string
+  batch: string
+  inventoryStatus: string
+  containerNumber: string
+  fromLocationCode: string
+  toLocationCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creatorId: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询备货任务子列表
+export const getPickJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/pick-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/pick-job-detail/page`, params })
+  }
+}
+
+// 查询备货任务子详情
+export const getPickJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/pick-job-detail/get?id=` + id })
+}
+
+// 新增备货任务子
+export const createPickJobDetail = async (data: PickJobDetailVO) => {
+  return await request.post({ url: `/wms/pick-job-detail/create`, data })
+}
+
+// 修改备货任务子
+export const updatePickJobDetail = async (data: PickJobDetailVO) => {
+  return await request.put({ url: `/wms/pick-job-detail/update`, data })
+}
+
+// 删除备货任务子
+export const deletePickJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/pick-job-detail/delete?id=` + id })
+}
+
+// 导出备货任务子 Excel
+export const exportPickJobDetail = async (params) => {
+  return await request.download({ url: `/wms/pick-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/pick-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/pickJobMain/index.ts b/src/api/wms/pickJobMain/index.ts
new file mode 100644
index 000000000..20722e557
--- /dev/null
+++ b/src/api/wms/pickJobMain/index.ts
@@ -0,0 +1,87 @@
+import request from '@/config/axios'
+
+export interface PickJobMainVO {
+  requestNumber: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromWarehouseCode: string
+  fromAreaCodes: string
+  toWarehouseCode: string
+  toAreaCodes: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询备货任务主列表
+export const getPickJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/pick-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/pick-job-main/page`, params })
+  }
+}
+
+// 查询备货任务主详情
+export const getPickJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/pick-job-main/get?id=` + id })
+}
+
+// 新增备货任务主
+export const createPickJobMain = async (data: PickJobMainVO) => {
+  return await request.post({ url: `/wms/pick-job-main/create`, data })
+}
+
+// 修改备货任务主
+export const updatePickJobMain = async (data: PickJobMainVO) => {
+  return await request.put({ url: `/wms/pick-job-main/update`, data })
+}
+
+// 删除备货任务主
+export const deletePickJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/pick-job-main/delete?id=` + id })
+}
+
+// 导出备货任务主 Excel
+export const exportPickJobMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/pick-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/pick-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/pick-job-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/pickRecordDetail/index.ts b/src/api/wms/pickRecordDetail/index.ts
new file mode 100644
index 000000000..7bec0331e
--- /dev/null
+++ b/src/api/wms/pickRecordDetail/index.ts
@@ -0,0 +1,74 @@
+import request from '@/config/axios'
+
+export interface PickRecordDetailVO {
+  fromPackingNumber: string
+  fromBatch: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  fromContainerNumber: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  toOwnerCode: string
+  toContainerNumber: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+  toPackingNumber: string
+  toBatch: string
+}
+
+// 查询备货记录子列表
+export const getPickRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/pick-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/pick-record-detail/page`, params })
+  }
+}
+
+// 查询备货记录子详情
+export const getPickRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/pick-record-detail/get?id=` + id })
+}
+
+// 新增备货记录子
+export const createPickRecordDetail = async (data: PickRecordDetailVO) => {
+  return await request.post({ url: `/wms/pick-record-detail/create`, data })
+}
+
+// 修改备货记录子
+export const updatePickRecordDetail = async (data: PickRecordDetailVO) => {
+  return await request.put({ url: `/wms/pick-record-detail/update`, data })
+}
+
+// 删除备货记录子
+export const deletePickRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/pick-record-detail/delete?id=` + id })
+}
+
+// 导出备货记录子 Excel
+export const exportPickRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/pick-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/pick-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/pickRecordMain/index.ts b/src/api/wms/pickRecordMain/index.ts
new file mode 100644
index 000000000..bf291181c
--- /dev/null
+++ b/src/api/wms/pickRecordMain/index.ts
@@ -0,0 +1,74 @@
+import request from '@/config/axios'
+
+export interface PickRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  available: string
+}
+
+// 查询备货记录主列表
+export const getPickRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/pick-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/pick-record-main/page`, params })
+  }
+}
+
+// 查询备货记录主详情
+export const getPickRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/pick-record-main/get?id=` + id })
+}
+
+// 新增备货记录主
+export const createPickRecordMain = async (data: PickRecordMainVO) => {
+  return await request.post({ url: `/wms/pick-record-main/create`, data })
+}
+
+// 修改备货记录主
+export const updatePickRecordMain = async (data: PickRecordMainVO) => {
+  return await request.put({ url: `/wms/pick-record-main/update`, data })
+}
+
+// 删除备货记录主
+export const deletePickRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/pick-record-main/delete?id=` + id })
+}
+
+// 导出备货记录主 Excel
+export const exportPickRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/pick-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/pick-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/pick-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/pickRequestDetail/index.ts b/src/api/wms/pickRequestDetail/index.ts
new file mode 100644
index 000000000..4f41d5e05
--- /dev/null
+++ b/src/api/wms/pickRequestDetail/index.ts
@@ -0,0 +1,62 @@
+import request from '@/config/axios'
+
+export interface PickRequestDetailVO {
+  inventoryStatus: string
+  toLocationCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询备货申请子列表
+export const getPickRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/pick-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/pick-request-detail/page`, params })
+  }
+}
+
+// 查询备货申请子详情
+export const getPickRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/pick-request-detail/get?id=` + id })
+}
+
+// 新增备货申请子
+export const createPickRequestDetail = async (data: PickRequestDetailVO) => {
+  return await request.post({ url: `/wms/pick-request-detail/create`, data })
+}
+
+// 修改备货申请子
+export const updatePickRequestDetail = async (data: PickRequestDetailVO) => {
+  return await request.put({ url: `/wms/pick-request-detail/update`, data })
+}
+
+// 删除备货申请子
+export const deletePickRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/pick-request-detail/delete?id=` + id })
+}
+
+// 导出备货申请子 Excel
+export const exportPickRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/pick-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/pick-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/pickRequestMain/index.ts b/src/api/wms/pickRequestMain/index.ts
new file mode 100644
index 000000000..b11d5593b
--- /dev/null
+++ b/src/api/wms/pickRequestMain/index.ts
@@ -0,0 +1,72 @@
+import request from '@/config/axios'
+
+export interface PickRequestMainVO {
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreas: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询备货申请主列表
+export const getPickRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/pick-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/pick-request-main/page`, params })
+  }
+}
+
+// 查询备货申请主详情
+export const getPickRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/pick-request-main/get?id=` + id })
+}
+
+// 新增备货申请主
+export const createPickRequestMain = async (data: PickRequestMainVO) => {
+  return await request.post({ url: `/wms/pick-request-main/create`, data })
+}
+
+// 修改备货申请主
+export const updatePickRequestMain = async (data: PickRequestMainVO) => {
+  return await request.put({ url: `/wms/pick-request-main/update`, data })
+}
+
+// 删除备货申请主
+export const deletePickRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/pick-request-main/delete?id=` + id })
+}
+
+// 导出备货申请主 Excel
+export const exportPickRequestMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/pick-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/pick-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/pick-request-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/plansetting/index.ts b/src/api/wms/plansetting/index.ts
new file mode 100644
index 000000000..1b703dadc
--- /dev/null
+++ b/src/api/wms/plansetting/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface PlansettingVO {
+  id: number
+  code: string
+  requestMode: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  concurrencyStamp: number
+}
+
+// 查询计划设置列表
+export const getPlansettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/plansetting/senior', data })
+  } else {
+    return await request.get({ url: `/wms/plansetting/page`, params })
+  }
+}
+
+// 查询计划设置详情
+export const getPlansetting = async (id: number) => {
+  return await request.get({ url: `/wms/plansetting/get?id=` + id })
+}
+
+// 新增计划设置
+export const createPlansetting = async (data: PlansettingVO) => {
+  return await request.post({ url: `/wms/plansetting/create`, data })
+}
+
+// 修改计划设置
+export const updatePlansetting = async (data: PlansettingVO) => {
+  return await request.put({ url: `/wms/plansetting/update`, data })
+}
+
+// 删除计划设置
+export const deletePlansetting = async (id: number) => {
+  return await request.delete({ url: `/wms/plansetting/delete?id=` + id })
+}
+
+// 导出计划设置 Excel
+export const exportPlansetting = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/plansetting/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/plansetting/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/plansetting/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/preparetoissueDetail/index.ts b/src/api/wms/preparetoissueDetail/index.ts
new file mode 100644
index 000000000..44655ff0f
--- /dev/null
+++ b/src/api/wms/preparetoissueDetail/index.ts
@@ -0,0 +1,47 @@
+import request from '@/config/axios'
+
+export interface PreparetoissueDetailVO {
+  toLocationCode: string
+  workStation: string
+  dueTime: Date
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  planQty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  available: string
+}
+
+// 查询备料计划子列表
+export const getPreparetoissueDetailPage = async (params) => {
+  return await request.get({ url: `/wms/preparetoissue-detail/page`, params })
+}
+
+// 查询备料计划子详情
+export const getPreparetoissueDetail = async (id: number) => {
+  return await request.get({ url: `/wms/preparetoissue-detail/get?id=` + id })
+}
+
+// 新增备料计划子
+export const createPreparetoissueDetail = async (data: PreparetoissueDetailVO) => {
+  return await request.post({ url: `/wms/preparetoissue-detail/create`, data })
+}
+
+// 修改备料计划子
+export const updatePreparetoissueDetail = async (data: PreparetoissueDetailVO) => {
+  return await request.put({ url: `/wms/preparetoissue-detail/update`, data })
+}
+
+// 删除备料计划子
+export const deletePreparetoissueDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/preparetoissue-detail/delete?id=` + id })
+}
+
+// 导出备料计划子 Excel
+export const exportPreparetoissueDetail = async (params) => {
+  return await request.download({ url: `/wms/preparetoissue-detail/export-excel`, params })
+}
diff --git a/src/api/wms/preparetoissueMain/index.ts b/src/api/wms/preparetoissueMain/index.ts
new file mode 100644
index 000000000..b86b6fcd7
--- /dev/null
+++ b/src/api/wms/preparetoissueMain/index.ts
@@ -0,0 +1,109 @@
+import request from '@/config/axios'
+
+export interface PreparetoissueMainVO {
+  productionPlanNumber: string
+  workshop: string
+  prodLine: string
+  shift: string
+  team: string
+  planDate: Date
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  beginTime: Date
+  endTime: Date
+  status: string
+  updateTime: Date
+  updater: string
+  available: string
+}
+
+// 查询备料计划主列表
+export const getPreparetoissueMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/preparetoissue-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/preparetoissue-main/page`, params })
+  }
+}
+
+// 查询备料计划主详情
+export const getPreparetoissueMain = async (id: number) => {
+  return await request.get({ url: `/wms/preparetoissue-main/get?id=` + id })
+}
+
+// 新增备料计划主
+export const createPreparetoissueMain = async (data: PreparetoissueMainVO) => {
+  return await request.post({ url: `/wms/preparetoissue-main/create`, data })
+}
+
+// 修改备料计划主
+export const updatePreparetoissueMain = async (data: PreparetoissueMainVO) => {
+  return await request.put({ url: `/wms/preparetoissue-main/update`, data })
+}
+
+// 删除备料计划主
+export const deletePreparetoissueMain = async (id: number) => {
+  return await request.delete({ url: `/wms/preparetoissue-main/delete?id=` + id })
+}
+
+// 导出备料计划主 Excel
+export const exportPreparetoissueMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/preparetoissue-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/preparetoissue-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/preparetoissue-main/get-import-template' })
+}
+
+// bom拆解
+export const getBomDisassemble = async (id: number) => {
+  return await request.get({ url: `/wms/preparetoissue-main/getBomDisassemble?id=` + id })
+}
+
+
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/preparetoissue-main/close?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/preparetoissue-main/submit?id=' + id })
+}
+
+// 打开
+export const open = (id) => {
+  return request.put({ url: '/wms/preparetoissue-main/open?id=' + id })
+}
+
+// 驳回
+export const reject = (id) => {
+  return request.put({ url: '/wms/preparetoissue-main/reject?id=' + id })
+}
+
+// 驳回
+export const agree = (id) => {
+  return request.put({ url: '/wms/preparetoissue-main/agree?id=' + id })
+}
+
+// 发布
+export const publish = (id) => {
+  return request.put({ url: '/wms/preparetoissue-main/publish?id=' + id })
+}
+
+// 重置
+export const resetting = (id) => {
+  return request.put({ url: '/wms/preparetoissue-main/resetting?id=' + id })
+}
diff --git a/src/api/wms/process/index.ts b/src/api/wms/process/index.ts
new file mode 100644
index 000000000..c89f7e192
--- /dev/null
+++ b/src/api/wms/process/index.ts
@@ -0,0 +1,60 @@
+import request from '@/config/axios'
+
+export interface ProcessVO {
+  code: string
+  name: string
+  description: string
+  type: string
+  workshopCode: string
+  productionLineCode: string
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询工序列表
+export const getProcessPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/process/senior', data })
+  } else {
+    return await request.get({ url: `/wms/process/page`, params })
+  }
+}
+
+// 查询工序详情
+export const getProcess = async (id: number) => {
+  return await request.get({ url: `/wms/process/get?id=` + id })
+}
+
+// 新增工序
+export const createProcess = async (data: ProcessVO) => {
+  return await request.post({ url: `/wms/process/create`, data })
+}
+
+// 修改工序
+export const updateProcess = async (data: ProcessVO) => {
+  return await request.put({ url: `/wms/process/update`, data })
+}
+
+// 删除工序
+export const deleteProcess = async (id: number) => {
+  return await request.delete({ url: `/wms/process/delete?id=` + id })
+}
+
+// 导出工序 Excel
+export const exportProcess = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/process/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/process/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/process/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productdismantleJobDetail/index.ts b/src/api/wms/productdismantleJobDetail/index.ts
new file mode 100644
index 000000000..bdd27c66f
--- /dev/null
+++ b/src/api/wms/productdismantleJobDetail/index.ts
@@ -0,0 +1,70 @@
+import request from '@/config/axios'
+
+export interface ProductdismantleJobDetailVO {
+  productionLineCode: string
+  workStationCode: string
+  processCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  packQty: number
+  packUnit: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromLocationCode: string
+  ownerCode: string
+  fromOwnerCode: string
+}
+
+// 查询制品拆解任务子列表
+export const getProductdismantleJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productdismantle-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productdismantle-job-detail/page`, params })
+  }
+}
+
+// 查询制品拆解任务子详情
+export const getProductdismantleJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productdismantle-job-detail/get?id=` + id })
+}
+
+// 新增制品拆解任务子
+export const createProductdismantleJobDetail = async (data: ProductdismantleJobDetailVO) => {
+  return await request.post({ url: `/wms/productdismantle-job-detail/create`, data })
+}
+
+// 修改制品拆解任务子
+export const updateProductdismantleJobDetail = async (data: ProductdismantleJobDetailVO) => {
+  return await request.put({ url: `/wms/productdismantle-job-detail/update`, data })
+}
+
+// 删除制品拆解任务子
+export const deleteProductdismantleJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productdismantle-job-detail/delete?id=` + id })
+}
+
+// 导出制品拆解任务子 Excel
+export const exportProductdismantleJobDetail = async (params) => {
+  return await request.download({ url: `/wms/productdismantle-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productdismantle-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productdismantleJobMain/index.ts b/src/api/wms/productdismantleJobMain/index.ts
new file mode 100644
index 000000000..0459b0d62
--- /dev/null
+++ b/src/api/wms/productdismantleJobMain/index.ts
@@ -0,0 +1,88 @@
+import request from '@/config/axios'
+
+export interface ProductdismantleJobMainVO {
+  requestNumber: string
+  workshopCode: string
+  team: string
+  shift: string
+  fromWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromAreaCodes: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询制品拆解任务主列表
+export const getProductdismantleJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productdismantle-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productdismantle-job-main/page`, params })
+  }
+}
+
+// 查询制品拆解任务主详情
+export const getProductdismantleJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/productdismantle-job-main/get?id=` + id })
+}
+
+// 新增制品拆解任务主
+export const createProductdismantleJobMain = async (data: ProductdismantleJobMainVO) => {
+  return await request.post({ url: `/wms/productdismantle-job-main/create`, data })
+}
+
+// 修改制品拆解任务主
+export const updateProductdismantleJobMain = async (data: ProductdismantleJobMainVO) => {
+  return await request.put({ url: `/wms/productdismantle-job-main/update`, data })
+}
+
+// 删除制品拆解任务主
+export const deleteProductdismantleJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productdismantle-job-main/delete?id=` + id })
+}
+
+// 导出制品拆解任务主 Excel
+export const exportProductdismantleJobMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productdismantle-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productdismantle-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productdismantle-job-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productdismantleRecordDetaila/index.ts b/src/api/wms/productdismantleRecordDetaila/index.ts
new file mode 100644
index 000000000..da0a502ea
--- /dev/null
+++ b/src/api/wms/productdismantleRecordDetaila/index.ts
@@ -0,0 +1,72 @@
+import request from '@/config/axios'
+
+export interface ProductdismantleRecordDetailaVO {
+  fromOwnerCode: string
+  productionLineCode: string
+  workStationCode: string
+  processCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  produceDate: Date
+  expireDate: Date
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  inventoryStatus: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+}
+
+// 查询制品拆解记录子列表
+export const getProductdismantleRecordDetailaPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productdismantle-record-detaila/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productdismantle-record-detaila/page`, params })
+  }
+}
+
+// 查询制品拆解记录子详情
+export const getProductdismantleRecordDetaila = async (id: number) => {
+  return await request.get({ url: `/wms/productdismantle-record-detaila/get?id=` + id })
+}
+
+// 新增制品拆解记录子
+export const createProductdismantleRecordDetaila = async (data: ProductdismantleRecordDetailaVO) => {
+  return await request.post({ url: `/wms/productdismantle-record-detaila/create`, data })
+}
+
+// 修改制品拆解记录子
+export const updateProductdismantleRecordDetaila = async (data: ProductdismantleRecordDetailaVO) => {
+  return await request.put({ url: `/wms/productdismantle-record-detaila/update`, data })
+}
+
+// 删除制品拆解记录子
+export const deleteProductdismantleRecordDetaila = async (id: number) => {
+  return await request.delete({ url: `/wms/productdismantle-record-detaila/delete?id=` + id })
+}
+
+// 导出制品拆解记录子 Excel
+export const exportProductdismantleRecordDetaila = async (params) => {
+  return await request.download({ url: `/wms/productdismantle-record-detaila/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productdismantle-record-detaila/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productdismantleRecordMain/index.ts b/src/api/wms/productdismantleRecordMain/index.ts
new file mode 100644
index 000000000..6cf740a06
--- /dev/null
+++ b/src/api/wms/productdismantleRecordMain/index.ts
@@ -0,0 +1,73 @@
+import request from '@/config/axios'
+
+export interface ProductdismantleRecordMainVO {
+  requestNumber: string
+  workshopCode: string
+  team: string
+  shift: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  available: string
+}
+
+// 查询制品拆解记录主列表
+export const getProductdismantleRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productdismantle-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productdismantle-record-main/page`, params })
+  }
+}
+
+// 查询制品拆解记录主详情
+export const getProductdismantleRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/productdismantle-record-main/get?id=` + id })
+}
+
+// 新增制品拆解记录主
+export const createProductdismantleRecordMain = async (data: ProductdismantleRecordMainVO) => {
+  return await request.post({ url: `/wms/productdismantle-record-main/create`, data })
+}
+
+// 修改制品拆解记录主
+export const updateProductdismantleRecordMain = async (data: ProductdismantleRecordMainVO) => {
+  return await request.put({ url: `/wms/productdismantle-record-main/update`, data })
+}
+
+// 删除制品拆解记录主
+export const deleteProductdismantleRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productdismantle-record-main/delete?id=` + id })
+}
+
+// 导出制品拆解记录主 Excel
+export const exportProductdismantleRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productdismantle-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productdismantle-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productdismantle-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productdismantleRequestDetaila/index.ts b/src/api/wms/productdismantleRequestDetaila/index.ts
new file mode 100644
index 000000000..edb9652c8
--- /dev/null
+++ b/src/api/wms/productdismantleRequestDetaila/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface ProductdismantleRequestDetailaVO {
+  productionLineCode: string
+  workStationCode: string
+  processCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  packQty: number
+  packUnit: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectOde: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  fromLocationCode: string
+  fromOwnerCode: string
+}
+
+// 查询制品拆解申请子列表
+export const getProductdismantleRequestDetailaPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productdismantle-request-detaila/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productdismantle-request-detaila/page`, params })
+  }
+}
+
+// 查询制品拆解申请子详情
+export const getProductdismantleRequestDetaila = async (id: number) => {
+  return await request.get({ url: `/wms/productdismantle-request-detaila/get?id=` + id })
+}
+
+// 新增制品拆解申请子
+export const createProductdismantleRequestDetaila = async (data: ProductdismantleRequestDetailaVO) => {
+  return await request.post({ url: `/wms/productdismantle-request-detaila/create`, data })
+}
+
+// 修改制品拆解申请子
+export const updateProductdismantleRequestDetaila = async (data: ProductdismantleRequestDetailaVO) => {
+  return await request.put({ url: `/wms/productdismantle-request-detaila/update`, data })
+}
+
+// 删除制品拆解申请子
+export const deleteProductdismantleRequestDetaila = async (id: number) => {
+  return await request.delete({ url: `/wms/productdismantle-request-detaila/delete?id=` + id })
+}
+
+// 导出制品拆解申请子 Excel
+export const exportProductdismantleRequestDetaila = async (params) => {
+  return await request.download({ url: `/wms/productdismantle-request-detaila/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productdismantle-request-detaila/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productdismantleRequestMain/index.ts b/src/api/wms/productdismantleRequestMain/index.ts
new file mode 100644
index 000000000..e4af1dd06
--- /dev/null
+++ b/src/api/wms/productdismantleRequestMain/index.ts
@@ -0,0 +1,101 @@
+import request from '@/config/axios'
+
+export interface ProductdismantleRequestMainVO {
+  workshopCode: string
+  team: string
+  shift: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询制品拆解申请主列表
+export const getProductdismantleRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productdismantle-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productdismantle-request-main/page`, params })
+  }
+}
+
+// 查询制品拆解申请主详情
+export const getProductdismantleRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/productdismantle-request-main/get?id=` + id })
+}
+
+// 新增制品拆解申请主
+export const createProductdismantleRequestMain = async (data: ProductdismantleRequestMainVO) => {
+  return await request.post({ url: `/wms/productdismantle-request-main/create`, data })
+}
+
+// 修改制品拆解申请主
+export const updateProductdismantleRequestMain = async (data: ProductdismantleRequestMainVO) => {
+  return await request.put({ url: `/wms/productdismantle-request-main/update`, data })
+}
+
+// 删除制品拆解申请主
+export const deleteProductdismantleRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productdismantle-request-main/delete?id=` + id })
+}
+
+// 导出制品拆解申请主 Excel
+export const exportProductdismantleRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productdismantle-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productdismantle-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productdismantle-request-main/get-import-template' })
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/productdismantle-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/productdismantle-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/productdismantle-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/productdismantle-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/productdismantle-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/productdismantle-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/productionDetail/index.ts b/src/api/wms/productionDetail/index.ts
new file mode 100644
index 000000000..313ecbba9
--- /dev/null
+++ b/src/api/wms/productionDetail/index.ts
@@ -0,0 +1,47 @@
+import request from '@/config/axios'
+
+export interface ProductionDetailVO {
+  bomVersion: string
+  goodQty: number
+  notGoodQty: number
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  planQty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  available: string
+}
+
+// 查询生产计划子列表
+export const getProductionDetailPage = async (params) => {
+  return await request.get({ url: `/wms/production-detail/page`, params })
+}
+
+// 查询生产计划子详情
+export const getProductionDetail = async (id: number) => {
+  return await request.get({ url: `/wms/production-detail/get?id=` + id })
+}
+
+// 新增生产计划子
+export const createProductionDetail = async (data: ProductionDetailVO) => {
+  return await request.post({ url: `/wms/production-detail/create`, data })
+}
+
+// 修改生产计划子
+export const updateProductionDetail = async (data: ProductionDetailVO) => {
+  return await request.put({ url: `/wms/production-detail/update`, data })
+}
+
+// 删除生产计划子
+export const deleteProductionDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/production-detail/delete?id=` + id })
+}
+
+// 导出生产计划子 Excel
+export const exportProductionDetail = async (params) => {
+  return await request.download({ url: `/wms/production-detail/export-excel`, params })
+}
diff --git a/src/api/wms/productionMain/index.ts b/src/api/wms/productionMain/index.ts
new file mode 100644
index 000000000..9e4fed120
--- /dev/null
+++ b/src/api/wms/productionMain/index.ts
@@ -0,0 +1,192 @@
+import request from '@/config/axios'
+
+export interface ProductionMainVO {
+  displayOrder: number
+  workshop: string
+  productionLine: string
+  shift: string
+  team: string
+  planDate: Date
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  beginTime: Date
+  endTime: Date
+  status: string
+  updateTime: Date
+  updater: string
+  available: string
+  woNumber: string
+  woLine: string
+}
+
+// 查询生产计划主列表
+export const getProductionMainPage = async (params) => {
+  params.planType = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/production-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/production-main/page`, params })
+  }
+}
+
+// 查询 —— 装配 主列表
+export const getProductionMainAssemblePage = async (params) => {
+  params.planType = 'assemble'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/production-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/production-main/page`, params })
+  }
+}
+
+// 查询 —— 预生产备件 主列表
+export const getProductionMainPredictSparePartPage = async (params) => {
+  params.planType = 'predictSparePart'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/production-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/production-main/page`, params })
+  }
+}
+
+// 查询 —— 装配备件 主列表
+export const getProductionMainASparePartPage = async (params) => {
+  params.planType = 'assembleSparePart'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/production-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/production-main/page`, params })
+  }
+}
+
+// 查询生产计划子表数据不可用物料
+export const getProductionDetail = async (id: number) => {
+  return await request.get({ url: `/wms/production-main/getDetailByAvailable?id=` + id })
+}
+
+// 查询生产计划主详情
+export const getProductionMain = async (id: number) => {
+  return await request.get({ url: `/wms/production-main/get?id=` + id })
+}
+
+// 新增生产计划主
+export const createProductionMain = async (data: ProductionMainVO) => {
+  return await request.post({ url: `/wms/production-main/create`, data })
+}
+
+// 修改生产计划主
+export const updateProductionMain = async (data: ProductionMainVO) => {
+  return await request.put({ url: `/wms/production-main/update`, data })
+}
+
+// 删除生产计划主
+export const deleteProductionMain = async (id: number) => {
+  return await request.delete({ url: `/wms/production-main/delete?id=` + id })
+}
+
+// 导出预生产计划主 Excel
+export const exportProductionMain = async (params) => {
+  params.planType = 'predict'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/production-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/production-main/export-excel`, params })
+  }
+}
+
+// 导出装配计划主 Excel
+export const exportProductionMainAssemble = async (params) => {
+  params.planType = 'assemble'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/production-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/production-main/export-excel`, params })
+  }
+}
+
+// 导出装配备件计划主 Excel
+export const exportProductionMainPredictSparePart = async (params) => {
+  params.planType = 'predictSparePart'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/production-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/production-main/export-excel`, params })
+  }
+}
+
+// 导出预生产备件计划主 Excel
+export const exportProductionMainAssembleSparePart = async (params) => {
+  params.planType = 'assembleSparePart'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/production-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/production-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/production-main/get-import-template' })
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/production-main/close?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/production-main/submit?id=' + id })
+}
+
+// 打开
+export const open = (id) => {
+  return request.put({ url: '/wms/production-main/open?id=' + id })
+}
+
+// 驳回
+export const reject = (id) => {
+  return request.put({ url: '/wms/production-main/reject?id=' + id })
+}
+
+// 驳回
+export const agree = (id) => {
+  return request.put({ url: '/wms/production-main/agree?id=' + id })
+}
+
+// 发布
+export const publish = (id) => {
+  return request.put({ url: '/wms/production-main/publish?id=' + id })
+}
+
+// 重置
+export const resetting = (id) => {
+  return request.put({ url: '/wms/production-main/resetting?id=' + id })
+}
+
+// 创建备料计划/制品收货申请
+export const generateRequest = (number) => {
+  return request.post({ url: '/wms/production-main/generateRequest?number=' + number })
+}
+
+
+
+
+
+
+
diff --git a/src/api/wms/productionline/index.ts b/src/api/wms/productionline/index.ts
new file mode 100644
index 000000000..050c8a0fb
--- /dev/null
+++ b/src/api/wms/productionline/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface ProductionlineVO {
+  code: string
+  name: string
+  description: string
+  type: string
+  workshopCode: string
+  rawLocationCode: string
+  fgLocationCode: string
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询生产线列表
+export const getProductionlinePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/productionline/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionline/page`, params })
+  }
+}
+
+// 查询生产线详情
+export const getProductionline = async (id: number) => {
+  return await request.get({ url: `/wms/productionline/get?id=` + id })
+}
+
+// 新增生产线
+export const createProductionline = async (data: ProductionlineVO) => {
+  return await request.post({ url: `/wms/productionline/create`, data })
+}
+
+// 修改生产线
+export const updateProductionline = async (data: ProductionlineVO) => {
+  return await request.put({ url: `/wms/productionline/update`, data })
+}
+
+// 删除生产线
+export const deleteProductionline = async (id: number) => {
+  return await request.delete({ url: `/wms/productionline/delete?id=` + id })
+}
+
+// 导出生产线 Excel
+export const exportProductionline = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productionline/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productionline/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionline/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productionlineitem/index.ts b/src/api/wms/productionlineitem/index.ts
new file mode 100644
index 000000000..cc9716fe3
--- /dev/null
+++ b/src/api/wms/productionlineitem/index.ts
@@ -0,0 +1,69 @@
+import request from '@/config/axios'
+
+export interface ProductionlineitemVO {
+  fgLocationCode: string
+  productionLineCode: string
+  itemCode: string
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询生产线物料关系列表
+export const getProductionlineitemPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/productionlineitem/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionlineitem/page`, params })
+  }
+}
+
+// 查询生产线物料关系列表——根据 生产线 物料类型为原料和半成品
+export const getProductionlineitemPageByItemtype = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionlineitem/pageByItemtypeSenior', data })
+  } else {
+    return await request.get({ url: `/wms/productionlineitem/pageByItemtype`, params })
+  }
+  
+}
+
+// 查询生产线物料关系详情
+export const getProductionlineitem = async (id: number) => {
+  return await request.get({ url: `/wms/productionlineitem/get?id=` + id })
+}
+
+// 新增生产线物料关系
+export const createProductionlineitem = async (data: ProductionlineitemVO) => {
+  return await request.post({ url: `/wms/productionlineitem/create`, data })
+}
+
+// 修改生产线物料关系
+export const updateProductionlineitem = async (data: ProductionlineitemVO) => {
+  return await request.put({ url: `/wms/productionlineitem/update`, data })
+}
+
+// 删除生产线物料关系
+export const deleteProductionlineitem = async (id: number) => {
+  return await request.delete({ url: `/wms/productionlineitem/delete?id=` + id })
+}
+
+// 导出生产线物料关系 Excel
+export const exportProductionlineitem = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productionlineitem/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productionlineitem/export-excel`, params }) 
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionlineitem/get-import-template' })
+}
diff --git a/src/api/wms/productionreceiptJobDetail/index.ts b/src/api/wms/productionreceiptJobDetail/index.ts
new file mode 100644
index 000000000..9300b16ac
--- /dev/null
+++ b/src/api/wms/productionreceiptJobDetail/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface ProductionreceiptJobDetailVO {
+  productionLineCode: string
+  workStationCode: string
+  onTheWayLocationCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  fromLocationCode: string
+  toLocationCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询生产收料任务子列表
+export const getProductionreceiptJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreceipt-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreceipt-job-detail/page`, params })
+  }
+}
+
+// 查询生产收料任务子详情
+export const getProductionreceiptJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productionreceipt-job-detail/get?id=` + id })
+}
+
+// 新增生产收料任务子
+export const createProductionreceiptJobDetail = async (data: ProductionreceiptJobDetailVO) => {
+  return await request.post({ url: `/wms/productionreceipt-job-detail/create`, data })
+}
+
+// 修改生产收料任务子
+export const updateProductionreceiptJobDetail = async (data: ProductionreceiptJobDetailVO) => {
+  return await request.put({ url: `/wms/productionreceipt-job-detail/update`, data })
+}
+
+// 删除生产收料任务子
+export const deleteProductionreceiptJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productionreceipt-job-detail/delete?id=` + id })
+}
+
+// 导出生产收料任务子 Excel
+export const exportProductionreceiptJobDetail = async (params) => {
+  return await request.download({ url: `/wms/productionreceipt-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionreceipt-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productionreceiptJobMain/index.ts b/src/api/wms/productionreceiptJobMain/index.ts
new file mode 100644
index 000000000..4096d39b7
--- /dev/null
+++ b/src/api/wms/productionreceiptJobMain/index.ts
@@ -0,0 +1,108 @@
+import request from '@/config/axios'
+
+export interface ProductionreceiptJobMainVO {
+  issueJobNumber: string
+  workshopCode: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  update: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  useOnTheWayLocation: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询生产收料任务主列表
+export const getProductionreceiptJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreceipt-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreceipt-job-main/page`, params })
+  }
+}
+
+// 查询生产收料任务主详情
+export const getProductionreceiptJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/productionreceipt-job-main/get?id=` + id })
+}
+
+// 新增生产收料任务主
+export const createProductionreceiptJobMain = async (data: ProductionreceiptJobMainVO) => {
+  return await request.post({ url: `/wms/productionreceipt-job-main/create`, data })
+}
+
+// 修改生产收料任务主
+export const updateProductionreceiptJobMain = async (data: ProductionreceiptJobMainVO) => {
+  return await request.put({ url: `/wms/productionreceipt-job-main/update`, data })
+}
+
+// 删除生产收料任务主
+export const deleteProductionreceiptJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productionreceipt-job-main/delete?id=` + id })
+}
+
+// 导出生产收料任务主 Excel
+export const exportProductionreceiptJobMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productionreceipt-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productionreceipt-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionreceipt-job-main/get-import-template' })
+}
+
+// 承接发料任务
+export const acceptIssueMain = async (id) => {
+  return await request.get({ url: `/wms/productionreceipt-job-main/accept?id=` + id })
+}
+
+// 放弃发料任务
+export const abandonIssueMain = async (id) => {
+  return await request.get({ url: `/wms/productionreceipt-job-main/abandon?id=` + id })
+}
+
+// 关闭发料任务
+export const closeIssueMain = async (id) => {
+  return await request.get({ url: `/wms/productionreceipt-job-main/close?id=` + id })
+}
+
+// 执行发料任务
+export const executeIssueMain = async (data) => {
+  return await request.put({ url: `/wms/productionreceipt-job-main/execute`, data})
+}
\ No newline at end of file
diff --git a/src/api/wms/productionreceiptRecordDetail/index.ts b/src/api/wms/productionreceiptRecordDetail/index.ts
new file mode 100644
index 000000000..1afb5f50c
--- /dev/null
+++ b/src/api/wms/productionreceiptRecordDetail/index.ts
@@ -0,0 +1,77 @@
+import request from '@/config/axios'
+
+export interface ProductionreceiptRecordDetailVO {
+  productionLineCode: string
+  workStationCode: string
+  onTheWayLocationCode: string
+  fromPackingNumber: string
+  toPackingNumber: string
+  fromBatch: string
+  toBatch: string
+  inventoryStatus: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+  fromContainerNumber: string
+  toContainerNumber: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询生产收料记录子列表
+export const getProductionreceiptRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreceipt-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreceipt-record-detail/page`, params })
+  }
+}
+
+// 查询生产收料记录子详情
+export const getProductionreceiptRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productionreceipt-record-detail/get?id=` + id })
+}
+
+// 新增生产收料记录子
+export const createProductionreceiptRecordDetail = async (data: ProductionreceiptRecordDetailVO) => {
+  return await request.post({ url: `/wms/productionreceipt-record-detail/create`, data })
+}
+
+// 修改生产收料记录子
+export const updateProductionreceiptRecordDetail = async (data: ProductionreceiptRecordDetailVO) => {
+  return await request.put({ url: `/wms/productionreceipt-record-detail/update`, data })
+}
+
+// 删除生产收料记录子
+export const deleteProductionreceiptRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productionreceipt-record-detail/delete?id=` + id })
+}
+
+// 导出生产收料记录子 Excel
+export const exportProductionreceiptRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/productionreceipt-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionreceipt-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productionreceiptRecordMain/index.ts b/src/api/wms/productionreceiptRecordMain/index.ts
new file mode 100644
index 000000000..cd2002af1
--- /dev/null
+++ b/src/api/wms/productionreceiptRecordMain/index.ts
@@ -0,0 +1,70 @@
+import request from '@/config/axios'
+
+export interface ProductionreceiptRecordMainVO {
+  issueJobNumber: string
+  jobNumber: string
+  workshopCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  useOnTheWayLocation: string
+  available: string
+}
+
+// 查询生产收料记录主列表
+export const getProductionreceiptRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreceipt-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreceipt-record-main/page`, params })
+  }
+}
+
+// 查询生产收料记录主详情
+export const getProductionreceiptRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/productionreceipt-record-main/get?id=` + id })
+}
+
+// 新增生产收料记录主
+export const createProductionreceiptRecordMain = async (data: ProductionreceiptRecordMainVO) => {
+  return await request.post({ url: `/wms/productionreceipt-record-main/create`, data })
+}
+
+// 修改生产收料记录主
+export const updateProductionreceiptRecordMain = async (data: ProductionreceiptRecordMainVO) => {
+  return await request.put({ url: `/wms/productionreceipt-record-main/update`, data })
+}
+
+// 删除生产收料记录主
+export const deleteProductionreceiptRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productionreceipt-record-main/delete?id=` + id })
+}
+
+// 导出生产收料记录主 Excel
+export const exportProductionreceiptRecordMain = async (params) => {
+  return await request.download({ url: `/wms/productionreceipt-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionreceipt-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productionreturnJobDetail/index.ts b/src/api/wms/productionreturnJobDetail/index.ts
new file mode 100644
index 000000000..f2bd6d534
--- /dev/null
+++ b/src/api/wms/productionreturnJobDetail/index.ts
@@ -0,0 +1,66 @@
+import request from '@/config/axios'
+
+export interface ProductionreturnJobDetailVO {
+  productionLineCode: string
+  workStationCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  fromLocationCode: string
+  toLocationCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询生产退料任务子列表
+export const getProductionreturnJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreturn-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreturn-job-detail/page`, params })
+  }
+}
+
+// 查询生产退料任务子详情
+export const getProductionreturnJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productionreturn-job-detail/get?id=` + id })
+}
+
+// 新增生产退料任务子
+export const createProductionreturnJobDetail = async (data: ProductionreturnJobDetailVO) => {
+  return await request.post({ url: `/wms/productionreturn-job-detail/create`, data })
+}
+
+// 修改生产退料任务子
+export const updateProductionreturnJobDetail = async (data: ProductionreturnJobDetailVO) => {
+  return await request.put({ url: `/wms/productionreturn-job-detail/update`, data })
+}
+
+// 删除生产退料任务子
+export const deleteProductionreturnJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productionreturn-job-detail/delete?id=` + id })
+}
+
+// 导出生产退料任务子 Excel
+export const exportProductionreturnJobDetail = async (params) => {
+  return await request.download({ url: `/wms/productionreturn-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionreturn-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productionreturnJobMain/index.ts b/src/api/wms/productionreturnJobMain/index.ts
new file mode 100644
index 000000000..0848605bd
--- /dev/null
+++ b/src/api/wms/productionreturnJobMain/index.ts
@@ -0,0 +1,107 @@
+import request from '@/config/axios'
+
+export interface ProductionreturnJobMainVO {
+  requestNumber: string
+  workshopCode: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询生产退料任务主列表
+export const getProductionreturnJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreturn-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreturn-job-main/page`, params })
+  }
+}
+
+// 查询生产退料任务主详情
+export const getProductionreturnJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/productionreturn-job-main/get?id=` + id })
+}
+
+// 新增生产退料任务主
+export const createProductionreturnJobMain = async (data: ProductionreturnJobMainVO) => {
+  return await request.post({ url: `/wms/productionreturn-job-main/create`, data })
+}
+
+// 修改生产退料任务主
+export const updateProductionreturnJobMain = async (data: ProductionreturnJobMainVO) => {
+  return await request.put({ url: `/wms/productionreturn-job-main/update`, data })
+}
+
+// 删除生产退料任务主
+export const deleteProductionreturnJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productionreturn-job-main/delete?id=` + id })
+}
+
+// 导出生产退料任务主 Excel
+export const exportProductionreturnJobMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productionreturn-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productionreturn-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionreturn-job-main/get-import-template' })
+}
+
+// 承接发料任务
+export const acceptProductionreturnMain = async (id) => {
+  return await request.put({ url: `/wms/productionreturn-job-main/accept?id=` + id })
+}
+
+// 放弃发料任务
+export const abandonProductionreturnMain = async (id) => {
+  return await request.put({ url: `/wms/productionreturn-job-main/abandon?id=` + id })
+}
+
+// 关闭发料任务
+export const closeProductionreturnMain = async (id) => {
+  return await request.put({ url: `/wms/productionreturn-job-main/close?id=` + id })
+}
+
+// 执行发料任务
+export const executeProductionreturnMain = async (data) => {
+  return await request.put({ url: `/wms/productionreturn-job-main/execute`, data})
+}
\ No newline at end of file
diff --git a/src/api/wms/productionreturnRecordDetail/index.ts b/src/api/wms/productionreturnRecordDetail/index.ts
new file mode 100644
index 000000000..f9ffcd4a4
--- /dev/null
+++ b/src/api/wms/productionreturnRecordDetail/index.ts
@@ -0,0 +1,76 @@
+import request from '@/config/axios'
+
+export interface ProductionreturnRecordDetailVO {
+  productionLineCode: string
+  workStationCode: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  fromPackingNumber: string
+  fromContainerNumber: string
+  fromBatch: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  toOwnerCode: string
+  toPackingNumber: string
+  toContainerNumber: string
+  toBatch: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+}
+
+// 查询生产退料记录子列表
+export const getProductionreturnRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreturn-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreturn-record-detail/page`, params })
+  }
+}
+
+// 查询生产退料记录子详情
+export const getProductionreturnRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productionreturn-record-detail/get?id=` + id })
+}
+
+// 新增生产退料记录子
+export const createProductionreturnRecordDetail = async (data: ProductionreturnRecordDetailVO) => {
+  return await request.post({ url: `/wms/productionreturn-record-detail/create`, data })
+}
+
+// 修改生产退料记录子
+export const updateProductionreturnRecordDetail = async (data: ProductionreturnRecordDetailVO) => {
+  return await request.put({ url: `/wms/productionreturn-record-detail/update`, data })
+}
+
+// 删除生产退料记录子
+export const deleteProductionreturnRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productionreturn-record-detail/delete?id=` + id })
+}
+
+// 导出生产退料记录子 Excel
+export const exportProductionreturnRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/productionreturn-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionreturn-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productionreturnRecordMain/index.ts b/src/api/wms/productionreturnRecordMain/index.ts
new file mode 100644
index 000000000..328415e2c
--- /dev/null
+++ b/src/api/wms/productionreturnRecordMain/index.ts
@@ -0,0 +1,69 @@
+import request from '@/config/axios'
+
+export interface ProductionreturnRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  workshopCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  available: string
+}
+
+// 查询生产退料记录主列表
+export const getProductionreturnRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreturn-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreturn-record-main/page`, params })
+  }
+}
+
+// 查询生产退料记录主详情
+export const getProductionreturnRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/productionreturn-record-main/get?id=` + id })
+}
+
+// 新增生产退料记录主
+export const createProductionreturnRecordMain = async (data: ProductionreturnRecordMainVO) => {
+  return await request.post({ url: `/wms/productionreturn-record-main/create`, data })
+}
+
+// 修改生产退料记录主
+export const updateProductionreturnRecordMain = async (data: ProductionreturnRecordMainVO) => {
+  return await request.put({ url: `/wms/productionreturn-record-main/update`, data })
+}
+
+// 删除生产退料记录主
+export const deleteProductionreturnRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productionreturn-record-main/delete?id=` + id })
+}
+
+// 导出生产退料记录主 Excel
+export const exportProductionreturnRecordMain = async (params) => {
+  return await request.download({ url: `/wms/productionreturn-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionreturn-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productionreturnRequestDetail/index.ts b/src/api/wms/productionreturnRequestDetail/index.ts
new file mode 100644
index 000000000..0b7bdd7c6
--- /dev/null
+++ b/src/api/wms/productionreturnRequestDetail/index.ts
@@ -0,0 +1,72 @@
+import request from '@/config/axios'
+
+export interface ProductionreturnRequestDetailVO {
+  productionLineCode: string
+  workStationCode: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  fromLocationCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  toOwnerCode: string
+}
+
+// 查询生产退料申请子列表
+export const getProductionreturnRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreturn-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreturn-request-detail/page`, params })
+  }
+}
+
+// 查询生产退料申请子详情
+export const getProductionreturnRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productionreturn-request-detail/get?id=` + id })
+}
+
+// 新增生产退料申请子
+export const createProductionreturnRequestDetail = async (data: ProductionreturnRequestDetailVO) => {
+  return await request.post({ url: `/wms/productionreturn-request-detail/create`, data })
+}
+
+// 修改生产退料申请子
+export const updateProductionreturnRequestDetail = async (data: ProductionreturnRequestDetailVO) => {
+  return await request.put({ url: `/wms/productionreturn-request-detail/update`, data })
+}
+
+// 删除生产退料申请子
+export const deleteProductionreturnRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productionreturn-request-detail/delete?id=` + id })
+}
+
+// 导出生产退料申请子 Excel
+export const exportProductionreturnRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/productionreturn-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionreturn-request-detail/get-import-template' })
+}
+
+// 创建包装信息后更新子表数据packingNumber
+export const updateDetailPackingNumber = async (id: number, number) => {
+  return await request.put({ url: '/wms/productionreturn-request-detail/updateDetailPackingNumber?id=' + id + '&number=' + number })
+}
\ No newline at end of file
diff --git a/src/api/wms/productionreturnRequestDetailNo/index.ts b/src/api/wms/productionreturnRequestDetailNo/index.ts
new file mode 100644
index 000000000..66dd5921d
--- /dev/null
+++ b/src/api/wms/productionreturnRequestDetailNo/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface ProductionreturnRequestDetailVO {
+  productionLineCode: string
+  workStationCode: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  fromLocationCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  toOwnerCode: string
+}
+
+// 查询生产退料申请子列表
+export const getProductionreturnRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreturn-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreturn-request-detail/page`, params })
+  }
+}
+
+// 查询生产退料申请子详情
+export const getProductionreturnRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productionreturn-request-detail/get?id=` + id })
+}
+
+// 新增生产退料申请子
+export const createProductionreturnRequestDetail = async (data: ProductionreturnRequestDetailVO) => {
+  return await request.post({ url: `/wms/productionreturn-request-detail/create`, data })
+}
+
+// 修改生产退料申请子
+export const updateProductionreturnRequestDetail = async (data: ProductionreturnRequestDetailVO) => {
+  return await request.put({ url: `/wms/productionreturn-request-detail/update`, data })
+}
+
+// 删除生产退料申请子
+export const deleteProductionreturnRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productionreturn-request-detail/delete?id=` + id })
+}
+
+// 导出生产退料申请子 Excel
+export const exportProductionreturnRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/productionreturn-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionreturn-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productionreturnRequestMain/index.ts b/src/api/wms/productionreturnRequestMain/index.ts
new file mode 100644
index 000000000..04a6c8ad8
--- /dev/null
+++ b/src/api/wms/productionreturnRequestMain/index.ts
@@ -0,0 +1,104 @@
+import request from '@/config/axios'
+
+export interface ProductionreturnRequestMainVO {
+  workshopCode: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询生产退料申请主列表
+export const getProductionreturnRequestMainPage = async (params) => {
+  params.businessType = 'ReturnToStore'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreturn-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreturn-request-main/page`, params })
+  }
+}
+
+// 查询生产退料申请主详情
+export const getProductionreturnRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/productionreturn-request-main/get?id=` + id })
+}
+
+// 新增生产退料申请主
+export const createProductionreturnRequestMain = async (data: ProductionreturnRequestMainVO) => {
+  return await request.post({ url: `/wms/productionreturn-request-main/create`, data })
+}
+
+// 修改生产退料申请主
+export const updateProductionreturnRequestMain = async (data: ProductionreturnRequestMainVO) => {
+  return await request.put({ url: `/wms/productionreturn-request-main/update`, data })
+}
+
+// 删除生产退料申请主
+export const deleteProductionreturnRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productionreturn-request-main/delete?id=` + id })
+}
+
+// 导出生产退料申请主 Excel
+export const exportProductionreturnRequestMain = async (params) => {
+  params.businessType = 'ReturnToStore'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productionreturn-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productionreturn-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionreturn-request-main/get-import-template' })
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/productionreturn-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/productionreturn-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/productionreturn-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/productionreturn-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/productionreturn-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/productionreturn-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/productionreturnRequestMainNo/index.ts b/src/api/wms/productionreturnRequestMainNo/index.ts
new file mode 100644
index 000000000..af389c559
--- /dev/null
+++ b/src/api/wms/productionreturnRequestMainNo/index.ts
@@ -0,0 +1,104 @@
+import request from '@/config/axios'
+
+export interface ProductionreturnRequestMainVO {
+  workshopCode: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询不合格生产退料申请主列表
+export const getProductionreturnRequestMainPage = async (params) => {
+  params.businessType = 'ReturnToHold'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreturn-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreturn-request-main/page`, params })
+  }
+}
+
+// 查询不合格生产退料申请主详情
+export const getProductionreturnRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/productionreturn-request-main/get?id=` + id })
+}
+
+// 新增不合格生产退料申请主
+export const createProductionreturnRequestMain = async (data: ProductionreturnRequestMainVO) => {
+  return await request.post({ url: `/wms/productionreturn-request-main/create`, data })
+}
+
+// 修改不合格生产退料申请主
+export const updateProductionreturnRequestMain = async (data: ProductionreturnRequestMainVO) => {
+  return await request.put({ url: `/wms/productionreturn-request-main/update`, data })
+}
+
+// 删除不合格生产退料申请主
+export const deleteProductionreturnRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productionreturn-request-main/delete?id=` + id })
+}
+
+// 导出不合格生产退料申请主 Excel
+export const exportProductionreturnRequestMain = async (params) => {
+  params.businessType = 'ReturnToHold'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productionreturn-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productionreturn-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionreturn-request-main/get-import-template-hold' })
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/productionreturn-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/productionreturn-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/productionreturn-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/productionreturn-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/productionreturn-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/productionreturn-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/productputawayJobDetail/index.ts b/src/api/wms/productputawayJobDetail/index.ts
new file mode 100644
index 000000000..0265d3f03
--- /dev/null
+++ b/src/api/wms/productputawayJobDetail/index.ts
@@ -0,0 +1,66 @@
+import request from '@/config/axios'
+
+export interface ProductputawayJobDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  poNumber: string
+  poLine: string
+  fromLocationCode: string
+  toLocationCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询制品上架任务子列表
+export const getProductputawayJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productputaway-job-detail/page`, params })
+  }
+}
+
+// 查询制品上架任务子详情
+export const getProductputawayJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productputaway-job-detail/get?id=` + id })
+}
+
+// 新增制品上架任务子
+export const createProductputawayJobDetail = async (data: ProductputawayJobDetailVO) => {
+  return await request.post({ url: `/wms/productputaway-job-detail/create`, data })
+}
+
+// 修改制品上架任务子
+export const updateProductputawayJobDetail = async (data: ProductputawayJobDetailVO) => {
+  return await request.put({ url: `/wms/productputaway-job-detail/update`, data })
+}
+
+// 删除制品上架任务子
+export const deleteProductputawayJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productputaway-job-detail/delete?id=` + id })
+}
+
+// 导出制品上架任务子 Excel
+export const exportProductputawayJobDetail = async (params) => {
+  return await request.download({ url: `/wms/productputaway-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productputaway-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productputawayJobMain/index.ts b/src/api/wms/productputawayJobMain/index.ts
new file mode 100644
index 000000000..9789444e8
--- /dev/null
+++ b/src/api/wms/productputawayJobMain/index.ts
@@ -0,0 +1,107 @@
+import request from '@/config/axios'
+
+export interface ProductputawayJobMainVO {
+  requestNumber: string
+  supplierCode: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  completetime: Date
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询制品上架任务主列表
+export const getProductputawayJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productputaway-job-main/page`, params })
+  }
+}
+
+// 查询制品上架任务主详情
+export const getProductputawayJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/productputaway-job-main/get?id=` + id })
+}
+
+// 新增制品上架任务主
+export const createProductputawayJobMain = async (data: ProductputawayJobMainVO) => {
+  return await request.post({ url: `/wms/productputaway-job-main/create`, data })
+}
+
+// 修改制品上架任务主
+export const updateProductputawayJobMain = async (data: ProductputawayJobMainVO) => {
+  return await request.put({ url: `/wms/productputaway-job-main/update`, data })
+}
+
+// 删除制品上架任务主
+export const deleteProductputawayJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productputaway-job-main/delete?id=` + id })
+}
+
+// 导出制品上架任务主 Excel
+export const exportProductputawayJobMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productputaway-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productputaway-job-main/export-excel`, params })
+  }
+} 
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productputaway-job-main/get-import-template' })
+}
+
+// 承接发料任务
+export const acceptProductputawayMain = async (id) => {
+  return await request.put({ url: `/wms/productputaway-job-main/accept?id=` + id })
+}
+
+// 放弃发料任务
+export const abandonProductputawayMain = async (id) => {
+  return await request.put({ url: `/wms/productputaway-job-main/abandon?id=` + id })
+}
+
+// 关闭发料任务
+export const closeProductputawayMain = async (id) => {
+  return await request.put({ url: `/wms/productputaway-job-main/close?id=` + id })
+}
+
+// 执行发料任务
+export const executeProductputawayMain = async (data) => {
+  return await request.put({ url: `/wms/productputaway-job-main/execute`, data})
+}
\ No newline at end of file
diff --git a/src/api/wms/productputawayRecordDetail/index.ts b/src/api/wms/productputawayRecordDetail/index.ts
new file mode 100644
index 000000000..2ab8e2d61
--- /dev/null
+++ b/src/api/wms/productputawayRecordDetail/index.ts
@@ -0,0 +1,76 @@
+import request from '@/config/axios'
+
+export interface ProductputawayRecordDetailVO {
+  fromPackingNumber: string
+  toPackingNumber: string
+  fromBatch: string
+  toBatch: string
+  fromContainerNumber: string
+  toContainerNumber: string
+  inventoryStatus: string
+  poNumber: string
+  poLine: string
+  fromOwnerCode: string
+  toOwnerCode: string
+  fromLocationCode: string
+  toLocationCode: string
+  fromLocationGroupCode: string
+  toLocationGroupCode: string
+  fromAreaCode: string
+  toAreaCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+}
+
+// 查询制品上架记录子列表
+export const getProductputawayRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productputaway-record-detail/page`, params })
+  }
+}
+
+// 查询制品上架记录子详情
+export const getProductputawayRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productputaway-record-detail/get?id=` + id })
+}
+
+// 新增制品上架记录子
+export const createProductputawayRecordDetail = async (data: ProductputawayRecordDetailVO) => {
+  return await request.post({ url: `/wms/productputaway-record-detail/create`, data })
+}
+
+// 修改制品上架记录子
+export const updateProductputawayRecordDetail = async (data: ProductputawayRecordDetailVO) => {
+  return await request.put({ url: `/wms/productputaway-record-detail/update`, data })
+}
+
+// 删除制品上架记录子
+export const deleteProductputawayRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productputaway-record-detail/delete?id=` + id })
+}
+
+// 导出制品上架记录子 Excel
+export const exportProductputawayRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/productputaway-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productputaway-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productputawayRecordMain/index.ts b/src/api/wms/productputawayRecordMain/index.ts
new file mode 100644
index 000000000..ef29d16f6
--- /dev/null
+++ b/src/api/wms/productputawayRecordMain/index.ts
@@ -0,0 +1,76 @@
+import request from '@/config/axios'
+
+export interface ProductputawayRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  supplierCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  ruleUserId: number
+  available: string
+}
+
+// 查询制品上架记录主列表
+export const getProductputawayRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productputaway-record-main/page`, params })
+  }
+}
+
+// 查询制品上架记录主详情
+export const getProductputawayRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/productputaway-record-main/get?id=` + id })
+}
+
+// 新增制品上架记录主
+export const createProductputawayRecordMain = async (data: ProductputawayRecordMainVO) => {
+  return await request.post({ url: `/wms/productputaway-record-main/create`, data })
+}
+
+// 修改制品上架记录主
+export const updateProductputawayRecordMain = async (data: ProductputawayRecordMainVO) => {
+  return await request.put({ url: `/wms/productputaway-record-main/update`, data })
+}
+
+// 删除制品上架记录主
+export const deleteProductputawayRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productputaway-record-main/delete?id=` + id })
+}
+
+// 导出制品上架记录主 Excel
+export const exportProductputawayRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productputaway-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productputawayRequestDetail/index.ts b/src/api/wms/productputawayRequestDetail/index.ts
new file mode 100644
index 000000000..0f3a061bf
--- /dev/null
+++ b/src/api/wms/productputawayRequestDetail/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface ProductputawayRequestDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  poNumber: string
+  poLine: string
+  fromLocationCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询制品上架申请子列表
+export const getProductputawayRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productputaway-request-detail/page`, params })
+  }
+}
+
+// 查询制品上架申请子详情
+export const getProductputawayRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productputaway-request-detail/get?id=` + id })
+}
+
+// 新增制品上架申请子
+export const createProductputawayRequestDetail = async (data: ProductputawayRequestDetailVO) => {
+  return await request.post({ url: `/wms/productputaway-request-detail/create`, data })
+}
+
+// 修改制品上架申请子
+export const updateProductputawayRequestDetail = async (data: ProductputawayRequestDetailVO) => {
+  return await request.put({ url: `/wms/productputaway-request-detail/update`, data })
+}
+
+// 删除制品上架申请子
+export const deleteProductputawayRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productputaway-request-detail/delete?id=` + id })
+}
+
+// 导出制品上架申请子 Excel
+export const exportProductputawayRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/productputaway-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productputaway-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productputawayRequestMain/index.ts b/src/api/wms/productputawayRequestMain/index.ts
new file mode 100644
index 000000000..7975d1ea5
--- /dev/null
+++ b/src/api/wms/productputawayRequestMain/index.ts
@@ -0,0 +1,104 @@
+import request from '@/config/axios'
+
+export interface ProductputawayRequestMainVO {
+  id: number
+  supplierCode: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询制品上架申请主列表
+export const getProductputawayRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productputaway-request-main/page`, params })
+  }
+}
+
+// 查询制品上架申请主详情
+export const getProductputawayRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/productputaway-request-main/get?id=` + id })
+}
+
+// 新增制品上架申请主
+export const createProductputawayRequestMain = async (data: ProductputawayRequestMainVO) => {
+  return await request.post({ url: `/wms/productputaway-request-main/create`, data })
+}
+
+// 修改制品上架申请主
+export const updateProductputawayRequestMain = async (data: ProductputawayRequestMainVO) => {
+  return await request.put({ url: `/wms/productputaway-request-main/update`, data })
+}
+
+// 删除制品上架申请主
+export const deleteProductputawayRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productputaway-request-main/delete?id=` + id })
+}
+
+// 导出制品上架申请主 Excel
+export const exportProductputawayRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productputaway-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productputaway-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productputaway-request-main/get-import-template' })
+}
+
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/productputaway-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/productputaway-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/productputaway-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/productputaway-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/productputaway-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/productputaway-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/productreceiptJobDetail/index.ts b/src/api/wms/productreceiptJobDetail/index.ts
new file mode 100644
index 000000000..df00da6fa
--- /dev/null
+++ b/src/api/wms/productreceiptJobDetail/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface ProductreceiptJobDetailVO {
+  productionLineCode: string
+  workStationCode: string
+  processCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  toLocationCode: string
+  woNumber: string
+  woLine: string
+  packQty: number
+  packUnit: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  toOwnerCode: string
+}
+
+// 查询制品收货任务子列表
+export const getProductreceiptJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-job-detail/page`, params })
+  }
+}
+
+// 查询制品收货任务子详情
+export const getProductreceiptJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productreceipt-job-detail/get?id=` + id })
+}
+
+// 新增制品收货任务子
+export const createProductreceiptJobDetail = async (data: ProductreceiptJobDetailVO) => {
+  return await request.post({ url: `/wms/productreceipt-job-detail/create`, data })
+}
+
+// 修改制品收货任务子
+export const updateProductreceiptJobDetail = async (data: ProductreceiptJobDetailVO) => {
+  return await request.put({ url: `/wms/productreceipt-job-detail/update`, data })
+}
+
+// 删除制品收货任务子
+export const deleteProductreceiptJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productreceipt-job-detail/delete?id=` + id })
+}
+
+// 导出制品收货任务子 Excel
+export const exportProductreceiptJobDetail = async (params) => {
+  return await request.download({ url: `/wms/productreceipt-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productreceipt-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts
new file mode 100644
index 000000000..8f06b62f8
--- /dev/null
+++ b/src/api/wms/productreceiptJobMain/index.ts
@@ -0,0 +1,148 @@
+import request from '@/config/axios'
+
+export interface ProductreceiptJobMainVO {
+  requestNumber: string
+  productionPlanNumber: string
+  workShopCode: string
+  team: string
+  shift: string
+  details: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  toWarehouseCode: string
+  toAreaCodes: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询制品收货任务主列表
+export const getProductreceiptJobMainPage = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-job-main/page`, params })
+  }
+}
+
+// 查询装配收货任务主列表
+export const getProductreceiptJobMainAssemblePage = async (params) => {
+  params.type = 'assemble'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-job-main/page`, params })
+  }
+}
+
+// 查询报废收货货任务主列表
+export const getProductreceiptscapJobMainPage = async (params) => {
+  params.type = 'scrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-job-main/page`, params })
+  }
+}
+
+
+// 查询制品收货任务主详情
+export const getProductreceiptJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/productreceipt-job-main/get?id=` + id })
+}
+
+// 新增制品收货任务主
+export const createProductreceiptJobMain = async (data: ProductreceiptJobMainVO) => {
+  return await request.post({ url: `/wms/productreceipt-job-main/create`, data })
+}
+
+// 修改制品收货任务主
+export const updateProductreceiptJobMain = async (data: ProductreceiptJobMainVO) => {
+  return await request.put({ url: `/wms/productreceipt-job-main/update`, data })
+}
+
+// 删除制品收货任务主
+export const deleteProductreceiptJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productreceipt-job-main/delete?id=` + id })
+}
+
+// 导出制品收货任务主 Excel
+export const exportProductreceiptJobMain = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-job-main/export-excel`, params })
+  }
+}
+
+
+// 导出装配收货任务主 Excel
+export const exportProductreceiptJobMainAssemble = async (params) => {
+  params.type = 'assemble'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productreceipt-job-main/get-import-template' })
+}
+
+// 承接发料任务
+export const acceptProductreceiptMain = async (id) => {
+  return await request.put({ url: `/wms/productreceipt-job-main/accept?id=` + id })
+}
+
+// 放弃发料任务
+export const abandonProductreceiptMain = async (id) => {
+  return await request.put({ url: `/wms/productreceipt-job-main/abandon?id=` + id })
+}
+
+// 关闭发料任务
+export const closeProductreceiptMain = async (id) => {
+  return await request.put({ url: `/wms/productreceipt-job-main/close?id=` + id })
+}
+
+// 执行发料任务
+export const executeProductreceiptMain = async (data) => {
+  return await request.put({ url: `/wms/productreceipt-job-main/execute`, data})
+}
\ No newline at end of file
diff --git a/src/api/wms/productreceiptRecordDetail/index.ts b/src/api/wms/productreceiptRecordDetail/index.ts
new file mode 100644
index 000000000..8dafd938a
--- /dev/null
+++ b/src/api/wms/productreceiptRecordDetail/index.ts
@@ -0,0 +1,76 @@
+import request from '@/config/axios'
+
+export interface ProductreceiptRecordDetailVO {
+  productionlineCode: string
+  workStationCode: string
+  processCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  toOwnerCode: string
+  woNumber: string
+  woLine: string
+  packQty: number
+  packUnit: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+}
+
+// 查询制品收货记录子列表
+export const getProductreceiptRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-record-detail/page`, params })
+  }
+}
+
+// 查询制品收货记录子详情
+export const getProductreceiptRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productreceipt-record-detail/get?id=` + id })
+}
+
+// 新增制品收货记录子
+export const createProductreceiptRecordDetail = async (data: ProductreceiptRecordDetailVO) => {
+  return await request.post({ url: `/wms/productreceipt-record-detail/create`, data })
+}
+
+// 修改制品收货记录子
+export const updateProductreceiptRecordDetail = async (data: ProductreceiptRecordDetailVO) => {
+  return await request.put({ url: `/wms/productreceipt-record-detail/update`, data })
+}
+
+// 删除制品收货记录子
+export const deleteProductreceiptRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productreceipt-record-detail/delete?id=` + id })
+}
+
+// 导出制品收货记录子 Excel
+export const exportProductreceiptRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/productreceipt-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productreceipt-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts
new file mode 100644
index 000000000..79b5699c9
--- /dev/null
+++ b/src/api/wms/productreceiptRecordMain/index.ts
@@ -0,0 +1,113 @@
+import request from '@/config/axios'
+
+export interface ProductreceiptRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  productionPlanNumber: string
+  workshopCode: string
+  team: string
+  shift: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  available: string
+}
+
+// 查询制品收货记录主列表
+export const getProductreceiptRecordMainPage = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-record-main/page`, params })
+  }
+}
+
+// 查询装配收货记录主列表
+export const getProductreceiptRecordMainAssemblePage = async (params) => {
+  params.type = 'assemble'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-record-main/page`, params })
+  }
+}
+
+// 查询报废收货记录主列表
+export const getProductreceiptRecordMainScrapPage = async (params) => {
+  params.type = 'scrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-record-main/page`, params })
+  }
+}
+
+// 查询制品收货记录主详情
+export const getProductreceiptRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/productreceipt-record-main/get?id=` + id })
+}
+
+// 新增制品收货记录主
+export const createProductreceiptRecordMain = async (data: ProductreceiptRecordMainVO) => {
+  return await request.post({ url: `/wms/productreceipt-record-main/create`, data })
+}
+
+// 修改制品收货记录主
+export const updateProductreceiptRecordMain = async (data: ProductreceiptRecordMainVO) => {
+  return await request.put({ url: `/wms/productreceipt-record-main/update`, data })
+}
+
+// 删除制品收货记录主
+export const deleteProductreceiptRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productreceipt-record-main/delete?id=` + id })
+}
+
+// 导出制品收货记录主 Excel
+export const exportProductreceiptRecordMain = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params })
+  }
+}
+
+// 导出装配收货记录主 Excel
+export const exportProductreceiptRecordAssembleMain = async (params) => {
+  params.type = 'assemble'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productreceipt-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productreceiptRequestDetail/index.ts b/src/api/wms/productreceiptRequestDetail/index.ts
new file mode 100644
index 000000000..f832fb50d
--- /dev/null
+++ b/src/api/wms/productreceiptRequestDetail/index.ts
@@ -0,0 +1,77 @@
+import request from '@/config/axios'
+
+export interface ProductreceiptRequestDetailVO {
+  productionLineCode: string
+  workStationCode: string
+  processCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  woNumber: string
+  woLine: string
+  packQty: number
+  packUnit: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  toOwnerCode: string
+}
+
+// 查询制品收货申请子列表
+export const getProductreceiptRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-request-detail/page`, params })
+  }
+}
+
+// 查询制品收货申请子详情
+export const getProductreceiptRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productreceipt-request-detail/get?id=` + id })
+}
+
+// 新增制品收货申请子
+export const createProductreceiptRequestDetail = async (data: ProductreceiptRequestDetailVO) => {
+  return await request.post({ url: `/wms/productreceipt-request-detail/create`, data })
+}
+
+// 修改制品收货申请子
+export const updateProductreceiptRequestDetail = async (data: ProductreceiptRequestDetailVO) => {
+  return await request.put({ url: `/wms/productreceipt-request-detail/update`, data })
+}
+
+// 删除制品收货申请子
+export const deleteProductreceiptRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productreceipt-request-detail/delete?id=` + id })
+}
+
+// 导出制品收货申请子 Excel
+export const exportProductreceiptRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/productreceipt-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productreceipt-request-detail/get-import-template' })
+}
+
+// 创建包装信息后更新子表数据packingNumber
+export const updateDetailPackingNumber = async (id: number, number) => {
+  return await request.put({ url: '/wms/productreceipt-request-detail/updateDetailPackingNumber?id=' + id + '&number=' + number })
+}
diff --git a/src/api/wms/productreceiptRequestMain/index.ts b/src/api/wms/productreceiptRequestMain/index.ts
new file mode 100644
index 000000000..0d337b177
--- /dev/null
+++ b/src/api/wms/productreceiptRequestMain/index.ts
@@ -0,0 +1,140 @@
+import request from '@/config/axios'
+
+export interface ProductreceiptRequestMainVO {
+  productionPlanNumber: string
+  workshopCode: string
+  team: string
+  shift: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询制品收货申请主列表
+export const getProductreceiptRequestMainPage = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-request-main/page`, params })
+  }
+}
+
+// 查询制品收货申请主列表
+export const getProductreceiptRequestMainAssemblePage = async (params) => {
+  params.type = 'assemble'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-request-main/page`, params })
+  }
+}
+
+// 查询报废收货申请主列表
+export const getProductreceiptRequestMainScrapPage = async (params) => {
+  params.type = 'scrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-request-main/page`, params })
+  }
+}
+
+
+// 查询制品收货申请主详情
+export const getProductreceiptRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/productreceipt-request-main/get?id=` + id })
+}
+
+// 新增制品收货申请主
+export const createProductreceiptRequestMain = async (data: ProductreceiptRequestMainVO) => {
+  return await request.post({ url: `/wms/productreceipt-request-main/create`, data })
+}
+
+// 修改制品收货申请主
+export const updateProductreceiptRequestMain = async (data: ProductreceiptRequestMainVO) => {
+  return await request.put({ url: `/wms/productreceipt-request-main/update`, data })
+}
+
+// 删除制品收货申请主
+export const deleteProductreceiptRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productreceipt-request-main/delete?id=` + id })
+}
+
+// 导出制品收货申请主 Excel
+export const exportProductreceiptRequestMain = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productreceipt-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-request-main/export-excel`, params })
+  }
+}
+
+// 导出制品收货申请主 Excel
+export const exportProductreceiptRequestMainAssemble = async (params) => {
+  params.type = 'assemble'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productreceipt-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productreceipt-request-main/get-import-template' })
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/productreceipt-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/productreceipt-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/productreceipt-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/productreceipt-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/productreceipt-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/productreceipt-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/productredressJobDetail/index.ts b/src/api/wms/productredressJobDetail/index.ts
new file mode 100644
index 000000000..27dd360fe
--- /dev/null
+++ b/src/api/wms/productredressJobDetail/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface ProductredressJobDetailVO {
+  id: number
+  productionLineCode: string
+  workStationCode: string
+  processCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  toLocationCode: string
+  woNumber: string
+  woLine: string
+  packQty: number
+  packUnit: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  masterId: number
+  number: string
+  remark: string
+  toOwnerCode: string
+}
+
+// 查询制品回收任务子列表
+export const getProductredressJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productredress-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productredress-job-detail/page`, params })
+  }
+}
+
+// 查询制品回收任务子详情
+export const getProductredressJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productredress-job-detail/get?id=` + id })
+}
+
+// 新增制品回收任务子
+export const createProductredressJobDetail = async (data: ProductredressJobDetailVO) => {
+  return await request.post({ url: `/wms/productredress-job-detail/create`, data })
+}
+
+// 修改制品回收任务子
+export const updateProductredressJobDetail = async (data: ProductredressJobDetailVO) => {
+  return await request.put({ url: `/wms/productredress-job-detail/update`, data })
+}
+
+// 删除制品回收任务子
+export const deleteProductredressJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productredress-job-detail/delete?id=` + id })
+}
+
+// 导出制品回收任务子 Excel
+export const exportProductredressJobDetail = async (params) => {
+  return await request.download({ url: `/wms/productredress-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productredress-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productredressJobMain/index.ts b/src/api/wms/productredressJobMain/index.ts
new file mode 100644
index 000000000..40311c5c8
--- /dev/null
+++ b/src/api/wms/productredressJobMain/index.ts
@@ -0,0 +1,87 @@
+import request from '@/config/axios'
+
+export interface ProductredressJobMainVO {
+  id: number
+  requestNumber: string
+  productionPlanNumber: string
+  workShopCode: string
+  team: string
+  shift: string
+  details: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  userGroupCode: string
+  acceptUserId: string
+  acceptUserName: string
+  acceptTime: Date
+  completeUserId: string
+  completeUserName: string
+  completeTime: Date
+  toWarehouseCode: string
+  toAreaCodes: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  type: string
+  businessType: string
+  remark: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+  inInventoryStatuses: string
+  outInventoryStatuses: string
+}
+
+// 查询制品回收任务主列表
+export const getProductredressJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productredress-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productredress-job-main/page`, params })
+  }
+}
+
+// 查询制品回收任务主详情
+export const getProductredressJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/productredress-job-main/get?id=` + id })
+}
+
+// 新增制品回收任务主
+export const createProductredressJobMain = async (data: ProductredressJobMainVO) => {
+  return await request.post({ url: `/wms/productredress-job-main/create`, data })
+}
+
+// 修改制品回收任务主
+export const updateProductredressJobMain = async (data: ProductredressJobMainVO) => {
+  return await request.put({ url: `/wms/productredress-job-main/update`, data })
+}
+
+// 删除制品回收任务主
+export const deleteProductredressJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productredress-job-main/delete?id=` + id })
+}
+
+// 导出制品回收任务主 Excel
+export const exportProductredressJobMain = async (params) => {
+  return await request.download({ url: `/wms/productredress-job-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productredress-job-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productredressRecordDetail/index.ts b/src/api/wms/productredressRecordDetail/index.ts
new file mode 100644
index 000000000..860b7d8a3
--- /dev/null
+++ b/src/api/wms/productredressRecordDetail/index.ts
@@ -0,0 +1,77 @@
+import request from '@/config/axios'
+
+export interface ProductredressRecordDetailVO {
+  id: number
+  productionlineCode: string
+  workStationCode: string
+  processCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  toOwnerCode: string
+  woNumber: string
+  woLine: string
+  packQty: number
+  packUnit: string
+  bomVersion: string
+  backFlushDetails: string
+  masterId: number
+  number: string
+  itemCode: string
+  remark: string
+  siteId: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  interfaceType: string
+}
+
+// 查询制品回收记录子列表
+export const getProductredressRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productredress-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productredress-record-detail/page`, params })
+  }
+}
+
+// 查询制品回收记录子详情
+export const getProductredressRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productredress-record-detail/get?id=` + id })
+}
+
+// 新增制品回收记录子
+export const createProductredressRecordDetail = async (data: ProductredressRecordDetailVO) => {
+  return await request.post({ url: `/wms/productredress-record-detail/create`, data })
+}
+
+// 修改制品回收记录子
+export const updateProductredressRecordDetail = async (data: ProductredressRecordDetailVO) => {
+  return await request.put({ url: `/wms/productredress-record-detail/update`, data })
+}
+
+// 删除制品回收记录子
+export const deleteProductredressRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productredress-record-detail/delete?id=` + id })
+}
+
+// 导出制品回收记录子 Excel
+export const exportProductredressRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/productredress-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productredress-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productredressRecordMain/index.ts b/src/api/wms/productredressRecordMain/index.ts
new file mode 100644
index 000000000..e935de9c9
--- /dev/null
+++ b/src/api/wms/productredressRecordMain/index.ts
@@ -0,0 +1,70 @@
+import request from '@/config/axios'
+
+export interface ProductredressRecordMainVO {
+  id: number
+  requestNumber: string
+  jobNumber: string
+  productionPlanNumber: string
+  workshopCode: string
+  team: string
+  shift: string
+  details: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  available: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  type: string
+  businessType: string
+  remark: string
+  code: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+}
+
+// 查询制品回收记录主列表
+export const getProductredressRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productredress-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productredress-record-main/page`, params })
+  }
+}
+
+// 查询制品回收记录主详情
+export const getProductredressRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/productredress-record-main/get?id=` + id })
+}
+
+// 新增制品回收记录主
+export const createProductredressRecordMain = async (data: ProductredressRecordMainVO) => {
+  return await request.post({ url: `/wms/productredress-record-main/create`, data })
+}
+
+// 修改制品回收记录主
+export const updateProductredressRecordMain = async (data: ProductredressRecordMainVO) => {
+  return await request.put({ url: `/wms/productredress-record-main/update`, data })
+}
+
+// 删除制品回收记录主
+export const deleteProductredressRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productredress-record-main/delete?id=` + id })
+}
+
+// 导出制品回收记录主 Excel
+export const exportProductredressRecordMain = async (params) => {
+  return await request.download({ url: `/wms/productredress-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productredress-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productredressRequestDetail/index.ts b/src/api/wms/productredressRequestDetail/index.ts
new file mode 100644
index 000000000..150891c58
--- /dev/null
+++ b/src/api/wms/productredressRequestDetail/index.ts
@@ -0,0 +1,73 @@
+import request from '@/config/axios'
+
+export interface ProductredressRequestDetailVO {
+  id: number
+  productionLineCode: string
+  workStationCode: string
+  toLocationCode: string
+  processCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  woNumber: string
+  woLine: string
+  packQty: number
+  packUnit: string
+  bomVersion: string
+  backFlushDetails: string
+  masterId: number
+  number: string
+  itemCode: string
+  remark: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  toOwnerCode: string
+}
+
+// 查询制品回收申请子列表
+export const getProductredressRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productredress-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productredress-request-detail/page`, params })
+  }
+}
+
+// 查询制品回收申请子详情
+export const getProductredressRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productredress-request-detail/get?id=` + id })
+}
+
+// 新增制品回收申请子
+export const createProductredressRequestDetail = async (data: ProductredressRequestDetailVO) => {
+  return await request.post({ url: `/wms/productredress-request-detail/create`, data })
+}
+
+// 修改制品回收申请子
+export const updateProductredressRequestDetail = async (data: ProductredressRequestDetailVO) => {
+  return await request.put({ url: `/wms/productredress-request-detail/update`, data })
+}
+
+// 删除制品回收申请子
+export const deleteProductredressRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productredress-request-detail/delete?id=` + id })
+}
+
+// 导出制品回收申请子 Excel
+export const exportProductredressRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/productredress-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productredress-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productredressRequestMain/index.ts b/src/api/wms/productredressRequestMain/index.ts
new file mode 100644
index 000000000..933a72def
--- /dev/null
+++ b/src/api/wms/productredressRequestMain/index.ts
@@ -0,0 +1,100 @@
+import request from '@/config/axios'
+
+export interface ProductredressRequestMainVO {
+  id: number
+  productionPlanNumber: string
+  workshopCode: string
+  team: string
+  shift: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  number: string
+  type: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+  inInventoryStatuses: string
+  outInventoryStatuses: string
+}
+
+// 查询制品回收申请主列表
+export const getProductredressRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productredress-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productredress-request-main/page`, params })
+  }
+}
+
+// 查询制品回收申请主详情
+export const getProductredressRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/productredress-request-main/get?id=` + id })
+}
+
+// 新增制品回收申请主
+export const createProductredressRequestMain = async (data: ProductredressRequestMainVO) => {
+  return await request.post({ url: `/wms/productredress-request-main/create`, data })
+}
+
+// 修改制品回收申请主
+export const updateProductredressRequestMain = async (data: ProductredressRequestMainVO) => {
+  return await request.put({ url: `/wms/productredress-request-main/update`, data })
+}
+
+// 删除制品回收申请主
+export const deleteProductredressRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productredress-request-main/delete?id=` + id })
+}
+
+// 导出制品回收申请主 Excel
+export const exportProductredressRequestMain = async (params) => {
+  return await request.download({ url: `/wms/productredress-request-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productredress-request-main/get-import-template' })
+}
+
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/productredress-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/productredress-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/productredress-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/productredress-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/productredress-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/productredress-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/productrepairRecordDetail/index.ts b/src/api/wms/productrepairRecordDetail/index.ts
new file mode 100644
index 000000000..20faa9799
--- /dev/null
+++ b/src/api/wms/productrepairRecordDetail/index.ts
@@ -0,0 +1,72 @@
+import request from '@/config/axios'
+
+export interface ProductrepairRecordDetailVO {
+  fromOwnerCode: string
+  productionLineCode: string
+  workStationCode: string
+  processCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  produceDate: Date
+  expireDate: Date
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  inventoryStatus: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+}
+
+// 查询制品返修记录子列表
+export const getProductrepairRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productrepair-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productrepair-record-detail/page`, params })
+  }
+}
+
+// 查询制品返修记录子详情
+export const getProductrepairRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productrepair-record-detail/get?id=` + id })
+}
+
+// 新增制品返修记录子
+export const createProductrepairRecordDetail = async (data: ProductrepairRecordDetailVO) => {
+  return await request.post({ url: `/wms/productrepair-record-detail/create`, data })
+}
+
+// 修改制品返修记录子
+export const updateProductrepairRecordDetail = async (data: ProductrepairRecordDetailVO) => {
+  return await request.put({ url: `/wms/productrepair-record-detail/update`, data })
+}
+
+// 删除制品返修记录子
+export const deleteProductrepairRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productrepair-record-detail/delete?id=` + id })
+}
+
+// 导出制品返修记录子 Excel
+export const exportProductrepairRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/productrepair-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productrepair-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productrepairRecordMain/index.ts b/src/api/wms/productrepairRecordMain/index.ts
new file mode 100644
index 000000000..3469be295
--- /dev/null
+++ b/src/api/wms/productrepairRecordMain/index.ts
@@ -0,0 +1,73 @@
+import request from '@/config/axios'
+
+export interface ProductrepairRecordMainVO {
+  requestNumber: string
+  workshopCode: string
+  team: string
+  shift: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  available: string
+}
+
+// 查询制品返修记录主列表
+export const getProductrepairRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productrepair-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productrepair-record-main/page`, params })
+  }
+}
+
+// 查询制品返修记录主详情
+export const getProductrepairRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/productrepair-record-main/get?id=` + id })
+}
+
+// 新增制品返修记录主
+export const createProductrepairRecordMain = async (data: ProductrepairRecordMainVO) => {
+  return await request.post({ url: `/wms/productrepair-record-main/create`, data })
+}
+
+// 修改制品返修记录主
+export const updateProductrepairRecordMain = async (data: ProductrepairRecordMainVO) => {
+  return await request.put({ url: `/wms/productrepair-record-main/update`, data })
+}
+
+// 删除制品返修记录主
+export const deleteProductrepairRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productrepair-record-main/delete?id=` + id })
+}
+
+// 导出制品返修记录主 Excel
+export const exportProductrepairRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productrepair-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productrepair-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productrepair-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productrepairRequestDetaila/index.ts b/src/api/wms/productrepairRequestDetaila/index.ts
new file mode 100644
index 000000000..5b5adeec3
--- /dev/null
+++ b/src/api/wms/productrepairRequestDetaila/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface ProductrepairRequestDetailaVO {
+  fromOwnerCode: string
+  productionlineCode: string
+  workStationCode: string
+  processCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  fromLocationCode: string
+  inventoryStatus: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+}
+
+// 查询制品返修申请子列表
+export const getProductrepairRequestDetailaPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productrepair-request-detaila/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productrepair-request-detaila/page`, params })
+  }
+}
+
+// 查询制品返修申请子详情
+export const getProductrepairRequestDetaila = async (id: number) => {
+  return await request.get({ url: `/wms/productrepair-request-detaila/get?id=` + id })
+}
+
+// 新增制品返修申请子
+export const createProductrepairRequestDetaila = async (data: ProductrepairRequestDetailaVO) => {
+  return await request.post({ url: `/wms/productrepair-request-detaila/create`, data })
+}
+
+// 修改制品返修申请子
+export const updateProductrepairRequestDetaila = async (data: ProductrepairRequestDetailaVO) => {
+  return await request.put({ url: `/wms/productrepair-request-detaila/update`, data })
+}
+
+// 删除制品返修申请子
+export const deleteProductrepairRequestDetaila = async (id: number) => {
+  return await request.delete({ url: `/wms/productrepair-request-detaila/delete?id=` + id })
+}
+
+// 导出制品返修申请子 Excel
+export const exportProductrepairRequestDetaila = async (params) => {
+  return await request.download({ url: `/wms/productrepair-request-detaila/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productrepair-request-detaila/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productrepairRequestMain/index.ts b/src/api/wms/productrepairRequestMain/index.ts
new file mode 100644
index 000000000..0a5fb8315
--- /dev/null
+++ b/src/api/wms/productrepairRequestMain/index.ts
@@ -0,0 +1,101 @@
+import request from '@/config/axios'
+
+export interface ProductrepairRequestMainVO {
+  workshopCode: string
+  team: string
+  shift: string
+  fromWarehouseCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询制品返修申请主列表
+export const getProductrepairRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productrepair-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productrepair-request-main/page`, params })
+  }
+}
+
+// 查询制品返修申请主详情
+export const getProductrepairRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/productrepair-request-main/get?id=` + id })
+}
+
+// 新增制品返修申请主
+export const createProductrepairRequestMain = async (data: ProductrepairRequestMainVO) => {
+  return await request.post({ url: `/wms/productrepair-request-main/create`, data })
+}
+
+// 修改制品返修申请主
+export const updateProductrepairRequestMain = async (data: ProductrepairRequestMainVO) => {
+  return await request.put({ url: `/wms/productrepair-request-main/update`, data })
+}
+
+// 删除制品返修申请主
+export const deleteProductrepairRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productrepair-request-main/delete?id=` + id })
+}
+
+// 导出制品返修申请主 Excel
+export const exportProductrepairRequestMain = async (params) => {
+  return await request.download({ url: `/wms/productrepair-request-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productrepair-request-main/get-import-template' })
+}
+
+// 关闭-制品返修申请
+export const closeProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/close?id=` + id })
+}
+
+// 重新添加-制品返修申请
+export const reAddProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-制品返修申请
+export const submitProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/submit?id=` + id })
+}
+
+// 审批驳回-制品返修申请
+export const refusedProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/refused?id=` + id })
+}
+
+// 审批通过-制品返修申请
+export const agreeProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/agree?id=` + id })
+}
+
+// 处理-制品返修申请
+export const handleProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/handle?id=` + id })
+}
+
+// 修改制品返修BOM数据
+export const updateProductscrapDetailRequestBom = async (id, data) => {
+  return await request.post({ url: `/wms/productrepair-request-main/updateBom?id=`+id, data })
+}
diff --git a/src/api/wms/productscrapJobDetail/index.ts b/src/api/wms/productscrapJobDetail/index.ts
new file mode 100644
index 000000000..226fd56d0
--- /dev/null
+++ b/src/api/wms/productscrapJobDetail/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface ProductscrapJobDetailVO {
+  ownerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  fromLocationCode: string
+  inventoryStatus: string
+  reason: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+}
+
+// 查询制品报废任务子列表
+export const getProductscrapJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productscrap-job-detail/page`, params })
+  }
+}
+
+// 查询制品报废任务子详情
+export const getProductscrapJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productscrap-job-detail/get?id=` + id })
+}
+
+// 新增制品报废任务子
+export const createProductscrapJobDetail = async (data: ProductscrapJobDetailVO) => {
+  return await request.post({ url: `/wms/productscrap-job-detail/create`, data })
+}
+
+// 修改制品报废任务子
+export const updateProductscrapJobDetail = async (data: ProductscrapJobDetailVO) => {
+  return await request.put({ url: `/wms/productscrap-job-detail/update`, data })
+}
+
+// 删除制品报废任务子
+export const deleteProductscrapJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productscrap-job-detail/delete?id=` + id })
+}
+
+// 导出制品报废任务子 Excel
+export const exportProductscrapJobDetail = async (params) => {
+  return await request.download({ url: `/wms/productscrap-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productscrap-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productscrapJobMain/index.ts b/src/api/wms/productscrapJobMain/index.ts
new file mode 100644
index 000000000..d4c094196
--- /dev/null
+++ b/src/api/wms/productscrapJobMain/index.ts
@@ -0,0 +1,79 @@
+import request from '@/config/axios'
+
+export interface ProductscrapJobMainVO {
+  requestNumber: string
+  fromWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromAreaCodes: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询制品报废任务主列表
+export const getProductscrapJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productscrap-job-main/page`, params })
+  }
+}
+
+// 查询制品报废任务主详情
+export const getProductscrapJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/productscrap-job-main/get?id=` + id })
+}
+
+// 新增制品报废任务主
+export const createProductscrapJobMain = async (data: ProductscrapJobMainVO) => {
+  return await request.post({ url: `/wms/productscrap-job-main/create`, data })
+}
+
+// 修改制品报废任务主
+export const updateProductscrapJobMain = async (data: ProductscrapJobMainVO) => {
+  return await request.put({ url: `/wms/productscrap-job-main/update`, data })
+}
+
+// 删除制品报废任务主
+export const deleteProductscrapJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productscrap-job-main/delete?id=` + id })
+}
+
+// 导出制品报废任务主 Excel
+export const exportProductscrapJobMain = async (params) => {
+  return await request.download({ url: `/wms/productscrap-job-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productscrap-job-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productscrapRecordDetail/index.ts b/src/api/wms/productscrapRecordDetail/index.ts
new file mode 100644
index 000000000..ae2aae838
--- /dev/null
+++ b/src/api/wms/productscrapRecordDetail/index.ts
@@ -0,0 +1,70 @@
+import request from '@/config/axios'
+
+export interface ProductscrapRecordDetailVO {
+  fromOwnerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  inventoryStatus: string
+  reason: string
+  singlePrice: number
+  amount: number
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  jobDetailId: string
+}
+
+// 查询制品报废记录子列表
+export const getProductscrapRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productscrap-record-detail/page`, params })
+  }
+}
+
+// 查询制品报废记录子详情
+export const getProductscrapRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productscrap-record-detail/get?id=` + id })
+}
+
+// 新增制品报废记录子
+export const createProductscrapRecordDetail = async (data: ProductscrapRecordDetailVO) => {
+  return await request.post({ url: `/wms/productscrap-record-detail/create`, data })
+}
+
+// 修改制品报废记录子
+export const updateProductscrapRecordDetail = async (data: ProductscrapRecordDetailVO) => {
+  return await request.put({ url: `/wms/productscrap-record-detail/update`, data })
+}
+
+// 删除制品报废记录子
+export const deleteProductscrapRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productscrap-record-detail/delete?id=` + id })
+}
+
+// 导出制品报废记录子 Excel
+export const exportProductscrapRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/productscrap-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productscrap-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productscrapRecordMain/index.ts b/src/api/wms/productscrapRecordMain/index.ts
new file mode 100644
index 000000000..de4020cac
--- /dev/null
+++ b/src/api/wms/productscrapRecordMain/index.ts
@@ -0,0 +1,72 @@
+import request from '@/config/axios'
+
+export interface ProductscrapRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  code: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  ruleUserId: number
+  available: string
+}
+
+// 查询制品报废记录主列表
+export const getProductscrapRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productscrap-record-main/page`, params })
+  }
+}
+
+// 查询制品报废记录主详情
+export const getProductscrapRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/productscrap-record-main/get?id=` + id })
+}
+
+// 新增制品报废记录主
+export const createProductscrapRecordMain = async (data: ProductscrapRecordMainVO) => {
+  return await request.post({ url: `/wms/productscrap-record-main/create`, data })
+}
+
+// 修改制品报废记录主
+export const updateProductscrapRecordMain = async (data: ProductscrapRecordMainVO) => {
+  return await request.put({ url: `/wms/productscrap-record-main/update`, data })
+}
+
+// 删除制品报废记录主
+export const deleteProductscrapRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productscrap-record-main/delete?id=` + id })
+}
+
+// 导出制品报废记录主 Excel
+export const exportProductscrapRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productscrap-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productscrap-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productscrapRequestDetail/index.ts b/src/api/wms/productscrapRequestDetail/index.ts
new file mode 100644
index 000000000..ffb26714f
--- /dev/null
+++ b/src/api/wms/productscrapRequestDetail/index.ts
@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface ProductscrapRequestDetailVO {
+  fromOwnerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  fromLocationCode: string
+  inventoryStatus: string
+  reason: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+}
+
+// 查询制品报废申请子列表
+export const getProductscrapRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productscrap-request-detail/page`, params })
+  }
+}
+
+// 查询制品报废申请子详情
+export const getProductscrapRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productscrap-request-detail/get?id=` + id })
+}
+
+// 新增制品报废申请子
+export const createProductscrapRequestDetail = async (data: ProductscrapRequestDetailVO) => {
+  return await request.post({ url: `/wms/productscrap-request-detail/create`, data })
+}
+
+// 修改制品报废申请子
+export const updateProductscrapRequestDetail = async (data: ProductscrapRequestDetailVO) => {
+  return await request.put({ url: `/wms/productscrap-request-detail/update`, data })
+}
+
+// 删除制品报废申请子
+export const deleteProductscrapRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productscrap-request-detail/delete?id=` + id })
+}
+
+// 导出制品报废申请子 Excel
+export const exportProductscrapRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/productscrap-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productscrap-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productscrapRequestMain/index.ts b/src/api/wms/productscrapRequestMain/index.ts
new file mode 100644
index 000000000..dfed6c9f7
--- /dev/null
+++ b/src/api/wms/productscrapRequestMain/index.ts
@@ -0,0 +1,104 @@
+import request from '@/config/axios'
+
+export interface ProductscrapRequestMainVO {
+  fromWarehouseCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询制品报废申请主列表
+export const getProductscrapRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productscrap-request-main/page`, params })
+  }
+}
+
+// 查询制品报废申请主详情
+export const getProductscrapRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/productscrap-request-main/get?id=` + id })
+}
+
+// 新增制品报废申请主
+export const createProductscrapRequestMain = async (data: ProductscrapRequestMainVO) => {
+  return await request.post({ url: `/wms/productscrap-request-main/create`, data })
+}
+
+// 修改制品报废申请主
+export const updateProductscrapRequestMain = async (data: ProductscrapRequestMainVO) => {
+  return await request.put({ url: `/wms/productscrap-request-main/update`, data })
+}
+
+// 删除制品报废申请主
+export const deleteProductscrapRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productscrap-request-main/delete?id=` + id })
+}
+
+// 导出制品报废申请主 Excel
+export const exportProductscrapRequestMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productscrap-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productscrap-request-main/get-import-template' })
+}
+
+// 关闭-制品报废申请
+export const closeProductscrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productscrap-request-main/close?id=` + id })
+}
+
+// 重新添加-制品报废申请
+export const reAddProductscrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productscrap-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-制品报废申请
+export const submitProductscrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productscrap-request-main/submit?id=` + id })
+}
+
+// 审批驳回-制品报废申请
+export const refusedProductscrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productscrap-request-main/refused?id=` + id })
+}
+
+// 审批通过-制品报废申请
+export const agreeProductscrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productscrap-request-main/agree?id=` + id })
+}
+
+// 处理-制品报废申请
+export const handleProductscrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productscrap-request-main/handle?id=` + id })
+}
+
+// 修改制品报废BOM数据
+export const updateProductscrapDetailRequestBom = async (id, data) => {
+  return await request.post({ url: `/wms/productscrap-request-main/updateBom?id=`+id, data })
+}
diff --git a/src/api/wms/project/index.ts b/src/api/wms/project/index.ts
new file mode 100644
index 000000000..2689abd43
--- /dev/null
+++ b/src/api/wms/project/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface ProjectVO {
+  code: string
+  name: string
+  description: string
+  customerCode: string
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询项目列表
+export const getProjectPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/project/senior', data })
+  } else {
+    return await request.get({ url: `/wms/project/page`, params })
+  }
+}
+
+// 查询项目详情
+export const getProject = async (id: number) => {
+  return await request.get({ url: `/wms/project/get?id=` + id })
+}
+
+// 新增项目
+export const createProject = async (data: ProjectVO) => {
+  return await request.post({ url: `/wms/project/create`, data })
+}
+
+// 修改项目
+export const updateProject = async (data: ProjectVO) => {
+  return await request.put({ url: `/wms/project/update`, data })
+}
+
+// 删除项目
+export const deleteProject = async (id: number) => {
+  return await request.delete({ url: `/wms/project/delete?id=` + id })
+}
+
+// 导出项目 Excel
+export const exportProject = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/project/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/project/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/project/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/purchaseDetail/index.ts b/src/api/wms/purchaseDetail/index.ts
new file mode 100644
index 000000000..f85c46731
--- /dev/null
+++ b/src/api/wms/purchaseDetail/index.ts
@@ -0,0 +1,91 @@
+import request from '@/config/axios'
+
+export interface PurchaseDetailVO {
+  lineNumber: string
+  erpLocationCode: string
+  projectCode: string
+  packQty: number
+  packUnit: string
+  supplierQty: number
+  supplierUom: string
+  convertRate: number
+  shippedQty: number
+  receivedQty: number
+  returnedQty: number
+  putawayQty: number
+  overReceivingPercent: number
+  singlePrice: number
+  amount: number
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  orderQty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  concurrencyStamp: string
+  status: string
+  available: string
+}
+
+const message = useMessage() // 消息弹窗
+
+// 查询采购订单子列表
+export const getPurchaseDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchase-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchase-detail/page`, params })
+  }
+}
+
+// 校验子表数据
+export const getPurchaseDetailPageCheckData = async (params) => {
+  return await request.get({ url: `/wms/purchase-detail/pageCheckData`, params })
+}
+
+// 查询采购订单子列表
+export const getPurchaseDetailPagePoNumber = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchase-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchase-detail/page`, params })
+  }
+}
+
+
+// 查询采购订单子详情
+export const getPurchaseDetail = async (id: number) => {
+  return await request.get({ url: `/wms/purchase-detail/get?id=` + id })
+}
+
+// 新增采购订单子
+export const createPurchaseDetail = async (data: PurchaseDetailVO) => {
+  return await request.post({ url: `/wms/purchase-detail/create`, data })
+}
+
+// 修改采购订单子
+export const updatePurchaseDetail = async (data: PurchaseDetailVO) => {
+  return await request.put({ url: `/wms/purchase-detail/update`, data })
+}
+
+// 删除采购订单子
+export const deletePurchaseDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/purchase-detail/delete?id=` + id })
+}
+
+// 导出采购订单子 Excel
+export const exportPurchaseDetail = async (params) => {
+  return await request.download({ url: `/wms/purchase-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchase-detail/get-import-template' })
+}
diff --git a/src/api/wms/purchaseMain/index.ts b/src/api/wms/purchaseMain/index.ts
new file mode 100644
index 000000000..a833a5427
--- /dev/null
+++ b/src/api/wms/purchaseMain/index.ts
@@ -0,0 +1,81 @@
+import request from '@/config/axios'
+
+export interface PurchaseMainVO {
+  supplierCode: string
+  number: string
+  type: string
+  status: string
+  orderDate: Date
+  dueDate: Date
+  version: string
+  taxRate: number
+  contactName: string
+  contactPhone: string
+  contactEmail: string
+  isConsignment: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  updateTime: Date
+  updater: string
+  currentStage: number
+  available: string
+}
+
+// 查询采购订单主列表
+export const getPurchaseMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchase-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchase-main/page`, params })
+  }
+}
+
+// 查询采购订单主详情
+export const getPurchaseMain = async (id: number) => {
+  return await request.get({ url: `/wms/purchase-main/get?id=` + id })
+}
+
+// 新增采购订单主
+export const createPurchaseMain = async (data: PurchaseMainVO) => {
+  return await request.post({ url: `/wms/purchase-main/create`, data })
+}
+
+// 修改采购订单主
+export const updatePurchaseMain = async (data: PurchaseMainVO) => {
+  return await request.put({ url: `/wms/purchase-main/update`, data })
+}
+
+// 删除采购订单主
+export const deletePurchaseMain = async (id: number) => {
+  return await request.delete({ url: `/wms/purchase-main/delete?id=` + id })
+}
+
+// 关闭采购订单主
+export const closePurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-main/close?id=` + id })
+}
+// 打开采购订单主
+export const openPurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-main/open?id=` + id })
+}
+// 发布采购订单主
+export const publishPurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-main/publish?id=` + id })
+}
+// 下架采购订单主
+export const witPurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-main/wit?id=` + id })
+}
+// 导出采购订单主 Excel
+export const exportPurchaseMain = async (params) => {
+  return await request.download({ url: `/wms/purchase-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchase-main/get-import-template' })
+}
diff --git a/src/api/wms/purchasePlanDetail/index.ts b/src/api/wms/purchasePlanDetail/index.ts
new file mode 100644
index 000000000..1b35d8ec9
--- /dev/null
+++ b/src/api/wms/purchasePlanDetail/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface PurchasePlanDetailVO {
+  poNumber: string
+  poLine: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  shippedQty: number
+  planQty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  available: string
+}
+
+// 查询要货计划子列表
+export const getPurchasePlanDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchase-plan-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchase-plan-detail/page`, params })
+  }
+}
+
+// 查询采购收货记录子列表
+export const getPurchasePlanDetailList = async (params) => {
+    return await request.get({ url: `/wms/purchase-plan-detail/allList`, params })
+}
+
+// 查询要货计划子详情
+export const getPurchasePlanDetail = async (id: number) => {
+  return await request.get({ url: `/wms/purchase-plan-detail/get?id=` + id })
+}
+
+// 新增要货计划子
+export const createPurchasePlanDetail = async (data: PurchasePlanDetailVO) => {
+  return await request.post({ url: `/wms/purchase-plan-detail/create`, data })
+}
+
+// 修改要货计划子
+export const updatePurchasePlanDetail = async (data: PurchasePlanDetailVO) => {
+  return await request.put({ url: `/wms/purchase-plan-detail/update`, data })
+}
+
+// 删除要货计划子
+export const deletePurchasePlanDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/purchase-plan-detail/delete?id=` + id })
+}
+
+// 导出要货计划子 Excel
+export const exportPurchasePlanDetail = async (params) => {
+  return await request.download({ url: `/wms/purchase-plan-detail/export-excel`, params })
+}
diff --git a/src/api/wms/purchasePlanMain/index.ts b/src/api/wms/purchasePlanMain/index.ts
new file mode 100644
index 000000000..167e3ffd6
--- /dev/null
+++ b/src/api/wms/purchasePlanMain/index.ts
@@ -0,0 +1,97 @@
+import request from '@/config/axios'
+
+export interface PurchasePlanMainVO {
+  supplierCode: string
+  timeWindow: string
+  warehouseCode: string
+  dockCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  beginTime: Date
+  endTime: Date
+  status: string
+  updateTime: Date
+  updater: string
+  available: string
+}
+
+// 查询要货计划主列表
+export const getPurchasePlanMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchase-plan-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchase-plan-main/page`, params })
+  }
+}
+
+// 查询要货计划主详情
+export const getPurchasePlanMain = async (id: number) => {
+  return await request.get({ url: `/wms/purchase-plan-main/get?id=` + id })
+}
+
+// 新增要货计划主
+export const createPurchasePlanMain = async (data: PurchasePlanMainVO) => {
+  return await request.post({ url: `/wms/purchase-plan-main/create`, data })
+}
+
+// 修改要货计划主
+export const updatePurchasePlanMain = async (data: PurchasePlanMainVO) => {
+  return await request.put({ url: `/wms/purchase-plan-main/update`, data })
+}
+
+// 删除要货计划主
+export const deletePurchasePlanMain = async (id: number) => {
+  return await request.delete({ url: `/wms/purchase-plan-main/delete?id=` + id })
+}
+
+// 关闭要货计划主
+export const closePurchasePlanMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-plan-main/close?id=` + id })
+}
+// 打开要货计划主
+export const openPurchasePlanMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-plan-main/open?id=` + id })
+}
+// 发布要货计划主
+export const publishPurchasePlanMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-plan-main/publish?id=` + id })
+}
+// 下架要货计划主
+export const witPurchasePlanMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-plan-main/wit?id=` + id })
+}
+
+// 接受要货计划主
+export const accPurchasePlanMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-plan-main/acc?id=` + id })
+}
+
+// 驳回要货计划主
+export const rejPurchasePlanMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-plan-main/rej?id=` + id })
+}
+
+// 导出要货计划主 Excel
+export const exportPurchasePlanMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchase-plan-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchase-plan-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchase-plan-main/get-import-template' })
+}
+
+// 查询要货计划策略根据供应商
+export const queryPurchasePlan = async (supplierCode: string) => {
+  return await request.get({ url: `/wms/purchase-plan-main/queryPurchasePlan?supplierCode=` + supplierCode })
+}
\ No newline at end of file
diff --git a/src/api/wms/purchaseclaimRecordDetail/index.ts b/src/api/wms/purchaseclaimRecordDetail/index.ts
new file mode 100644
index 000000000..89f1f5351
--- /dev/null
+++ b/src/api/wms/purchaseclaimRecordDetail/index.ts
@@ -0,0 +1,66 @@
+import request from '@/config/axios'
+
+export interface PurchaseclaimRecordDetailVO {
+  batch: string
+  altBatch: string
+  poNumber: string
+  poLine: string
+  reason: string
+  singlePrice: number
+  amount: number
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+}
+
+// 查询采购索赔记录子列表
+export const getPurchaseclaimRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchaseclaim-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchaseclaim-record-detail/page`, params })
+  }
+}
+
+// 查询采购索赔记录子详情
+export const getPurchaseclaimRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/purchaseclaim-record-detail/get?id=` + id })
+}
+
+// 新增采购索赔记录子
+export const createPurchaseclaimRecordDetail = async (data: PurchaseclaimRecordDetailVO) => {
+  return await request.post({ url: `/wms/purchaseclaim-record-detail/create`, data })
+}
+
+// 修改采购索赔记录子
+export const updatePurchaseclaimRecordDetail = async (data: PurchaseclaimRecordDetailVO) => {
+  return await request.put({ url: `/wms/purchaseclaim-record-detail/update`, data })
+}
+
+// 删除采购索赔记录子
+export const deletePurchaseclaimRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/purchaseclaim-record-detail/delete?id=` + id })
+}
+
+// 导出采购索赔记录子 Excel
+export const exportPurchaseclaimRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/purchaseclaim-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchaseclaim-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/purchaseclaimRecordMain/index.ts b/src/api/wms/purchaseclaimRecordMain/index.ts
new file mode 100644
index 000000000..a4baa7d68
--- /dev/null
+++ b/src/api/wms/purchaseclaimRecordMain/index.ts
@@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+export interface PurchaseclaimRecordMainVO {
+  requestNumber: string
+  asnNumber: string
+  ppNumber: string
+  supplierCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  available: string
+}
+
+// 查询采购索赔记录主列表
+export const getPurchaseclaimRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchaseclaim-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchaseclaim-record-main/page`, params })
+  }
+}
+
+// 查询采购索赔记录主详情
+export const getPurchaseclaimRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/purchaseclaim-record-main/get?id=` + id })
+}
+
+// 新增采购索赔记录主
+export const createPurchaseclaimRecordMain = async (data: PurchaseclaimRecordMainVO) => {
+  return await request.post({ url: `/wms/purchaseclaim-record-main/create`, data })
+}
+
+// 修改采购索赔记录主
+export const updatePurchaseclaimRecordMain = async (data: PurchaseclaimRecordMainVO) => {
+  return await request.put({ url: `/wms/purchaseclaim-record-main/update`, data })
+}
+
+// 删除采购索赔记录主
+export const deletePurchaseclaimRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/purchaseclaim-record-main/delete?id=` + id })
+}
+
+// 导出采购索赔记录主 Excel
+export const exportPurchaseclaimRecordMain = async (params) => {
+  return await request.download({ url: `/wms/purchaseclaim-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchaseclaim-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/purchaseclaimRequestDetail/index.ts b/src/api/wms/purchaseclaimRequestDetail/index.ts
new file mode 100644
index 000000000..fed254b7d
--- /dev/null
+++ b/src/api/wms/purchaseclaimRequestDetail/index.ts
@@ -0,0 +1,53 @@
+import request from '@/config/axios'
+
+export interface PurchaseclaimRequestDetailVO {
+  altBatch: string
+  amount: Number
+  batch: Number
+  id: string
+  itemCode: string
+  itemDesc1: string
+  itemDesc2: string
+  itemName: string
+  number: string
+  poLine: string
+  poNumber: string
+  projectCode: string
+  qty: Number
+  reason: string
+  remark: string
+  singlePrice: Number
+  uom: string
+}
+
+// 查询采购索赔申请子列表
+export const getPurchaseclaimRequestDetailPage = async (params) => {
+  // return await request.get({ url: `/wms/purchaseclaim-request-detail/page`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/purchaseclaim-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchaseclaim-request-detail/page`, params })
+  }
+}
+
+// 查询采购索赔申请子详情
+export const getPurchaseclaimRequesDetail = async (id: number) => {
+  return await request.get({ url: `/wms/purchaseclaim-request-detail/get?id=` + id })
+}
+
+// 新增采购索赔申请子
+export const createPurchaseclaimRequestDetail = async (data: PurchaseclaimRequestDetailVO) => {
+  return await request.post({ url: `/wms/purchaseclaim-request-detail/create`, data })
+}
+
+// 修改采购索赔申请子
+export const updatePurchaseclaimRequestDetail = async (data: PurchaseclaimRequestDetailVO) => {
+  return await request.put({ url: `/wms/purchaseclaim-request-detail/update`, data })
+}
+
+// 删除采购索赔申请子
+export const deletePurchaseclaimRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/purchaseclaim-request-detail/delete?id=` + id })
+}
diff --git a/src/api/wms/purchaseclaimRequestMain/index.ts b/src/api/wms/purchaseclaimRequestMain/index.ts
new file mode 100644
index 000000000..392f87385
--- /dev/null
+++ b/src/api/wms/purchaseclaimRequestMain/index.ts
@@ -0,0 +1,86 @@
+import request from '@/config/axios'
+
+export interface PurchaseclaimRequestMainVO {
+  asnNumber: string
+  ppNumber: string
+  supplierCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询采购索赔申请主列表
+export const getPurchaseclaimRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/purchaseclaim-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchaseclaim-request-main/page`, params })
+  }
+}
+// 查询采购索赔申请主详情
+export const getPurchaseclaimRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/purchaseclaim-request-main/get?id=` + id })
+}
+
+// 新增采购索赔申请主
+export const createPurchaseclaimRequestMain = async (data: PurchaseclaimRequestMainVO) => {
+  return await request.post({ url: `/wms/purchaseclaim-request-main/create`, data })
+}
+
+// 修改采购索赔申请主
+export const updatePurchaseclaimRequestMain = async (data: PurchaseclaimRequestMainVO) => {
+  return await request.put({ url: `/wms/purchaseclaim-request-main/update`, data })
+}
+
+// 删除采购索赔申请主
+export const deletePurchaseclaimRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/purchaseclaim-request-main/delete?id=` + id })
+}
+
+// 打开供应商发货申请主
+export const opePurchaseclaimRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchaseclaim-request-main/open?id=` + id })
+}
+// 关闭供应商发货申请主
+export const cloPurchaseclaimRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchaseclaim-request-main/close?id=` + id })
+}
+// 提交审批供应商发货申请主
+export const subPurchaseclaimRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchaseclaim-request-main/sub?id=` + id })
+}
+// 审批通过供应商发货申请主
+export const appPurchaseclaimRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchaseclaim-request-main/app?id=` + id })
+}
+// 驳回供应商发货申请主
+export const rejPurchaseclaimRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchaseclaim-request-main/rej?id=` + id })
+}
+// 处理
+export const genRecordsPurchaseclaimRequestMain = async (id) => {
+  return await request.post({ url: `/wms/purchaseclaim-request-main/genRecords?id=` + id })
+}
+// 导出采购索赔申请主 Excel
+export const exportPurchaseclaimRequestMain = async (params) => {
+  return await request.download({ url: `/wms/purchaseclaim-request-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchaseclaim-request-main/get-import-template' })
+}
diff --git a/src/api/wms/purchaseprice/index.ts b/src/api/wms/purchaseprice/index.ts
new file mode 100644
index 000000000..cf2438619
--- /dev/null
+++ b/src/api/wms/purchaseprice/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface PurchasepriceVO {
+  supplierCode: string
+  itemCode: string
+  currency: string
+  price: number
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询采购价格单列表
+export const getPurchasepricePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/purchaseprice/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchaseprice/page`, params })
+  }
+}
+
+// 查询采购价格单详情
+export const getPurchaseprice = async (id: number) => {
+  return await request.get({ url: `/wms/purchaseprice/get?id=` + id })
+}
+
+// 新增采购价格单
+export const createPurchaseprice = async (data: PurchasepriceVO) => {
+  return await request.post({ url: `/wms/purchaseprice/create`, data })
+}
+
+// 修改采购价格单
+export const updatePurchaseprice = async (data: PurchasepriceVO) => {
+  return await request.put({ url: `/wms/purchaseprice/update`, data })
+}
+
+// 删除采购价格单
+export const deletePurchaseprice = async (id: number) => {
+  return await request.delete({ url: `/wms/purchaseprice/delete?id=` + id })
+}
+
+// 导出采购价格单 Excel
+export const exportPurchaseprice = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchaseprice/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchaseprice/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchaseprice/get-import-template' })
+}
diff --git a/src/api/wms/purchasereceiptJobDetail/index.ts b/src/api/wms/purchasereceiptJobDetail/index.ts
new file mode 100644
index 000000000..6020d680f
--- /dev/null
+++ b/src/api/wms/purchasereceiptJobDetail/index.ts
@@ -0,0 +1,86 @@
+import request from '@/config/axios'
+
+export interface PurchasereceiptJobDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  altBatch: string
+  arriveDate: Date
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  fromLocationCode: string
+  toLocationCode: string
+  poNumber: string
+  poLine: string
+  packQty: number
+  packUnit: string
+  supplierQty: number
+  supplierUom: string
+  convertRate: number
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  eemark: string
+  createTime: Date
+  creator: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询采购收货任务子列表
+export const getPurchasereceiptJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-job-detail/page`, params })
+  }
+}
+
+// 查询采购收货任务子详情
+export const getPurchasereceiptJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/purchasereceipt-job-detail/get?id=` + id })
+}
+
+// 新增采购收货任务子
+export const createPurchasereceiptJobDetail = async (data: PurchasereceiptJobDetailVO) => {
+  return await request.post({ url: `/wms/purchasereceipt-job-detail/create`, data })
+}
+
+// 修改采购收货任务子
+export const updatePurchasereceiptJobDetail = async (data: PurchasereceiptJobDetailVO) => {
+  return await request.put({ url: `/wms/purchasereceipt-job-detail/update`, data })
+}
+
+// 删除采购收货任务子
+export const deletePurchasereceiptJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/purchasereceipt-job-detail/delete?id=` + id })
+}
+
+// 导出采购收货任务子 Excel
+export const exportPurchasereceiptJobDetail = async (params) => {
+  return await request.download({ url: `/wms/purchasereceipt-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchasereceipt-job-detail/get-import-template' })
+}
+
+// 查询采购收货任务子列表
+export const queryPurchaseceiptChildPackingNumber = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-job-detail/seniorPackingNumber', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-job-detail/pagePackingNumber`, params })
+  }
+}
\ No newline at end of file
diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts
new file mode 100644
index 000000000..9e3463fb0
--- /dev/null
+++ b/src/api/wms/purchasereceiptJobMain/index.ts
@@ -0,0 +1,126 @@
+import request from '@/config/axios'
+
+export interface PurchasereceiptJobMainVO {
+  requestNumber: string
+  asnNumber: string
+  ppNumber: string
+  supplierCode: string
+  toDockCode: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  userPositionCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  allowModifyBatch: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyPackingNumber: string
+}
+
+// 查询采购收货任务主列表
+export const getPurchasereceiptJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-job-main/page`, params })
+  }
+}
+
+// 查询备件收货任务主列表
+export const getPurchasereceiptJobMainPageSpare = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-job-main/seniorSpare', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-job-main/pageSpare`, params })
+  }
+}
+
+
+// 查询采购收货任务主详情
+export const getPurchasereceiptJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/purchasereceipt-job-main/get?id=` + id })
+}
+
+// 新增采购收货任务主
+export const createPurchasereceiptJobMain = async (data: PurchasereceiptJobMainVO) => {
+  return await request.post({ url: `/wms/purchasereceipt-job-main/create`, data })
+}
+
+// 修改采购收货任务主
+export const updatePurchasereceiptJobMain = async (data: PurchasereceiptJobMainVO) => {
+  return await request.put({ url: `/wms/purchasereceipt-job-main/update`, data })
+}
+
+// 删除采购收货任务主
+export const deletePurchasereceiptJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/purchasereceipt-job-main/delete?id=` + id })
+}
+
+// 导出采购收货任务主 Excel
+export const exportPurchasereceiptJobMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchasereceipt-job-main/get-import-template' })
+}
+
+// 关闭采购收货任务主
+export const closePurchasereceiptJobMain = (id: number) => {
+  return request.put({ url: '/wms/purchasereceipt-job-main/close?id=' + id })
+}
+
+// 执行备件收货任务主
+export const executePurchasereceiptJobMainSpare = (id: number) => {
+  return request.put({ url: '/wms/purchasereceipt-job-main/executeSpare?id=' + id })
+}
+
+// 放弃备件收货任务主
+export const abandonPurchasereceiptJobMainSpare = (id: number) => {
+  return request.put({ url: '/wms/purchasereceipt-job-main/abandon?id=' + id })
+}
+
+// 承接采购收货任务主
+export const acceptPurchasereceiptJobMain = (id: number) => {
+  return request.put({ url: '/wms/purchasereceipt-job-main/accept?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts
new file mode 100644
index 000000000..2afacb3e1
--- /dev/null
+++ b/src/api/wms/purchasereceiptRecordDetail/index.ts
@@ -0,0 +1,127 @@
+import request from '@/config/axios'
+
+export interface PurchasereceiptRecordDetailVO {
+  fromPackingNumber: string
+  toPackingNumber: string
+  fromContainerNumber: string
+  toContainerNumber: string
+  fromBatch: string
+  altBatch: string
+  arriveDate: Date
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  fromLocationCode: string
+  toLocationCode: string
+  fromLocationGroupCode: string
+  toLocationGroupCode: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  poNumber: string
+  poLine: string
+  packQty: number
+  packUnit: string
+  qty: number
+  uom: string
+  supplierQty: number
+  supplierUom: string
+  convertRate: number
+  visualInspectResult: string
+  visualInspectPhotos: string
+  failedReason: string
+  singlePrice: number
+  amount: number
+  jobDetailId: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  projectCode: string
+  code: string
+  interfaceType: string
+  fromOwnerCode: string
+  toOwnerCode: string
+  toBatch: string,
+  parentPackingNumber:string
+  packingNumber:string
+}
+
+// 查询采购收货记录子列表
+export const getPurchasereceiptRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-record-detail/page`, params })
+  }
+}
+
+// 查询采购收货记录子列表
+export const getPurchasereceiptRecordDetailPageBySupplierCode = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorBySupplierCode', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-record-detail/pageBySupplierCode`, params })
+  }
+}
+
+// 查询采购收货记录子列表
+export const getPurchasereceiptRecordDetailList = async (params) => {
+    return await request.get({ url: `/wms/purchasereceipt-record-detail/list`, params })
+}
+// 查询采购收货记录子详情
+export const getPurchasereceiptRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/purchasereceipt-record-detail/get?id=` + id })
+}
+
+// 新增采购收货记录子
+export const createPurchasereceiptRecordDetail = async (data: PurchasereceiptRecordDetailVO) => {
+  return await request.post({ url: `/wms/purchasereceipt-record-detail/create`, data })
+}
+
+// 修改采购收货记录子
+export const updatePurchasereceiptRecordDetail = async (data: PurchasereceiptRecordDetailVO) => {
+  return await request.put({ url: `/wms/purchasereceipt-record-detail/update`, data })
+}
+
+// 删除采购收货记录子
+export const deletePurchasereceiptRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/purchasereceipt-record-detail/delete?id=` + id })
+}
+
+// 导出采购收货记录子 Excel
+export const exportPurchasereceiptRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/purchasereceipt-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchasereceipt-record-detail/get-import-template' })
+}
+// 缺货明细
+export const getScarceGoodsDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchaseshortage-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchaseshortage-detail/page`, params })
+  }
+}
+
+// 查询采购收货记录子包装数据
+export const queryPurchaseceiptChildPackingNumber = async (params) => {
+  return await request.get({ url: `/wms/purchasereceipt-record-detail/pageChildPackingNumber`, params })
+}
+
+// 查询采购收货缺货记录子包装数据
+export const queryPurchaseshortageChildPackingNumber = async (params) => {
+  return await request.get({ url: `/wms/purchaseshortage-detail/pageChildPackingNumber`, params })
+}
\ No newline at end of file
diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts
new file mode 100644
index 000000000..b3eccfdf4
--- /dev/null
+++ b/src/api/wms/purchasereceiptRecordMain/index.ts
@@ -0,0 +1,105 @@
+import request from '@/config/axios'
+
+export interface PurchasereceiptRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  asnNumber: string
+  ppNumber: string
+  supplierCode: string
+  toDockCode: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  outTransaction: string
+  inTransaction: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  available: string
+  putawayRequestFlag: boolean
+  putawayRequestNumber: string
+  inspectRequestFlag: boolean
+  inspectRequestNumber: string
+}
+
+// 查询采购收货记录主列表
+export const getPurchasereceiptRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-record-main/page`, params })
+  }
+}
+
+// 查询备件收货记录主列表
+export const getPurchasereceiptRecordMainPageSpare = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-record-main/seniorSpare', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-record-main/pageSpare`, params })
+  }
+}
+
+// 查询采购收货记录主详情
+export const getPurchasereceiptRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/purchasereceipt-record-main/get?id=` + id })
+}
+
+// 新增采购收货记录主
+export const createPurchasereceiptRecordMain = async (data: PurchasereceiptRecordMainVO) => {
+  return await request.post({ url: `/wms/purchasereceipt-record-main/create`, data })
+}
+
+// 修改采购收货记录主
+export const updatePurchasereceiptRecordMain = async (data: PurchasereceiptRecordMainVO) => {
+  return await request.put({ url: `/wms/purchasereceipt-record-main/update`, data })
+}
+
+// 删除采购收货记录主
+export const deletePurchasereceiptRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/purchasereceipt-record-main/delete?id=` + id })
+}
+
+// 导出采购收货记录主 Excel
+export const exportPurchasereceiptRecordMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchasereceipt-record-main/get-import-template' })
+}
+
+// 创建上架申请
+export const createPutawayRequest = async (number:string) => {
+  return await request.post({ url: `/wms/purchasereceipt-record-main/createPutawayRequest?number=`+number })
+}
+
+// 创建检验申请
+export const createInspectRequest = async (number:string) => {
+  return await request.post({ url: `/wms/purchasereceipt-record-main/createInspectRequest?number=`+number })
+}
\ No newline at end of file
diff --git a/src/api/wms/purchasereceiptRequestDetail/index.ts b/src/api/wms/purchasereceiptRequestDetail/index.ts
new file mode 100644
index 000000000..ae652347a
--- /dev/null
+++ b/src/api/wms/purchasereceiptRequestDetail/index.ts
@@ -0,0 +1,90 @@
+import request from '@/config/axios'
+
+export interface PurchasereceiptRequestDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  altBatch: string
+  arriveDate: Date
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  fromLocationCode: string
+  poNumber: string
+  poLine: string
+  packQty: number
+  packUnit: string
+  supplierPackQty: number
+  supplierPackUnit: string
+  convertRate: number
+  number: string
+  itemCode: string
+  remark: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  fromOwnerCode: string
+  toOwnerCode: string
+  createTime: Date
+  creator: string
+  labelStatus: string
+}
+
+// 查询采购收货申请子列表
+export const getPurchasereceiptRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-request-detail/page`, params })
+  }
+}
+
+// 查询采购收货申请子详情
+export const getPurchasereceiptRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/purchasereceipt-request-detail/get?id=` + id })
+}
+
+// 新增采购收货申请子
+export const createPurchasereceiptRequestDetail = async (data: PurchasereceiptRequestDetailVO) => {
+  return await request.post({ url: `/wms/purchasereceipt-request-detail/create`, data })
+}
+
+// 修改采购收货申请子
+export const updatePurchasereceiptRequestDetail = async (data: PurchasereceiptRequestDetailVO) => {
+  return await request.put({ url: `/wms/purchasereceipt-request-detail/update`, data })
+}
+
+// 删除采购收货申请子
+export const deletePurchasereceiptRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/purchasereceipt-request-detail/delete?id=` + id })
+}
+
+
+
+// 导出采购收货申请子 Excel
+export const exportPurchasereceiptRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/purchasereceipt-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchasereceipt-request-detail/get-import-template' })
+}
+
+// 查询采购收货申请子列表
+export const queryPurchaseceiptChildPackingNumber = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-request-detail/queryPurchaseceiptChildPackingNumberSenior', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-request-detail/queryPurchaseceiptChildPackingNumberPage`, params })
+  }
+}
\ No newline at end of file
diff --git a/src/api/wms/purchasereceiptRequestMain/index.ts b/src/api/wms/purchasereceiptRequestMain/index.ts
new file mode 100644
index 000000000..148b8e98a
--- /dev/null
+++ b/src/api/wms/purchasereceiptRequestMain/index.ts
@@ -0,0 +1,129 @@
+import request from '@/config/axios'
+
+export interface PurchasereceiptRequestMainVO {
+  asnNumber: string
+  ppNumber: string
+  supplierCode: string
+  carrierCode: string
+  transferMode: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  toDockCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  updateTime: Date
+  updater: string
+  status: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+  vehiclePlateNumber: string
+}
+
+// 查询采购收货申请主列表
+export const getPurchasereceiptRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-request-main/page`, params })
+  }
+}
+
+// 查询备件收货申请主列表
+export const getPurchasereceiptRequestMainPageSpare = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-request-main/seniorSpare', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-request-main/pageSpare`, params })
+  }
+}
+
+// 查询采购收货申请主详情
+export const getPurchasereceiptRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/purchasereceipt-request-main/get?id=` + id })
+}
+
+// 新增采购收货申请主
+export const createPurchasereceiptRequestMain = async (data: PurchasereceiptRequestMainVO) => {
+  return await request.post({ url: `/wms/purchasereceipt-request-main/create`, data })
+}
+
+// 新增备件收货申请主
+export const createPurchasereceiptRequestMainSpare = async (data: PurchasereceiptRequestMainVO) => {
+  return await request.post({ url: `/wms/purchasereceipt-request-main/createSpare`, data })
+}
+
+// 修改采购收货申请主
+export const updatePurchasereceiptRequestMain = async (data: PurchasereceiptRequestMainVO) => {
+  return await request.put({ url: `/wms/purchasereceipt-request-main/update`, data })
+}
+
+// 删除采购收货申请主
+export const deletePurchasereceiptRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/purchasereceipt-request-main/delete?id=` + id })
+}
+
+// 导出采购收货申请主 Excel
+export const exportPurchasereceiptRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchasereceipt-request-main/get-import-template' })
+}
+
+// 关闭采购收货申请主 Excel
+export const closePurchasereceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereceipt-request-main/close?id=` + id })
+}
+
+// 重新添加采购收货申请主 Excel
+export const reAddPurchasereceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereceipt-request-main/reAdd?id=` + id })
+}
+
+// 提交采购收货申请主 Excel
+export const submitPurchasereceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereceipt-request-main/submit?id=` + id })
+}
+
+// 审批通过采购收货申请主 Excel
+export const agreePurchasereceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereceipt-request-main/agree?id=` + id })
+}
+
+// 审批驳回采购收货申请主 Excel
+export const refusedPurchasereceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereceipt-request-main/refused?id=` + id })
+}
+
+// 处理采购收货申请主 Excel
+export const handlePurchasereceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereceipt-request-main/handle?id=` + id })
+}
+
+// 生成标签
+export const genLabel = async (id) => {
+  return await request.post({ url: `/wms/purchasereceipt-request-main/genLabel?id=` + id })
+}
diff --git a/src/api/wms/purchasereturnJobDetail/index.ts b/src/api/wms/purchasereturnJobDetail/index.ts
new file mode 100644
index 000000000..2fadb786d
--- /dev/null
+++ b/src/api/wms/purchasereturnJobDetail/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface PurchasereturnJobDetailVO {
+  fromOwnerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  altBatch: string
+  fromLocationCode: string
+  toLocationCode: string
+  inventoryStatus: string
+  poNumber: string
+  poLine: string
+  reason: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: number
+  toOwnerCode: string
+}
+
+// 查询采购退货任务子列表
+export const getPurchasereturnJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereturn-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereturn-job-detail/page`, params })
+  }
+}
+
+// 查询采购退货任务子详情
+export const getPurchasereturnJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/purchasereturn-job-detail/get?id=` + id })
+}
+
+// 新增采购退货任务子
+export const createPurchasereturnJobDetail = async (data: PurchasereturnJobDetailVO) => {
+  return await request.post({ url: `/wms/purchasereturn-job-detail/create`, data })
+}
+
+// 修改采购退货任务子
+export const updatePurchasereturnJobDetail = async (data: PurchasereturnJobDetailVO) => {
+  return await request.put({ url: `/wms/purchasereturn-job-detail/update`, data })
+}
+
+// 删除采购退货任务子
+export const deletePurchasereturnJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/purchasereturn-job-detail/delete?id=` + id })
+}
+
+// 导出采购退货任务子 Excel
+export const exportPurchasereturnJobDetail = async (params) => {
+  return await request.download({ url: `/wms/purchasereturn-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchasereturn-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/purchasereturnJobMain/index.ts b/src/api/wms/purchasereturnJobMain/index.ts
new file mode 100644
index 000000000..6b43ab046
--- /dev/null
+++ b/src/api/wms/purchasereturnJobMain/index.ts
@@ -0,0 +1,100 @@
+import request from '@/config/axios'
+
+export interface PurchasereturnJobMainVO {
+  requestNumber: string
+  purchaseReceiptRecordNumber: string
+  asnNumber: string
+  ppNumber: string
+  supplierCode: string
+  deliverDock: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  fromDockCode: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询采购退货任务主列表
+export const getPurchasereturnJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereturn-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereturn-job-main/page`, params })
+  }
+}
+
+// 查询采购退货任务主详情
+export const getPurchasereturnJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/purchasereturn-job-main/get?id=` + id })
+}
+
+// 新增采购退货任务主
+export const createPurchasereturnJobMain = async (data: PurchasereturnJobMainVO) => {
+  return await request.post({ url: `/wms/purchasereturn-job-main/create`, data })
+}
+
+// 修改采购退货任务主
+export const updatePurchasereturnJobMain = async (data: PurchasereturnJobMainVO) => {
+  return await request.put({ url: `/wms/purchasereturn-job-main/update`, data })
+}
+
+// 删除采购退货任务主
+export const deletePurchasereturnJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/purchasereturn-job-main/delete?id=` + id })
+}
+
+// 导出采购退货任务主 Excel
+export const exportPurchasereturnJobMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereturn-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchasereturn-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchasereturn-job-main/get-import-template' })
+}
+
+// 关闭采购退货任务主
+export const closePurchasereturnJobMain = (id: number) => {
+  return request.put({ url: '/wms/purchasereturn-job-main/close?id=' + id })
+}
diff --git a/src/api/wms/purchasereturnRecordDetail/index.ts b/src/api/wms/purchasereturnRecordDetail/index.ts
new file mode 100644
index 000000000..f1366853a
--- /dev/null
+++ b/src/api/wms/purchasereturnRecordDetail/index.ts
@@ -0,0 +1,80 @@
+import request from '@/config/axios'
+
+export interface PurchasereturnRecordDetailVO {
+  fromPackingNumber: string
+  toPackingNumber: string
+  fromContainerNumber: string
+  fromBatch: string
+  altBatch: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  inventoryStatus: string
+  poNumber: string
+  poLine: string
+  reason: string
+  singlePrice: number
+  amount: number
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+  toContainerNumber: string
+  fromOwnerCode: string
+  toOwnerCode: string
+  toBatch: string
+}
+
+// 查询采购退货记录子列表
+export const getPurchasereturnRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereturn-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereturn-record-detail/page`, params })
+  }
+}
+
+// 查询采购退货记录子详情
+export const getPurchasereturnRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/purchasereturn-record-detail/get?id=` + id })
+}
+
+// 新增采购退货记录子
+export const createPurchasereturnRecordDetail = async (data: PurchasereturnRecordDetailVO) => {
+  return await request.post({ url: `/wms/purchasereturn-record-detail/create`, data })
+}
+
+// 修改采购退货记录子
+export const updatePurchasereturnRecordDetail = async (data: PurchasereturnRecordDetailVO) => {
+  return await request.put({ url: `/wms/purchasereturn-record-detail/update`, data })
+}
+
+// 删除采购退货记录子
+export const deletePurchasereturnRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/purchasereturn-record-detail/delete?id=` + id })
+}
+
+// 导出采购退货记录子 Excel
+export const exportPurchasereturnRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/purchasereturn-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchasereturn-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/purchasereturnRecordMain/index.ts b/src/api/wms/purchasereturnRecordMain/index.ts
new file mode 100644
index 000000000..b08fddfe7
--- /dev/null
+++ b/src/api/wms/purchasereturnRecordMain/index.ts
@@ -0,0 +1,81 @@
+import request from '@/config/axios'
+
+export interface PurchasereturnRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  purchaseReceiptRecordNumber: string
+  asnNumber: string
+  ppNumber: string
+  supplierCode: string
+  fromDockCode: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  available: string
+}
+
+// 查询采购退货记录主列表
+export const getPurchasereturnRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereturn-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereturn-record-main/page`, params })
+  }
+}
+
+// 查询采购退货记录主详情
+export const getPurchasereturnRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/purchasereturn-record-main/get?id=` + id })
+}
+
+// 新增采购退货记录主
+export const createPurchasereturnRecordMain = async (data: PurchasereturnRecordMainVO) => {
+  return await request.post({ url: `/wms/purchasereturn-record-main/create`, data })
+}
+
+// 修改采购退货记录主
+export const updatePurchasereturnRecordMain = async (data: PurchasereturnRecordMainVO) => {
+  return await request.put({ url: `/wms/purchasereturn-record-main/update`, data })
+}
+
+// 删除采购退货记录主
+export const deletePurchasereturnRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/purchasereturn-record-main/delete?id=` + id })
+}
+
+// 导出采购退货记录主 Excel
+export const exportPurchasereturnRecordMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereturn-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/purchasereturn-record-main/export-excel`, params})
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchasereturn-record-main/get-import-template' })
+}
diff --git a/src/api/wms/purchasereturnRequestDetail/index.ts b/src/api/wms/purchasereturnRequestDetail/index.ts
new file mode 100644
index 000000000..a50d8fcce
--- /dev/null
+++ b/src/api/wms/purchasereturnRequestDetail/index.ts
@@ -0,0 +1,69 @@
+import request from '@/config/axios'
+
+export interface PurchasereturnRequestDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  altBatch: string
+  toLocationCode: string
+  inventoryStatus: string
+  poNumber: string
+  poLine: string
+  reason: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询采购退货申请子列表
+export const getPurchasereturnRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereturn-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereturn-request-detail/page`, params })
+  }
+}
+
+// 查询采购退货申请子详情
+export const getPurchasereturnRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/purchasereturn-request-detail/get?id=` + id })
+}
+
+// 新增采购退货申请子
+export const createPurchasereturnRequestDetail = async (data: PurchasereturnRequestDetailVO) => {
+  return await request.post({ url: `/wms/purchasereturn-request-detail/create`, data })
+}
+
+// 修改采购退货申请子
+export const updatePurchasereturnRequestDetail = async (data: PurchasereturnRequestDetailVO) => {
+  return await request.put({ url: `/wms/purchasereturn-request-detail/update`, data })
+}
+
+// 删除采购退货申请子
+export const deletePurchasereturnRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/purchasereturn-request-detail/delete?id=` + id })
+}
+
+// 导出采购退货申请子 Excel
+export const exportPurchasereturnRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/purchasereturn-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchasereturn-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/purchasereturnRequestMain/index.ts b/src/api/wms/purchasereturnRequestMain/index.ts
new file mode 100644
index 000000000..d6b4a3b7c
--- /dev/null
+++ b/src/api/wms/purchasereturnRequestMain/index.ts
@@ -0,0 +1,109 @@
+import request from '@/config/axios'
+
+export interface PurchasereturnRequestMainVO {
+  purchaseReceiptRecordNumber: string
+  asnNumber: string
+  ppNumber: string
+  supplierCode: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  fromDockCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询采购退货申请主列表
+export const getPurchasereturnRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereturn-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereturn-request-main/page`, params })
+  }
+}
+
+// 查询采购退货申请主详情
+export const getPurchasereturnRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/purchasereturn-request-main/get?id=` + id })
+}
+
+// 新增采购退货申请主
+export const createPurchasereturnRequestMain = async (data: PurchasereturnRequestMainVO) => {
+  return await request.post({ url: `/wms/purchasereturn-request-main/create`, data })
+}
+
+// 修改采购退货申请主
+export const updatePurchasereturnRequestMain = async (data: PurchasereturnRequestMainVO) => {
+  return await request.put({ url: `/wms/purchasereturn-request-main/update`, data })
+}
+
+// 删除采购退货申请主
+export const deletePurchasereturnRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/purchasereturn-request-main/delete?id=` + id })
+}
+
+// 导出采购退货申请主 Excel
+export const exportPurchasereturnRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereturn-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/purchasereturn-request-main/export-excel`, params})
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchasereturn-request-main/get-import-template' })
+}
+
+// 关闭采购退货申请主 Excel
+export const closePurchasereturnRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereturn-request-main/close?id=` + id })
+}
+
+// 重新添加采购退货申请主 Excel
+export const reAddPurchasereturnRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereturn-request-main/reAdd?id=` + id })
+}
+
+// 提交采购退货申请主 Excel
+export const submitPurchasereturnRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereturn-request-main/submit?id=` + id })
+}
+
+// 审批通过采购退货申请主 Excel
+export const agreePurchasereturnRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereturn-request-main/agree?id=` + id })
+}
+
+// 审批驳回采购退货申请主 Excel
+export const refusedPurchasereturnRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereturn-request-main/refused?id=` + id })
+}
+
+// 处理采购退货申请主 Excel
+export const handlePurchasereturnRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereturn-request-main/handle?id=` + id })
+}
diff --git a/src/api/wms/putawayJobDetail/index.ts b/src/api/wms/putawayJobDetail/index.ts
new file mode 100644
index 000000000..2916d8d08
--- /dev/null
+++ b/src/api/wms/putawayJobDetail/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface PutawayJobDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  poNumber: string
+  poLine: string
+  fromLocationCode: string
+  toLocationCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemdesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询上架任务子列表
+export const getPutawayJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/putaway-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/putaway-job-detail/page`, params })
+  }
+}
+
+// 查询上架任务子详情
+export const getPutawayJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/putaway-job-detail/get?id=` + id })
+}
+
+// 新增上架任务子
+export const createPutawayJobDetail = async (data: PutawayJobDetailVO) => {
+  return await request.post({ url: `/wms/putaway-job-detail/create`, data })
+}
+
+// 修改上架任务子
+export const updatePutawayJobDetail = async (data: PutawayJobDetailVO) => {
+  return await request.put({ url: `/wms/putaway-job-detail/update`, data })
+}
+
+// 删除上架任务子
+export const deletePutawayJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/putaway-job-detail/delete?id=` + id })
+}
+
+// 导出上架任务子 Excel
+export const exportPutawayJobDetail = async (params) => {
+  return await request.download({ url: `/wms/putaway-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/putaway-job-detail/get-import-template' })
+}
+
+// 查询上架任务子列表--自包装数量
+export const getPutawayJobDetailPageChildPackingNumber = async (params) => {
+  return await request.get({ url: `/wms/putaway-job-detail/pageChildPackingNumber`, params })
+}
\ No newline at end of file
diff --git a/src/api/wms/putawayJobMain/index.ts b/src/api/wms/putawayJobMain/index.ts
new file mode 100644
index 000000000..88959b43f
--- /dev/null
+++ b/src/api/wms/putawayJobMain/index.ts
@@ -0,0 +1,93 @@
+import request from '@/config/axios'
+
+export interface PutawayJobMainVO {
+  requestNumber: string
+  supplierCode: string
+  fromWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  concurrencyStamp: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  toWarehouseCode: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询上架任务主列表
+export const getPutawayJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/putaway-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/putaway-job-main/page`, params })
+  }
+}
+
+// 查询上架任务主详情
+export const getPutawayJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/putaway-job-main/get?id=` + id })
+}
+
+// 新增上架任务主
+export const createPutawayJobMain = async (data: PutawayJobMainVO) => {
+  return await request.post({ url: `/wms/putaway-job-main/create`, data })
+}
+
+// 修改上架任务主
+export const updatePutawayJobMain = async (data: PutawayJobMainVO) => {
+  return await request.put({ url: `/wms/putaway-job-main/update`, data })
+}
+
+// 删除上架任务主
+export const deletePutawayJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/putaway-job-main/delete?id=` + id })
+}
+
+// 导出上架任务主 Excel
+export const exportPutawayJobMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/putaway-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/putaway-job-main/export-excel`, params})
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/putaway-job-main/get-import-template' })
+}
+
+// 关闭上架任务主
+export const closePutawayJobMain = (id: number) => {
+  return request.put({ url: '/wms/putaway-job-main/close?id=' + id })
+}
diff --git a/src/api/wms/putawayRecordDetail/index.ts b/src/api/wms/putawayRecordDetail/index.ts
new file mode 100644
index 000000000..2d98839a1
--- /dev/null
+++ b/src/api/wms/putawayRecordDetail/index.ts
@@ -0,0 +1,81 @@
+import request from '@/config/axios'
+
+export interface PutawayRecordDetailVO {
+  fromPackingNumber: string
+  toPackingNumber: string
+  fromBatch: string
+  inventoryStatus: string
+  poNumber: string
+  poLine: string
+  fromOwnerCode: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  toOwnerCode: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+  fromContainerNumber: string
+  toContainerNumber: string
+  toBatch: string
+}
+
+// 查询上架记录子列表
+export const getPutawayRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/putaway-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/putaway-record-detail/page`, params })
+  }
+}
+
+// 查询上架记录子详情
+export const getPutawayRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/putaway-record-detail/get?id=` + id })
+}
+
+// 新增上架记录子
+export const createPutawayRecordDetail = async (data: PutawayRecordDetailVO) => {
+  return await request.post({ url: `/wms/putaway-record-detail/create`, data })
+}
+
+// 修改上架记录子
+export const updatePutawayRecordDetail = async (data: PutawayRecordDetailVO) => {
+  return await request.put({ url: `/wms/putaway-record-detail/update`, data })
+}
+
+// 删除上架记录子
+export const deletePutawayRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/putaway-record-detail/delete?id=` + id })
+}
+
+// 导出上架记录子 Excel
+export const exportPutawayRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/putaway-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/putaway-record-detail/get-import-template' })
+}
+
+// 查询上架记录子列表--子包装数据
+export const getPutawayJobDetailPageChildPackingNumber = async (params) => {
+  return await request.get({ url: `/wms/putaway-record-detail/pageChildPackingNumber`, params })
+}
\ No newline at end of file
diff --git a/src/api/wms/putawayRecordMain/index.ts b/src/api/wms/putawayRecordMain/index.ts
new file mode 100644
index 000000000..36507e3d6
--- /dev/null
+++ b/src/api/wms/putawayRecordMain/index.ts
@@ -0,0 +1,74 @@
+import request from '@/config/axios'
+
+export interface PutawayRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  supplierCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  available: string
+}
+
+// 查询上架记录主列表
+export const getPutawayRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/putaway-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/putaway-record-main/page`, params })
+  }
+}
+
+// 查询上架记录主详情
+export const getPutawayRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/putaway-record-main/get?id=` + id })
+}
+
+// 新增上架记录主
+export const createPutawayRecordMain = async (data: PutawayRecordMainVO) => {
+  return await request.post({ url: `/wms/putaway-record-main/create`, data })
+}
+
+// 修改上架记录主
+export const updatePutawayRecordMain = async (data: PutawayRecordMainVO) => {
+  return await request.put({ url: `/wms/putaway-record-main/update`, data })
+}
+
+// 删除上架记录主
+export const deletePutawayRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/putaway-record-main/delete?id=` + id })
+}
+
+// 导出上架记录主 Excel
+export const exportPutawayRecordMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/putaway-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/putaway-record-main/export-excel`, params})
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/putaway-record-main/get-import-template' })
+}
diff --git a/src/api/wms/putawayRequestDetail/index.ts b/src/api/wms/putawayRequestDetail/index.ts
new file mode 100644
index 000000000..a96a2d14d
--- /dev/null
+++ b/src/api/wms/putawayRequestDetail/index.ts
@@ -0,0 +1,72 @@
+import request from '@/config/axios'
+
+export interface PutawayRequestDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  poNumber: string
+  poLine: string
+  fromLocationCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询上架申请子列表
+export const getPutawayRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/putaway-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/putaway-request-detail/page`, params })
+  }
+}
+
+// 查询上架申请子详情
+export const getPutawayRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/putaway-request-detail/get?id=` + id })
+}
+
+// 新增上架申请子
+export const createPutawayRequestDetail = async (data: PutawayRequestDetailVO) => {
+  return await request.post({ url: `/wms/putaway-request-detail/create`, data })
+}
+
+// 修改上架申请子
+export const updatePutawayRequestDetail = async (data: PutawayRequestDetailVO) => {
+  return await request.put({ url: `/wms/putaway-request-detail/update`, data })
+}
+
+// 删除上架申请子
+export const deletePutawayRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/putaway-request-detail/delete?id=` + id })
+}
+
+// 导出上架申请子 Excel
+export const exportPutawayRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/putaway-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/putaway-request-detail/get-import-template' })
+}
+
+// 查询上架申请子列表--子包装数据
+export const getPutawayRequestDetailPageChildPackingNumber = async (params) => {
+  return await request.get({ url: `/wms/putaway-request-detail/pageChildPackingNumber`, params })
+}
\ No newline at end of file
diff --git a/src/api/wms/putawayRequestMain/index.ts b/src/api/wms/putawayRequestMain/index.ts
new file mode 100644
index 000000000..7db4cc062
--- /dev/null
+++ b/src/api/wms/putawayRequestMain/index.ts
@@ -0,0 +1,102 @@
+import request from '@/config/axios'
+
+export interface PutawayRequestMainVO {
+  supplierCode: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询上架申请主列表
+export const getPutawayRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/putaway-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/putaway-request-main/page`, params })
+  }
+}
+
+// 查询上架申请主详情
+export const getPutawayRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/putaway-request-main/get?id=` + id })
+}
+
+// 新增上架申请主
+export const createPutawayRequestMain = async (data: PutawayRequestMainVO) => {
+  return await request.post({ url: `/wms/putaway-request-main/create`, data })
+}
+
+// 修改上架申请主
+export const updatePutawayRequestMain = async (data: PutawayRequestMainVO) => {
+  return await request.put({ url: `/wms/putaway-request-main/update`, data })
+}
+
+// 删除上架申请主
+export const deletePutawayRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/putaway-request-main/delete?id=` + id })
+}
+
+// 导出上架申请主 Excel
+export const exportPutawayRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/putaway-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({url: `/wms/putaway-request-main/export-excel`, params})
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/putaway-request-main/get-import-template' })
+}
+
+// 关闭上架申请主 Excel
+export const closePutawayRequestMain = async (id) => {
+  return await request.put({ url: `/wms/putaway-request-main/close?id=` + id })
+}
+
+// 重新添加上架申请主 Excel
+export const reAddPutawayRequestMain = async (id) => {
+  return await request.put({ url: `/wms/putaway-request-main/reAdd?id=` + id })
+}
+
+// 提交上架申请主 Excel
+export const submitPutawayRequestMain = async (id) => {
+  return await request.put({ url: `/wms/putaway-request-main/submit?id=` + id })
+}
+
+// 审批通过上架申请主 Excel
+export const agreePutawayRequestMain = async (id) => {
+  return await request.put({ url: `/wms/putaway-request-main/agree?id=` + id })
+}
+
+// 审批驳回上架申请主 Excel
+export const refusedPutawayRequestMain = async (id) => {
+  return await request.put({ url: `/wms/putaway-request-main/refused?id=` + id })
+}
+
+// 处理上架申请主 Excel
+export const handlePutawayRequestMain = async (id) => {
+  return await request.put({ url: `/wms/putaway-request-main/handle?id=` + id })
+}
diff --git a/src/api/wms/recordsetting/index.ts b/src/api/wms/recordsetting/index.ts
new file mode 100644
index 000000000..25f8d0d97
--- /dev/null
+++ b/src/api/wms/recordsetting/index.ts
@@ -0,0 +1,52 @@
+import request from '@/config/axios'
+
+export interface RecordsettingVO {
+  code: string
+  interfaceType: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  available: string
+  isSoftDeleted: string
+}
+
+// 查询记录设置列表
+export const getRecordsettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/recordsetting/senior', data })
+  } else {
+    return await request.get({ url: `/wms/recordsetting/page`, params })
+  }
+}
+
+// 查询记录设置详情
+export const getRecordsetting = async (id: number) => {
+  return await request.get({ url: `/wms/recordsetting/get?id=` + id })
+}
+
+// 新增记录设置
+export const createRecordsetting = async (data: RecordsettingVO) => {
+  return await request.post({ url: `/wms/recordsetting/create`, data })
+}
+
+// 修改记录设置
+export const updateRecordsetting = async (data: RecordsettingVO) => {
+  return await request.put({ url: `/wms/recordsetting/update`, data })
+}
+
+// 删除记录设置
+export const deleteRecordsetting = async (id: number) => {
+  return await request.delete({ url: `/wms/recordsetting/delete?id=` + id })
+}
+
+// 导出记录设置 Excel
+export const exportRecordsetting = async (params) => {
+  return await request.download({ url: `/wms/recordsetting/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/recordsetting/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/remark/index.ts b/src/api/wms/remark/index.ts
new file mode 100644
index 000000000..7a1ac3642
--- /dev/null
+++ b/src/api/wms/remark/index.ts
@@ -0,0 +1,14 @@
+import request from '@/config/axios'
+// 查询备注列表
+export const getRemarkPage = async (params) => {
+  return await request.get({ url: `/infra/remark/list`, params })
+}
+
+// 新增备注
+export const createRemark= async (data) => {
+  return await request.post({ url: `/infra/remark/create`, data })
+}
+// 查询变更记录列表
+export const getChangeRecordPage = async (params) => {
+  return await request.get({ url: `/infra/trends/list`, params })
+}
diff --git a/src/api/wms/repleinshJobDetail/index.ts b/src/api/wms/repleinshJobDetail/index.ts
new file mode 100644
index 000000000..86483e094
--- /dev/null
+++ b/src/api/wms/repleinshJobDetail/index.ts
@@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+export interface RepleinshJobDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  fromLocationCode: string
+  toLocationCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询补料任务子列表
+export const getRepleinshJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/job/repleinsh-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/job/repleinsh-job-detail/page`, params })
+  }
+}
+
+// 查询补料任务子详情
+export const getRepleinshJobDetail = async (id: number) => {
+  return await request.get({ url: `/job/repleinsh-job-detail/get?id=` + id })
+}
+
+// 新增补料任务子
+export const createRepleinshJobDetail = async (data: RepleinshJobDetailVO) => {
+  return await request.post({ url: `/job/repleinsh-job-detail/create`, data })
+}
+
+// 修改补料任务子
+export const updateRepleinshJobDetail = async (data: RepleinshJobDetailVO) => {
+  return await request.put({ url: `/job/repleinsh-job-detail/update`, data })
+}
+
+// 删除补料任务子
+export const deleteRepleinshJobDetail = async (id: number) => {
+  return await request.delete({ url: `/job/repleinsh-job-detail/delete?id=` + id })
+}
+
+// 导出补料任务子 Excel
+export const exportRepleinshJobDetail = async (params) => {
+  return await request.download({ url: `/job/repleinsh-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/job/repleinsh-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/repleinshJobMain/index.ts b/src/api/wms/repleinshJobMain/index.ts
new file mode 100644
index 000000000..2869a7745
--- /dev/null
+++ b/src/api/wms/repleinshJobMain/index.ts
@@ -0,0 +1,106 @@
+import request from '@/config/axios'
+
+export interface RepleinshJobMainVO {
+  requestNumber: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询补料任务主列表
+export const getRepleinshJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/repleinsh-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/repleinsh-job-main/page`, params })
+  }
+}
+
+// 查询补料任务主详情
+export const getRepleinshJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/repleinsh-job-main/get?id=` + id })
+}
+
+// 新增补料任务主
+export const createRepleinshJobMain = async (data: RepleinshJobMainVO) => {
+  return await request.post({ url: `/wms/repleinsh-job-main/create`, data })
+}
+
+// 修改补料任务主
+export const updateRepleinshJobMain = async (data: RepleinshJobMainVO) => {
+  return await request.put({ url: `/wms/repleinsh-job-main/update`, data })
+}
+
+// 删除补料任务主
+export const deleteRepleinshJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/repleinsh-job-main/delete?id=` + id })
+}
+
+// 导出补料任务主 Excel
+export const exportRepleinshJobMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/repleinsh-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/repleinsh-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/repleinsh-job-main/get-import-template' })
+}
+
+// 承接发料任务
+export const acceptRepleinshMain = async (id) => {
+  return await request.put({ url: `/wms/repleinsh-job-main/accept?id=` + id })
+}
+
+// 放弃发料任务
+export const abandonRepleinshMain = async (id) => {
+  return await request.put({ url: `/wms/repleinsh-job-main/abandon?id=` + id })
+}
+
+// 关闭发料任务
+export const closeRepleinshMain = async (id) => {
+  return await request.put({ url: `/wms/repleinsh-job-main/close?id=` + id })
+}
+
+// 执行发料任务
+export const executeRepleinshMain = async (data) => {
+  return await request.put({ url: `/wms/repleinsh-job-main/execute`, data})
+}
\ No newline at end of file
diff --git a/src/api/wms/repleinshRecordDetail/index.ts b/src/api/wms/repleinshRecordDetail/index.ts
new file mode 100644
index 000000000..2dc706090
--- /dev/null
+++ b/src/api/wms/repleinshRecordDetail/index.ts
@@ -0,0 +1,74 @@
+import request from '@/config/axios'
+
+export interface RepleinshRecordDetailVO {
+  fromPackingNumber: string
+  fromContainerNumber: string
+  fromBatch: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  toOwnerCode: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+  toPackingNumber: string
+  toContainerNumber: string
+  toBatch: string
+}
+
+// 查询补料记录子列表
+export const getRepleinshRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/repleinsh-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/repleinsh-record-detail/page`, params })
+  }
+}
+
+// 查询补料记录子详情
+export const getRepleinshRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/repleinsh-record-detail/get?id=` + id })
+}
+
+// 新增补料记录子
+export const createRepleinshRecordDetail = async (data: RepleinshRecordDetailVO) => {
+  return await request.post({ url: `/wms/repleinsh-record-detail/create`, data })
+}
+
+// 修改补料记录子
+export const updateRepleinshRecordDetail = async (data: RepleinshRecordDetailVO) => {
+  return await request.put({ url: `/wms/repleinsh-record-detail/update`, data })
+}
+
+// 删除补料记录子
+export const deleteRepleinshRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/repleinsh-record-detail/delete?id=` + id })
+}
+
+// 导出补料记录子 Excel
+export const exportRepleinshRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/repleinsh-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/repleinsh-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/repleinshRecordMain/index.ts b/src/api/wms/repleinshRecordMain/index.ts
new file mode 100644
index 000000000..654f84618
--- /dev/null
+++ b/src/api/wms/repleinshRecordMain/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface RepleinshRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  available: string
+}
+
+// 查询补料记录主列表
+export const getRepleinshRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/repleinsh-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/repleinsh-record-main/page`, params })
+  }
+}
+
+// 查询补料记录主详情
+export const getRepleinshRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/repleinsh-record-main/get?id=` + id })
+}
+
+// 新增补料记录主
+export const createRepleinshRecordMain = async (data: RepleinshRecordMainVO) => {
+  return await request.post({ url: `/wms/repleinsh-record-main/create`, data })
+}
+
+// 修改补料记录主
+export const updateRepleinshRecordMain = async (data: RepleinshRecordMainVO) => {
+  return await request.put({ url: `/wms/repleinsh-record-main/update`, data })
+}
+
+// 删除补料记录主
+export const deleteRepleinshRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/repleinsh-record-main/delete?id=` + id })
+}
+
+// 导出补料记录主 Excel
+export const exportRepleinshRecordMain = async (params) => {
+  return await request.download({ url: `/wms/repleinsh-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/repleinsh-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/repleinshRequestDetail/index.ts b/src/api/wms/repleinshRequestDetail/index.ts
new file mode 100644
index 000000000..9e15b3710
--- /dev/null
+++ b/src/api/wms/repleinshRequestDetail/index.ts
@@ -0,0 +1,62 @@
+import request from '@/config/axios'
+
+export interface RepleinshRequestDetailVO {
+  inventoryStatus: string
+  toLocationCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询补料申请子列表
+export const getRepleinshRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/repleinsh-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/repleinsh-request-detail/page`, params })
+  }
+}
+
+// 查询补料申请子详情
+export const getRepleinshRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/repleinsh-request-detail/get?id=` + id })
+}
+
+// 新增补料申请子
+export const createRepleinshRequestDetail = async (data: RepleinshRequestDetailVO) => {
+  return await request.post({ url: `/wms/repleinsh-request-detail/create`, data })
+}
+
+// 修改补料申请子
+export const updateRepleinshRequestDetail = async (data: RepleinshRequestDetailVO) => {
+  return await request.put({ url: `/wms/repleinsh-request-detail/update`, data })
+}
+
+// 删除补料申请子
+export const deleteRepleinshRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/repleinsh-request-detail/delete?id=` + id })
+}
+
+// 导出补料申请子 Excel
+export const exportRepleinshRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/repleinsh-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/repleinsh-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/repleinshRequestMain/index.ts b/src/api/wms/repleinshRequestMain/index.ts
new file mode 100644
index 000000000..78ad4d484
--- /dev/null
+++ b/src/api/wms/repleinshRequestMain/index.ts
@@ -0,0 +1,102 @@
+import request from '@/config/axios'
+
+export interface RepleinshRequestMainVO {
+  fomWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询补料申请主列表
+export const getRepleinshRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/repleinsh-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/repleinsh-request-main/page`, params })
+  }
+}
+
+// 查询补料申请主详情
+export const getRepleinshRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/repleinsh-request-main/get?id=` + id })
+}
+
+// 新增补料申请主
+export const createRepleinshRequestMain = async (data: RepleinshRequestMainVO) => {
+  return await request.post({ url: `/wms/repleinsh-request-main/create`, data })
+}
+
+// 修改补料申请主
+export const updateRepleinshRequestMain = async (data: RepleinshRequestMainVO) => {
+  return await request.put({ url: `/wms/repleinsh-request-main/update`, data })
+}
+
+// 删除补料申请主
+export const deleteRepleinshRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/repleinsh-request-main/delete?id=` + id })
+}
+
+// 导出补料申请主 Excel
+export const exportRepleinshRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/repleinsh-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/repleinsh-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/repleinsh-request-main/get-import-template' })
+}
+
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/repleinsh-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/repleinsh-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/repleinsh-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/repleinsh-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/repleinsh-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/repleinsh-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/requestsetting/index.ts b/src/api/wms/requestsetting/index.ts
new file mode 100644
index 000000000..7c6ea88ef
--- /dev/null
+++ b/src/api/wms/requestsetting/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface RequestsettingVO {
+  code: string
+  requestMode: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+  available: string
+  isSoftDeleted: string
+}
+
+// 查询申请设置列表
+export const getRequestsettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/requestsetting/senior', data })
+  } else {
+    return await request.get({ url: `/wms/requestsetting/page`, params })
+  }
+}
+
+// 查询申请设置详情
+export const getRequestsetting = async (id: number) => {
+  return await request.get({ url: `/wms/requestsetting/get?id=` + id })
+}
+
+// 新增申请设置
+export const createRequestsetting = async (data: RequestsettingVO) => {
+  return await request.post({ url: `/wms/requestsetting/create`, data })
+}
+
+// 修改申请设置
+export const updateRequestsetting = async (data: RequestsettingVO) => {
+  return await request.put({ url: `/wms/requestsetting/update`, data })
+}
+
+// 删除申请设置
+export const deleteRequestsetting = async (id: number) => {
+  return await request.delete({ url: `/wms/requestsetting/delete?id=` + id })
+}
+
+// 导出申请设置 Excel
+export const exportRequestsetting = async (params) => {
+  return await request.download({ url: `/wms/requestsetting/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/requestsetting/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/rule/index.ts b/src/api/wms/rule/index.ts
new file mode 100644
index 000000000..52b279fa7
--- /dev/null
+++ b/src/api/wms/rule/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface RuleVO {
+  strategyCode: string
+  priority: number
+  code: string
+  name: string
+  description: string
+  status: number
+  condition: string
+  configuration: string
+}
+
+// 查询规则列表
+export const getRulePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/rule/senior', data })
+  } else {
+    return await request.get({ url: `/wms/rule/page`, params })
+  }
+}
+
+// 查询规则详情
+export const getRule = async (id: number) => {
+  return await request.get({ url: `/wms/rule/get?id=` + id })
+}
+
+// 新增规则
+export const createRule = async (data: RuleVO) => {
+  return await request.post({ url: `/wms/rule/create`, data })
+}
+
+// 修改规则
+export const updateRule = async (data: RuleVO) => {
+  return await request.put({ url: `/wms/rule/update`, data })
+}
+
+// 删除规则
+export const deleteRule = async (id: number) => {
+  return await request.delete({ url: `/wms/rule/delete?id=` + id })
+}
+
+// 导出规则 Excel
+export const exportRule = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/rule/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/rule/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/rule/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/saleDetail/index.ts b/src/api/wms/saleDetail/index.ts
new file mode 100644
index 000000000..79c182062
--- /dev/null
+++ b/src/api/wms/saleDetail/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface SaleDetailVO {
+  lineNumber: string
+  projectCode: string
+  packQty: number
+  packUnit: string
+  customerPackQty: number
+  customerPackUnit: string
+  convertRate: number
+  shippedQty: number
+  receivedQty: number
+  returnedQty: number
+  singlePrice: number
+  amount: number
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  orderQty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  available: string
+}
+
+// 查询销售订单子列表
+export const getSaleDetailPage = async (params) => {
+  return await request.get({ url: `/wms/sale-detail/page`, params })
+}
+
+// 查询销售订单子详情
+export const getSaleDetail = async (id: number) => {
+  return await request.get({ url: `/wms/sale-detail/get?id=` + id })
+}
+
+// 新增销售订单子
+export const createSaleDetail = async (data: SaleDetailVO) => {
+  return await request.post({ url: `/wms/sale-detail/create`, data })
+}
+
+// 修改销售订单子
+export const updateSaleDetail = async (data: SaleDetailVO) => {
+  return await request.put({ url: `/wms/sale-detail/update`, data })
+}
+
+// 删除销售订单子
+export const deleteSaleDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/sale-detail/delete?id=` + id })
+}
+
+// 导出销售订单子 Excel
+export const exportSaleDetail = async (params) => {
+  return await request.download({ url: `/wms/sale-detail/export-excel`, params })
+}
diff --git a/src/api/wms/saleMain/index.ts b/src/api/wms/saleMain/index.ts
new file mode 100644
index 000000000..75b3ca168
--- /dev/null
+++ b/src/api/wms/saleMain/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface SaleMainVO {
+  customerCode: string
+  type: string
+  orderDate: Date
+  dueDate: Date
+  version: string
+  taxRate: number
+  contactName: string
+  contactPhone: string
+  contactEmail: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  updateTime: Date
+  updater: string
+  currentStage: number
+  available: string
+}
+
+// 查询销售订单主列表
+export const getSaleMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/sale-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/sale-main/page`, params })
+  }
+}
+
+// 查询销售订单主详情
+export const getSaleMain = async (id: number) => {
+  return await request.get({ url: `/wms/sale-main/get?id=` + id })
+}
+
+// 新增销售订单主
+export const createSaleMain = async (data: SaleMainVO) => {
+  return await request.post({ url: `/wms/sale-main/create`, data })
+}
+
+// 修改销售订单主
+export const updateSaleMain = async (data: SaleMainVO) => {
+  return await request.put({ url: `/wms/sale-main/update`, data })
+}
+
+// 删除销售订单主
+export const deleteSaleMain = async (id: number) => {
+  return await request.delete({ url: `/wms/sale-main/delete?id=` + id })
+}
+
+// 导出销售订单主 Excel
+export const exportSaleMain = async (params) => {
+  return await request.download({ url: `/wms/sale-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/sale-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/saleprice/index.ts b/src/api/wms/saleprice/index.ts
new file mode 100644
index 000000000..6ac634e3d
--- /dev/null
+++ b/src/api/wms/saleprice/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface SalepriceVO {
+  customercode: string
+  itemcode: string
+  currency: string
+  price: number
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询销售价格单列表
+export const getSalepricePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/saleprice/senior', data })
+  } else {
+    return await request.get({ url: `/wms/saleprice/page`, params })
+  }
+}
+
+// 查询销售价格单详情
+export const getSaleprice = async (id: number) => {
+  return await request.get({ url: `/wms/saleprice/get?id=` + id })
+}
+
+// 新增销售价格单
+export const createSaleprice = async (data: SalepriceVO) => {
+  return await request.post({ url: `/wms/saleprice/create`, data })
+}
+
+// 修改销售价格单
+export const updateSaleprice = async (data: SalepriceVO) => {
+  return await request.put({ url: `/wms/saleprice/update`, data })
+}
+
+// 删除销售价格单
+export const deleteSaleprice = async (id: number) => {
+  return await request.delete({ url: `/wms/saleprice/delete?id=` + id })
+}
+
+// 导出销售价格单 Excel
+export const exportSaleprice = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/saleprice/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/saleprice/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/saleprice/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/scrapJobDetail/index.ts b/src/api/wms/scrapJobDetail/index.ts
new file mode 100644
index 000000000..c333d8030
--- /dev/null
+++ b/src/api/wms/scrapJobDetail/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface ScrapJobDetailVO {
+  ownerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  fromLocationCode: string
+  inventoryStatus: string
+  reason: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+}
+
+// 查询报废出库任务子列表
+export const getScrapJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/scrap-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/scrap-job-detail/page`, params })
+  }
+}
+
+// 查询报废出库任务子详情
+export const getScrapJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/scrap-job-detail/get?id=` + id })
+}
+
+// 新增报废出库任务子
+export const createScrapJobDetail = async (data: ScrapJobDetailVO) => {
+  return await request.post({ url: `/wms/scrap-job-detail/create`, data })
+}
+
+// 修改报废出库任务子
+export const updateScrapJobDetail = async (data: ScrapJobDetailVO) => {
+  return await request.put({ url: `/wms/scrap-job-detail/update`, data })
+}
+
+// 删除报废出库任务子
+export const deleteScrapJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/scrap-job-detail/delete?id=` + id })
+}
+
+// 导出报废出库任务子 Excel
+export const exportScrapJobDetail = async (params) => {
+  return await request.download({ url: `/wms/scrap-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/scrap-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/scrapJobMain/index.ts b/src/api/wms/scrapJobMain/index.ts
new file mode 100644
index 000000000..e4b0dfa1e
--- /dev/null
+++ b/src/api/wms/scrapJobMain/index.ts
@@ -0,0 +1,85 @@
+import request from '@/config/axios'
+
+export interface ScrapJobMainVO {
+  requestNumber: string
+  fromWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromAreaCodes: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询报废出库任务主列表
+export const getScrapJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/scrap-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/scrap-job-main/page`, params })
+  }
+}
+
+// 查询报废出库任务主详情
+export const getScrapJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/scrap-job-main/get?id=` + id })
+}
+
+// 新增报废出库任务主
+export const createScrapJobMain = async (data: ScrapJobMainVO) => {
+  return await request.post({ url: `/wms/scrap-job-main/create`, data })
+}
+
+// 修改报废出库任务主
+export const updateScrapJobMain = async (data: ScrapJobMainVO) => {
+  return await request.put({ url: `/wms/scrap-job-main/update`, data })
+}
+
+// 删除报废出库任务主
+export const deleteScrapJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/scrap-job-main/delete?id=` + id })
+}
+
+// 导出报废出库任务主 Excel
+export const exportScrapJobMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/scrap-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/scrap-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/scrap-job-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/scrapRecordDetail/index.ts b/src/api/wms/scrapRecordDetail/index.ts
new file mode 100644
index 000000000..4ff183bed
--- /dev/null
+++ b/src/api/wms/scrapRecordDetail/index.ts
@@ -0,0 +1,70 @@
+import request from '@/config/axios'
+
+export interface ScrapRecordDetailVO {
+  fromOwnerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  inventoryStatus: string
+  reason: string
+  singlePrice: number
+  amount: number
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  jobDetailId: string
+}
+
+// 查询报废出库记录子列表
+export const getScrapRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/scrap-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/scrap-record-detail/page`, params })
+  }
+}
+
+// 查询报废出库记录子详情
+export const getScrapRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/scrap-record-detail/get?id=` + id })
+}
+
+// 新增报废出库记录子
+export const createScrapRecordDetail = async (data: ScrapRecordDetailVO) => {
+  return await request.post({ url: `/wms/scrap-record-detail/create`, data })
+}
+
+// 修改报废出库记录子
+export const updateScrapRecordDetail = async (data: ScrapRecordDetailVO) => {
+  return await request.put({ url: `/wms/scrap-record-detail/update`, data })
+}
+
+// 删除报废出库记录子
+export const deleteScrapRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/scrap-record-detail/delete?id=` + id })
+}
+
+// 导出报废出库记录子 Excel
+export const exportScrapRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/scrap-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/scrap-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/scrapRecordMain/index.ts b/src/api/wms/scrapRecordMain/index.ts
new file mode 100644
index 000000000..1efab607d
--- /dev/null
+++ b/src/api/wms/scrapRecordMain/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface ScrapRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  code: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  available: string
+}
+
+// 查询报废出库记录主列表
+export const getScrapRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/scrap-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/scrap-record-main/page`, params })
+  }
+}
+
+// 查询报废出库记录主详情
+export const getScrapRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/scrap-record-main/get?id=` + id })
+}
+
+// 新增报废出库记录主
+export const createScrapRecordMain = async (data: ScrapRecordMainVO) => {
+  return await request.post({ url: `/wms/scrap-record-main/create`, data })
+}
+
+// 修改报废出库记录主
+export const updateScrapRecordMain = async (data: ScrapRecordMainVO) => {
+  return await request.put({ url: `/wms/scrap-record-main/update`, data })
+}
+
+// 删除报废出库记录主
+export const deleteScrapRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/scrap-record-main/delete?id=` + id })
+}
+
+// 导出报废出库记录主 Excel
+export const exportScrapRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/scrap-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/scrap-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/scrap-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/scrapRequestDetail/index.ts b/src/api/wms/scrapRequestDetail/index.ts
new file mode 100644
index 000000000..99a15ec2a
--- /dev/null
+++ b/src/api/wms/scrapRequestDetail/index.ts
@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface ScrapRequestDetailVO {
+  fromOwnerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  fromLocationCode: string
+  inventoryStatus: string
+  reason: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+}
+
+// 查询报废出库申请子列表
+export const getScrapRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/scrap-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/scrap-request-detail/page`, params })
+  }
+}
+
+// 查询报废出库申请子详情
+export const getScrapRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/scrap-request-detail/get?id=` + id })
+}
+
+// 新增报废出库申请子
+export const createScrapRequestDetail = async (data: ScrapRequestDetailVO) => {
+  return await request.post({ url: `/wms/scrap-request-detail/create`, data })
+}
+
+// 修改报废出库申请子
+export const updateScrapRequestDetail = async (data: ScrapRequestDetailVO) => {
+  return await request.put({ url: `/wms/scrap-request-detail/update`, data })
+}
+
+// 删除报废出库申请子
+export const deleteScrapRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/scrap-request-detail/delete?id=` + id })
+}
+
+// 导出报废出库申请子 Excel
+export const exportScrapRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/scrap-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/scrap-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/scrapRequestMain/index.ts b/src/api/wms/scrapRequestMain/index.ts
new file mode 100644
index 000000000..b4ca02457
--- /dev/null
+++ b/src/api/wms/scrapRequestMain/index.ts
@@ -0,0 +1,98 @@
+import request from '@/config/axios'
+
+export interface ScrapRequestMainVO {
+  fromWarehouseCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询报废出库申请主列表
+export const getScrapRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/scrap-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/scrap-request-main/page`, params })
+  }
+}
+
+// 查询报废出库申请主详情
+export const getScrapRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/scrap-request-main/get?id=` + id })
+}
+
+// 新增报废出库申请主
+export const createScrapRequestMain = async (data: ScrapRequestMainVO) => {
+  return await request.post({ url: `/wms/scrap-request-main/create`, data })
+}
+
+// 修改报废出库申请主
+export const updateScrapRequestMain = async (data: ScrapRequestMainVO) => {
+  return await request.put({ url: `/wms/scrap-request-main/update`, data })
+}
+
+// 删除报废出库申请主
+export const deleteScrapRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/scrap-request-main/delete?id=` + id })
+}
+
+// 导出报废出库申请主 Excel
+export const exportScrapRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/scrap-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/scrap-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/scrap-request-main/get-import-template' })
+}
+
+// 关闭-报废出库申请
+export const closeScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/close?id=` + id })
+}
+
+// 重新添加-报废出库申请
+export const reAddScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-报废出库申请
+export const submitScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/submit?id=` + id })
+}
+
+// 审批驳回-报废出库申请
+export const refusedScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/refused?id=` + id })
+}
+
+// 审批通过-报废出库申请
+export const agreeScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/agree?id=` + id })
+}
+
+// 处理-报废出库申请
+export const handleScrapRequestMain = async (id) => {
+  return await request.put({ url: `/wms/scrap-request-main/handle?id=` + id })
+}
diff --git a/src/api/wms/shift/index.ts b/src/api/wms/shift/index.ts
new file mode 100644
index 000000000..f663b794f
--- /dev/null
+++ b/src/api/wms/shift/index.ts
@@ -0,0 +1,60 @@
+import request from '@/config/axios'
+
+export interface ShiftVO {
+  code: string
+  name: string
+  description: string
+  beginTime: Date
+  entTime: Date
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  endAtNextDay: string
+  available: string
+}
+
+// 查询班次列表
+export const getShiftPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/shift/senior', data })
+  } else {
+    return await request.get({ url: `/wms/shift/page`, params })
+  }
+}
+
+// 查询班次详情
+export const getShift = async (id: number) => {
+  return await request.get({ url: `/wms/shift/get?id=` + id })
+}
+
+// 新增班次
+export const createShift = async (data: ShiftVO) => {
+  return await request.post({ url: `/wms/shift/create`, data })
+}
+
+// 修改班次
+export const updateShift = async (data: ShiftVO) => {
+  return await request.put({ url: `/wms/shift/update`, data })
+}
+
+// 删除班次
+export const deleteShift = async (id: number) => {
+  return await request.delete({ url: `/wms/shift/delete?id=` + id })
+}
+
+// 导出班次 Excel
+export const exportShift = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/shift/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/shift/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/shift/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/stdcostprice/index.ts b/src/api/wms/stdcostprice/index.ts
new file mode 100644
index 000000000..3ec273f8e
--- /dev/null
+++ b/src/api/wms/stdcostprice/index.ts
@@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+export interface StdcostpriceVO {
+  supplierCode: string
+  itemCode: string
+  currency: string
+  price: number
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询标准成本价格单列表
+export const getStdcostpricePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/stdcostprice/senior', data })
+  } else {
+    return await request.get({ url: `/wms/stdcostprice/page`, params })
+  }
+}
+
+// 查询标准成本价格单详情
+export const getStdcostprice = async (id: number) => {
+  return await request.get({ url: `/wms/stdcostprice/get?id=` + id })
+}
+
+// 新增标准成本价格单
+export const createStdcostprice = async (data: StdcostpriceVO) => {
+  return await request.post({ url: `/wms/stdcostprice/create`, data })
+}
+
+// 修改标准成本价格单
+export const updateStdcostprice = async (data: StdcostpriceVO) => {
+  return await request.put({ url: `/wms/stdcostprice/update`, data })
+}
+
+// 删除标准成本价格单
+export const deleteStdcostprice = async (id: number) => {
+  return await request.delete({ url: `/wms/stdcostprice/delete?id=` + id })
+}
+
+// 导出标准成本价格单 Excel
+export const exportStdcostprice = async (params) => {
+   if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/stdcostprice/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/stdcostprice/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/stdcostprice/get-import-template' })
+}
+
+
+// 查询标准成本价格单列表
+export const queryStdcostpriceByItemCode = async (data: StdcostpriceVO) => {
+  return await request.post({ url: `/wms/stdcostprice/queryStdcostpriceByItemCode`, data })
+}
\ No newline at end of file
diff --git a/src/api/wms/stockupDetailJob/index.ts b/src/api/wms/stockupDetailJob/index.ts
new file mode 100644
index 000000000..0f0aedc5e
--- /dev/null
+++ b/src/api/wms/stockupDetailJob/index.ts
@@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+export interface StockupDetailJobVO {
+  id: number
+  packingNumber: string
+  batch: string
+  inventoryStatus: string
+  ownerCode: string
+  containerNumber: string
+  fromLocationCode: string
+  toLocationCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  masterId: number
+  number: string
+  remark: string
+  siteId: string
+}
+
+// 查询备货任务子列表
+export const getStockupDetailJobPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/stockup-detail-job/senior', data })
+  } else {
+    return await request.get({ url: `/wms/stockup-detail-job/page`, params })
+  }
+}
+
+// 查询备货任务子详情
+export const getStockupDetailJob = async (id: number) => {
+  return await request.get({ url: `/wms/stockup-detail-job/get?id=` + id })
+}
+
+// 新增备货任务子
+export const createStockupDetailJob = async (data: StockupDetailJobVO) => {
+  return await request.post({ url: `/wms/stockup-detail-job/create`, data })
+}
+
+// 修改备货任务子
+export const updateStockupDetailJob = async (data: StockupDetailJobVO) => {
+  return await request.put({ url: `/wms/stockup-detail-job/update`, data })
+}
+
+// 删除备货任务子
+export const deleteStockupDetailJob = async (id: number) => {
+  return await request.delete({ url: `/wms/stockup-detail-job/delete?id=` + id })
+}
+
+// 导出备货任务子 Excel
+export const exportStockupDetailJob = async (params) => {
+  return await request.download({ url: `/wms/stockup-detail-job/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/stockup-detail-job/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/stockupDetailRecord/index.ts b/src/api/wms/stockupDetailRecord/index.ts
new file mode 100644
index 000000000..1ec393ecd
--- /dev/null
+++ b/src/api/wms/stockupDetailRecord/index.ts
@@ -0,0 +1,76 @@
+import request from '@/config/axios'
+
+export interface StockupDetailRecordVO {
+  id: number
+  packingNumber: string
+  batch: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  fromContainerNumber: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  toOwnerCode: string
+  toContainerNumber: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  singlePrice: number
+  amount: number
+  masterId: number
+  number: string
+  itemCode: string
+  remark: string
+  siteId: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+  available: string
+}
+
+// 查询备货记录子列表
+export const getStockupDetailRecordPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/stockup-detail-record/senior', data })
+  } else {
+    return await request.get({ url: `/wms/stockup-detail-record/page`, params })
+  }
+}
+
+// 查询备货记录子详情
+export const getStockupDetailRecord = async (id: number) => {
+  return await request.get({ url: `/wms/stockup-detail-record/get?id=` + id })
+}
+
+// 新增备货记录子
+export const createStockupDetailRecord = async (data: StockupDetailRecordVO) => {
+  return await request.post({ url: `/wms/stockup-detail-record/create`, data })
+}
+
+// 修改备货记录子
+export const updateStockupDetailRecord = async (data: StockupDetailRecordVO) => {
+  return await request.put({ url: `/wms/stockup-detail-record/update`, data })
+}
+
+// 删除备货记录子
+export const deleteStockupDetailRecord = async (id: number) => {
+  return await request.delete({ url: `/wms/stockup-detail-record/delete?id=` + id })
+}
+
+// 导出备货记录子 Excel
+export const exportStockupDetailRecord = async (params) => {
+  return await request.download({ url: `/wms/stockup-detail-record/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/stockup-detail-record/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/stockupDetailRequest/index.ts b/src/api/wms/stockupDetailRequest/index.ts
new file mode 100644
index 000000000..333596286
--- /dev/null
+++ b/src/api/wms/stockupDetailRequest/index.ts
@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface StockupDetailRequestVO {
+  id: number
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  toOwnerCode: string
+  toLocationCode: string
+  masterId: number
+  number: string
+  remark: string
+  siteId: number
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  concurrencyStamp: string
+  fromOwnerCode: string
+}
+
+// 查询备货申请子列表
+export const getStockupDetailRequestPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/stockup-detail-request/senior', data })
+  } else {
+    return await request.get({ url: `/wms/stockup-detail-request/page`, params })
+  }
+}
+
+// 查询备货申请子详情
+export const getStockupDetailRequest = async (id: number) => {
+  return await request.get({ url: `/wms/stockup-detail-request/get?id=` + id })
+}
+
+// 新增备货申请子
+export const createStockupDetailRequest = async (data: StockupDetailRequestVO) => {
+  return await request.post({ url: `/wms/stockup-detail-request/create`, data })
+}
+
+// 修改备货申请子
+export const updateStockupDetailRequest = async (data: StockupDetailRequestVO) => {
+  return await request.put({ url: `/wms/stockup-detail-request/update`, data })
+}
+
+// 删除备货申请子
+export const deleteStockupDetailRequest = async (id: number) => {
+  return await request.delete({ url: `/wms/stockup-detail-request/delete?id=` + id })
+}
+
+// 导出备货申请子 Excel
+export const exportStockupDetailRequest = async (params) => {
+  return await request.download({ url: `/wms/stockup-detail-request/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/stockup-detail-request/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/stockupMainJob/index.ts b/src/api/wms/stockupMainJob/index.ts
new file mode 100644
index 000000000..b9dffb7ff
--- /dev/null
+++ b/src/api/wms/stockupMainJob/index.ts
@@ -0,0 +1,116 @@
+import request from '@/config/axios'
+
+export interface StockupMainJobVO {
+  id: number
+  requestNumber: string
+  deliverPlanNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  details: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  concurrencyStamp: string
+  jobStageStatus: string
+  priority: number
+  priorityincrement: number
+  departmentCode: string
+  userGroupCode: string
+  acceptUserId: string
+  acceptUserName: string
+  acceptTime: Date
+  completeUserId: string
+  completeUserName: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  ruleUserId: number
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  serialNumber: string
+  inInventoryStatuses: string
+  outInventoryStatuses: string
+}
+
+// 查询备货任务主列表
+export const getStockupMainJobPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/stockup-main-job/senior', data })
+  } else {
+    return await request.get({ url: `/wms/stockup-main-job/page`, params })
+  }
+}
+
+// 查询备货任务主详情
+export const getStockupMainJob = async (id: number) => {
+  return await request.get({ url: `/wms/stockup-main-job/get?id=` + id })
+}
+
+// 新增备货任务主
+export const createStockupMainJob = async (data: StockupMainJobVO) => {
+  return await request.post({ url: `/wms/stockup-main-job/create`, data })
+}
+
+// 修改备货任务主
+export const updateStockupMainJob = async (data: StockupMainJobVO) => {
+  return await request.put({ url: `/wms/stockup-main-job/update`, data })
+}
+
+// 删除备货任务主
+export const deleteStockupMainJob = async (id: number) => {
+  return await request.delete({ url: `/wms/stockup-main-job/delete?id=` + id })
+}
+
+// 导出备货任务主 Excel
+export const exportStockupMainJob = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/stockup-main-job/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/stockup-main-job/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/stockup-main-job/get-import-template' })
+}
+
+// 承接发货任务 Excel
+export const acceptStockupMainJob = async (id) => {
+  return await request.put({ url: `/wms/stockup-main-job/accept?id=` + id })
+}
+
+// 取消承接发货任务 Excel
+export const abandonStockupMainJob = async (id) => {
+  return await request.put({ url: `/wms/stockup-main-job/abandon?id=` + id })
+}
+
+// 关闭发货任务主 Excel
+export const closeStockupMainJob = async (id) => {
+  return await request.put({ url: `/wms/stockup-main-job/close?id=` + id })
+}
+
+// 执行发货任务主
+export const executeStockupMainJob = async (data: StockupMainJobVO) => {
+  return await request.put({ url: `/wms/stockup-main-job/execute`, data })
+}
\ No newline at end of file
diff --git a/src/api/wms/stockupMainRecord/index.ts b/src/api/wms/stockupMainRecord/index.ts
new file mode 100644
index 000000000..cc3952c54
--- /dev/null
+++ b/src/api/wms/stockupMainRecord/index.ts
@@ -0,0 +1,78 @@
+import request from '@/config/axios'
+
+export interface StockupMainRecordVO {
+  id: number
+  requestNumber: string
+  jobNumber: string
+  deliverPlanNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  details: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  available: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  userGroupCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: string
+  code: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toAreaTypes: string
+  toAreaCodes: string
+}
+
+// 查询备货记录主列表
+export const getStockupMainRecordPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/stockup-main-record/senior', data })
+  } else {
+    return await request.get({ url: `/wms/stockup-main-record/page`, params })
+  }
+}
+
+// 查询备货记录主详情
+export const getStockupMainRecord = async (id: number) => {
+  return await request.get({ url: `/wms/stockup-main-record/get?id=` + id })
+}
+
+// 新增备货记录主
+export const createStockupMainRecord = async (data: StockupMainRecordVO) => {
+  return await request.post({ url: `/wms/stockup-main-record/create`, data })
+}
+
+// 修改备货记录主
+export const updateStockupMainRecord = async (data: StockupMainRecordVO) => {
+  return await request.put({ url: `/wms/stockup-main-record/update`, data })
+}
+
+// 删除备货记录主
+export const deleteStockupMainRecord = async (id: number) => {
+  return await request.delete({ url: `/wms/stockup-main-record/delete?id=` + id })
+}
+
+// 导出备货记录主 Excel
+export const exportStockupMainRecord = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/stockup-main-record/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/stockup-main-record/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/stockup-main-record/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/stockupMainRequest/index.ts b/src/api/wms/stockupMainRequest/index.ts
new file mode 100644
index 000000000..a14539008
--- /dev/null
+++ b/src/api/wms/stockupMainRequest/index.ts
@@ -0,0 +1,108 @@
+import request from '@/config/axios'
+
+export interface StockupMainRequestVO {
+  id: number
+  deliverPlanNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  details: string
+  number: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: number
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+  concurrencyStamp: string
+  ruleUserId: number
+  toAreaTypes: string
+  toAreaCodes: string
+  serialNumber: string
+  deliverDate: Date
+  inInventoryStatuses: string
+  outInventoryStatuses: string
+}
+
+// 查询备货申请主列表
+export const getStockupMainRequestPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/stockup-main-request/senior', data })
+  } else {
+    return await request.get({ url: `/wms/stockup-main-request/page`, params })
+  }
+}
+
+// 查询备货申请主详情
+export const getStockupMainRequest = async (id: number) => {
+  return await request.get({ url: `/wms/stockup-main-request/get?id=` + id })
+}
+
+// 新增备货申请主
+export const createStockupMainRequest = async (data: StockupMainRequestVO) => {
+  return await request.post({ url: `/wms/stockup-main-request/create`, data })
+}
+
+// 修改备货申请主
+export const updateStockupMainRequest = async (data: StockupMainRequestVO) => {
+  return await request.put({ url: `/wms/stockup-main-request/update`, data })
+}
+
+// 删除备货申请主
+export const deleteStockupMainRequest = async (id: number) => {
+  return await request.delete({ url: `/wms/stockup-main-request/delete?id=` + id })
+}
+
+// 导出备货申请主 Excel
+export const exportStockupMainRequest = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/stockup-main-request/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/stockup-main-request/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/stockup-main-request/get-import-template' })
+}
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/stockup-main-request/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/stockup-main-request/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/stockup-main-request/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/stockup-main-request/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/stockup-main-request/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/stockup-main-request/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/api/wms/strategy/index.ts b/src/api/wms/strategy/index.ts
new file mode 100644
index 000000000..d10cd5108
--- /dev/null
+++ b/src/api/wms/strategy/index.ts
@@ -0,0 +1,53 @@
+import request from '@/config/axios'
+
+export interface StrategyVO {
+  remark: string
+  code: string
+  name: string
+  description: string
+  type: string
+  priority: number
+  isActive: string
+}
+
+// 查询策略列表
+export const getStrategyPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/strategy/senior', data })
+  } else {
+    return await request.get({ url: `/wms/strategy/page`, params })
+  }
+}
+
+// 查询策略详情
+export const getStrategy = async (id: number) => {
+  return await request.get({ url: `/wms/strategy/get?id=` + id })
+}
+
+// 新增策略
+export const createStrategy = async (data: StrategyVO) => {
+  return await request.post({ url: `/wms/strategy/create`, data })
+}
+
+// 修改策略
+export const updateStrategy = async (data: StrategyVO) => {
+  return await request.put({ url: `/wms/strategy/update`, data })
+}
+
+// 删除策略
+export const deleteStrategy = async (id: number) => {
+  return await request.delete({ url: `/wms/strategy/delete?id=` + id })
+}
+
+// 导出策略 Excel
+export const exportStrategy = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/strategy/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/strategy/export-excel`, params })
+  }
+}
diff --git a/src/api/wms/supplier/index.ts b/src/api/wms/supplier/index.ts
new file mode 100644
index 000000000..805a4163c
--- /dev/null
+++ b/src/api/wms/supplier/index.ts
@@ -0,0 +1,72 @@
+import request from '@/config/axios'
+
+export interface SupplierVO {
+  code: string
+  name: string
+  shortName: string
+  address: string
+  country: string
+  city: string
+  phone: string
+  fax: string
+  postId: string
+  contacts: string
+  bank: string
+  currency: string
+  taxRate: number
+  type: string
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询供应商列表分页
+export const getSupplierPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/supplier/senior', data })
+  } else {
+    return await request.get({ url: `/wms/supplier/page`, params })
+  }
+}
+// 查询供应商列表
+export const getSupplierList = async (params) => {
+  return await request.get({ url: `/wms/supplier/list`, params })
+}
+
+// 查询供应商详情
+export const getSupplier = async (id: number) => {
+  return await request.get({ url: `/wms/supplier/get?id=` + id })
+}
+
+// 新增供应商
+export const createSupplier = async (data: SupplierVO) => {
+  return await request.post({ url: `/wms/supplier/create`, data })
+}
+
+// 修改供应商
+export const updateSupplier = async (data: SupplierVO) => {
+  return await request.put({ url: `/wms/supplier/update`, data })
+}
+
+// 删除供应商
+export const deleteSupplier = async (id: number) => {
+  return await request.delete({ url: `/wms/supplier/delete?id=` + id })
+}
+
+// 导出供应商 Excel
+export const exportSupplier = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/supplier/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/supplier/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplier/get-import-template' })
+}
diff --git a/src/api/wms/supplierUser/index.ts b/src/api/wms/supplierUser/index.ts
new file mode 100644
index 000000000..a7d284e80
--- /dev/null
+++ b/src/api/wms/supplierUser/index.ts
@@ -0,0 +1,59 @@
+import request from '@/config/axios'
+
+export interface SupplierUserVO {
+  id: number
+  userId: number
+  supplierCode: string
+  status: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  remark: string
+}
+
+// 查询供应商用户关联信息列表
+export const getSupplierUserPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplier-user/senior', data })
+  } else {
+    return await request.get({ url: `/wms/supplier-user/page`, params })
+  }
+}
+
+// 查询供应商用户关联信息详情
+export const getSupplierUser = async (id: number) => {
+  return await request.get({ url: `/wms/supplier-user/get?id=` + id })
+}
+
+// 新增供应商用户关联信息
+export const createSupplierUser = async (data: SupplierUserVO) => {
+  return await request.post({ url: `/wms/supplier-user/create`, data })
+}
+
+// 修改供应商用户关联信息
+export const updateSupplierUser = async (data: SupplierUserVO) => {
+  return await request.put({ url: `/wms/supplier-user/update`, data })
+}
+
+// 删除供应商用户关联信息
+export const deleteSupplierUser = async (id: number) => {
+  return await request.delete({ url: `/wms/supplier-user/delete?id=` + id })
+}
+
+// 导出供应商用户关联信息 Excel
+export const exportSupplierUser = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/supplier-user/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/supplier-user/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplier-user/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/supplierdeliverRecordDetail/index.ts b/src/api/wms/supplierdeliverRecordDetail/index.ts
new file mode 100644
index 000000000..2efc8aa17
--- /dev/null
+++ b/src/api/wms/supplierdeliverRecordDetail/index.ts
@@ -0,0 +1,98 @@
+import request from '@/config/axios'
+
+export interface SupplierdeliverRecordDetailVO {
+  fromPackingNumber: string
+  toPackingNumber: string
+  fromBatch: string
+  altBatch: string
+  fromContainerNumber: string
+  toContainerNumber: string
+  arriveDate: Date
+  produceDate: Date
+  expireDate: Date
+  poNumber: string
+  poLine: string
+  packQty: number
+  packUnit: string
+  supplierQty: number
+  supplierUom: string
+  convertRate: number
+  fromLocationCode: string
+  toLocationCode: string
+  fromLocationGroupCode: string
+  toLocationGroupCode: string
+  fromAreaCode: string
+  toAreaCode: string
+  fromOwnerCode: string
+  toOwnerCode: string
+  projectCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  jobDetailId: string
+  toBatch: string
+}
+
+// 查询供应商发货记录子列表
+export const getSupplierdeliverRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplierdeliver-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/supplierdeliver-record-detail/page`, params })
+  }
+}
+
+// 查询采供应商发货记录子列表
+export const getSupplierdeliverRecordDetailList = async (params) => {
+    return await request.get({ url: `/wms/supplierdeliver-record-detail/allList`, params })
+}
+
+// 查询供应商发货记录子详情
+export const getSupplierdeliverRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/supplierdeliver-record-detail/get?id=` + id })
+}
+
+// 新增供应商发货记录子
+export const createSupplierdeliverRecordDetail = async (data: SupplierdeliverRecordDetailVO) => {
+  return await request.post({ url: `/wms/supplierdeliver-record-detail/create`, data })
+}
+
+// 修改供应商发货记录子
+export const updateSupplierdeliverRecordDetail = async (data: SupplierdeliverRecordDetailVO) => {
+  return await request.put({ url: `/wms/supplierdeliver-record-detail/update`, data })
+}
+
+// 删除供应商发货记录子
+export const deleteSupplierdeliverRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/supplierdeliver-record-detail/delete?id=` + id })
+}
+
+// 导出供应商发货记录子 Excel
+export const exportSupplierdeliverRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/supplierdeliver-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplierdeliver-record-detail/get-import-template' })
+}
+
+// 查询供应商发货记录
+export const queryChildPickingNumber = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplierdeliver-record-detail/queryChildPickingNumberSenior', data })
+  } else {
+    return await request.get({ url: `/wms/supplierdeliver-record-detail/queryChildPickingNumberPage`, params })
+  }
+}
\ No newline at end of file
diff --git a/src/api/wms/supplierdeliverRecordMain/index.ts b/src/api/wms/supplierdeliverRecordMain/index.ts
new file mode 100644
index 000000000..659794ff4
--- /dev/null
+++ b/src/api/wms/supplierdeliverRecordMain/index.ts
@@ -0,0 +1,88 @@
+import request from '@/config/axios'
+
+export interface SupplierdeliverRecordMainVO {
+  requestNumber: string
+  ppNumber: string
+  asnNumber: string
+  supplierCode: string
+  contactName: string
+  contactPhone: string
+  contactEmail: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  toDockCode: string
+  timeWindow: string
+  planArriveTime: Date
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  outTransaction: string
+  inTransaction: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: number
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  serialNumber: string
+  available: string
+  purchasereceiptRequestFlag: boolean
+  purchasereceiptRequestNumber: string
+}
+
+// 查询供应商发货记录主列表
+export const getSupplierdeliverRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplierdeliver-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/supplierdeliver-record-main/page`, params })
+  }
+}
+
+// 查询供应商发货记录主详情
+export const getSupplierdeliverRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/supplierdeliver-record-main/get?id=` + id })
+}
+
+// 新增供应商发货记录主
+export const createSupplierdeliverRecordMain = async (data: SupplierdeliverRecordMainVO) => {
+  return await request.post({ url: `/wms/supplierdeliver-record-main/create`, data })
+}
+
+// 修改供应商发货记录主
+export const updateSupplierdeliverRecordMain = async (data: SupplierdeliverRecordMainVO) => {
+  return await request.put({ url: `/wms/supplierdeliver-record-main/update`, data })
+}
+
+// 删除供应商发货记录主
+export const deleteSupplierdeliverRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/supplierdeliver-record-main/delete?id=` + id })
+}
+
+// 导出供应商发货记录主 Excel
+export const exportSupplierdeliverRecordMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/supplierdeliver-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/supplierdeliver-record-main/export-excel`, params })
+  }
+  }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplierdeliver-record-main/get-import-template' })
+}
+
+// 创建采购申请
+export const createPurchasereceiptRequest = async (number:string) => {
+  return await request.post({ url: `/wms/supplierdeliver-record-main/createPurchasereceiptRequest?number=`+number })
+}
+
diff --git a/src/api/wms/supplierdeliverRequestDetail/index.ts b/src/api/wms/supplierdeliverRequestDetail/index.ts
new file mode 100644
index 000000000..64580a04e
--- /dev/null
+++ b/src/api/wms/supplierdeliverRequestDetail/index.ts
@@ -0,0 +1,75 @@
+import request from '@/config/axios'
+
+export interface SupplierdeliverRequestDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  altBatch: string
+  arriveDate: Date
+  produceDate: Date
+  expireDate: Date
+  poNumber: string
+  poLine: string
+  packQty: number
+  packUnit: string
+  supplierPackQty: number
+  supplierPackUnit: string
+  convertRate: number
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+
+// 查询供应商发货申请子列表
+export const getSupplierdeliverRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplierdeliver-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/supplierdeliver-request-detail/page`, params })
+  }
+}
+
+// 查询供应商发货申请子详情
+export const getSupplierdeliverRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/supplierdeliver-request-detail/get?id=` + id })
+}
+
+// 新增供应商发货申请子
+export const createSupplierdeliverRequestDetail = async (data: SupplierdeliverRequestDetailVO) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-detail/create`, data })
+}
+
+// 修改供应商发货申请子
+export const updateSupplierdeliverRequestDetail = async (data: SupplierdeliverRequestDetailVO) => {
+  return await request.put({ url: `/wms/supplierdeliver-request-detail/update`, data })
+}
+
+// 删除供应商发货申请子
+export const deleteSupplierdeliverRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/supplierdeliver-request-detail/delete?id=` + id })
+}
+
+// 导出供应商发货申请子 Excel
+export const exportSupplierdeliverRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/supplierdeliver-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplierdeliver-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts
new file mode 100644
index 000000000..dddc0c3a1
--- /dev/null
+++ b/src/api/wms/supplierdeliverRequestMain/index.ts
@@ -0,0 +1,117 @@
+import request from '@/config/axios'
+import { SupplierdeliverRequestDetailVO } from '../supplierdeliverRequestDetail'
+
+export interface SupplierdeliverRequestMainVO {
+  ppNumber: string
+  asnNumber: string
+  supplierCode: string
+  contactName: string
+  contactPhone: string
+  contactEmail: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  toDockCode: string
+  timeWindow: string
+  planArriveTime: Date
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+  labelStatus: string
+}
+
+// 查询供应商发货申请主列表
+export const getSupplierdeliverRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplierdeliver-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/supplierdeliver-request-main/page`, params })
+  }
+}
+
+// 查询供应商发货申请主详情
+export const getSupplierdeliverRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/supplierdeliver-request-main/get?id=` + id })
+}
+
+// 新增供应商发货申请主
+export const createSupplierdeliverRequestMain = async (data: SupplierdeliverRequestMainVO) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/create`, data })
+}
+
+// 修改供应商发货申请主
+export const updateSupplierdeliverRequestMain = async (data: SupplierdeliverRequestMainVO) => {
+  return await request.put({ url: `/wms/supplierdeliver-request-main/update`, data })
+}
+
+// 删除供应商发货申请主
+export const deleteSupplierdeliverRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/supplierdeliver-request-main/delete?id=` + id })
+}
+
+// 打开供应商发货申请主
+export const opeSupplierdeliverRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/open?id=` + id })
+}
+// 关闭供应商发货申请主
+export const cloSupplierdeliverRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/close?id=` + id })
+}
+// 提交审批供应商发货申请主
+export const subSupplierdeliverRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/sub?id=` + id })
+}
+// 审批通过供应商发货申请主
+export const appSupplierdeliverRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/app?id=` + id })
+}
+// 驳回供应商发货申请主
+export const rejSupplierdeliverRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/rej?id=` + id })
+}
+
+// 校验是否上传自检报告
+export const selfCheckReport = async (id) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/selfCheckReport?id=` + id })
+}
+
+// 生成标签
+export const genLabel = async (data:SupplierdeliverRequestMainVO) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/genLabel`,data })
+}
+
+// 生成记录
+export const genRecordsSupplierdeliverRequestMain = async (id) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/genRecords?id=` + id })
+}
+// 导出供应商发货申请主 Excel
+export const exportSupplierdeliverRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/supplierdeliver-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({url: `/wms/supplierdeliver-request-main/export-excel`, params})
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplierdeliver-request-main/get-import-template' })
+}
+
diff --git a/src/api/wms/supplierinvoiceRecordDeatil/index.ts b/src/api/wms/supplierinvoiceRecordDeatil/index.ts
new file mode 100644
index 000000000..5c55d7a40
--- /dev/null
+++ b/src/api/wms/supplierinvoiceRecordDeatil/index.ts
@@ -0,0 +1,73 @@
+import request from '@/config/axios'
+
+export interface SupplierinvoiceRecordDeatilVO {
+  recordNumber: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  altBatch: string
+  poNumber: string
+  poLine: string
+  packQty: number
+  packUnit: string
+  supplierQty: number
+  supplierUom: string
+  convertRate: number
+  singlePrice: number
+  amount: number
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+}
+
+// 查询供应商发票记录子列表
+export const getSupplierinvoiceRecordDeatilPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplierinvoice-record-deatil/senior', data })
+  } else {
+    return await request.get({ url: `/wms/supplierinvoice-record-deatil/page`, params })
+  }
+}
+
+// 查询供应商发票记录子详情
+export const getSupplierinvoiceRecordDeatil = async (id: number) => {
+  return await request.get({ url: `/wms/supplierinvoice-record-deatil/get?id=` + id })
+}
+
+// 新增供应商发票记录子
+export const createSupplierinvoiceRecordDeatil = async (data: SupplierinvoiceRecordDeatilVO) => {
+  return await request.post({ url: `/wms/supplierinvoice-record-deatil/create`, data })
+}
+
+// 修改供应商发票记录子
+export const updateSupplierinvoiceRecordDeatil = async (data: SupplierinvoiceRecordDeatilVO) => {
+  return await request.put({ url: `/wms/supplierinvoice-record-deatil/update`, data })
+}
+
+// 删除供应商发票记录子
+export const deleteSupplierinvoiceRecordDeatil = async (id: number) => {
+  return await request.delete({ url: `/wms/supplierinvoice-record-deatil/delete?id=` + id })
+}
+
+// 导出供应商发票记录子 Excel
+export const exportSupplierinvoiceRecordDeatil = async (params) => {
+  return await request.download({ url: `/wms/supplierinvoice-record-deatil/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplierinvoice-record-deatil/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/supplierinvoiceRecordMain/index.ts b/src/api/wms/supplierinvoiceRecordMain/index.ts
new file mode 100644
index 000000000..4f04bdeb2
--- /dev/null
+++ b/src/api/wms/supplierinvoiceRecordMain/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface SupplierinvoiceRecordMainVO {
+  requestNumber: string
+  supplierCode: string
+  adjustAmount: number
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  code: string
+  available: string
+}
+
+// 查询供应商发票记录主列表
+export const getSupplierinvoiceRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplierinvoice-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/supplierinvoice-record-main/page`, params })
+  }
+}
+
+// 查询供应商发票记录主详情
+export const getSupplierinvoiceRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/supplierinvoice-record-main/get?id=` + id })
+}
+
+// 新增供应商发票记录主
+export const createSupplierinvoiceRecordMain = async (data: SupplierinvoiceRecordMainVO) => {
+  return await request.post({ url: `/wms/supplierinvoice-record-main/create`, data })
+}
+
+// 修改供应商发票记录主
+export const updateSupplierinvoiceRecordMain = async (data: SupplierinvoiceRecordMainVO) => {
+  return await request.put({ url: `/wms/supplierinvoice-record-main/update`, data })
+}
+
+// 删除供应商发票记录主
+export const deleteSupplierinvoiceRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/supplierinvoice-record-main/delete?id=` + id })
+}
+
+// 导出供应商发票记录主 Excel
+export const exportSupplierinvoiceRecordMain = async (params) => {
+  return await request.download({ url: `/wms/supplierinvoice-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplierinvoice-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/supplierinvoiceRequestDetail/index.ts b/src/api/wms/supplierinvoiceRequestDetail/index.ts
new file mode 100644
index 000000000..d256011f2
--- /dev/null
+++ b/src/api/wms/supplierinvoiceRequestDetail/index.ts
@@ -0,0 +1,70 @@
+import request from '@/config/axios'
+
+export interface SupplierinvoiceRequestDetailVO {
+  recordNumber: string
+  ownerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  altBatch: string
+  poNumber: string
+  poLine: string
+  packQty: number
+  packUnit: string
+  supplierPackQty: number
+  supplierPackUnit: string
+  convertRate: number
+  singlePrice: number
+  amount: number
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+}
+
+// 查询供应商发票申请子列表
+export const getSupplierinvoiceRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplierinvoice-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/supplierinvoice-request-detail/page`, params })
+  }
+}
+
+// 查询供应商发票申请主详情
+export const getPoNumber = async (params) => {
+  return await request.get({ url: `/wms/supplierinvoice-request-detail/getPoNumber`, params})
+}
+
+// 查询供应商发票申请子详情
+export const getSupplierinvoiceRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/supplierinvoice-request-detail/get?id=` + id })
+}
+
+// 新增供应商发票申请子
+export const createSupplierinvoiceRequestDetail = async (data: SupplierinvoiceRequestDetailVO) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-detail/create`, data })
+}
+
+// 修改供应商发票申请子
+export const updateSupplierinvoiceRequestDetail = async (data: SupplierinvoiceRequestDetailVO) => {
+  return await request.put({ url: `/wms/supplierinvoice-request-detail/update`, data })
+}
+
+// 删除供应商发票申请子
+export const deleteSupplierinvoiceRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/supplierinvoice-request-detail/delete?id=` + id })
+}
+
+// 导出供应商发票申请子 Excel
+export const exportSupplierinvoiceRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/supplierinvoice-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplierinvoice-request-detail/get-import-template' })
+}
diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts
new file mode 100644
index 000000000..b3e752a7b
--- /dev/null
+++ b/src/api/wms/supplierinvoiceRequestMain/index.ts
@@ -0,0 +1,91 @@
+import request from '@/config/axios'
+
+export interface SupplierinvoiceRequestMainVO {
+  supplierCode: string
+  adjustAmount: number
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询供应商发票申请主列表
+export const getSupplierinvoiceRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplierinvoice-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/supplierinvoice-request-main/page`, params })
+  }
+}
+
+// 查询供应商发票申请主详情
+export const getSupplierinvoiceRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/supplierinvoice-request-main/get?id=` + id })
+}
+
+// 查询供应商发票申请主详情
+export const getNumber = async (params) => {
+  return await request.get({ url: `/wms/supplierinvoice-request-main/getNumber`, params})
+}
+
+// 新增供应商发票申请主
+export const createSupplierinvoiceRequestMain = async (data: SupplierinvoiceRequestMainVO) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/create`, data })
+}
+
+// 修改供应商发票申请主
+export const updateSupplierinvoiceRequestMain = async (data: SupplierinvoiceRequestMainVO) => {
+  return await request.put({ url: `/wms/supplierinvoice-request-main/update`, data })
+}
+
+// 删除供应商发票申请主
+export const deleteSupplierinvoiceRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/supplierinvoice-request-main/delete?id=` + id })
+}
+
+// 打开供应商发货申请主
+export const opeSupplierinvoiceRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/open?id=` + id })
+}
+// 关闭供应商发货申请主
+export const cloSupplierinvoiceRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/close?id=` + id })
+}
+// 提交审批供应商发货申请主
+export const subSupplierinvoiceRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/sub?id=` + id })
+}
+// 审批通过供应商发货申请主
+export const appSupplierinvoiceRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/app?id=` + id })
+}
+// 驳回供应商发货申请主
+export const rejSupplierinvoiceRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/rej?id=` + id })
+}
+// 生成记录
+export const genRecordsSupplierinvoiceRequestMain = async (id) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/genRecords?id=` + id })
+}
+// 导出供应商发票申请主 Excel
+export const exportSupplierinvoiceRequestMain = async (params) => {
+  if(params.isSearch){
+    return await request.downloadPost({ url: `/wms/supplierinvoice-request-main/export-excel-senior`, params })
+  }else {
+    return await request.download({ url: `/wms/supplierinvoice-request-main/export-excel`, params })
+  }
+}
+
diff --git a/src/api/wms/supplieritem/index.ts b/src/api/wms/supplieritem/index.ts
new file mode 100644
index 000000000..448b6b108
--- /dev/null
+++ b/src/api/wms/supplieritem/index.ts
@@ -0,0 +1,81 @@
+import request from '@/config/axios'
+
+export interface SupplieritemVO {
+  supplierCode: string
+  itemCode: string
+  supplierItemCode: string
+  supplierUom: string
+  convertRate: number
+  packUnit: string
+  packQty: number
+  altPackUnit: string
+  altPackQty: number
+  packQtyOfContainer: number
+  defaultWarehouseCode: string
+  defaultLocationCode: string
+  settlementType: string
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询供应商物料列表
+export const getSupplieritemPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/supplieritem/senior', data })
+  } else {
+    return await request.get({ url: `/wms/supplieritem/page`, params })
+  }
+}
+
+// 查询供应商物料详情
+export const getSupplieritem = async (id: number) => {
+  return await request.get({ url: `/wms/supplieritem/get?id=` + id })
+}
+
+// 新增供应商物料
+export const createSupplieritem = async (data: SupplieritemVO) => {
+  return await request.post({ url: `/wms/supplieritem/create`, data })
+}
+
+// 修改供应商物料
+export const updateSupplieritem = async (data: SupplieritemVO) => {
+  return await request.put({ url: `/wms/supplieritem/update`, data })
+}
+
+// 删除供应商物料
+export const deleteSupplieritem = async (id: number) => {
+  return await request.delete({ url: `/wms/supplieritem/delete?id=` + id })
+}
+
+// 导出供应商物料 Excel
+export const exportSupplieritem = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/supplieritem/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/supplieritem/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplieritem/get-import-template' })
+}
+
+// 查询供应商物料列表
+export const selectItembasicTypeToSupplieritem = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.post({ url: `/wms/supplieritem/pageItembasicTypeToSupplieritemSenior`, data })
+  } else {
+    return await request.get({ url: `/wms/supplieritem/pageItembasicTypeToSupplieritem`, params })
+  }
+}
+
+export const getDefaultLocationCode = async(data: SupplieritemVO)=> {
+  return await request.post({ url: `/wms/supplieritem/getDefaultLocationCode`, data })
+}
\ No newline at end of file
diff --git a/src/api/wms/switch/index.ts b/src/api/wms/switch/index.ts
new file mode 100644
index 000000000..aeb11a1cb
--- /dev/null
+++ b/src/api/wms/switch/index.ts
@@ -0,0 +1,50 @@
+import request from '@/config/axios'
+
+export interface SwitchVO {
+  id: number
+  code: string
+  description: string
+  effectiveSetValue: string
+  available: string
+}
+
+// 查询单据开关列表
+export const getSwitchPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/switch/senior', data })
+  } else {
+    return await request.get({ url: `/wms/switch/page`, params })
+  }
+}
+
+// 查询单据开关详情
+export const getSwitch = async (id: number) => {
+  return await request.get({ url: `/wms/switch/get?id=` + id })
+}
+
+// 新增单据开关
+export const createSwitch = async (data: SwitchVO) => {
+  return await request.post({ url: `/wms/switch/create`, data })
+}
+
+// 修改单据开关
+export const updateSwitch = async (data: SwitchVO) => {
+  return await request.put({ url: `/wms/switch/update`, data })
+}
+
+// 删除单据开关
+export const deleteSwitch = async (id: number) => {
+  return await request.delete({ url: `/wms/switch/delete?id=` + id })
+}
+
+// 导出单据开关 Excel
+export const exportSwitch = async (params) => {
+  return await request.download({ url: `/wms/switch/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/switch/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/systemcalendar/index.ts b/src/api/wms/systemcalendar/index.ts
new file mode 100644
index 000000000..0499f49c9
--- /dev/null
+++ b/src/api/wms/systemcalendar/index.ts
@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface SystemcalendarVO {
+  module: string
+  startTime: Date
+  stopTime: Date
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询系统日历列表
+export const getSystemcalendarPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/systemcalendar/senior', data })
+  } else {
+    return await request.get({ url: `/wms/systemcalendar/page`, params })
+  }
+}
+
+// 查询系统日历详情
+export const getSystemcalendar = async (id: number) => {
+  return await request.get({ url: `/wms/systemcalendar/get?id=` + id })
+}
+
+// 新增系统日历
+export const createSystemcalendar = async (data: SystemcalendarVO) => {
+  return await request.post({ url: `/wms/systemcalendar/create`, data })
+}
+
+// 修改系统日历
+export const updateSystemcalendar = async (data: SystemcalendarVO) => {
+  return await request.put({ url: `/wms/systemcalendar/update`, data })
+}
+
+// 删除系统日历
+export const deleteSystemcalendar = async (id: number) => {
+  return await request.delete({ url: `/wms/systemcalendar/delete?id=` + id })
+}
+
+// 导出系统日历 Excel
+export const exportSystemcalendar = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/systemcalendar/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/systemcalendar/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/systemcalendar/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/team/index.ts b/src/api/wms/team/index.ts
new file mode 100644
index 000000000..6c978a410
--- /dev/null
+++ b/src/api/wms/team/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface TeamVO {
+  code: string
+  name: string
+  description: string
+  members: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  available: string
+}
+
+// 查询班组列表
+export const getTeamPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/team/senior', data })
+  } else {
+    return await request.get({ url: `/wms/team/page`, params })
+  }
+}
+
+// 查询班组详情
+export const getTeam = async (id: number) => {
+  return await request.get({ url: `/wms/team/get?id=` + id })
+}
+
+// 新增班组
+export const createTeam = async (data: TeamVO) => {
+  return await request.post({ url: `/wms/team/create`, data })
+}
+
+// 修改班组
+export const updateTeam = async (data: TeamVO) => {
+  return await request.put({ url: `/wms/team/update`, data })
+}
+
+// 删除班组
+export const deleteTeam = async (id: number) => {
+  return await request.delete({ url: `/wms/team/delete?id=` + id })
+}
+
+// 导出班组 Excel
+export const exportTeam = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/team/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/team/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/team/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/transaction/index.ts b/src/api/wms/transaction/index.ts
new file mode 100644
index 000000000..98b4a8aea
--- /dev/null
+++ b/src/api/wms/transaction/index.ts
@@ -0,0 +1,77 @@
+import request from '@/config/axios'
+
+export interface TransactionVO {
+  number: string
+  transactionType: string
+  inventoryAction: string
+  worker: string
+  businessType: string
+  recordNumber: string
+  activeTime: Date
+  itemCode: string
+  batch: string
+  inventoryStatus: string
+  uom: string
+  qty: number
+  singlePrice: number
+  amount: number
+  altBatch: string
+  arriveDate: Date
+  produceDate: Date
+  expireDate: Date
+  packingNumber: string
+  containerNumber: string
+  locationCode: string
+  warehouseCode: string
+  areaCode: string
+  locationGroupCode: string
+  erpLocationCode: string
+  ownerCode: string
+}
+
+// 查询库存事务列表
+export const getTransactionPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transaction/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transaction/page`, params })
+  }
+}
+
+// 查询库存事务详情
+export const getTransaction = async (id: number) => {
+  return await request.get({ url: `/wms/transaction/get?id=` + id })
+}
+
+// 新增库存事务
+export const createTransaction = async (data: TransactionVO) => {
+  return await request.post({ url: `/wms/transaction/create`, data })
+}
+
+// 修改库存事务
+export const updateTransaction = async (data: TransactionVO) => {
+  return await request.put({ url: `/wms/transaction/update`, data })
+}
+
+// 删除库存事务
+export const deleteTransaction = async (id: number) => {
+  return await request.delete({ url: `/wms/transaction/delete?id=` + id })
+}
+
+// 导出库存事务 Excel
+export const exportTransaction = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transaction/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transaction/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transaction/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/transactiontype/index.ts b/src/api/wms/transactiontype/index.ts
new file mode 100644
index 000000000..56d65f367
--- /dev/null
+++ b/src/api/wms/transactiontype/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface TransactiontypeVO {
+  code: string
+  name: string
+  description: string
+  inventoryAction: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  allowNegative: string
+  available: string
+  isSoftDeleted: string
+}
+
+// 查询事务类型列表
+export const getTransactiontypePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/transactiontype/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transactiontype/page`, params })
+  }
+}
+
+// 查询事务类型详情
+export const getTransactiontype = async (id: number) => {
+  return await request.get({ url: `/wms/transactiontype/get?id=` + id })
+}
+
+// 新增事务类型
+export const createTransactiontype = async (data: TransactiontypeVO) => {
+  return await request.post({ url: `/wms/transactiontype/create`, data })
+}
+
+// 修改事务类型
+export const updateTransactiontype = async (data: TransactiontypeVO) => {
+  return await request.put({ url: `/wms/transactiontype/update`, data })
+}
+
+// 删除事务类型
+export const deleteTransactiontype = async (id: number) => {
+  return await request.delete({ url: `/wms/transactiontype/delete?id=` + id })
+}
+
+// 导出事务类型 Excel
+export const exportTransactiontype = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.downloadPost({ url: '/wms/transactiontype/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transactiontype/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transactiontype/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/transferissueJobDetail/index.ts b/src/api/wms/transferissueJobDetail/index.ts
new file mode 100644
index 000000000..3837dcb28
--- /dev/null
+++ b/src/api/wms/transferissueJobDetail/index.ts
@@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+export interface TransferissueJobDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  fromLocationCode: string
+  toLocationCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询调拨出库任务子列表
+export const getTransferissueJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferissue-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transferissue-job-detail/page`, params })
+  }
+}
+
+// 查询调拨出库任务子详情
+export const getTransferissueJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/transferissue-job-detail/get?id=` + id })
+}
+
+// 新增调拨出库任务子
+export const createTransferissueJobDetail = async (data: TransferissueJobDetailVO) => {
+  return await request.post({ url: `/wms/transferissue-job-detail/create`, data })
+}
+
+// 修改调拨出库任务子
+export const updateTransferissueJobDetail = async (data: TransferissueJobDetailVO) => {
+  return await request.put({ url: `/wms/transferissue-job-detail/update`, data })
+}
+
+// 删除调拨出库任务子
+export const deleteTransferissueJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/transferissue-job-detail/delete?id=` + id })
+}
+
+// 导出调拨出库任务子 Excel
+export const exportTransferissueJobDetail = async (params) => {
+  return await request.download({ url: `/wms/transferissue-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transferissue-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/transferissueJobMain/index.ts b/src/api/wms/transferissueJobMain/index.ts
new file mode 100644
index 000000000..b24c424ab
--- /dev/null
+++ b/src/api/wms/transferissueJobMain/index.ts
@@ -0,0 +1,107 @@
+import request from '@/config/axios'
+
+export interface TransferissueJobMainVO {
+  requestNumber: string
+  deliverDock: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  fromAreaCodes: string
+  fromDockCode: string
+  toAreaCodes: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询调拨出库任务主列表
+export const getTransferissueJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferissue-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transferissue-job-main/page`, params })
+  }
+}
+
+// 查询调拨出库任务主详情
+export const getTransferissueJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/transferissue-job-main/get?id=` + id })
+}
+
+// 新增调拨出库任务主
+export const createTransferissueJobMain = async (data: TransferissueJobMainVO) => {
+  return await request.post({ url: `/wms/transferissue-job-main/create`, data })
+}
+
+// 修改调拨出库任务主
+export const updateTransferissueJobMain = async (data: TransferissueJobMainVO) => {
+  return await request.put({ url: `/wms/transferissue-job-main/update`, data })
+}
+
+// 删除调拨出库任务主
+export const deleteTransferissueJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/transferissue-job-main/delete?id=` + id })
+}
+
+// 导出调拨出库任务主 Excel
+export const exportTransferissueJobMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/transferissue-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transferissue-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transferissue-job-main/get-import-template' })
+}
+
+// 关闭-调拨出库任务主
+export const closeTransferissueJobMain = (id: number) => {
+  return request.download({ url: '/wms/transferissue-job-main/close?id=' + id })
+}
+
+// 承接-调拨出库任务主
+export const acceptTransferissueJobMain = (id: number) => {
+  return request.download({ url: '/wms/transferissue-job-main/accept?id=' + id })
+}
+
+// 放弃-调拨出库任务主
+export const abandonTransferissueJobMain = (id: number) => {
+  return request.download({ url: '/wms/transferissue-job-main/abandon?id=' + id })
+}
diff --git a/src/api/wms/transferissueRecordDetail/index.ts b/src/api/wms/transferissueRecordDetail/index.ts
new file mode 100644
index 000000000..507b9aa51
--- /dev/null
+++ b/src/api/wms/transferissueRecordDetail/index.ts
@@ -0,0 +1,74 @@
+import request from '@/config/axios'
+
+export interface TransferissueRecordDetailVO {
+  fromBatch: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  toOwnerCode: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  code: string
+  interfaceType: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  jobDetailId: string
+  fromPackingNumber: string
+  toPackingNumber: string
+  fromContainerNumber: string
+  toContainerNumber: string
+  toBatch: string
+}
+
+// 查询调拨出库记录子列表
+export const getTransferissueRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferissue-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transferissue-record-detail/page`, params })
+  }
+}
+
+// 查询调拨出库记录子详情
+export const getTransferissueRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/transferissue-record-detail/get?id=` + id })
+}
+
+// 新增调拨出库记录子
+export const createTransferissueRecordDetail = async (data: TransferissueRecordDetailVO) => {
+  return await request.post({ url: `/wms/transferissue-record-detail/create`, data })
+}
+
+// 修改调拨出库记录子
+export const updateTransferissueRecordDetail = async (data: TransferissueRecordDetailVO) => {
+  return await request.put({ url: `/wms/transferissue-record-detail/update`, data })
+}
+
+// 删除调拨出库记录子
+export const deleteTransferissueRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/transferissue-record-detail/delete?id=` + id })
+}
+
+// 导出调拨出库记录子 Excel
+export const exportTransferissueRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/transferissue-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transferissue-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/transferissueRecordMain/index.ts b/src/api/wms/transferissueRecordMain/index.ts
new file mode 100644
index 000000000..fc4124135
--- /dev/null
+++ b/src/api/wms/transferissueRecordMain/index.ts
@@ -0,0 +1,78 @@
+import request from '@/config/axios'
+
+export interface TransferissueRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  code: string
+  interfaceType: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromDockCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toAreaTypes: string
+  toAreaCodes: string
+  available: string
+}
+
+// 查询调拨出库记录主列表
+export const getTransferissueRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferissue-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transferissue-record-main/page`, params })
+  }
+}
+
+// 查询调拨出库记录主详情
+export const getTransferissueRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/transferissue-record-main/get?id=` + id })
+}
+
+// 新增调拨出库记录主
+export const createTransferissueRecordMain = async (data: TransferissueRecordMainVO) => {
+  return await request.post({ url: `/wms/transferissue-record-main/create`, data })
+}
+
+// 修改调拨出库记录主
+export const updateTransferissueRecordMain = async (data: TransferissueRecordMainVO) => {
+  return await request.put({ url: `/wms/transferissue-record-main/update`, data })
+}
+
+// 删除调拨出库记录主
+export const deleteTransferissueRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/transferissue-record-main/delete?id=` + id })
+}
+
+// 导出调拨出库记录主 Excel
+export const exportTransferissueRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferissue-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transferissue-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transferissue-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/transferissueRequestDetail/index.ts b/src/api/wms/transferissueRequestDetail/index.ts
new file mode 100644
index 000000000..fc8fde3ca
--- /dev/null
+++ b/src/api/wms/transferissueRequestDetail/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface TransferissueRequestDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  toOwnerCode: string
+  toLocationCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  fromOwnerCode: string
+  fromLocationCode: string
+  reason: string
+}
+
+// 查询调拨出库申请子列表
+export const getTransferissueRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferissue-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transferissue-request-detail/page`, params })
+  }
+}
+
+// 查询调拨出库申请子详情
+export const getTransferissueRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/transferissue-request-detail/get?id=` + id })
+}
+
+// 新增调拨出库申请子
+export const createTransferissueRequestDetail = async (data: TransferissueRequestDetailVO) => {
+  return await request.post({ url: `/wms/transferissue-request-detail/create`, data })
+}
+
+// 修改调拨出库申请子
+export const updateTransferissueRequestDetail = async (data: TransferissueRequestDetailVO) => {
+  return await request.put({ url: `/wms/transferissue-request-detail/update`, data })
+}
+
+// 删除调拨出库申请子
+export const deleteTransferissueRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/transferissue-request-detail/delete?id=` + id })
+}
+
+// 导出调拨出库申请子 Excel
+export const exportTransferissueRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/transferissue-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transferissue-request-detail/get-import-template' })
+}
diff --git a/src/api/wms/transferissueRequestMain/index.ts b/src/api/wms/transferissueRequestMain/index.ts
new file mode 100644
index 000000000..5e08ee1cd
--- /dev/null
+++ b/src/api/wms/transferissueRequestMain/index.ts
@@ -0,0 +1,106 @@
+import request from '@/config/axios'
+
+export interface TransferissueRequestMainVO {
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  fromWarehouseCode: string
+  fromDockCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询调拨出库申请主列表
+export const getTransferissueRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferissue-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transferissue-request-main/page`, params })
+  }
+}
+
+// 查询调拨出库申请主详情
+export const getTransferissueRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/transferissue-request-main/get?id=` + id })
+}
+
+// 新增-调拨出库申请主
+export const createTransferissueRequestMain = async (data: TransferissueRequestMainVO) => {
+  return await request.post({ url: `/wms/transferissue-request-main/create`, data })
+}
+
+// 修改-调拨出库申请主
+export const updateTransferissueRequestMain = async (data: TransferissueRequestMainVO) => {
+  return await request.put({ url: `/wms/transferissue-request-main/update`, data })
+}
+
+// 删除-调拨出库申请主
+export const deleteTransferissueRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/transferissue-request-main/delete?id=` + id })
+}
+
+// 导出-调拨出库申请主 Excel
+export const exportTransferissueRequestMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/transferissue-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transferissue-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transferissue-request-main/get-import-template' })
+}
+
+// 关闭-调拨出库申请
+export const closeTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/close?id=` + id })
+}
+
+// 重新添加-调拨出库申请
+export const reAddTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-调拨出库申请
+export const submitTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/submit?id=` + id })
+}
+
+// 审批驳回-调拨出库申请
+export const refusedTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/refused?id=` + id })
+}
+
+// 审批通过-调拨出库申请
+export const agreeTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/agree?id=` + id })
+}
+
+// 处理-调拨出库申请
+export const handleTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/handle?id=` + id })
+}
diff --git a/src/api/wms/transferlog/index.ts b/src/api/wms/transferlog/index.ts
new file mode 100644
index 000000000..f24fc1e3b
--- /dev/null
+++ b/src/api/wms/transferlog/index.ts
@@ -0,0 +1,86 @@
+import request from '@/config/axios'
+
+export interface TransferlogVO {
+  number: string
+  transactionType: string
+  worker: string
+  businessType: string
+  recordNumber: string
+  activeTime: Date
+  itemCode: string
+  uom: string
+  qty: number
+  altBatch: string
+  arriveDate: Date
+  produceDate: Date
+  expireDate: Date
+  fomTransactionNumber: string
+  fromPackingNumber: string
+  fromBatch: string
+  fromInventoryStatus: string
+  fromContainerNumber: string
+  fromLocationCode: string
+  fromWarehouseCode: string
+  fromAreaCode: string
+  fromLocationGroupCode: string
+  fromErpLocationCode: string
+  fromOwnerCode: string
+  toTransactionNumber: string
+  toPackingNumber: string
+  toBatch: string
+  toInventoryStatus: string
+  toContainerNumber: string
+  toLocationCode: string
+  toWarehouseCode: string
+  toAreaCode: string
+  toLocationGroupCode: string
+  toErpLocationCode: string
+  toOwnerCode: string
+}
+
+// 查询库存转移日志列表
+export const getTransferlogPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferlog/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transferlog/page`, params })
+  }
+}
+
+// 查询库存转移日志详情
+export const getTransferlog = async (id: number) => {
+  return await request.get({ url: `/wms/transferlog/get?id=` + id })
+}
+
+// 新增库存转移日志
+export const createTransferlog = async (data: TransferlogVO) => {
+  return await request.post({ url: `/wms/transferlog/create`, data })
+}
+
+// 修改库存转移日志
+export const updateTransferlog = async (data: TransferlogVO) => {
+  return await request.put({ url: `/wms/transferlog/update`, data })
+}
+
+// 删除库存转移日志
+export const deleteTransferlog = async (id: number) => {
+  return await request.delete({ url: `/wms/transferlog/delete?id=` + id })
+}
+
+// 导出库存转移日志 Excel
+export const exportTransferlog = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferlog/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transferlog/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transferlog/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/transferreceiptJobDetail/index.ts b/src/api/wms/transferreceiptJobDetail/index.ts
new file mode 100644
index 000000000..f424cc47d
--- /dev/null
+++ b/src/api/wms/transferreceiptJobDetail/index.ts
@@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+export interface TransferreceiptJobDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  fromLocationCode: string
+  toLocationCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询调拨入库任务子列表
+export const getTransferreceiptJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferreceipt-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transferreceipt-job-detail/page`, params })
+  }
+}
+
+// 查询调拨入库任务子详情
+export const getTransferreceiptJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/transferreceipt-job-detail/get?id=` + id })
+}
+
+// 新增调拨入库任务子
+export const createTransferreceiptJobDetail = async (data: TransferreceiptJobDetailVO) => {
+  return await request.post({ url: `/wms/transferreceipt-job-detail/create`, data })
+}
+
+// 修改调拨入库任务子
+export const updateTransferreceiptJobDetail = async (data: TransferreceiptJobDetailVO) => {
+  return await request.put({ url: `/wms/transferreceipt-job-detail/update`, data })
+}
+
+// 删除调拨入库任务子
+export const deleteTransferreceiptJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/transferreceipt-job-detail/delete?id=` + id })
+}
+
+// 导出调拨入库任务子 Excel
+export const exportTransferreceiptJobDetail = async (params) => {
+  return await request.download({ url: `/wms/transferreceipt-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transferreceipt-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/transferreceiptJobMain/index.ts b/src/api/wms/transferreceiptJobMain/index.ts
new file mode 100644
index 000000000..ab8fe4e41
--- /dev/null
+++ b/src/api/wms/transferreceiptJobMain/index.ts
@@ -0,0 +1,91 @@
+import request from '@/config/axios'
+
+export interface TransferreceiptJobMainVO {
+  requestNumber: string
+  toDockCode: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromAreaCodes: string
+  toAreaCodes: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询调拨入库任务主列表
+export const getTransferreceiptJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferreceipt-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transferreceipt-job-main/page`, params })
+  }
+}
+
+// 查询调拨入库任务主详情
+export const getTransferreceiptJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/transferreceipt-job-main/get?id=` + id })
+}
+
+// 新增调拨入库任务主
+export const createTransferreceiptJobMain = async (data: TransferreceiptJobMainVO) => {
+  return await request.post({ url: `/wms/transferreceipt-job-main/create`, data })
+}
+
+// 修改调拨入库任务主
+export const updateTransferreceiptJobMain = async (data: TransferreceiptJobMainVO) => {
+  return await request.put({ url: `/wms/transferreceipt-job-main/update`, data })
+}
+
+// 删除调拨入库任务主
+export const deleteTransferreceiptJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/transferreceipt-job-main/delete?id=` + id })
+}
+
+// 导出调拨入库任务主 Excel
+export const exportTransferreceiptJobMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/transferreceipt-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transferreceipt-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transferreceipt-job-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/transferreceiptRecordDetail/index.ts b/src/api/wms/transferreceiptRecordDetail/index.ts
new file mode 100644
index 000000000..869ea1e6b
--- /dev/null
+++ b/src/api/wms/transferreceiptRecordDetail/index.ts
@@ -0,0 +1,74 @@
+import request from '@/config/axios'
+
+export interface TransferreceiptRecordDetailVO {
+  fromBatch: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  toOwnerCode: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  jobDetailId: string
+  fromPackingNumber: string
+  toPackingNumber: string
+  fromContainerNumber: string
+  toContainerNumber: string
+  toBatch: string
+}
+
+// 查询调拨入库记录子列表
+export const getTransferreceiptRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferreceipt-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transferreceipt-record-detail/page`, params })
+  }
+}
+
+// 查询调拨入库记录子详情
+export const getTransferreceiptRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/transferreceipt-record-detail/get?id=` + id })
+}
+
+// 新增调拨入库记录子
+export const createTransferreceiptRecordDetail = async (data: TransferreceiptRecordDetailVO) => {
+  return await request.post({ url: `/wms/transferreceipt-record-detail/create`, data })
+}
+
+// 修改调拨入库记录子
+export const updateTransferreceiptRecordDetail = async (data: TransferreceiptRecordDetailVO) => {
+  return await request.put({ url: `/wms/transferreceipt-record-detail/update`, data })
+}
+
+// 删除调拨入库记录子
+export const deleteTransferreceiptRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/transferreceipt-record-detail/delete?id=` + id })
+}
+
+// 导出调拨入库记录子 Excel
+export const exportTransferreceiptRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/transferreceipt-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transferreceipt-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/transferreceiptRecordMain/index.ts b/src/api/wms/transferreceiptRecordMain/index.ts
new file mode 100644
index 000000000..ad358f00f
--- /dev/null
+++ b/src/api/wms/transferreceiptRecordMain/index.ts
@@ -0,0 +1,79 @@
+import request from '@/config/axios'
+
+export interface TransferreceiptRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  receiptDock: string
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  code: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toDockCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  available: string
+}
+
+// 查询调拨入库记录主列表
+export const getTransferreceiptRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferreceipt-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transferreceipt-record-main/page`, params })
+  }
+}
+
+// 查询调拨入库记录主详情
+export const getTransferreceiptRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/transferreceipt-record-main/get?id=` + id })
+}
+
+// 新增调拨入库记录主
+export const createTransferreceiptRecordMain = async (data: TransferreceiptRecordMainVO) => {
+  return await request.post({ url: `/wms/transferreceipt-record-main/create`, data })
+}
+
+// 修改调拨入库记录主
+export const updateTransferreceiptRecordMain = async (data: TransferreceiptRecordMainVO) => {
+  return await request.put({ url: `/wms/transferreceipt-record-main/update`, data })
+}
+
+// 删除调拨入库记录主
+export const deleteTransferreceiptRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/transferreceipt-record-main/delete?id=` + id })
+}
+
+// 导出调拨入库记录主 Excel
+export const exportTransferreceiptRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/transferreceipt-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transferreceipt-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transferreceipt-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/transferreceiptRequestDetail/index.ts b/src/api/wms/transferreceiptRequestDetail/index.ts
new file mode 100644
index 000000000..bcaa5b2a1
--- /dev/null
+++ b/src/api/wms/transferreceiptRequestDetail/index.ts
@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface TransferreceiptRequestDetailVO {
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  fromLocationCode: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  toOwnerCode: string
+}
+
+// 查询调拨入库申请子列表
+export const getTransferreceiptRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferreceipt-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transferreceipt-request-detail/page`, params })
+  }
+}
+
+// 查询调拨入库申请子详情
+export const getTransferreceiptRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/transferreceipt-request-detail/get?id=` + id })
+}
+
+// 新增调拨入库申请子
+export const createTransferreceiptRequestDetail = async (data: TransferreceiptRequestDetailVO) => {
+  return await request.post({ url: `/wms/transferreceipt-request-detail/create`, data })
+}
+
+// 修改调拨入库申请子
+export const updateTransferreceiptRequestDetail = async (data: TransferreceiptRequestDetailVO) => {
+  return await request.put({ url: `/wms/transferreceipt-request-detail/update`, data })
+}
+
+// 删除调拨入库申请子
+export const deleteTransferreceiptRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/transferreceipt-request-detail/delete?id=` + id })
+}
+
+// 导出调拨入库申请子 Excel
+export const exportTransferreceiptRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/transferreceipt-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transferreceipt-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/transferreceiptRequestMain/index.ts b/src/api/wms/transferreceiptRequestMain/index.ts
new file mode 100644
index 000000000..69f1c5114
--- /dev/null
+++ b/src/api/wms/transferreceiptRequestMain/index.ts
@@ -0,0 +1,106 @@
+import request from '@/config/axios'
+
+export interface TransferreceiptRequestMainVO {
+  carrierCode: string
+  transferMode: string
+  vehiclePlateNumber: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  fromWarehouseCode: string
+  toDockCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询调拨入库申请主列表
+export const getTransferreceiptRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferreceipt-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transferreceipt-request-main/page`, params })
+  }
+}
+
+// 查询调拨入库申请主详情
+export const getTransferreceiptRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/transferreceipt-request-main/get?id=` + id })
+}
+
+// 新增调拨入库申请主
+export const createTransferreceiptRequestMain = async (data: TransferreceiptRequestMainVO) => {
+  return await request.post({ url: `/wms/transferreceipt-request-main/create`, data })
+}
+
+// 修改调拨入库申请主
+export const updateTransferreceiptRequestMain = async (data: TransferreceiptRequestMainVO) => {
+  return await request.put({ url: `/wms/transferreceipt-request-main/update`, data })
+}
+
+// 删除调拨入库申请主
+export const deleteTransferreceiptRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/transferreceipt-request-main/delete?id=` + id })
+}
+
+// 导出调拨入库申请主 Excel
+export const exportTransferreceiptRequestMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/transferreceipt-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transferreceipt-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  // return request.download({ url: '/wms/transferreceipt-request-main/get-import-template' })
+}
+
+// 关闭-调拨入库申请
+export const closeTransferreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferreceipt-request-main/close?id=` + id })
+}
+
+// 重新添加-调拨入库申请
+export const reAddTransferreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferreceipt-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-调拨入库申请
+export const submitTransferreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferreceipt-request-main/submit?id=` + id })
+}
+
+// 审批驳回-调拨入库申请
+export const refusedTransferreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferreceipt-request-main/refused?id=` + id })
+}
+
+// 审批通过-调拨入库申请
+export const agreeTransferreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferreceipt-request-main/agree?id=` + id })
+}
+
+// 处理-调拨入库申请
+export const handleTransferreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferreceipt-request-main/handle?id=` + id })
+}
diff --git a/src/api/wms/unplannedissueJobDetail/index.ts b/src/api/wms/unplannedissueJobDetail/index.ts
new file mode 100644
index 000000000..62afa1fb9
--- /dev/null
+++ b/src/api/wms/unplannedissueJobDetail/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface UnplannedissueJobDetailVO {
+  ownerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  fromLocationCode: string
+  inventoryStatus: string
+  reason: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+}
+
+// 查询计划外出库任务子列表
+export const getUnplannedissueJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/unplannedissue-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/unplannedissue-job-detail/page`, params })
+  }
+}
+
+// 查询计划外出库任务子详情
+export const getUnplannedissueJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedissue-job-detail/get?id=` + id })
+}
+
+// 新增计划外出库任务子
+export const createUnplannedissueJobDetail = async (data: UnplannedissueJobDetailVO) => {
+  return await request.post({ url: `/wms/unplannedissue-job-detail/create`, data })
+}
+
+// 修改计划外出库任务子
+export const updateUnplannedissueJobDetail = async (data: UnplannedissueJobDetailVO) => {
+  return await request.put({ url: `/wms/unplannedissue-job-detail/update`, data })
+}
+
+// 删除计划外出库任务子
+export const deleteUnplannedissueJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedissue-job-detail/delete?id=` + id })
+}
+
+// 导出计划外出库任务子 Excel
+export const exportUnplannedissueJobDetail = async (params) => {
+  return await request.download({ url: `/wms/unplannedissue-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/unplannedissue-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/unplannedissueJobMain/index.ts b/src/api/wms/unplannedissueJobMain/index.ts
new file mode 100644
index 000000000..5a230b649
--- /dev/null
+++ b/src/api/wms/unplannedissueJobMain/index.ts
@@ -0,0 +1,85 @@
+import request from '@/config/axios'
+
+export interface UnplannedissueJobMainVO {
+  requestNumber: string
+  fromWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  fromAreaCodes: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询计划外出库任务主列表
+export const getUnplannedissueJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/unplannedissue-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/unplannedissue-job-main/page`, params })
+  }
+}
+
+// 查询计划外出库任务主详情
+export const getUnplannedissueJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedissue-job-main/get?id=` + id })
+}
+
+// 新增计划外出库任务主
+export const createUnplannedissueJobMain = async (data: UnplannedissueJobMainVO) => {
+  return await request.post({ url: `/wms/unplannedissue-job-main/create`, data })
+}
+
+// 修改计划外出库任务主
+export const updateUnplannedissueJobMain = async (data: UnplannedissueJobMainVO) => {
+  return await request.put({ url: `/wms/unplannedissue-job-main/update`, data })
+}
+
+// 删除计划外出库任务主
+export const deleteUnplannedissueJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedissue-job-main/delete?id=` + id })
+}
+
+// 导出计划外出库任务主 Excel
+export const exportUnplannedissueJobMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/unplannedissue-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/unplannedissue-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/unplannedissue-job-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/unplannedissueRecordDetail/index.ts b/src/api/wms/unplannedissueRecordDetail/index.ts
new file mode 100644
index 000000000..a8dd317ea
--- /dev/null
+++ b/src/api/wms/unplannedissueRecordDetail/index.ts
@@ -0,0 +1,70 @@
+import request from '@/config/axios'
+
+export interface UnplannedissueRecordDetailVO {
+  ownerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  inventoryStatus: string
+  reason: string
+  singlePrice: number
+  amount: number
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  jobDetailId: string
+}
+
+// 查询计划外出库记录子列表
+export const getUnplannedissueRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/unplannedissue-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/unplannedissue-record-detail/page`, params })
+  }
+}
+
+// 查询计划外出库记录子详情
+export const getUnplannedissueRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedissue-record-detail/get?id=` + id })
+}
+
+// 新增计划外出库记录子
+export const createUnplannedissueRecordDetail = async (data: UnplannedissueRecordDetailVO) => {
+  return await request.post({ url: `/wms/unplannedissue-record-detail/create`, data })
+}
+
+// 修改计划外出库记录子
+export const updateUnplannedissueRecordDetail = async (data: UnplannedissueRecordDetailVO) => {
+  return await request.put({ url: `/wms/unplannedissue-record-detail/update`, data })
+}
+
+// 删除计划外出库记录子
+export const deleteUnplannedissueRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedissue-record-detail/delete?id=` + id })
+}
+
+// 导出计划外出库记录子 Excel
+export const exportUnplannedissueRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/unplannedissue-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/unplannedissue-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/unplannedissueRecordMain/index.ts b/src/api/wms/unplannedissueRecordMain/index.ts
new file mode 100644
index 000000000..41c4cac1b
--- /dev/null
+++ b/src/api/wms/unplannedissueRecordMain/index.ts
@@ -0,0 +1,72 @@
+import request from '@/config/axios'
+
+export interface UnplannedissueRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  code: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creatorId: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  fromDockCode: string
+  available: string
+}
+
+// 查询计划外出库记录主列表
+export const getUnplannedissueRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/unplannedissue-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/unplannedissue-record-main/page`, params })
+  }
+}
+
+// 查询计划外出库记录主详情
+export const getUnplannedissueRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedissue-record-main/get?id=` + id })
+}
+
+// 新增计划外出库记录主
+export const createUnplannedissueRecordMain = async (data: UnplannedissueRecordMainVO) => {
+  return await request.post({ url: `/wms/unplannedissue-record-main/create`, data })
+}
+
+// 修改计划外出库记录主
+export const updateUnplannedissueRecordMain = async (data: UnplannedissueRecordMainVO) => {
+  return await request.put({ url: `/wms/unplannedissue-record-main/update`, data })
+}
+
+// 删除计划外出库记录主
+export const deleteUnplannedissueRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedissue-record-main/delete?id=` + id })
+}
+
+// 导出计划外出库记录主 Excel
+export const exportUnplannedissueRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/unplannedissue-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/unplannedissue-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/unplannedissue-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/unplannedissueRequestDetail/index.ts b/src/api/wms/unplannedissueRequestDetail/index.ts
new file mode 100644
index 000000000..e5105fcb8
--- /dev/null
+++ b/src/api/wms/unplannedissueRequestDetail/index.ts
@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface UnplannedissueRequestDetailVO {
+  fromOwnerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  fromLocationCode: string
+  inventoryStatus: string
+  reason: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+}
+
+// 查询计划外出库申请子列表
+export const getUnplannedissueRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/unplannedissue-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/unplannedissue-request-detail/page`, params })
+  }
+}
+
+// 查询计划外出库申请子详情
+export const getUnplannedissueRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedissue-request-detail/get?id=` + id })
+}
+
+// 新增计划外出库申请子
+export const createUnplannedissueRequestDetail = async (data: UnplannedissueRequestDetailVO) => {
+  return await request.post({ url: `/wms/unplannedissue-request-detail/create`, data })
+}
+
+// 修改计划外出库申请子
+export const updateUnplannedissueRequestDetail = async (data: UnplannedissueRequestDetailVO) => {
+  return await request.put({ url: `/wms/unplannedissue-request-detail/update`, data })
+}
+
+// 删除计划外出库申请子
+export const deleteUnplannedissueRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedissue-request-detail/delete?id=` + id })
+}
+
+// 导出计划外出库申请子 Excel
+export const exportUnplannedissueRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/unplannedissue-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/unplannedissue-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/unplannedissueRequestMain/index.ts b/src/api/wms/unplannedissueRequestMain/index.ts
new file mode 100644
index 000000000..62738b340
--- /dev/null
+++ b/src/api/wms/unplannedissueRequestMain/index.ts
@@ -0,0 +1,99 @@
+import request from '@/config/axios'
+
+export interface UnplannedissueRequestMainVO {
+  fromWarehouseCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  concurrencyStamp: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询计划外出库申请主列表
+export const getUnplannedissueRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/unplannedissue-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/unplannedissue-request-main/page`, params })
+  }
+}
+
+// 查询计划外出库申请主详情
+export const getUnplannedissueRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedissue-request-main/get?id=` + id })
+}
+
+// 新增计划外出库申请主
+export const createUnplannedissueRequestMain = async (data: UnplannedissueRequestMainVO) => {
+  return await request.post({ url: `/wms/unplannedissue-request-main/create`, data })
+}
+
+// 修改计划外出库申请主
+export const updateUnplannedissueRequestMain = async (data: UnplannedissueRequestMainVO) => {
+  return await request.put({ url: `/wms/unplannedissue-request-main/update`, data })
+}
+
+// 删除计划外出库申请主
+export const deleteUnplannedissueRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedissue-request-main/delete?id=` + id })
+}
+
+// 导出计划外出库申请主 Excel
+export const exportUnplannedissueRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/unplannedissue-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/unplannedissue-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/unplannedissue-request-main/get-import-template' })
+}
+
+// 关闭-计划外出库申请
+export const closeUnplannedissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedissue-request-main/close?id=` + id })
+}
+
+// 重新添加-计划外出库申请
+export const reAddUnplannedissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedissue-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-计划外出库申请
+export const submitUnplannedissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedissue-request-main/submit?id=` + id })
+}
+
+// 审批驳回-计划外出库申请
+export const refusedUnplannedissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedissue-request-main/refused?id=` + id })
+}
+
+// 审批通过-计划外出库申请
+export const agreeUnplannedissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedissue-request-main/agree?id=` + id })
+}
+
+// 处理-计划外出库申请
+export const handleUnplannedissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedissue-request-main/handle?id=` + id })
+}
diff --git a/src/api/wms/unplannedreceiptJobDetail/index.ts b/src/api/wms/unplannedreceiptJobDetail/index.ts
new file mode 100644
index 000000000..450f8130a
--- /dev/null
+++ b/src/api/wms/unplannedreceiptJobDetail/index.ts
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface UnplannedreceiptJobDetailVO {
+  ownerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  altBatch: string
+  arriveDate: Date
+  produceDate: Date
+  expireDate: Date
+  toLocationCode: string
+  inventoryStatus: string
+  reason: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  number: string
+  remark: string
+  createTime: Date
+  creator: string
+}
+
+// 查询计划外入库任务子列表
+export const getUnplannedreceiptJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/unplannedreceipt-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/unplannedreceipt-job-detail/page`, params })
+  }
+}
+
+// 查询计划外入库任务子详情
+export const getUnplannedreceiptJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedreceipt-job-detail/get?id=` + id })
+}
+
+// 新增计划外入库任务子
+export const createUnplannedreceiptJobDetail = async (data: UnplannedreceiptJobDetailVO) => {
+  return await request.post({ url: `/wms/unplannedreceipt-job-detail/create`, data })
+}
+
+// 修改计划外入库任务子
+export const updateUnplannedreceiptJobDetail = async (data: UnplannedreceiptJobDetailVO) => {
+  return await request.put({ url: `/wms/unplannedreceipt-job-detail/update`, data })
+}
+
+// 删除计划外入库任务子
+export const deleteUnplannedreceiptJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedreceipt-job-detail/delete?id=` + id })
+}
+
+// 导出计划外入库任务子 Excel
+export const exportUnplannedreceiptJobDetail = async (params) => {
+  return await request.download({ url: `/wms/unplannedreceipt-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/unplannedreceipt-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/unplannedreceiptJobMain/index.ts b/src/api/wms/unplannedreceiptJobMain/index.ts
new file mode 100644
index 000000000..0868c7db4
--- /dev/null
+++ b/src/api/wms/unplannedreceiptJobMain/index.ts
@@ -0,0 +1,85 @@
+import request from '@/config/axios'
+
+export interface UnplannedreceiptJobMainVO {
+  requestNumber: string
+  toWarehouseCode: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  updateTime: Date
+  updater: string
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  acceptUserId: string
+  acceptTime: Date
+  completeUserId: string
+  completeTime: Date
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  toAreaCodes: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+}
+
+// 查询计划外入库任务主列表
+export const getUnplannedreceiptJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/unplannedreceipt-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/unplannedreceipt-job-main/page`, params })
+  }
+}
+
+// 查询计划外入库任务主详情
+export const getUnplannedreceiptJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedreceipt-job-main/get?id=` + id })
+}
+
+// 新增计划外入库任务主
+export const createUnplannedreceiptJobMain = async (data: UnplannedreceiptJobMainVO) => {
+  return await request.post({ url: `/wms/unplannedreceipt-job-main/create`, data })
+}
+
+// 修改计划外入库任务主
+export const updateUnplannedreceiptJobMain = async (data: UnplannedreceiptJobMainVO) => {
+  return await request.put({ url: `/wms/unplannedreceipt-job-main/update`, data })
+}
+
+// 删除计划外入库任务主
+export const deleteUnplannedreceiptJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedreceipt-job-main/delete?id=` + id })
+}
+
+// 导出计划外入库任务主 Excel
+export const exportUnplannedreceiptJobMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/unplannedreceipt-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/unplannedreceipt-job-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/unplannedreceipt-job-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/unplannedreceiptRecordDetail/index.ts b/src/api/wms/unplannedreceiptRecordDetail/index.ts
new file mode 100644
index 000000000..458ebabed
--- /dev/null
+++ b/src/api/wms/unplannedreceiptRecordDetail/index.ts
@@ -0,0 +1,74 @@
+import request from '@/config/axios'
+
+export interface UnplannedreceiptRecordDetailVO {
+  ownerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  altBatch: string
+  arriveDate: Date
+  produceDate: Date
+  expireDate: Date
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  inventoryStatus: string
+  reason: string
+  singlePrice: number
+  amount: number
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  jobDetailId: string
+}
+
+// 查询计划外入库记录子列表
+export const getUnplannedreceiptRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/unplannedreceipt-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/unplannedreceipt-record-detail/page`, params })
+  }
+}
+
+// 查询计划外入库记录子详情
+export const getUnplannedreceiptRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedreceipt-record-detail/get?id=` + id })
+}
+
+// 新增计划外入库记录子
+export const createUnplannedreceiptRecordDetail = async (data: UnplannedreceiptRecordDetailVO) => {
+  return await request.post({ url: `/wms/unplannedreceipt-record-detail/create`, data })
+}
+
+// 修改计划外入库记录子
+export const updateUnplannedreceiptRecordDetail = async (data: UnplannedreceiptRecordDetailVO) => {
+  return await request.put({ url: `/wms/unplannedreceipt-record-detail/update`, data })
+}
+
+// 删除计划外入库记录子
+export const deleteUnplannedreceiptRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedreceipt-record-detail/delete?id=` + id })
+}
+
+// 导出计划外入库记录子 Excel
+export const exportUnplannedreceiptRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/unplannedreceipt-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/unplannedreceipt-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/unplannedreceiptRecordMain/index.ts b/src/api/wms/unplannedreceiptRecordMain/index.ts
new file mode 100644
index 000000000..bf684d705
--- /dev/null
+++ b/src/api/wms/unplannedreceiptRecordMain/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface UnplannedreceiptRecordMainVO {
+  requestNumber: string
+  jobNumber: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  code: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  available: string
+}
+
+// 查询计划外入库记录主列表
+export const getUnplannedreceiptRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/unplannedreceipt-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/unplannedreceipt-record-main/page`, params })
+  }
+}
+
+// 查询计划外入库记录主详情
+export const getUnplannedreceiptRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedreceipt-record-main/get?id=` + id })
+}
+
+// 新增计划外入库记录主
+export const createUnplannedreceiptRecordMain = async (data: UnplannedreceiptRecordMainVO) => {
+  return await request.post({ url: `/wms/unplannedreceipt-record-main/create`, data })
+}
+
+// 修改计划外入库记录主
+export const updateUnplannedreceiptRecordMain = async (data: UnplannedreceiptRecordMainVO) => {
+  return await request.put({ url: `/wms/unplannedreceipt-record-main/update`, data })
+}
+
+// 删除计划外入库记录主
+export const deleteUnplannedreceiptRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedreceipt-record-main/delete?id=` + id })
+}
+
+// 导出计划外入库记录主 Excel
+export const exportUnplannedreceiptRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/unplannedreceipt-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/unplannedreceipt-record-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/unplannedreceipt-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/unplannedreceiptRequestDetail/index.ts b/src/api/wms/unplannedreceiptRequestDetail/index.ts
new file mode 100644
index 000000000..c62a7e13f
--- /dev/null
+++ b/src/api/wms/unplannedreceiptRequestDetail/index.ts
@@ -0,0 +1,74 @@
+import request from '@/config/axios'
+
+export interface UnplannedreceiptRequestDetailVO {
+  toOwnerCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  altBatch: string
+  arriveDate: Date
+  produceDate: Date
+  expireDate: Date
+  toLocationCode: string
+  inventoryStatus: string
+  reason: string
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  updateTime: Date
+  updater: string
+}
+
+// 查询计划外入库申请子列表
+export const getUnplannedreceiptRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/unplannedreceipt-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/unplannedreceipt-request-detail/page`, params })
+  }
+}
+
+// 查询计划外入库申请子详情
+export const getUnplannedreceiptRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedreceipt-request-detail/get?id=` + id })
+}
+
+// 新增计划外入库申请子
+export const createUnplannedreceiptRequestDetail = async (data: UnplannedreceiptRequestDetailVO) => {
+  return await request.post({ url: `/wms/unplannedreceipt-request-detail/create`, data })
+}
+
+// 修改计划外入库申请子
+export const updateUnplannedreceiptRequestDetail = async (data: UnplannedreceiptRequestDetailVO) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-detail/update`, data })
+}
+
+// 删除计划外入库申请子
+export const deleteUnplannedreceiptRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedreceipt-request-detail/delete?id=` + id })
+}
+
+// 导出计划外入库申请子 Excel
+export const exportUnplannedreceiptRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/unplannedreceipt-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/unplannedreceipt-request-detail/get-import-template' })
+}
+
+// 创建包装信息后更新子表数据packingNumber
+export const updateDetailPackingNumber = async (id: number, number) => {
+  return await request.put({ url: '/wms/unplannedreceipt-request-detail/updateDetailPackingNumber?id=' + id + '&number=' + number })
+}
diff --git a/src/api/wms/unplannedreceiptRequestMain/index.ts b/src/api/wms/unplannedreceiptRequestMain/index.ts
new file mode 100644
index 000000000..67966664e
--- /dev/null
+++ b/src/api/wms/unplannedreceiptRequestMain/index.ts
@@ -0,0 +1,98 @@
+import request from '@/config/axios'
+
+export interface UnplannedreceiptRequestMainVO {
+  toWarehouseCode: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  updateTime: Date
+  updater: string
+  toAreaTypes: string
+  toAreaCodes: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+}
+
+// 查询计划外入库申请主列表
+export const getUnplannedreceiptRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/unplannedreceipt-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/unplannedreceipt-request-main/page`, params })
+  }
+}
+
+// 查询计划外入库申请主详情
+export const getUnplannedreceiptRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedreceipt-request-main/get?id=` + id })
+}
+
+// 新增计划外入库申请主
+export const createUnplannedreceiptRequestMain = async (data: UnplannedreceiptRequestMainVO) => {
+  return await request.post({ url: `/wms/unplannedreceipt-request-main/create`, data })
+}
+
+// 修改计划外入库申请主
+export const updateUnplannedreceiptRequestMain = async (data: UnplannedreceiptRequestMainVO) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/update`, data })
+}
+
+// 删除计划外入库申请主
+export const deleteUnplannedreceiptRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedreceipt-request-main/delete?id=` + id })
+}
+
+// 导出计划外入库申请主 Excel
+export const exportUnplannedreceiptRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/unplannedreceipt-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/unplannedreceipt-request-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/unplannedreceipt-request-main/get-import-template' })
+}
+
+// 关闭-计划外入库申请
+export const closeUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/close?id=` + id })
+}
+
+// 重新添加-计划外入库申请
+export const reAddUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-计划外入库申请
+export const submitUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/submit?id=` + id })
+}
+
+// 审批驳回-计划外入库申请
+export const refusedUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/refused?id=` + id })
+}
+
+// 审批通过-计划外入库申请
+export const agreeUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/agree?id=` + id })
+}
+
+// 处理-计划外入库申请
+export const handleUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/handle?id=` + id })
+}
diff --git a/src/api/wms/warehouse/index.ts b/src/api/wms/warehouse/index.ts
new file mode 100644
index 000000000..882fac24e
--- /dev/null
+++ b/src/api/wms/warehouse/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface WarehouseVO {
+  code: string
+  name: string
+  description: string
+  type: string
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询仓库列表
+export const getWarehousePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/warehouse/senior', data })
+  } else {
+    return await request.get({ url: `/wms/warehouse/page`, params })
+  }
+}
+// 查询仓库所有列表
+export const getWarehouseList = async (params) => {
+  return await request.get({ url: `/wms/warehouse/list`, params })
+}
+// 查询仓库详情
+export const getWarehouse = async (id: number) => {
+  return await request.get({ url: `/wms/warehouse/get?id=` + id })
+}
+
+// 新增仓库
+export const createWarehouse = async (data: WarehouseVO) => {
+  return await request.post({ url: `/wms/warehouse/create`, data })
+}
+
+// 修改仓库
+export const updateWarehouse = async (data: WarehouseVO) => {
+  return await request.put({ url: `/wms/warehouse/update`, data })
+}
+
+// 删除仓库
+export const deleteWarehouse = async (id: number) => {
+  return await request.delete({ url: `/wms/warehouse/delete?id=` + id })
+}
+
+// 导出仓库 Excel
+export const exportWarehouse = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/warehouse/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/warehouse/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/warehouse/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/workDetail/index.ts b/src/api/wms/workDetail/index.ts
new file mode 100644
index 000000000..2c5a1c81b
--- /dev/null
+++ b/src/api/wms/workDetail/index.ts
@@ -0,0 +1,47 @@
+import request from '@/config/axios'
+
+export interface WorkDetailVO {
+  lineNumber: string
+  projectCode: string
+  finishedQty: number
+  number: string
+  itemCode: string
+  remark: string
+  createTime: Date
+  creator: string
+  orderQty: number
+  uom: string
+  updateTime: Date
+  updater: string
+  available: string
+}
+
+// 查询生产订单子列表
+export const getWorkDetailPage = async (params) => {
+  return await request.get({ url: `/wms/work-detail/page`, params })
+}
+
+// 查询生产订单子详情
+export const getWorkDetail = async (id: number) => {
+  return await request.get({ url: `/wms/work-detail/get?id=` + id })
+}
+
+// 新增生产订单子
+export const createWorkDetail = async (data: WorkDetailVO) => {
+  return await request.post({ url: `/wms/work-detail/create`, data })
+}
+
+// 修改生产订单子
+export const updateWorkDetail = async (data: WorkDetailVO) => {
+  return await request.put({ url: `/wms/work-detail/update`, data })
+}
+
+// 删除生产订单子
+export const deleteWorkDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/work-detail/delete?id=` + id })
+}
+
+// 导出生产订单子 Excel
+export const exportWorkDetail = async (params) => {
+  return await request.download({ url: `/wms/work-detail/export-excel`, params })
+}
diff --git a/src/api/wms/workMain/index.ts b/src/api/wms/workMain/index.ts
new file mode 100644
index 000000000..6465bc701
--- /dev/null
+++ b/src/api/wms/workMain/index.ts
@@ -0,0 +1,59 @@
+import request from '@/config/axios'
+
+export interface WorkMainVO {
+  customerCode: string
+  type: string
+  orderDate: Date
+  dueDate: Date
+  version: string
+  number: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  updateTime: Date
+  updater: string
+  currentStage: number
+  available: string
+}
+
+// 查询生产订单主列表
+export const getWorkMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/work-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/work-main/page`, params })
+  }
+}
+
+// 查询生产订单主详情
+export const getWorkMain = async (id: number) => {
+  return await request.get({ url: `/wms/work-main/get?id=` + id })
+}
+
+// 新增生产订单主
+export const createWorkMain = async (data: WorkMainVO) => {
+  return await request.post({ url: `/wms/work-main/create`, data })
+}
+
+// 修改生产订单主
+export const updateWorkMain = async (data: WorkMainVO) => {
+  return await request.put({ url: `/wms/work-main/update`, data })
+}
+
+// 删除生产订单主
+export const deleteWorkMain = async (id: number) => {
+  return await request.delete({ url: `/wms/work-main/delete?id=` + id })
+}
+
+// 导出生产订单主 Excel
+export const exportWorkMain = async (params) => {
+  return await request.download({ url: `/wms/work-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/work-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/workshop/index.ts b/src/api/wms/workshop/index.ts
new file mode 100644
index 000000000..727253443
--- /dev/null
+++ b/src/api/wms/workshop/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface WorkshopVO {
+  code: string
+  name: string
+  description: string
+  type: string
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询车间列表
+export const getWorkshopPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/workshop/senior', data })
+  } else {
+    return await request.get({ url: `/wms/workshop/page`, params })
+  }
+}
+
+// 查询车间详情
+export const getWorkshop = async (id: number) => {
+  return await request.get({ url: `/wms/workshop/get?id=` + id })
+}
+
+// 新增车间
+export const createWorkshop = async (data: WorkshopVO) => {
+  return await request.post({ url: `/wms/workshop/create`, data })
+}
+
+// 修改车间
+export const updateWorkshop = async (data: WorkshopVO) => {
+  return await request.put({ url: `/wms/workshop/update`, data })
+}
+
+// 删除车间
+export const deleteWorkshop = async (id: number) => {
+  return await request.delete({ url: `/wms/workshop/delete?id=` + id })
+}
+
+// 导出车间 Excel
+export const exportWorkshop = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/workshop/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/workshop/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/workshop/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/workstation/index.ts b/src/api/wms/workstation/index.ts
new file mode 100644
index 000000000..5eef9a588
--- /dev/null
+++ b/src/api/wms/workstation/index.ts
@@ -0,0 +1,73 @@
+import request from '@/config/axios'
+
+export interface WorkstationVO {
+  code: string
+  name: string
+  description: string
+  type: string
+  workshopCode: string
+  productionLineCode: string
+  rawLocationCode: string
+  fgLocationCode: string
+  available: number
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询工位列表
+export const getWorkstationPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/workstation/senior', data })
+  } else {
+    return await request.get({ url: `/wms/workstation/page`, params })
+  }
+}
+
+// 查询工位详情
+export const getWorkstation = async (id: number) => {
+  return await request.get({ url: `/wms/workstation/get?id=` + id })
+}
+
+// 新增工位
+export const createWorkstation = async (data: WorkstationVO) => {
+  return await request.post({ url: `/wms/workstation/create`, data })
+}
+
+// 修改工位
+export const updateWorkstation = async (data: WorkstationVO) => {
+  return await request.put({ url: `/wms/workstation/update`, data })
+}
+
+// 删除工位
+export const deleteWorkstation = async (id: number) => {
+  return await request.delete({ url: `/wms/workstation/delete?id=` + id })
+}
+
+// 导出工位 Excel
+export const exportWorkstation = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/workstation/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/workstation/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importWorkstationTemplate = () => {
+  return request.download({ url: '/wms/workstation/get-import-template' })
+}
+
+// 根据库区筛选出的库位分页
+export const selectAreaTypeToLocation = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/workstation/pageAreaToLocationSenior', data })
+  } else {
+    return await request.get({ url: `/wms/workstation/pageAreaToLocation`, params })
+  }
+}
\ No newline at end of file
diff --git a/src/assets/imgs/Eyes-closed.png b/src/assets/imgs/Eyes-closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..450f114645d1ce69dd4e9bbce541cd392b4024ee
GIT binary patch
literal 6454
zcmeHsS5#A7(Dnf$RV4u_3P^~dBOq0}k<dFzkN^VGI|$OGix@z9=uLxwfB{81p}c?;
zX$F+uL|y{Ydxt;ofBjv5SKr0iXRW=~*=uI@%rnnCC&o};;~M=fdH?{fX=x&j$?u;3
z9$IShihoj(PkvGO7;8KPDh4@M0Dyf<3yF9f@O0gh0c&XzID084nS~U*;S}h^AYgI>
zEA-AuBJ1Uaq$KsX8wDSJnt;LFIuva0!WpE(Q7%`6#?#S=YRiu%!EkrYp6RbcdX!Oh
z?`VxXX_V<<)>k0)hi8_T0er40{nIZ8l~31R8Vt6MWy6IJ!$MC(eQv+pyrkh(1%p9L
zY5<4>@c^93O~Hc+Rscna($XRpS9$(h6`-`4JWx}x<TSFJkG$a`K};#WN%`>qHvX66
zp%9dfUTwx2pAMWH=Nr37!jz5ShYvw!t)b`29UUDSOvGeu!HWhf!F?6vo-I&+4N@t<
zl)Fq%*$n=HZiN7|ddNOf@(c)&RXJVzN;1&bzbMXVc2|*w^<+!CUicDmYL_@{kSpVx
zRm^gV_|>t0ujwvciSVGcgLa|*0$x;*W*W%x_msdzKFsI|i+1UdVA0dGi8y0Z=t9%;
zp16-taWTqAj~>ySwuChsyOb!3Q?!Yt8S_&kyxdXE7N8j1vcS-81spe1C7+pm2N%~N
zuBcR*-@`!p74iekNbw*J!^#2MEx*FRO7QDV;Z^C!6=XqkWIbn(OH1+_5rQuaSv!1s
zfwocv*uteuEGRO3G~081&KyJsJ0Xc*oh$gJ?hq-JGmw@~3K5ATdPpGmip8(CTK-H}
z9%GESpODCdE5B=>fMGwZN{fMV$hh7AJmWD(3n&~)jIa8HK5>z{RR}z2w)@uyVNFee
zmsas~d#t@J>GhieD365RFUxqZ3nHSe-eKiSGQMyY6vSiLmXg?r*>}Kd#ACp#;x0Qd
z9|5I3*t8d8M&JY*Zvgrm_9ES+#N!qfc^R35b53~}`Vna1eyB+boRI&eO#&1L-aedh
zbAV}bc3Z)5w(it4fE9h@{QVr6Z=(q@;iD(6+NE`ANi#Z-?WY_dvtRZ_RhrYD8l9DF
z_n?gmGL%L)xEKH{kvlp=yVpIWZq3yol3X#%cX>g9eYan(-3$7Gpiz1h>3+}58zkc~
zUGLg7vqa<br|7jPcsday_V<cWvAGCdx-#<8T+EiQfT~U76?8rWkN`#C$vG2dEcgO-
z^D~%eZ^NEH+~>y^x#c>mU*h90W*c3g@*azh#mwFN$yUP!j&S(eFuqIB(=OGWBND(s
z8%LF!T<@BN>p%|Sd;L#A*vWJD=&)2-t>igx@?D4N2>$ZPYX?WHLcFEoJZ?wkzQ>-t
z5mDE(1LpUjw4yRZmOL&7@(olb=b52Ufqp)Ae6%#>HKW?4?>@Dq8Fxb$Otq`UifK3_
z1Y-4paET#^<!em0<7*x^1R6iOngSPGccX!va|3VhEa1(U!3|tA<kRL3w#>_`x@`0G
z9etlYgY8nj5RLTu>CG7yjR{gdXY1Lzja2*`-trLzjwmfHRZ<#i8tMvdJszeBPXr;_
zJi8<kr$G~+Z8~Q2^xv4x`f%$k3DmN=!4{AdAx3z1O7!Z0c4<c+eGbNhI-D0XKKSR3
zEMnL(d3aRKAu<Cm5Lo<WvI@Ogjy1OTRFIggu|Xzb;d6%C%?<sf+lre?@#?P<55JEi
z$N}1&Dy#DMyQG0#;OU~eK+ZBbmDJ(!ylbDQWfC(;N=}}XQOorj;fY>UK&3xc2AHo~
z_sik#-<0rvrVI9CRU-xxOgcNg_49rc4in_o<LYfeIDsH4;LLx*BhJHK2nojTx9`<V
z+t~9@dekvy<>nF!-Bg~n27{_cxgTp=w&!CsDQ=wH8srd%%;YO)`YY`c@BV2|Rx{c|
z0bW)1TmVYtd~c*%#JqN`cc;Wiaa`ScAY1wl1Dhz}I?&}dmEZmJ_iIu+NXxUP0u<g~
zo_gh<z(~w2B>Hz*q#tsIhjPGS7d*6!4s<okiq2#eQ5<+2ranZE7!Emg#Tr)%-ZDgm
zz~n`*c8J-hu{B)qfV;PQk&9K+BV&;5bs34;hv4f-*AR9UUkLHG3}xT5!jY9V>3jFK
z4Oz{SR~X4x(K;VAP(h$-ThAwP-6PkYFo!Z867|Zt2Cc!bwPV5&VPEad43lqiv45-8
z>G0qARLDI_(|1QLVawy=<Lk9&X1ugCEZy4^$UXmB$~Ai$poJ3@k;}Vs<uSLi*q8D4
z+=<1Bu6&m3t7IqZl!w$Jzf#*EHt6RLhqyR6{w#D#oV;x-*2}pba4_MhavkveGgdFE
zo&qm<o0w?jFl8zT($ZoQEb`);mzeV}QQqLe`E-aAx@0t;i78Neb8;8J=~Dj$+7BFa
z`uXH-_vGtokwP3PF}P)Z;Ilz~c<lG*EXS`I*z&&yY%i3=PBNXZ(SG2{uRn@Tm0=^)
zXFko7FyZgb?;TAkvP2A*_Y?>eeIn>Br_YOgF8&70cfqxeT!y8tsP9$XA^V;)QXakQ
zqo}H?+H}{laqr6-aVb?K4I13Qixb{`jWq}|f8IYT+Q`Un1>aBAue-Hv@@kc3&mL%_
zLx6+di;#*SAAY&yCBe0_9OJ$|t4hZV(sgXrexiqsagd?m=1EH!B0^oJInNHerMTIt
zUTE}PY{8h;*x`M{+e~-fF2@;itvLk*9PRMxq$|2TQ}w+Fe{e&M256(f8lOpO{(&PG
z>q<~>UPN|!2QxwB6c&H3v$~pp0Om`yOZ!6RS_%E9sB%duXxCAH{pKk*6qib2ogrfL
zZ&r@TK~S$(-4vAe6AGx&PC}LMZ@{%KYD{5NTgR#Sq?vShuf4Hi)2Umh_nC6h&o9W%
zc-NzVj(3TNFkH>%JLyO#e1j+FVIl`6`A^;0%ycF%ZKUUQ<UAD<lCzsIvH1tNw?IKB
zXu!Uy+S#`&(9iGs8hU0P&2eXv_M;WKFw@lwz3Z!^b7n<-&!LLJY{#Nt;%SGt$XT9<
zE*LNE&v5RRY)7qmh}fXmJiRFU^5tHkWIq*Fr@}CMU};xr$h-o3^4a*ilaGy=FsXrQ
z0)0e<IWoAi7iTg!ir&q+x_WBW$cz0mT1qQQ7!Tlr;Pq4N_K%K^4Crri7}|Thr33m>
z;bwzjP4fMV><Ot5;t^Z@HVZr!_XwDmtVnsG_Es*GVJC3O8Mju|Ct7}8VeRu={r3hD
z6>rYge9VQm;I|I}p=P1f-$WsKx1!$@BktZIhs3}{`@B#XIMP`Sob8|GF!dnqbiDbB
zD!ChFdMKGhXc-CR(51Z)EQ(i~&E)J014Dc+9}ejyO|S@Z^51vbxG)ub!4H{P37qxE
zEVCjBVc^KcozLrjr)krVrgsUZV8~^T!NIQ}FwxnDUElOkul#ce+2j#m9`~usz31Be
zE33NdBc97axR%Fm$Yn8^F-%vJ>p;VOUc4ZFe|2nALQ1L=bRUbk{%<SAyVy#Hz9{E7
zcbL4=)sFrUCkbXUb~GCQ9nr5kQf>a=2+WUZmo{4-=Wg2`2fnEkI;3hVMDDR);;}(*
zFV_QS_b#tpyQX(pKnfgbGERk0NNc4u%jaD;tyFv>xUZpIIwx2p-?sTa#*Ys-gIRuE
z+hZ+9Qhd~9>0p(w@&4l{QlO*Mt$5wmWy$}XV5Dd(iKR|gEzmjr1jRLl%&E-zB_42k
zW1M1W!Nihwam7?N-k4<-9p9QfXW+;S3{p}k-iMP30yiJ7)t~*$GtF4z&cfu)0>bN}
zkrfL7@ImR8j=N{73Y?P4x^uT&cO@a-IuVJ=$&39^+Qy58O>J_b)y)t5^7=53J&Ug7
zv|;xc`z92Ndj*6K-NvGgTCC4-vm6ngLHYg;g~aiS8-^;HIIKJegoGDW5kpv*@*8O@
z<->bpx3{-f8*Orx8SWXeezD-*%zGKeBB8zZ(X>r&X~_b479jiN1d-yASF-f~?d8E4
z*yYZ(KU<+%qetd`f2Qj?Q1dwxKKxpU!TLPo_%<YuCEBLgW#b$gWBivBIlZCK%7v&N
zC4I0`HvN1d-;Dnr5=xkGt5|%lf?RB%N1ZLI0)R3paP~WaH|qqMvR>h34uL1wUR323
zFh)KcP6XPB2(Z`7m1$cSm%r9?hnxL)0s2AkvafuY^CY2|8$MB+@DD3Fe^rXH=oNZ7
zARx1n6T_Z!;@d1^d&_ZPfAB%4uIqK5-#-~s#2LZcgcV1Ni$caXdAGGa%j-E?wtt|l
z%CYk8<KY6053KLPT3RrL%E@*oKUm1DGlYy`T7or>$?)gP7fb*OgfOhPA&h35pPa}A
z$9;SWlE>VC{L`IVbH^|R{^r$awkdPoPiYv=N?Z=?{m7^djYnm|wKix@aiMA|DwO%8
zc-dRmMAgil_9EZ~4v}6l`fP8u!<GVPW66-B%0p%mcxf@~orlG5|IwI#h*X?X&rHzT
zdC7-~+nHi4t}~IH1O!7o8q@qMCab#r{G!ylaRJz<f7~%ncw)Iu3RWKsJ6YM<+9K*?
zi2h6B6t-QTtZ9mW`*us;%GFlGa-f#l5TR;7Zu1)&oZeA2_{$1SV;Mwft_OER1GL4w
zG=tbn55QnS>_7q>Hv9Bx69PG{bTs8`Q-8;uGHLdy`OKHqNVq-Iq6V37ee3M(yeku-
z?^#(Nl)o-<>Pdn<55847va*%&C!RdDG;MLPPaS7idnz%%3IlID8r^7)IMqWR>;@tg
zd#m(BjUN9+9aqurbok~KVk3#@Rc_&;gPN-c6_}$Vw;Vib^$Hn1;`2$(*@=}xMNb_j
z99#RhDJq&U%N2f2%`VTM?<7n_d@}p$KvIiioe<UEW=2j|zK!aGYuyAjs5IlNMm4=<
zK9YwQv4fCH8kq>{aE?gmli@yxpclW{sC3h_3eI1y>>vAF*td&G9ZjG4XR%{?F2`Ot
z;p_f_M|G6@NO}6C@R*pG)2g1OG{HDHijEREESl12NtONQ(~kX(vO73~Xq%(tPxt!M
zb9nT~8F1VZrkMf{<~s}Is})&R#9<rr=@7`e61$_Un3<G8N*2+@(YqNEn(d&8PgwbB
zP^Y_ZXwobytufHh_55zpPb1canP-&1!;x#LKHrj4qIFi+t^>h-!H4b_O6Os<gQ-KY
z6me_rIe9v0K1{EJ&z9t1j@zy2(RBNi=}yq^W?e!_X;1ywE}@Vko|?N&jO<H+p|;W(
zF0~utZ5nqVkt1Yt?fWgn{TPAR&;ig;uA%2Y{1ESw*=OJ2Zpl#?J_i}$Tip07;hQCO
zCUe5+D9?3NdCh$-rm5Cns5>yzo4(4_c~JCfr9csC9MrW-;H~w0<QrEmpyg0@&tqca
zwi@vl;H7(8ygt-D1#a<nbwe?zxQf@kSFD<AN{Vfi!#5K9^Qv<nY6muMPyB`6UFR%N
z9N0gA02S9G=egEwr>GvC<)4UD)M0tT4el(wk?1jFCZc!wy7N7AcJ42BiQBNJpG-?x
zDZbMGukR1TwOR^jhOSnP-C1y=mJ^1pj^d|m?d+mn3br(5Ab@}ef-ioriJDAtHOy2y
zkL*sa%cR0V;cQGqU+*Yqne*Q>$6SOszu@4rxtDU)$H#wvl^1*+(O1~kt{m7_MXs4^
z4I=n8gVLHb1oxS8-l=SNG7nj{1k16t`^Z#}c0-7(KzO-fi*LH^?5Dofhuc4X{CHhh
zSlF7$^?0c93EK7P^h70j9K9ze=lpV8K=J{3w7UYFQTHv?(?b&LoW&FILSS<L(4m-L
zR1Dlt;l;_mw&@W*47rJ3RatuR$*<|WZE+EPh|l%kgKJtzWOkH}W}haFZ+r?;ggyOL
z$yxp&3CGy9Ykg{ltk!O<TKcRFY9ROFaC_)Q?%{2-+N=o+7TPMm^~q)pb@kfD^`6}M
zvq+T($nrXO)@RuxNM711?>}83lk2tXq6V@&u(7efQy(c2?70H5Xh7V7`Q!Wd??W;~
zEhqO6x{6gEnWsU?Dgm+xyUw>gIM?p3pk=~CZek<|QA4lQZg;tv0aE$dZKScG4BUAV
z$pYbGiT*9LidhnW!V;;gr>A$)GFJn4OQ?24w#H(@+~1KN7cqeZZTdPq$>tqc5CZPC
zF04*{q$f8Fi?87dF6+-2L|{QuS5;>VWq#Ps(^c7YM61f@CH(T?MOO1&RW0XV(sgJM
z0%;YfR#1f3WiHAUBy66(Nr;b6doI$B%B3<O&qP^-MrYyQKlR5_4%0&hTr0Fef~B(m
znqii!4s|z5@sx=Ah0}nI{zd^X(TP2}R#s{0`j=;*-(~RHL<3of_dDS|MkxfU!eT}G
zR=oa(=To*Tz>yIcWOk4};j2)B7lK4FlZQL!Hns^+@h_KSVbcm-x5;W}*LQSGYD5WO
zd^mPMeF4}ig3=~@wJHA?PtO!(RkJJX@A?XpkXc@sDNS?b+BGS%%hM(qO{<ff{5-gI
zX_mqxA<ZOzp`sRR?An<&8xJmZxQ@@8Q65p>R`Ux_Bx^%rH@UcK(0l)Yj`q^O`I+dH
z^V8Q2=(r9j6x6NWb;=GatD}QtuvQyopS)v^G7#LE@G$>_LI$VZwN+bxyiT8zGKsqO
z>gLggdZz_VcI-mFMi|-R?(LzN9`tK4tPy^-V`K+-T<oSs_iVqG4G4vR{@Ly8Y{0A|
z_<J@TxW|Q31Xgz*nu0-dA}-zOp=xyP-B0i~w1B}C#1^M{=47qp53;hddtQ;o9ERLe
z0LIxM4Sqi#yk(-TvV5UA6{D}Gx4v<zy!olt#BAv)GB>1s$gk)18aWgq1rFwKFjT)P
z^jrs|z1{C(XI^1wSWjf^9+T;D`Jw&IZ!craR=I}zl6y&1df=Rri4?e;XK?VeS?aJz
z>ie1{%4rKs(-st0-XWe_(P?xre=wC#@*Xke_)~-FVZ5M{qs}ISn93t<B`1o8N}dHG
z>)I3P<byYBX8f{+BmS@jHp%a-tRv{TO03Z1j7*Hj^^PCvCPVGV{f^e}=-LsoIRk&l
z%%BQN8KQ)qx_fXxp^^vpu*r^M-Uk6Dlt9%Re%6dy7$yv@uwMh_*~I(Y_R6K`p@qY3
z%u%}nRjFhVi8iwB;IF58z{@yi{2^ud3#6}?=Sl-_e&AA;QpR2LgU_WcrTL>Lt;4s4
z8uY+Kg?4d*d>zjAwKf>uoU#=n<{2_H?Iop^Vrxkz##t(O>4JEYAC<XFl6}p{rlasH
zQs><6_7$X}m}|m0w)`q$SeVYUVM)H-bDaXcc6w22YisMj&pfTzGSX<3YhL`2$(g0i
ze{xy2fPb*TPS$PQ%erKw;eJOB-qrZIS8Iy)TWyFPHSvBz!}yeIJ<<hzo?KUH#Q>~M
ztsgAK#L&6U_*xF)Mzg1y?`a)5w!DZY>rS#{eeIjQn^~|k{y1%aj}hS1L^6ser@{k&
z>=Mjrj#2(CXF^&@BB>_!S!68Nh6S0Gj7-e!DtbuQaRU}p9(A&)v@?@DMjlNQNBsrA
z$Z&8cUH`&|GO}P@Chx;k#|(;s>RYq&o2WgYHU5>ATAv4ng1jle-Y*rRe3(==nA^Dy
zB5U8wncuWbAmGTyFP7jQ{N#^w+eGxsV#C27$|U){6%Y?-7eEf)#wO&`O!DMnrs&8z
zIKOyYY8ea)D*fB9HLVW@N8XPx%YDp3@qecL4^fG@q&d_oX^=EJ9wYw<0kqWgkrfZE
GBmW=0wC*<m

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/avatar.gif b/src/assets/imgs/avatar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fdbd32c675f85af4ed57021ac0638a21a3c6cad3
GIT binary patch
literal 6334
zcmd_tc|cQFz6bD|n?QDwkc0#TNdjn8Kv1-Z)+S*KSS<=wq-p_?L8l8^YSlNjA@?SP
zkU&^uQ)0pzWRX=+DJJYFYCuFlTiIk2D>&L}r<RFU`{vEe`(tMQcz?YA?w|LZ@Av%9
z=lBQsd2WaZ0)l`a0U&B<U@`mJufP5Z06<7X{ms6<#lGo{qHl0k^sm0VJN@GM;IpSQ
zFJ5Fn7`O4-(DK8hl9{Q-M{^b|`<^EYqWj<JW~M&A(|_&Bf@Ji2#n?!wp?PR%XxFY?
zjzJ$V7>xG$$9JAR-LhrN_UcMBnKUyqQ#v!fFg@4U*x23O{ju@-hnE_2a&q=w?aX>G
z9^QLHCX=l_{JCF()HOP)p`pPqJF}#uB)s=#adGkS<HtKXI{b69-}&ljU0vO$ad9&*
zo_BS1U3@gRO;;Qf6SGlta&hLVL?Rg&7&vD7^Xciq!NIL1MFE<;yJKU4+Oth<ZGzO4
zLx&D2$3~{6rhI*Uxx031&#3R*xwAMlm-ApeGc!{;KC-B}x!5tbsK38ha!b+JFfw@W
zR#R84uA+DT@nXa93B#3#cSa%OjV$BMPYlfmcJ8}1J-s;cSf?(yU3z7zeIUHEy<=b?
zB>KQkaeQ8BY2J7DJPv=pSTT@#wL5EgaDPSFKy6!cR#tDdAr+RZ?hUgS@!Nbug1z}c
zzH40FkO)%@>=!6A6o3GnP2Z-Ff&c)$C<4R~ERiP266Hw>WpautH7z~kRAyFoPVVV5
zdFrzoZGJ&vQE`c`^jukaMdkUb>YCcR`f?iaLK>4q7h8iM4tptuU?2e$1Bh==?g5>c
zz1=sHNWCt^Uh6waj2;5^ngMq|3Ex8na6K2NW!O#wQE#}hAS3ro%^KRC+Wov75MZO5
zQ8xL~)reX=4!x$8xB6or!9CT>{jt?Sl9R0LFKHp-eIBWHwRxL{C|y_6ZS4+LQC5v#
zi$TzL8%KG_a#WlrhRF9oCFHY@WQ1mb9irtP;a|&^MTu?`qk9?`^zdE|-NHQRAZP4U
zYmA?*BF4MzniXf;B1*)oqZ$BIAV$B#S{aXx_8G7{B<Ho<VmXKBG+BRokX>aLBGU+{
z1Mhb9s%SMlq#>DB|2%RV*dA}j$IkYo8Ykjh#0vZ|CTpTF(WBk!?s_q2PDC~c-H`bY
z=eAf%E5dxkQU0gCy2Si`Lfdo#?LoEjyl~*p(X!c{1t<Sl-FNlR;mh?ON!VgZQsl%3
z1M@7W?8KqjigThXPufK`Jx^8lgKxGml;7C81;ZySxQDlXWe9o)AT85~&K~)oF?x#`
z!HwJ(Al#!<qY`HXh-gseJ_2}cLXK`(r<+2M259~yBza|(9(`brWx!ZA>0!W~?rlKZ
z2gRxc8xjV?4IzMbEotrdtS8&uTr>`OyJSoZf72|Xw#$8dIz63(^@yDmesW=E@^oy+
zim5Yk0|%$_j!l+MssHq2j*#`HRw%&P8n6T$0q*Nsp-i;`0N7NkL}>yFAd{umPS~U@
zg%YNkIz!0J&R0rV5LFG5O#LE)VjQYeTb@)1;HywNwbO;{Lb@7NrpD{D3bAc0oSM*m
zRauJfQrGv%ay##UL&K2Nr52=$&yF@s)ppg+&1SXL5*HvQm2mli_=g`Ur8IX<cnUA^
zxID~rhd)A_kHh<#X(<aW&AvE7VhzPxprAq7MK%FD0EsNoBgmTUAeHdZX!jxB7s&YB
zC0BLEDq$jwu(Qzbp1#>8FYq+y660Ir(VErRi_H8Cy`>#K$H`J31^2DoMQDnDf=ZQI
zSY)yWBiQXNyOOS-9MQGtc>wb8CxjY}l{p?*d5;s;9vEn~{28ifFkU1z%Yc8`d*sQ}
zEii`1)2Ipr<3%yqxMNP?s9vz^qX$^B%QT$me3_|n?b$zp=i3Tm-Po9}Ili@J4#r(0
zJja2&3WY{a>*w!(m|<}&qOb!auz%zp%lh^Z2kREO>EpJ-%TIkd9jk`jM4}guxAw2%
z9Dezdh4uJ#7~<$QvYG1kVBUYp6~^8CY(*?+j<HDd#=w{e7_j&76q+4GQDEH9p*k6x
z(MH9*N!aXF!c@QkSoS($v)2iWr3tWUa7X|wiG&3x_RQp*WGTxGq&leyxrHe>wHZka
z(u*pA3N^0`Us<Foqt=537jmU#EK~T+h1iQFX5V%s*Q)cx_16pA%gFr-;()Gi2*%pq
zgK=H=iFj}v!cPt{9zq1Veu%mNF`iX&)<bs-ZMd8R<2*EdZk`h6=9X^0(jm@cdtq#E
zvmf7)psMz1WfShnpE3iEIMS@SyWNhsN9h5y9sNV*A6nX^2(hP-pX$9eA<4$eGd749
zaD{))=79AG+dm7~*MhQ+(I%pp&KN><)#up`D;)d3#MTz?liOipVqIdZMQgS$SKG#E
zLRbcC?aE=x$jNDVi!A{xyQ|8ND3FWgBOwlYRN^;7*-g5%{gP|o(lc<EJ0^V@PO&~F
zE+EV(Vw0@6+=xaRMD`5$*op>~eZONvY_99Ox>ieY<!Kj}bv!}re$PDt<lajmlpUDx
zV?7<-4Gxpn_ok{;rO=hn#b-R9h?ZThrryI!+{A-Sth=X%Hfqp(y_Q8@W4vzlHZlz0
z%miqr$ednBhA~AZ1`+^_Ok$e#@>h{1rDQ4rdodoMu~@XMd?{W`0E)n(f-Ha_#$m<h
z%CpE2l?Pp_PdP89fVJ9hmDCmt;R=S@uC(ux5Nd8fSXQsZ`Zh!)3_%3z#M{<`$vE1?
z4MPg$VSyFwGy+rSvs}HmOwgW5$nzWejM`T65^?h09V}I<B^H_4rpo$6b;_Q(HkwB9
z@sa!eY)%+lXag_CY&bSgcGwZ6WURJT7)2=~0Ls#5Iy7sm=mV}8W={7xDF|{XS14i&
zTDGNQ7jtymTVY_$UQ}V|RAeW{X4!5Y9X3ok)V>!xz1!c2i1${WwaKop6HMgb=z-;>
zi2V->Y8FvBBZsL5^Rrz`Jsj&4<TPiCFx-)v2(vZYvX;87B=4@#tXNvZDyuq1mI~fy
zd8I8Z_f9k~vLEHn#Uz*)W`&VC?t*>*?H&2f8o}K(RBk(t_EkS$GViw|lW~OA((#4A
zz`4EgR~_%MpG9cwH*Mn^+30}W!ww;UjzwB6L{%;mwMmIPr_SF`VUgb)GbG?l1?Ye+
zu*8(vhzR-Weue-UAWc#vBq9^#N>g5&DXNt8B!9dZR1t}3r(xP=2&Acz*+md>vqqc=
zm7h0dg{&zhpGQ(JDT(JxT9fep=gF5Y!<)&4N?OZJnB;#;as3W7bXP&_l5QT>n{t&E
zeRp~)sd_UJ-?iNKxy8>GwtunU--^P9s(wg!WkY(VTWkv?J$M6iVo6nmJYk7X(<kgF
zlD+3-R5XU{DUx0MbfD|gt851u8+SthQfci&%R-9WRH&oi`vvGV)(h;N7zOMXV(t@B
z7dHuP-1hMXrsdnBnovRltN<2ZV_Nir2=QvsuTcUh<jG<z-JV5J09YcO2Bb*nEKsW@
zF>nYi;&dK@iObK2bqM;I6yo_B2!wFhdO5T4vINJVZ&#*NR!JCLnOEfW^DLOfH1;NI
zE{YjL!^z*lb=_r%?X5E6XbNLC0ryCbon5l_`HSa)9xpjbiee&Xp+KWTV0QI9-@YHE
zJdSXFSM<(wrw9lZ9vkXAV1}1va)Qb|O?Mn;FRBWO;e~U)Jk{bG1hg;;P*csQpdGq>
z++fR_?3M>}X-4k`I497fC>T0$KA96Z56pU&!Zw=#ZTQSZyHNi#c+`K>j07-%rLTA4
z;cvSjW=gQqBq^4R2SI$YDh<d26fl;QnkrF;nUEHWQ|IEa1-WFM0#Bh86iUO+OK_C3
zx?IF55Qh_k2-3IB32Gdv4G~)24N=q#34>YRC(dhEkca#FzrR1)TshG)JBxMw!L=JZ
zvD5aM1@d|DGh3wFB;0^G?&Z!iCa&7kSgu+4Tvg_alY54;MO~SzcJA?@JylW8g%72f
z-7D7bsRLRsn335K*=0w6i0g@*gYoZsdmy-%c4I_V&P}#O6Du%yS3k>;ee-P@X9Afv
z^7Zcq_V*^>8Jl?`o(J!(A<O}1ifLR~18h?Zo{7v&Eik8H#aNnYT<r%zB3VUIW}4fp
zKte7dOF_)d2N@7>*8EI<F;G#Fm9Byb*vbo;_!_mCe4#-JiV2qq&6Sx+Vm!3JSx4+K
zm{ZQ{%mJf0Xb(|j19yfB;nSydfc4qa-I>5#=IQ&&+roE#{OQM4tKB!cmq;p(T31Cr
z=m7YhI1O(>(D9z2B9kIm(=JK?_khRvoH6#Qcu1wGvQ!XLBbS<)p_Y%>mAN~!>#jvV
zf)&RBo_IeBn7nax^5oLX(u!2bFIZ6@xIARVt-L@gN;13B+x6gke>iwGOi15ZX<qI+
zVt!#x!+X;NG~i4(X^Q(sQ)tspz%(LOVnVv)t-BMI*-C(rK>~OgAU>y1V%oC|v=dDW
zl8TB-01^nf5G$>#vujHj5CKck;+k@sfr1Pw8mA?8%DYPvjV{`PKDfW6G@}Er&AN;J
zPB)f8cG9Lkn9`+Z;IUf$<0<hB$UKw(U~<H+>-Gveq-cKIhg@?Gt>p_Ri%Uo7czVNU
z_L!|9rw$I(MQPSw@*4bOruh=aA1JgL`8|KYD$diWvgCnYwnwCc)?(yM@`ga?C#PQ9
z{802SCY#^-&E|zUrMp+!5;T22K7m<ig(q`6)RpJra|Qz(rWaeFkc(t4+h~=^p+Yja
z#%4ZbJIXTIJfb%<%3+t_FJRX&UxHc5P57Z@0vE6b??Iju^5p}gK}$5ARY4UuY_VIN
zyZVX`M<Pf_c+k>O?_;y?H16V>2$TduA_aq-1tMm3Ri#kKh4sSJmBwQc#z*pme1x5G
zPpB$%XC0s8&CMUJ7%R1^P}X6;jHD1K&U?DN?q8CkS7f|@j62a^Dt`fJ&}v|{ZICzj
zT|(d4;19AHn$OIRkOL_=uLmMa;9%5uh)vm|mXmsSU6>SRAvo-p0X$}+MCQ(uyqwXG
zaXxjP&OmP(TsMx8o~njW4#Ihmx-mKuGTZX$@BaE{!j`@gwoD3$e;0P5GMOTNW9-6Q
zz+`L<NGdGKeQoTrg36>~d=2WH#;Gwom##roXz+%tTx>fFry*RurYysEYZ`7T61oP#
z;kzbc*PDo~9lJPP-(COcVOD!R@yRP<H%*Ek|3uljB9b?{G~V(ltv=Q<MIi8{GcVx;
z-kf;+FIFo&;ch<y)_n)z(1mk_0SKD&vOeAco`Pv*&bDofg02%$pMAzH5VUffEY0IQ
z0spc0sH@V(n0gPC1$rsm;W!bA2?n>s2|p>8bz_P@tYjWTKEQH_cDBy^s#XCmvD#?$
zQomgi9}k$14Kkx5TnJV`NRw~>)l(VH+vc!=)kp*pzY_cM@`U4T7KS1c@!0-moxXi;
z^yh(kOuktv^?(oRP@RUltY$t^HSCs>wi<O9V=%xhRz3QFFpASA;*`k=vnmchiC}R5
zFv4p@l4|3Cku-Jc5zopJ9rZHG*Oc_f{ftEJ`IuG!oNj$5;=Ih~$LElv5%?2Hu6YdW
z=ZCz^no7DbYHPR~vpifg!rB1yWMn_ge7yLV5S1U9udBKVT?As|H^skwo&SGEcIv-|
zY#Qh9ksZ6{Z;@^HkI3HkFCp9Woqs^~$jCn;+hmu&MfNMZyh1kOpCKEM{|(u=H^{~n
zzcn@mx>)zx*frWFCDnkyH6y5PO8ZU;uKGHJ#TzBo{g4Z85W-m}_FLaE8GHP?K7}%C
zGB)`>Onq!J_SSLQQwjMe+k?}_2pOK=;hJYz<kKQr=03(=l7W)6Coz0u-tXn!7a=yP
zLz!q|dm?q+=9A?MV-kpB^8?YA%oAhmW~;D+D|}Qc)1^O`%03)K#jf!Y>Ni+w-?LnI
zNQLR}<>9_`J*qIer}+l+nMXHUCV>f<FOhaS&wiaGbjzyr&FXmGPu@hPGiZT(c(Wgy
zi%6T>^doOI`v5E~kJaojCOWQ4K78q^XuD;H(oCY7H=X(|Oq~1SX`!E*Kn`PGfRR-W
zCL-)RlzPkrI}2&~(TuiwC#-woGppMXpRToRw%$M<jch1Vr$l;Qfm@C`ppQ2Yy(02d
zkYi6>FuYXXnp8T5$Ffo#yZf7G+R@;@0BhXe!y5NHtZ~1?`s^!LGhVy8<*lo6CRh6#
zZkSx%r|21g28R{IPAP8aN=-ULR&?+5WKuPbi0@o(`;)~B3)`P9_<c1fXI@rdmWm%<
zxo2ja57k8@FB1pd+FOa7k1miY)s-686ABc{mgmFo<lpXi4Qs8#b;tEBwOsGokHzcV
zTHK!8!MZ7z3gfC`<S?U^5D?>IW_6<^i1@$3dh!1f)?P1HzJ_(`Z?K-o-rfo&{|0NW
z3Dy?EdqaZg-(c<N@e0;aC?oh9)}-OTgSFXd=DVKDb>d$1x^3ScIXcrz@HGirP$xd5
zHNUoxLL3<l5~Fu_Zpar`wrI^sJZ^SiNb5jFJmT$?ef`{c3+<=>9<-VNIkYWI&^|f|
zhjp3F$3==X)Lo6SyZPhyS-X;GwA3mAaN1>8d1EXW!*K{n^>M;Cx`@Cpdf(3^umtAp
zutHsh2WsstagO8=7*vPpUJry-%^&e7SJBamP0y`iGsZS=#-;#z=nhCz9Q@w9b`#UB
zV!S<z$BHV7`lsUl%l{NN<3AEN<KGjvFm2+MxP!QVVvpNvcV5G=b0YQL@v9I`EXt_r
zl%6jPa>RB-2iGS6n@^tTJeRQ!K^{I(dsHB`^g|fF21okRt{$I^+gCPlXi@`O*lcwl
tSeX}8JPlhsJH^s%`^fr8K)RRk_D-Z(;fYh+bq~SM_Ebo|rD1@Le+4VAC8PiV

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/avatar.jpg b/src/assets/imgs/avatar.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d46a70a46430e31744420865138cc7eedb8b77e1
GIT binary patch
literal 6264
zcmbuDWmMGNx5t0O&^aUB-GkEIDM;r~(j~)yH1YsLHwXesHv>qAlqeFC(jYM)4I&{S
zWpMHN-*xZ0ukYUH)p>E&=dAr*`<(r~UASEXAX@60>Hr7?0HC`BZkK^5fZ#3&2?&Xa
z3CSR&5Hd=Nd-o_PS*U66l0}G_gZXX=!NmA^_{CtlauO19x)$0GwJnhL_Q-_DgqD_5
z(Es;<+g<>Q58MDZU=SOC1qFejpxb_c9ssbgz;}@U8z3wkFg7mU?Gk|h_X+@TAqs#X
zia80n<k;M-ubg0Z$@YV7?2k!wk=Wbuq<pHD&{!^nAKkKemr3auNdt***>Z-z*uFcD
zP)Y!!L(=9e+rcumPh+2YXE(J-QejRVpO0I!gpo~}BL<ykPmFyfL|dPoB+<fFKGpqd
z6?#~e%`Gres1RM~=?$8={v)L{p-_fE?99)M8t`g%*AdFOsNl=qFt~`;O4s3g?{#T<
zAdI)rKHkQiOfM*8{~?p2==y_xz5(SYQ=V`tt$MsAxB8%a5uN8TG;Qk8yl4K&OEL#@
z-ko1d=f67e<-zQfZ>MlcHz=;JP-D~&6C7Ho@}#Q6+@<03;<oIj=jX;T8g?6pk#7{w
z<QFq_KJJF}xn!Q@r#kmw(I_*8eTx1ZMrpd}?pY^L{cF)4H5t?W#wcN9V8;K|2%7u7
zJ8p#_^o2^w!IMs`mt*$7x$T{deA-tcyzLSNJ+4-x3u_H6HHKT*=gza|EDhf;sya`8
z@Cdr(oW0SILbm^*lEbrX*~dLPxMv$4{sy6s&_0vq@y&O(&mWqYw^acFL+NT^LN2=@
z8ivxQm`<Iy9vW0n6B#m=h-DabDu(uQSN19|>Kb8wmX_-jgx(e>OVud(P*XF^Vl1<Y
zJI($PA=}f8tj<h%bF%!!y`b9M`#~DqY96A%^Hs)wGR|H-Drm1aJEvjWBwitz1aMo<
z&&i*!rp(FJS+MBhuY3(avFnvGl*N;r%l?*lG~o`Snz794a44^zni5Je<n&2@>6sN3
zL9VSB`M_g%o1P)BrQX9$svj~GgHrVO^-|)7rKENg&rc-;o<i+dLDPHdDh1k2FGW^Q
z+CQ=irKQ_H&^iqgncx_=L>C!k)8e~5)HYqtZ2DASDJ8VEC2{_$OcaQB$S8L5D^GQ?
z+s$*j6EqD70RKm}|D$LS78v_qHDf{U_Uv61dt8A`-ZyYSRaJk{$HGGBBjlXX+YC8V
zKwC6zGPAqf`cyz$pIyrm(T+CDOVQ!GC`}aSwxBW1ad%G@#B25L_H>uJj_SdwyELe?
z%Fe*gzZu@k_u1M3aj&S$SqNz`-S2$GASYKgNd~J_^|UX_DG1h-kMkwvwcS#<L!|o`
z@&7>nMa04V7ZUszQk&4N$!hAgCTqpAQhQTk8ON*f0ofdV2=AQy@I<b9Ub5<*e;s0N
zE|N{B^E1(>IWQN=Pws^DCr*gw;EVeJmQO)u{x?i}GaVh_sL#~;X+7GB*sV+YkAKOH
z1g^{+L!LhAjVPHKFZ{%Zl7;fP!+=RU0=KZEB1ma_T2b`3fZ#yb9jF2X0D-ZvvGBpT
z*tl5WJ1!7#2MWcx$0`I-!X;-DHZZh%$`YQ&E-0d0{DFeQJ6%-8$i8tZqKVR{<i8sT
zNCEg+Vlqhl!HPfn=|){0G|;^FJ^kww4xCr8br+=%R$lG8X#^mADO#9*MqNY6X=ne}
zJ_}7hl(wJoEf7tayBiw0Mee$)fh=DA1S%%v8N5!v1%h<T1GcjJCQ-^>uM@jzyiT0o
z7c1-kPHi_&7&CHY^{doMimEv}v39dY#<geq`Ms)Zq}96jJgMx=eBP0%+1goMamriK
z+5v+YD!2vg(6hxP4)2HELomf<j@-5R>&Lgi=@(n{fNjE>B(JpcOwknSb2+tX++3cg
z32t~n^3u<W7)bJm`+PTH_waY=FCU8s{HAb;?;4sq)6U_(bacB=2*`FeQySUd^Ri9<
zr<dNXE7g}vNk?xfb4OEleEWdnYECp*N^@GLhwwF1mZHTRr^@QLm-KZ_zvjK0xwLoA
zj00=ZB(3*hrde<e%Zx;XpUtmYA`M6Jq0j5h0VPSlA|Q&#-+z$WoxaGfI{t@)AlueI
zaIX3m!1+V;`gPG3L%3pPv7hCrN?bhp&3cDC$jod&jmi{&!LVuvob$&IbGfy4k*1!;
zy48E>%`AtMKa_^FzDw{tyaj}mT_SWwV&0ibLN*!>>|Owa%LbKvT4stf0)h_`1JuTz
zwF(^utK=XF|Ct&@jJM8u8IOb7jQc*V9HTkqI4CC2!JgUU0{6MLFg9yAHpz3dDZx!@
z%o`8A+h+QIWx*?}R6xxZ68zM4BDx4){0`?SOX0o-f_=pGF+*6D2_s#3Xv5In#4PWP
zm^HIklb(YU7j;~7_apA<z3JJuK#o7to$<H8OxQ)ng<OtQIl3ni){m_B%h{7s5!qyk
zXh?FDbP6)@LJ^-RuoL{WB>K8Th|gP<LnNciZkDg9`zkZ8aJx7x%b)yAT=8TqGIMf`
zun+j>Z1_+9E4lG<hpTu8YkDo8vwK=wm4ekH)6#FuU(W3+QZYwNPoXxz+h@$n8v{?<
zU6=MYSkFR}jr3rr(wYobn;kq@8vtgHeBmnZLKd=<3o#S(B}{NpSHiJvwJ*sN`}ix)
z_|R8fD}eroOLG|OawM^*LpHlgP5_>Me)LS?_tSUeYcu}830qZ-I%ywSJLBQCSZ*o5
zCo0nC;jboG#KEqAdOUJ=+8r_Q<b7P_QyfFvAFXeM`c=qw{KNInz0(WEa}RC4t?0O0
z0ImS3lC<z<P09uC&`jF|_hpAzdc#*PyS3wm6w1I%Mix0l4>QkfjYgT#Y^(;!X6g@~
z_AifVbfl{4(J4zV*gr{36(ao(#RMe|fy1^js-iSUeI6-0np|F+Dw&E=9G_ecKU^vA
z<wp>WN}f?U8B~?+h<|4H%<+0J<B`8kP};PXUPyncM=VisKjmEZ7IbwCEb=?{LC!}Z
zZmT|Kry@8`gk4JilaFD&sV(Q;Ew~N9Bn-H6Bolh8t{BqAk+|Qe^%hA@rN^E#(}+Zs
zTuNecGe=QGrEs6(<T+s?sg1FV^^`U9GvgVN)~*Gqn<%6x&*{3iSZ8^^bA;lWDQ%L9
z8I42FEIcAkv{_u(lQ{MuHRD?Epmb=bBW1BC>W1%?Uve+}TEc~Fp?(8cl~Ve?ztZD{
z{~Twy!MMdpLAL%yl|zp!)gkn3(ZRQbSoH%#jIxSu*UBhKF_KY*!St}JmGuYDa}dV@
z_oh&%3MK5Gv1|}-V*SUam&DxL^F$R6P_Yf^%0k_<T{;#O6br^Hn3ny~<DRu3sGq?U
zM%w<NT~Z;hp|4Ki_8fDrku=vW@X1tO$2gz9Bz*mpoIf@ta&4dif4^Ro%JJ<WH}6^&
zUe?3j&t#NHQ9n;~W(xM63CCD}Wj=l0ef20L{z4_wuKMz2Ov)vFu`!#Q4+gBhRhlZ2
z$*|=u6$(_bAbv1*JEV+zoybOH{6IxE8qeM{_Kly&@V9ff4x=Z+;q6Lb(|%l`WqNPP
zHMu-+WpIR2OhAr9S<=CshNAt5oIKGQKAK8m#OGCGk`kxMuqt5KWOXla>9LI(d(DHl
zPM&QTmtZpFK!M%pmuP3^N0zjRnhP%sU!^J~xher`D*M--%wWo?s)K_BH}(j((H1w?
z7Z*GPd{)eY%@U4bUG2<~q*Uc((k`5%BAC@?DR(L0zLv)#<0>7~;bCt|0bO7%Ianpn
zDn!%zLBCUU+O+z^aS_=Pt+MKzoWSkmc^{qLsu%`6;^r1aV{6ZqkAcYR<fINM3!Diw
zCbhwfdAt4VpP4>77qj>|qEPS9${R0!P!M8cHKDuKPmO5kT`Ds^pNeal!XZCTLU=7b
z{t^W-SpZzaE=Oecj8B7_iQ<fS#Q;N;YBG%x4qB$vRuOb~7^qfeZD{n!Nc5@twAC)0
z>m%=1)|lV(V(*nM^=yN!W*P~prKXZr*1bYLCYGHz^*?%h;PzP7OMlZ4Qx<JXcFO%>
z{1%wAwuzq9MLM?!Mo<VRB=E3PJ;?BL477Y3s--+sitw1K1+W>v+J?XDQ(a>oiy-+x
zA5mNxTAM+pK^nSlVjC!DnfL{tR3<C0I+e7~>swA>jL(F3!ReXLiLOu(mk)1Ad}H`k
zDvyCLitK~}eGA+p|MqP!|JQHE(p$h(&Y~nosuYpdE>*XXA_t3$HF`8MP?;7g$AtFT
z>28_cZ~Zc6)KBIYJ-A!6ezqZLJ0&`AJUW~N-q~jDs>2y!A+bVs>7Em=xlUaQHOtgA
z)_5}rgeQT{prumS(l!aZ9s5J4+i-OWokXFjcY=$+q2NBgNtz7!HKOs$6>q+a$j}x8
z0|<95@%!M{&R^n|q_h5kYKUA9Y7M*SMm(G6<~Ls}3dg@m+*lS}DJj;lW>r*&<v82`
z(D$5Pq@TSdR(AS&SO^xJ@Gb4WhqNC1<9_i7CG^N^lq$>VtU8t}<!`rb*2Lw0c;S;)
z^plZ_Q)_92E>8EzuB{!;QTLJr)#bnPeko9@_>%zJS|Vk<A)WMai43^-d=q6VS3ev&
z5-}gF{wWxBMPO!8!?7Bpv@SA*4~Uymcek4Qv`q%G01F`lGBuCP9yZX$RXbHhN1w>P
zq(@GhDofDSCE1DSSyHNOve6_Tsc)O;jy!WK4{C5AfYY#(MCD_wj;l7OhwS&Owz;OQ
z+Av;ow)s^N=-F9Ggp)!MI8FhVfZd9(Xa_%RD3J~3ahc1ri>JYDXehfQdP2SdhX6zX
z06!G{F*%?|ff9Uo`jcl9VbGXN<*o?c9%Qcl!`HD!-*kV}U_C0F#y85{Nsrl#h%Ny0
zGhdHH-|}^l3G5c=HPMhdy0rPtsXd8UuT=QQhu-{%>ElrAU^o9n`5$7#;`4Lwj$|$k
ze>h$|+(tcL<Ys9a{)Gio^QeU4IC`QaII^eRP6CHYTB0Mxjnu6X#}1O+bWMW{(PRCN
z6Uuh%<p6)Y*{r^;Pf%r_Qh;^|rR_fa(_2WN`(5rZxqMt4BwmdNnfyuKz>=ESL?%JG
zB%dfqN0c6Y{fo;V%L4S2J|<dE<}BtFW@-b`sS@=L;YgG1Jk+yG`ACmZR3JH*WFmgk
z&zG>Xw6vghC7DJdXi<ZaixD~`qw#jLimw?e5-Z|mLJEUVQJT*<58ndr?2jj}Fbp$e
z^d~u7qqKH6SCBG0yJ3FyF6I#v(SbUIrvzT7-mibK$yddhKv?3oYUlt8g2hr*kL#6F
z9r?T`3~TeE^e%yJ@&LN^drL>kfoOoh5Z4nW!a5_)5XG&Jjql|qKKS|h#jfwPynLJ0
zBOycm3`flAZyQCqTfhJlF+<%mk4!n4g5%jj9OIo>Cr?ftGlPeo#N|c#7JhEmd<gF>
z`*~xLs-WF2tr3RF9Z4y)J;@b>0iOk8<XVDA4t|8fz4k=+tgVc6rSyLASHH<zk`E^?
z$|cGW@mcpXsksmKDGj;iOV@T5T7A(ZADk(m!doIN<D85aZ-9sUQg-E-bNo{Feti$6
zhVGMnbBH+dSe}INO=HW+8y*yiI|9&4o0d#B;kcjH1M>DKtUaiRQ|+r4*)Ynp((I%|
z6GaeKR9BXVY(8(q^c;0<6%VonVwDK@?IMeXA8xq@Gcn9G;@$#KYDGYlNZ?Z9+#(rJ
z{`sQUY@6Y51Lq*;;-wYd(C_F0lm<*`M(e~&Octe=J*S6=E>mCK)cZ4l6~1}49`nAc
zqVi>Keg?C8G^{SIKfT!5yNCo`Ap&)g_1B0rKJ7Focn>aKTVsHkx`_JMX{3tj$u>at
zI0SBi$RkQF5%Pnj@VTx}*IL*ReCd#}IepcO#$zDEDdF=sdQab9>X{W|0q|qoCly&*
zkrz3ljI^UWbrCq$Sal5;xgXQ{kL=wJWiAMvHHi4wlFVzedxwrHzxLmKU{l?0foUp!
zxs?pYcFW}F(iw0GI%Y^X`%^z1YcYW+WS4A;aeK0y4$9x`n(=-AWoz<%9~9WzM3?tf
zj8V%)_)lfghSRHx<Y5VJ?*RU)gv<Tqb437#({62TlbprC7E4;Ozg(P*#$+Zo9%Rpe
z7ScbgrVyZZ;DN;G0;FTiubk?#2bsI^pTob?*Sy)>Qx>3V&6H;~!$G~2k*)vyL+9h*
zF6tK8_*R@WV+r44X30-hd~o-uDVBfaW4`imz^iwyWd5xC*;sP8E_^wJiksZA2vHjN
z(CcFN<1gh-98!wbr?ZBtJBdz6GcqjloM9Rz&?okNLYl{Jqr7DcD~r*66j?E82c+Dv
zRP0|fKL;#R`73fS-iECsC9$!Z+WMf)OGS(!6lwWBLZ5D;DR17`1pgDTscFN>6RZMW
zIDEKJt(k8`A*6gX<>`7&e+#%B$D}~!7w)&!#?;>e4TY6BG8#<OGm)*$vH=&WHYiyw
zkh!^gj}>Lqa1JL=OEVb(lY&hgHWmo}y^l9rQ@Ia0(-S;V1<%xVLlB}X8-sNxJojf$
zmiR_6G!Fs-?|u#=7(|?!Wprj1WZMv^t^#Mo{+YX41afAvNKDTy4qiJ#XO=Dwsu-*`
z4Cq|_=(+NizBhTbH|&-)wGpvEpEMElu6=K6YU(XqYU(#nZ&KMM2{@=jDWN}zMHThr
zGM5myaXMubt-3?=<hd+!O)}GHb*>qw2uD`RkyMKOPa+ysoID^4sW=lUbRI15*91B2
zo6JX@O}Y1=6{<}TV}obhs!^(S<q}R0*3^Ep$EM;2;B{zRtckC0#LDA^lB_8R%hcK7
z#D=n%<P77T%Uqb!?M1j!5uhGmi?2!k9nl4#0M@^T9f13HKL0zSV*wB-_#O+Zkdnbu
zHetJPY;tx%<uv=^#{YOApu2&57Ea)^<a~wNd)E~F=oZLmXVCuWB7C~r9^Un*kN%Lh
zs=(#(>1I1>71e{dFL_8$L8><yr_>!SV6_|+{nL|xI|rrLlSfjLJ4vr?#bx-ADLXnY
zgilc@@O6GI!CNlI4s3moX%|TAUTsLKDDDg-)F{@VF+QmbF@Gg0^hGGjNuP~Jbxdt+
zd__@chTr1@HQmc4p09<ZU)Z?l)@!3l*ZLW?xlZ7eBRXBQ4w#^~{vFHV4V9*{y!jsU
zasEY{2d-f^nzIoH*f2e~@dhuW1}=VVnCN3Ob(Y!Mj7Y4=L%}~e<nyE~TLyA{>MYbO
zez$-+ME&*W8Y&h_W&^6eP<QX0(SH1D3Fvp^eQX|8wi6|=!8gGGF^>b80sWE(HDAh^
zi4~Lruc+lyf@zd+`#r0mg>i9E1YaGvm^(YcAKZ}u!yy2)i(^i{M<z0E{-OQs_XFSS
z1dk`IQm~N>->%1R<$YCVFrlXzF<rm5nA5PgPLL;Eqgub-ldBo`_M~@(X>W1YXmrAb
z)KGK^FX!mv^4#>o<|N&HW%_2uUyNKAuMMnSznr=&F${X=!u$>Fe=V55CBE}-!H_!>
zMv2A14qNysIh$cP4!ekQ+J6kBzZGs_q2k1)JRjdyJZfZsyvu>XDZ}BE5g+WSz)jH!
z{;YURbaD4rY^gw4mRqpF4Skk_XHWHujU|&Mcx!hSuHl)9T@*@G0!lNbZELl9Eukai
zbh-8=6Z2KyBTXZ1-}`fraU%Ux)$%yF+9gRskBo9GIqpgGF<5AS>jg8XM;hx+BK&r!
z<dv~tmP1S9h>E;rJg*Y;rabcZV?9Sw-Hcu8E@-LpjYEWy&GXL~VkR^a(MJgtdG<o`
zR8vt=txSf6yWN}=bQSdhZ2f7wGytdn#DzrZ2=?Xl&6JC~$?gw_$ukljQBsg%f+t=q
z5(+VTbJfavDLv)lX0kb9gz{pg-aNt&b666`-`84OdNns#I@^LLHZ6P*j^_^OF+xKj
zq@(0jYefJAru;*`(kQD9lbE-woqd#RX01)ZMCdR|KB}2EE2-nMlFqhTfu1heCAq*)
z*HS>{ojJ?4>5}t-j+P^+(<;A4L=tRZB~w^*Ys`;%i8B)xY+a}hH{7crjc+B=^6+Oo
zH*Y&-{z2Uk)}URh-CaU3r=g>zo-K#=y=+}n#QG_*Ta{ap?J75@#D9$knHK|BvqUI^
z_46Fh)wAfUx!fAAsP2QLMmc}Qr)mFM_MdRY_n8)#DArG~RSr>3R@QnToH%m3_+J|q
BLq7lj

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/code.png b/src/assets/imgs/code.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac4c16f913928a6490c26c7b0b96c05c55f8a9c1
GIT binary patch
literal 4871
zcmV+i6Zq_jP)<h;3K|Lk000e1NJLTq0077U0077c1^@s6tyr#}00001b5ch_0Itp)
z=>Px{!AV3xRCr$Pom*1e$P$K2V6Wrgl^7N<I3~hO&`*Yy7*+y2;TRk-F`Nasy%KZQ
zVS`RcEj8+PtLx9Ktb6iCbV(}xRbS<$E^3VasRF9NtOAW{qY9`3^9m>+iS>^A`+ts_
zw}+qGwz*rJ{jp4}dev1&0ZFLIdpO=4{^+aJn5VXF?-pktt`e$ZbyZP75^3`LhyNZo
zrv0{29fc%%>nI@6o4}Zza7^men)X^PNt}jKK;r1WeyR<Qv7kZ{r=b*(IJ);wz5o01
zqG`+xS_Op!RZ6a$0wSj+=}z|#|6Vnw`AoWK6};b`e>}Y;U#Aza6i`4|vbkOK<?G{(
zY0U-uE{%CQ|9JY2eZ5`?E1-bDQn?o#(zu;Vb?kh%F2nWn`DC&9^U3*MdV^U76p%oj
zW0(N^W?FM3_DD?wi%B_mBL&2}#P&3<YZWwjcU5rydIiLvw*8&i!8pBM%k#6-6Z&O(
z#XbcT5KsL>G~Ph#sBsCZ6kJXLfu+I=I>j4ZCx0>5&4GE(%5-U5f;SXUQUL)(q7*@A
z#%J!ic9S~D%$tJ?)?A4(M&lAnt7!}(qn70^PVvUf1fb(RH5KgG@@hdG1?&Uy)iQPV
z{6^cF%f(-(w{ul-cG+~<JiC<@5Vmxy3!O*!wz)($Mma&EE*HC%6%eL$u2#bsLr%-O
z#wGnGES-HPwYUO8l54aYJ2p2_?&G-N(A{e3PDQl26cAJ?fmow^lvH-f)#Xxaf;GGX
zg6U-4^=G|JKR<!R8`gUb1w<gx0DiCB3WzOr>zJYHZ|~9fcaBRu*AIm~)p82Ro|bX)
z^@saPxm30e<Xl&sf!`^y0<uFEfeh7fY>%u<Wrak_+Ns;MmRbRs^g0oDWpzJt3fI>8
z(cdNCq5buIS^I`81!N3(i3cdmb=XiYl?@o@0Dg>3Dz_%p10v#14OSzy5m(HbR2-jF
z3y4_f5uDqwSq1LzBGzPWQNqSm+;^6`u1Y|hGd{2CFH^G`a~(r+K<JJhYJWao*ASmn
z1&A0J8M_>^)}*~Nzg})j2Biu>#K4H0p^|bNgsn-@r_dJ-NDoHSd=fco$HP()sSeM*
zk6?nL*v~Z-2Z-qC7<e|E+tFRG>(2;2FrVcHl5$+HVgT_0MmOP?OAzi1iQ^vl-=5!?
z?!?Ds?qABv9uO~J6zEQ&0F9r3W1Xln_mJVFmVMib(fWlhmn9%;D5T<xQT2?oQ_>wr
zG(OqV*O-GPvdvifojCW)29SxRcrSAJ^OjnvED_-}qOWVb4MdY=EUCkiG$6jA=-Nra
zu;b;$jh#Mru-qxak{lo*pcug@eUi)G^=T!%gOZ?SNdk~iPz>Fnn#>ff`{Sj9fHJ_+
zXTo00_gDdb6hHz4(YJi(N~y)bAwWt717#BAhX%$wAiap)-|C!MF9G&!V`^3k>F3U6
zyax08YB$ccc(gDgfUE?1b7ag*|7o$NY5p_J%DR7QjMIDy21hmLYx;h0czE12=97<1
zqqTx7V7k9$?=`%b@BM#G^TbUnvj7=BLfKh{H~`EmwQO5+7t3F@Hef{sg1cXcwiAHR
z8Garh505QUpCDz_S_F}q`;h2XWv1foujhBjGJPH(Umt&nENtVdKIY8}-;2PNC)Mjx
zg2gW&50Br1yH^TDs{Ni-uh_7hpPfR+0V=euz?V>fC={&Dm)k`#V967ZE{JN)Q)}Aq
zI%knvH<zjJ8kX)Gja?E*^1JerD*6TF>*I~sa_EHD;m9<(-o-@$FV>|oPv;*`-y!wl
zxma94)|+VB|E0Jv4G~Ps#8Y5B>D<k=tiA%wn`-b42z&@acRWn1FvROp<v)1`G#9{I
z!$-riEC>pS?c<cdi)ay509Ihw<n_aP0pSZ@egQG<_2TTqm9@fJKot;B0RBe3cR;{{
zo^>;lK&$I5U<J|v<N^MOCG6|LDriAfU`B!d_@c&i->cvIM;W-8E|vmfYXtp0yaI4+
zOmO{qfULe`gakuyzB#;{`oz){7*?5EvskTZPSEA=EI>M8zaT4m3Hj#I8cW|NyaF&F
z;7Z=^4fue7D|*o>{qS<?6H8M7T_cFD<aGlCT(C%~Olb|K?-N#mFCGSMz6DW0!nVFX
z&8k3JfPm|<C;^dG0WF{k>`}l+T+Fs0cuEb=7-;LO0xk+bfDk{?9RLtrZsOADdM&1a
zk6Co5ARVm`W!4gtLQAOvzbk;wqIVx4J^y%miE8LzLBQE`VujF(YdKY5ssIWIb-?BW
zg3hKBeLih=Re+-a922+Zl5%dEe?W9LozvcW4N(Dj7M-xn#3=^pE{3uO3J9^OwKzus
z7!blT6A3_|^RaZf38%^R8j1qwBq4QW2iwIOEC>XMP8L#{TFY`2Kmnl+)^334Y&xec
z^%@Tf_;UB10D&_HgbgYlw9{J#P+&a2s(+Nj=LR@cMd#$Gb0E$!2wE{}?wKQ!UK3A&
zodaceAmGpE6XXPS*P5eqAjtyKebD6m?DWJ{2)#Z%1@>l-0%b5!Ksd)xxw%+6S(sjr
z4Ok;2wHm^EK<d%S5*!en3kld86MGceDMNS<XkDl&UgsEulIo?V*AnXwTAhgkXop+{
z?D#>^T#?ZfZ_<G1TnM-M)4GlX#|jYA>RHa)LMdKj3}=vbib1-U!Bf4uaf;LUDP4oM
z^|a0*21XDNR-z~%Ai8lXrOr;R3z{j~xNiXK0oRLJ7Xd)PeIc6arS{2W%EO&-v&O6u
zoBGmd-MHB_cR)1NOKsDv%A*}{>!pIg(I<(}<xa$XAmjTu1EQ(ktol2tvZ=#C0))8C
zT^bN<RWGxWq*m3!A_}0(h+<ie@wq-zysIRfz#n|%BXKvEK-KgX3<Yw51NL5+DPA!^
z(DWZSP-3*PUcyu$Cph4`GBa3$fMA&{1%%ma16>ApxCq&*T@t`CQZ9gmSeFy1FBSI~
z790VVk?a%NcLqz&f}pA1$buHvtA$=DM>t3sEQi=vBuF2ECCy|Bb=Z)%$rX+PkRPTs
zM>f4UixkIuh6lufW}6WDJ57O{;Runz5_7S-8)+ts);VLB&K-^r0lF|CSSCvY_1I{1
zgBjdbua)ign77R(`teKOZ;1lpnmHA7vAR<&^vk!tyM_DxOMrtEpflHCiN_$Jd_wmw
zQtut$L2N2fVwPj9n(rkhz5u~8SsJJZr?ezELJr1aE|v!B!TUV?z|!DA;}41LzQTaO
z!C$cb0&~4+$hy5ZO`k_!wm+Y*LmYAj_iCYnEI7I&auT-k`2vzbpx$?ww};<;n_%jF
z?e=bQ_TfsXZ$`gOiExAr&_&a{p@S!G@3Sq<cTEd&>m_~N0LP6n=9qHtlr2Y$J|^m7
z4Z%~gfjX4pEWnbK3`fWS-HQc5XVfJED9Xs#ClUUByl5KJjjH?qGKQpdI0$Vhavqns
z1%XEC6`D`yA5Y)e`l{sbaNUOb<rb5a4oB$t!;b|)1N8`*5^~U*nI*BsSGxwA9Ab`X
zy+ch9j?WagAgRY8=q8(Wqhta}4RC~xKfG9w-q(Nl_o^|?XTUuQJ|8lh=G|A>M3-Bv
zvpNrtP-0~Iin&=1Vhkw~e|Q80oG^?Khx9_v&4pwLNiCKmM*QIqkc8uqk%1B*sR@n&
z5brw(x5r2?F$gUViFc@V&XBO+a9sKgxXj*)!0BCwGq845-Wwor91_XR%Gr|C1_#Bx
zlAd4l2S^5PmNO)QzT&!(=HvwA8C#BZBI4^K=3WWEt2aP$akFxQq(;lJ%8G(XpKfkV
z`21(DfWU56BHs>S$0PwP2@4JrFTRruM&P+ChZ7X%>gyR0ko?GT$W$EiZ2Kw~_|$rY
zgae1PFD}{PsrQ0s&xPG9Z)skR&&>ITHC1S|d`ghOqv!PHJdC8McGBfyx>rE}$<58$
zh)LcY{vb8DuqCM-4pR2Ylbi0<#Uck-iEZ<YX-O20)zB2vy$WJMDA}wO{pJ{uu;B1C
zf|4w#aAC^ipmg?Xd=>8&WMxIb#fu3A>#+iNh2vFu)Oz?FSi=B9nlwx^HAxxG)=f-|
zN#KEGbEFQwB3jr`?7SUCZ=VUCAb=3vtl&Eh(FUh9+7uFG=OpXi1-ezEZj{va`Pr$r
ze(deW+ntV-uJe%3Mj^13V|8SU>&Uui!EjLGKHsO%1OucLE7HeQ=;05Wa}zr)BkNuT
z!$C~#iZ3nM9w37PLg@^t?|7rU%bdH#x<}z~3<GIvv*i8n0VYJl0zwGZbNG%3E2tja
zEsD!I=`2MC<Qo}7f^`lthz13On(|HQgDrC-8W$4e+j?8iEFO-*y@HmthZ;b`146MP
z0Zb@l$}NRhkkB4n1soKYGlcb6d2tc`;1ph>6NkGb^9V^5aFCKX!rN;1ArJ)+ivR6%
z5=eS%5QikA0m4<wRQp5}KuDuSW}QR~lFZ)Q6%g2~2xvW`xmc@U9o$S6D4plpz#Ewu
zbnV&PLo0)W5_^P5?M|B|ngt<kZzZm2lI-l<d$BD^WpEHPSKcQEx7#}!AiWhK<h(<V
z99%G*EJ=lMq}~VO0zx?gH1YFso##n1eLvTM1YXka;lvW8?ok0DTaiqcSy<hzO5w2T
zvKb7B9Y~FUF_wuA2q~i#;hQ29F=wsF{Xa+M&B4Xa6Ynd9V`z75%~d4p5jBgo>8q16
zTFLGgvB5NC?z+!H9QQ{B74}tK+xt&{r|g{cy`+6#y_2vYWGj;Jei2G1skJO+zelH$
z&ka$wHb@2#l4uoXdu$Dv)9;i?!PqM)k^yAMhu@giTp*1d)9fPk(=xjiAWjfRcc+sA
zgla`{SPrkCY$`xX>n3ncT2g@YX<y1R4Ry7$;*a85h1&076EHnMD3gbM+BeN(f^5Rq
z_B+Y7N+_M593Z_Fp)EmqQdcW|+$gS9O3RAU1Z1`A@TQ+HK>pO#LR5-YhUi)aUyzu^
zJjiw>NdbFzaVFbyqxI5A56;!K8s$pTf{c};2JGr;MWSHOW4}B+!plig3CyRjlQtmg
zYNglX2{p>uwaUVR^Z`5N6clx}2;J9j(cE3DYycr=wGv7Z`t5@0-km(CCA^IxX%}l9
zi!fX*pC8psw`-<RGpcJ9b1|Y#u`B>#x>{bpJZlrS*59dcggO9@+aB2f!f~~_Jr~Hg
zIk@8Kb(;!M_IUJHW{{fC3Xo1y>IjuXBa{FdH7L(z@X8JlMgXYmwLB9@h9jdyN_K#7
zT`iqN^g~JM16G!R^pH@N#jpHb4ca|0LUwr*PU-HFCtE-i5)Zwdc+1k^SdFV0{|)9H
zU-dg!63uM6H##F@m8AvG8j$t;$lJqjq%St9yX8a(!*ZC^=R4*E$sQ2aB%;P7Y(Q#)
zBYPKX+RB_%qXzCYPIz$Sy(PK`3o<q{IkTmf1SW(7M~eG9;1?bW76k|^v!#$&`%JBH
z6y;*Atq67H?|7jG?mIzY!BNl}xZ*6x7_`rxroL~yR7lq9uu|v+rqPQ8#2J!`PhDrH
z&I^R2NEd4(v$gNL92U>J)&uECXOc}dEXb|ed@XB;mUn^9RbaVW6$bC*+40w|u{=LJ
zJ;}SL?5=&WF4p$zvQoe!B!#<N?091(a<Om}?_wz=_A#9`!CHakcuj8FH7u$G+maOM
zaye;HxaFu8kUmR8-Al3+jOPArK}VOWc(<ymAbrmKIYE-CHE~K<3_{kH-K!=@-vvrP
zl2Vt-XKGDE286b`T%7%}EXwD$yiC=A^zN2R8u-;wP4<({eGuNX-M1f)96EN<nW}xd
zR1e4~j`Ik+P6?+m$_m68y)?DCRNJs9AQMHLU9MM)a@)4eT?}_b#3CjJyMyI(zElC(
zl2ELJjh*bpTrd7Qy>)IW%MAv&Kck<~-g`S;w7Hf?0h#G3A}-ffjADMh+%6V>K1so{
zhPi1zImQ_4D%I{%sf$JEol<`MWH{>JShg?byNgv3wQ?H}rx8C9n#g-mwIG1R{R-Cu
z)44A$nV`)lb#6@C-chVdZ`A~?MPH$z9*eUNSAZ1N6;VLICigOGZ@XaTU^xx!C(nEj
zfAJT5AI(r<LMb4aPU})$K^aE$&J7a@w&&hWgK)Uj6%bge&4S|b39}xg%Q`RuWz|Ua
zO1Q8B;@CJ|;uFU@?YdmEQ#?@>5T0%uSM_e!;o))9m`^@p1$GrR0B1}08Xh{|LT@lt
zz<Z2>$laJ|Gx<pMaw?-1#8Ybpw<>BaytJeO;ziaS0sY%UnPni`_0_=JYYQqMUgiBA
zl;MOGw|Nc5BxAtWEb37TNTlXmyI=?AJv8T`P(*1d1tf~>zdv*fn0`r1YufK-Yj!=6
t>Q++?1*Dp$))(a{pnz~x(`%|x;Qy%W@qKP`15W?|002ovPDHLkV1oTH9ku`f

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/eye.png b/src/assets/imgs/eye.png
new file mode 100644
index 0000000000000000000000000000000000000000..e149f7cba7a8e287485690484717c5f7a108e5a3
GIT binary patch
literal 8173
zcmdU!Ra6}9lg5ESa2o;yw}D{6-DQwLgA5)t1Hs)LhF}4LySux?1cm^~;2K;)AUFgF
z1Yf@If6ngS@6}#(zZYHIr%rd*TTeZ|=r<Zl_&Ag}C@3iSU}cc@)4KU|e8qbHbfzWx
z0DD?c-L;kEQ0m61_fSyi%E2I6T_4k<T-+8DNan9#vsDQ^&Ee<Pt=M~BpsqQBXH7(o
z;C)>HOaM+4Cjl!NSNExqef9oIIRV&DOiV>8H-gfx!Q6vSKN0om=X_=Mhe<}MBt;v_
zmoW4xCzH#s{0xxwnz!wMZ|Cz{5|^E=S4OQJE8SODe}ixH12v9%KWn;-F>DYilcItl
z-8#oaE?67NyDXvd^iXtaY#o9Sof9G#poe=O!zVtpco-XIU!^ye2%t;!=@tr9B}B@z
zjal)h$W>|=tdfr*OcqE~mwlS2NGAdjbZy1HM4oLFkv{~eN^-)O)M#u>8_F4OC^>$S
zAxwqY&j><Oh+Tkcq9_`@@_mVuW2lib$ft*wQKOWvF+8QQ6Y_sZgJ-|D3EtV3`ppU^
zKNqkuNj)I_Yzt$knum5<opp<N$o~9l=cLa%Vhk-?ONc3M!oFzWvv4pu)QUzZ=9-nN
zot^4-=+wa=<*@-JEKjIEk*EJulj9&oDx-)8<J@f9Q7-)b?W^}g<5i}*@@kv5=HY!G
zC>>t1BR{-w+-IAMhw;MvcLe>+YZJC~Gc2X1fp77uevoy_;`4g`ZB}^cS7B!Q(b%^B
zn>X+y{g39Lf-N)OyuD6p3`p5CB_;ZK6=EF1*wcb}3bA*=v|WyE4vo{3cof^p3l<G$
z(A=!>$|^OT4E6@i$f72RLuPZ*Qx^hS+KcT?PVwZlqj;Dj{RxH`$u<y{9OB)=+oInk
z71{)_fbNd$o4R%xOVeO0$xPPxSVk#ro$Ifnt;ugaVi;5+kak-0m!H-hyZ4nlsJ@;-
zC7*B0^QrY{-3EQXbl3~%vr@5&=&3hKQ4%NT7gG`g2yKZSsL(tjrAE`Jn?niX#$Ajz
z=K_sv2Bqp7emtBH9$H)m9QXpp4eFF;?M4-^Umz?brJ0h@WPAae{(*rt2K-9%uS(|?
zB_&l6a$uWk!#^oH4tQ#si@+5IPd(imsDkG8sz=)|Wdp1Whlu9Y?!45Qd)`oc4!DVZ
zsV6VR96!+GXRPh>L8i9yuOj>4-LK??s(_>=l6TatPghi<SiV(I%)O)b1dgWv@zH{#
zQ|FJ~xflUJ=BYUAHDrU-sZ@fFv!7gy3U&zA*3t5*1gBi%53xh5_gxl0aZ@Qh0~LqC
zObb5vd<fZb%Cqkc4Pn@T7IN!DS69`N8}w-<N%zs}&xR-Lt9sa*?!8HLGwBiN8|ssP
zPtYT<(K>51r-=_I?wIUYz&?kmetob&!?4qcDV~0ik6x-7yF|K9p8NtR{@3iCM4tNQ
z-kDr^ke~2@tb=tD7D**PF;x3)1}l#i%)5%OQ)f{xP6vLzKf-zQ>wKF~Z*eY+H<QW2
zLPm3%T9vPB@qw=a?rR*_yJO%y4KB(2HTbigcTcEfoS2<@Y81@{y}=pxe7KD(0i3Il
z>f1CeG;nFHX|4R8z~FP2S$IHjI%x>$1APMlbBdH6WCv+w*tp7ZkU0DMYogNc5Mi4^
zuMH{^Q%fy9f+(9X*bZMU0ucJS&6knYfw-bTf)UXbkO+xY*cVz}iE)f2x33e+ti&0%
zXu_6}H8<g~n%SRG9zcz4a_L;~1MEB#{MpS~Yu;9HMG@NXm#eaF@Er5kSNGQ+zj>tZ
zjd)rf{jt`dp%nFe7}bk>!BuzD^i}Wn<J<Wpmm9u7|K4$J^Rx&QDfR{<i%I{q{=wMh
z&r6;$jfTtv-_*!6>Uc;*%5)5Q<GZEPt@<}ieAyLgXky!vU^A*W{gj-fo2T)Tu{Ily
zRV&&@>Ec_&`GJ+!NqL+I+rC$hXNsx8N8uRZ_h$v_UWT1diArj|uL%j%3n_H~bd;8@
z@Cj%J*+r;R@K`Q|(9XTeDRZGj09DoM*f=Y0+*+A01x6d}m@m-oF*nduQT#xge#A~-
zcieser<hQ2BSujUiwoH)JRU<q{Pb)xom-Kk$=z1((`2{Ct3)d{#ITq*b5SCKu(DAi
z=T*BRa4OoCaRYz1@`4w0`^&7X)^X8zm<!xNWjSpYEFw91HEWSsIrfSDC8AdS?4AcA
z?kCeJT<}Whn~xpx*y)qlFUZa}dE2E#cI@7RSt~r@A~iK)7%EKLAVo>LrSKKR9~wxf
zBF)3CfD*)w?6lo!2gkv#n}Q5d{I$^^y+W(m;kr64h0Jr!PP5NUeRHj}2$22#SeTjl
zb9Z={sM$Pb^xF%{x$4Gai#iJ(^Xb9PU|D1?PUw#3U!0{^(|igkxa{|5wE`FAa&q-0
zHuNhQ9|o}OL54=Zw~uu%+6yjr?L7`rtujp`_e6QhBi3dR4Xd8KzLHch-R;{zq-6N{
z&rAa7pi~Xft`fu`gpbJ!+O0*86y~_Mtoy>e1bAgpSVLZQ)(YyS*1P0~aUhB^t~Bkl
z$#*?@rSl{$u_}>v#_c9OP2&pJ5-#tiLjkP%0l$-HvstmvL)U;Ven|vE9@y)sY40qm
zE&K|sF-($)6r~k>P@r*+Hk@Pg&l|ARH@mW2oDEVEfG@&-USjvksGAbG*RXxN<lpDS
z{`KuGnEgmkpJB3_6p)RM@1N?4mac!Z9q)9M;MOBtK*tm*dYgGs)ggAloG76XUGvW#
zf=(C5C&Gk8PVToib3eUn?G)W6t?U`upB*b@_WEpfG2W5zFK}-faco>@FIccs=?&?;
zYMg?h@x2#I5qSk$$Mpm8V`Fq-cxO^-_=tO;3EVpVj_WxoO|(FD(Pbm(h5MdJA`4<H
zwJ3+UyvYEZ(U*=VZppM_L^XhDwLzY{hNZzA>PsGJHV?qNOUVT8yP~g5oOFzCDus9R
zFCDjyS;0;hgfRGM0tZ=R;w0{D0EH!dQ>CQRMXQz7OdVv1rqa`t7vrXiR;8$0hzJ+m
zl*^{oI)~oJu#zXd5AdL=!wQUMF4y9G+G{WD8BJd1KKiG=(_Vj#7uYGu5Exy-hVEAr
zCRy$S`&GIoVwkjp8cWk~g(jGNYaK3`sGDA8@>G+b6a3IX8i)YH&p;$pi>eFLmvGj6
z)5t6+@e};ZYz|L>^J30G)>Y$CJnpXug=@2DRNk<n%20T<b4JuFphYrPe(j6xZms>8
z6xg*)EShY}^J8#YUpoh!Q%z3aNUTTZF>bTiR!@)^Zp0P?VN=3k?$wJ}SX=hOl8KWO
zF+)^@0Vw|Y*wK6b#e5FvqUZ8v&jHh^S(Myw&PDtj?4BPgH1^Grnn_tDJ4Pg#)*$qg
z8rU$E2yf1kSv?fw5IeSiJ+)p6B;i%Mn=I*TDmL*}efDR*$3Tb|Cy}>ON036yq)1y=
zoPPR-22pktQc={#*WyMJl5R)q-JWb$)`=6Zh0rR-<9x|OY-HBfyUt1nDh93R4lYt0
zVcaAgfqm4Qs;jswsXNwmfC=1t#%7WE!cN&=7GcA;L;O}_duPi|vmUL0@g7CO6|po-
zfX_P|c{7|<k*wB6{<MSqSv!xM2Pv)KRPM-oH`^jH<2O4Pc4U~z9U^UI$Z$-D?VtV=
ziTYxYX;SRornPuCm2#vp^>=r4fsPCixRW}u$Gs)W-Fr2~3K4Ye>Md79my1pux-4%d
zHqP~(_o=pm3^$T?EtX|1H35_KZ&(j(bgzdqe#dDCI3h&W+#bu1IKC#K6O(e)+)Phl
zm&Yp`7?kn1jPJ8Dbx;{fs>*~%kXL+5$o$IofVH(S7eiD?(;cM}7L{aW4XtYl#IJP(
z1QnFrCX6&1rCtqT8EKNZ*cD)2g^E7fDIL!Vp{<U^On%6U?;27E5eK!Dj*mv(Y!7<j
zIb_33!S!-~9mG|Z_N!}fZwL1g+>X~XvNqh4qIfn1Bkz)_^D9PM4@`du(f7(ks%d2}
zgg_p657XOJ+S(PKgvo@qg|7oapR=6VgMi|7CecyqAKDZ`8^ppY)wN0O(0WZS_krU@
zKgS*kR^%Wwo7J8D-Yu~D%$TK6fBrLw>Lk>)^i@D@eF9i$)y$ss3+pX&z!|H`jQ1yI
z#I%amc!Ihtc~~!L7ajMR1S05d)Z+3R9Y<g5C*`>sb2kruxqB6wY)rfa&d+fRiyIUZ
z`(2vNTWn71(BX_zVi(60xid1ex<UMX!4{gEr1Qh1@&qsN+K1z^9rRR3<WX)=4m9!o
z;vDkJWp}>MOmvJd1&s9ikKSO#4ishVBlX(kz|uu>4wc*xk<UgibXMNiJAwdYX?xwR
z@uIx66U6kYn#Lc|O=g3Iv4hN3!@&LdDk`xR_qJb2^744nm>gHcS9a?4=O>Ee90FWh
z$bpginH&ix>VKnvqnJ06p^L5tSYN!1MOpl<NDeUU2xzhghKs8z-GW+!f6mdXmv4=t
zO(7YsdXpw`FR1C$aC303bOXUc&y2GY*J7ROOV$;&zt(5s(Ml5pHa7a55Ul-r)@%Gj
zmEYHCcSO)X%s&Bm;WRmL;aP>|9LJzXweK?hiJL`GL9<=tk+coNfOx#(#kRHa;bJb$
z44R|>CdXC<LD{K2g{qW<PTorHv1C%ioB0EXD8JiAO8Pz$EPwvRA?woPT&0T=Tz)Kv
z=#wV8NeWU&5a;9x70kFHkRokdppHWA7dot->21aUA$!ymE1cPt$#fCnJ1ahMu}13&
zh`H~m(qj?72o4w_ZoDcSEBCgX&r-4$_`+Ks7fKGuYA&?Ga94d;%@u1Jc10#Nn2{-Q
z2|o`tHGB*>hu?XvI`|5*|BlPaG!{{UT~kh21?iS4a+R;@028SuKgiUV#3m~4-&ZVe
z)pMMzUpwq^0XfnA66G%Z#SvKztl;lOyDz_3Pgg~hS@*_o-<;0mrbCXQXO4t2m^SR<
z1g7ZEdYkIvi$U3aMKRpsKUG&lVR6N_r##5un7)J~M)bB%R(?>YE@<@f@5(pR2apfz
z(WDQrF@*~`>n}zoj1y;+4OvGShdCkE*gd7GuEnhhofdD{Vp74?UXi{QnL#09;W%52
zana_}&3AvO=*GN(76sPg2nSWrGG7P735Ff~o8PTdh>v2b4N(v?;<0o*nX%^$IZG^`
zp+!^Q&yE>(5LLmu67`qEp+e3pCm-cLmSWXm2a0-U!;gR;tGV(JgjMjI6t#@vnI9Nc
zQ(*TbJT$addI7wm(R?#!p>;3*W>?^k_kWZ%d!F5a7yHy=MCH|wCs~(clZwrC@Wb_T
z?AKmiLpcK9<_i&hog{Z(?qTPgDQ;c+%F+=`mDe`?2R@lT<k>o;l0i4g&#W|Zm2WgP
zxyy9d-oWabJ7T~1(M#M9DoMV*?={@{z{L0|`W}(ndy2flNO4ZseVa|wGHy8M>n0x#
z<AwUcr7xJzpgro+;`_&`7k03ti9;G}*KjY{J`?Av8#i;Z!ry3u3GrIxs{sNR+r0q&
zKXjyJkk}@n*pOe(0+kEObsWBswoj%LbK`$0?WXE%e9K?0MZ`TBjKZ}$)R#Mq6VUrZ
zRl9VmNT8Qt1a}s=AAK<I`Sa2mY_11h$RTGrN%;0iVyLs-{Q)M8RwS|g@VJlw-gMw)
zTj5`9`V=IU+=rIQVqv)cv5D=+G<pIhAnW2;FfHT_M5Nj%1%%@Uf}W4N^)x+Dmi{8q
z7z}kz11}ihtKMJ$r@3u|pvo@|r-(^|bjKzuqa@Y&xZflf{NnzR0qf=BKL9#Nr9He5
z;VUwLA3jZ!Kr0_m0;}mF`Id5rDjpTkBcWJ)b6WoD4q)T?w8wqls<^eZwgC*~tnvQN
zbWTKYCQruxj-_Z<XynHpF;dL5pIV_2EPIy)3ms}!*c3YO&RxHjsV8dS^Y<uQWR;*J
zV~)>JXdD0>SO=aj=P6lMv}Lba*@p&^{-tYFY8!s>?vJ8+GShDwV}6_!)MJ{(r|vWi
z=`0==NrH7h@?UIofLUX-l^8KQvemrxGqV!yONxDR&6FsVU*YOr`?Q)Jj{?Y|-$MBc
zI#heRYd$<Gr4BR;Sk$ybe2fiJ%nY4>QQ@gwXgj+LdhET<LS;>9Es4o5#kT6Koq)kX
zUJ`uRW+a-<Q}l(Z7cG))5i%2c3s(DQK$iaZ(}}H3n3c?ae6rqbgpuVz=WjQLi=(k@
zZ;D)8=h8*oe20GM*|8DE33FYa&{^$c+)!;u4+FMoNsP!fDA;4z1ndJ<C9j>&8$GyG
zCd&KiUPIhpXZ$Hsyd$>IGHvcl>&-G(puBS=>k8wE>$Y+&m2VH^QnWMEqgAM7$C@#~
ze`_nybKsHmag!H95bdFNnbz<<ySkvW*w(SRNx&#Ps!qA$x@aE|!EG$=&nc|7c~ixm
zxC4zIfO5pboZMT!k3c7|E<Vq0@NSH`q6g28)bMlUypnENoDjin^?J*-jG}K)b}}!<
z;PQr3#=1a5ftq5^vVWSdunG@y%j}$KD4wyE`sbY0mAN8F*3Boi^X%^$&wDn^ckmiq
zP$!=dPwF`$h_~Fc#$l}GuQV!)fo(ypq9N_~f4UZ8)wRDIaXnYWNdpd21v<d#vLy48
zl>iHS>+VSGr%BGdd~1tVpY<TMiZjZ1;(cQM>7mqChNV4e*}uJVemLqXw~(98Ss~~E
zD4?{IGS~M-58Zq6S1VkKr8bl4^MSd;p*#-reLZ`e_W*n$H4Y7<D#z@I&X-hq0OA~R
zJRB=Qr{s83COyG0>d-3TGXfMq;4(|9Mu;4YJ+fR3E(PS9n*5=f$%y9N*X`)sAEDr_
z+Er=M*LL^WXsCl7LS4E``<EFlwi;VX^cez#xG>+$N8DRNX`%>IE^4h{5VVt+vBw%*
zvb;KH=+I;Uui;&dy=j4b-|Pb3K>?@FGEl%qb$HvL7U^&0j*gg2ui)4KSvtXM=*YJ7
zlwoml42(HiY{)U8t|y(hkLTyQXsr_FT*-f47{uGEX5{3U-0<6=OU>qe@9&_OHqGf#
zp<KirtQx<XS&d<(sYM2v^c+rTSw7(S%+$`NvegAokX$j4ZZ{o+%U0ha``(eok`tP;
z{AIZ8SUQg<o<b;yDhnO;A9;87M+0q|7dwuxzNWo6XFB?a(2#*D$a`)tL93;eHV}Z0
z?nD@P{f^4rFS71!qRW#{wlUu*K_uVxCHKBDDJmlAAp%E_PVLykvPE!w+UNpI^d=RP
zZ~^)4DvznYC1R0E%v%95WG7M(nK;mMs<A&CMK&zi{6{eUrhMY-iSc2+a=V;iAVeja
zwfPNLIKjfT(>(yZej|2A9lckvEi@4EKYBS}FAFv{Jbjf}8{vd!>sd1^TF0kJYu6eK
zxIYUe!w3U<7?#RkTP|>?FTYDB-z^UX?OV-93`EA9f!ZIG<Pgt^pWPFgyQQ;C?L@-y
zfQ1zh8f@xtySbE-o7Y%@o$PGT+FiDk3rkV}m@6l|7&DOfS9G^iV&bGh($5(B)1w$}
z+-^mBIn@8?^A*e<Zn?(!Xn;uhkC9d(3O&}nR`yZNFJ+VwF7S+Og~S$R@B+Q%zw=R|
zfpF6&OuGh`TJFy;JMG;hdt}DGT~9EV^J=NP%bWd>=vqkQ*LfDGPZxkIQdk>G<3+aF
zoLUsnKCszMLnew%1>)TM4(i}hk-uWJXKLWN*uI2aw3e_G2F|8AL|4q5RGfFZ<gHL9
z_S6mfga(CKpwTY1HjtrLxPe>E9^esmj-JsGu%R#!XO5F`c~Y(_vO!&)rZQjV+*pA;
z9D=r?3IaT>ZNFOgy~%)UDCU3_MH2UcKB!ZKY_pr(Phoe2{Kq6Y6?QhLhaiJIa?{`7
zyK`-v#pV+K_VpK!_=5LFhU<yp5v;$KEOn~ASntp`r|q<y>^;?1?kNZT+Rk35=xojZ
zd4Bz@kh`(hc}PWW3shJmT<PYg9a7m~YR8H5&zQdFprH96CTTh(@YTnX<9_C_xB;WX
zV<gC=%c-p=tL(M&>=FL%a7zMn5p`mUI^&87+mQcj4ljU^K1e<)fd#`vK0)B@11EOu
z8C~=~jcg`)g)d(R%3sy&!zJrj#MOZ(ywNM~?km|XW$O<MVinGWaR1-u$CK#^gK_eV
zKnH*;DG$F>q*v18lW)-I2nl!$fkOibntLt3{w;&?F6MUC_TB#x^Tr<|sV1Pwm`k88
z`!JY@z11RivHch5!J;U)r6x6*4f{!}-u~?UUX_SrCoQv}#tR<rSLLsA#I~Rj;^=yF
zrZ!_s?uWh!PItw*Yx_2NMaTHDXNf>8k-Nz>7mk!aau9f0gHiFZ4VFGk!7wfCm>8mg
zf3X4I?BzOdF~_19{(k(KWc&7K$3a1$Vc@a@?@7?SV0}#)8S<Bo!95-WlGF@PtC}f-
zP4$ROy}*M}=|saD6jMq`%`8<t$s^33{xQw`Q`r;}A_8j>(qL6%8l2#-{mD3*g%TJN
z;N0>j-9a3YAU?v1expT7RxlbR|DepLaBW>`_TW_#r1dCC3J{`IpV1_7?e2q+npJ6q
zQ<h6KTgHcn+Y1s*@lxl6hqsP1U};vJ>Av-GtL1*AEyvdy;X=>)zDc5JeJ+{Gg2YG-
z;-z|wZl6_NFd(kiN#I?H8cI`aB$dG=QnApYwJmKvAfZ7sH5@z2egIu1c?&*X73CQ3
zrISwi&gYfrg5Rs<((d~2o3G83wb=N5>5VY1Y+SkQ!Y205jS+E{(JV<2#dhvE8UK#2
z{i~;?eyCIfu@fT_O|437xt>hnI*%>wkTjLWpTxA3lSr@@lD7mjyTK$&>8@y|&*9FV
z{xE?9aC+9?gy2ZXXfkD7v0VNTyp&u<b8lTOn>vF&-n1L@eY=p`%wae|<km<*ZtK0&
z<T?5%gkF4lj3XP}sgkW7Z!9@~h~ncE(Eq>fM}Yr+vR+~JzXqgd^|Pd18yak?lW699
zbNsXz7ast9OW~Ff#HsRfB-iodUS-{XyiS?n#o-?)YX7>OLS!^eNicjyu9^1l2XUmX
zdepLe+B?N))uhjRZ75874EEn5M-ER1V+F}Ith@R=Xr$h|e2f@h$scJncd5&e)H%p%
z1+IM1U3+l&K7oZdf1rCa#3v%6l-JCKB&HGw?9`~~9ltP%4<pDwzHW|!fLJs(e^hbr
z99FiD`2i?@_Q=?<XUv}Kk;N>My>-V>E(kk|!a6up(0iSBSf6CwTCHJSg>Ws)h>?>u
z&uML@eB)zauC=SWvQ63bfq?`lU^?EVJ^Z<gPBrB7!O{T?J!8uX?cj~vo)rXImvQqU
z^S!BILP@+*yu=b~k!2kTv^3BPp~~6y7_gXw5za4<a5N`-egPa4{OaRDhO+i;C_VHK
z4i(6-UUVMULD?O*q%i_T=U)?@VIY!av~)3$KkCFv+eQnTS2LP)l*v?xdbPmuCj|Sp
z2_1ZwWW(7=x@iarsysE(;Dwk9CvJ%fN+;Op_;mG5R$87|OGb^U0W26jS&G!Ea7i#&
zVoo(6EZ*$PRjx>H)4)uH#{l?UKYO<k4@)v|Wk(-gGaP%yOrJQC{(6H#l{}&=1kB%f
zbe_dtALH=&h+U;dWFdE+)NuVD*kJInNokjz6mIxBrc)sATbeDvNqz-)Hm6Tm|ILq%
z@bqtemmyOubKB51DC!CNm6ojB*54Kx!ZCaj*A|x5BOtuka}?s);qaAQ{>x~)mOR4L
zA2fD1dN3L~D(!bXex#*@aMU0}lQiBu{1_CwwD^Lix0sfsW4`T%T&rKw?uos;oO=O=
zj90L%3%yg4#HOLpVb&@~`iBKbD#<AgX<UEW?Z{&^n@DmIr%)9$b{|y~WuCI#NjZuM
zafzHYOtj8R7Z{l4Pbl_B^Br=NEYh?8^jiljvXtUu-gK=*^l2|#O0Oo9>A)X(m78<q
z3ve13pe722(pkqE()6c1c)g}YKb{fexb%%6H54_cA;b$#`G;b`&i|!YXs<e7$19g@
zSmAIGA6JuYPbmZA85!bXOz8Y(^OZ&Td|4A_aYYNmN661891sJ;*T|)gRHz}G$%1N%
zKRuQgmhzloeQIdZbngaz$>6u1^(J5KYgt#|ArHVhVl>lu2PqIyiFWJ3%04n+iZ*%_
z5$S$<TEI<cvzXc9@PznKt_`Ipf7eT_k9HQt<!~7GxU2vGaV^A1_K1Ck+w)JgskugO
zLrEG>*bv?Fe__M1<^8>~>yyz5{4q`x7LvXXuMv~-_h*(iMJpAOPlz;QV<kgxo-L4P
zuq2tMRan<I8*e>yMOv2MOYct+LXkLcsAM$+UvPm(HwB+<X;!C-2KzNu`?quLW#ms@
zM4_FO`LUu<(DNbOkNOr8$m};mOdr4RoQ$o9j^Siu2o*ahQs#dLMFu-Ra3P1f7_$F|
zi)LLra)zwokWgdSVukY;r9W}p!|h%1^;(%HkQ>7z!sPc49X5@JpReLP;o<-9L4O}(
XP-B+mvrlZE_&o|(K?77LXCC%nXl$K0

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/icon1.png b/src/assets/imgs/icon1.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fb718a352c41ee3a5878c902de2e9603d7e0e77
GIT binary patch
literal 4141
zcmdT{`!|&9`+n!08I1D~rKp!C$0BDtr(vedh|0*I940iCa}kw^d9y2r4r8bci4ZYz
zERrzool}iN4n>q98zG79G{|Q@>-$f9zCS$Awbs4vb+7e2*L`2lb0r=-;vgfrT@nBQ
z88V4T5n=0pmxP#Tf96s8NCb!oii15++M)U#0OTgfM7!gce12rbJU!#4)Y9m?pU@T^
zc;eb!g~)sg*+H$zVYNB(FGTj!)9FRW23+mXKZ?ZeJjpGZOc$`|axEN+xLSLWld6gO
z0%FyvdFu!fqj&#N=C`4kxaFCMC7YP+g|*O^L$<Rgg31;=Ct^B-Y$aZNMDc@N0S9;6
z9mswZbJM5r;@lMk6>$m8dpEUg4@i+4ygI$9J=mNs6D=D3CSZZ#c>zJDchlZ3>;r1R
zmygDBan`r&j$!icQrd%$0%rh=0yswYK_<fM$ULl?wOo4?gDby6kFsGdfL|O98=3hN
zWz<wAilUg7x#*>;=%AZ|>h%JPFz@-ZsPJRX3*GI?sa7xl#T{-v3KqGbjq8w1Tb5kW
zK8?$hELrWQ3KC>|%(Ut~@Q?$>A`B-|t+-69BxgHN#bvv(W$_ia6TyhxII{<1A=puA
zqd!qbC!lCVe;n&x+;YyW=4Br5ZpE(=GSrh}T$PIO8cYvvR6VMG*}IW4t9cR=a0RxK
zpe-w(zNE@Kyl<W0WiDP$Nceku^?Pzh=!mU{J0>8hJA)(jH(KGd4?0|z`2=^>>-d>=
zK4bk;15hef?h=3JOsdycURamDLTfKrE6@7_z8ANRr^*f!6CN}*ueylXi!6_z36e>V
zc1#*yiogT}!d7y$WagCZ!3%Z3+E@X73C9dU9=HOJ-A63>pVEa(T<FGw051sc8@@Sq
z6}BO_w+Dv-%VJTL>TREpSH(i~VJGE;%}<M)4HpOfanZ#=Lr=0e){-<TK6@~Qq05V%
zD^O?+fEkj!T}a)ZimBu1{%Cq2z2<o8%c-T>9c{LKraQ$gF=JUSucqCrfDPxa5%}+c
zWHq%x+P}ZhK&)%KlNWjZ_Idd?PyJO-!s(nwg{*YVX;*q?wK^uiS<L2iw4ZRcyMQU2
zF^>X^8dz}{=CEVaS%Pxw6l4A4bkg~?Q5!R`NNlIjWT4-l+k6mG^sBAQXs}d9s<zle
zGP6yD(!Jj_Ss1gXozbLU^h&kYc>W9p@a15L$&FiMa&f;~1g)`7^W1&?N<R;rh0_PD
z`&RPPu5UX7Te$CvuJ(20{oyZ1h3HGkf%V0`47uIkT`wdD(Z^i_;|A^gYS`;u;v11)
zn;^6w-4>X;edlZ_VV-kGC^^;4uNIq&WVuFs+r?g|M=Tpzi)*n0U24`W|MH%3|2Oel
z*qmv-%&Ynv)fQjm(en$XR4d$oR4kny(jf$fGs!!5(0pH?Gm!Lp;P-+Wy0sJefMrz|
z>a(YxGtdMye6-WQDSK|8;4vlu!Th%U5lRoR0%^Txshew(Z1udWI|>wsMa|Rkt_8vH
zBS!9OpNWgE)BK^yZZSW<_rsa}prP?_sNf**Qwp_lG+XoVygM8lZ)RS#yZC!uCVJ;&
z9D<RMAJ)>fW`=_w0)iX7q`kYpD<=0AsMF{+*x(~jjw1Q%wn^9gRTfG?=+af#C)E4A
zxy6%X&o-)h!F6v^?>R5N@GG1I{+ftqt&Q&{fAwj->=C)0zT^osN|U;?dk$Gop#FRp
zbN~liNeTW&SeW-HpI$ucc9OqZb>hpCYTMmjQ~iNZQGtJ=re-lKsJ0)6^_|Yuat4M0
zMhV@AOA^i#>cb97<Y#=D2z#s<o57PASUk6Xxz#%hmJy2;{`;kCd~<C5$EQJCTvewZ
zUsK+AuyDK6<PKV>l4IqQ`ceo6kYy13q0n^G;l-;4xf{~ne`!0)W=Xx}GY(~U&MZ7b
zUof+d@68_;sN~bfAmi*elRHv`x0*XnoB<81)DSCk(!Qqke-_kum~y)W`>5@$xA_bu
zVKVvmi<IabS1qvU?MRTx^}T+|m$cuE3uP%t&%b{{rW!Rym!)~H^@(gR=$^$o(=k}c
zwjsD}k0t*s{#Zpx#ued<Yg~U{uNy0<@Nhj|*yK@C8dUH5uEx6!)vb8G#D{+%?{b}f
z?494A?~J#nL>Q&uunC;its!wYH$JF7@15w!uGATH*v;4WJ3MlPhLLm6`rC9LN!)_w
zuCj;kIBUPc7vH=v{B9aqk?LlJ-DW57Z72+wxw*6jtOa@Jbe~8BK;e7HzR`c2NY-Tq
zQnQbGE_!F!4=Mn1ZaqGOv$E4`3#$qy4Qt#JS3n;F-@vxzbHP2YeQca!-2rhkiLpBW
zkR1_b{=x7HBRqTS&d-d#xgJ8+p@B?Jr_8Djv)-@St%QtXBtGdO3s3USw)0;{IhTsH
zq`uanYE+;{xht!IvFbmJadEpwkA3>cXIPHuZE%CUcMYJib04sUDgXW`%QH7#Ghq&+
z#Tw$rPQf-k84ik~EAYcS?s0D<bPr$J6GD%|FzpN~A8rx!zA@OtVW_AZFPOUy%UCtM
zAPYya&rUkQD;s%bx|EuFC!@%wTdyj#2He)-87e%)?fBLYm?5-43uigFOVkX{39b6H
zhGNITiT)a{nk!@pNT{6RobG0GvLtxdD>FNmA+VvMNNRWFKj}F~3XDScdj>hM@7By(
zRN~i9UGl_JJeTi3rJk}9y@Qj<o4wZ;40@B-wI%`+WtJ{+2uAOOe8V!RL5JSTd+WE<
zx8FE>blP$#wtPfyin%G(lqrn-bgwV%liQwvLE7$|v;I{$mO=;c&we%&m8(cZ9g=6^
zBd;VdQAUY)!%pac<$KK>J<`CUOB4q~f;dt+v+p$_IL&+4=?5Gpid_p#H3WkS{}Tyg
z!s9V9VHlbe@bj*!&&b!q0?}}Hu5KmY(D(64euAP%xmxE1Mt|V~!M>dYYKnwNDy-O_
z4kayb?pGk;a_Lc;%=a4CUDN5P@f5Fq{>4B83=VWQUO+$1PLOw0|E!o$y}>NhfS(&A
z5Z1BGs@;E55|&W8r9%e)4N1LqzrU<B-Z!tff^4()f1(Z(p>uR)^;`Bt4ZP8K2V!DP
ziplJKzVRlbJQ9tuxZ0gLC27=z$+(DAvyRWVokm{iGA6;`hm$2tV~dKSuYUJ5SyLBt
z8sc#_3qgN=ie?o-ZocJJKV6<0d^bHZVxlRU^rRpiu&5LlgzWMtF|qeBE^hYg8}VY}
zr^fU$f6I48vwrtFa_A5Q2QW+Z*9ds<`_X4<=fp&eiA_#b+M;m(+X(@a^eB0zH82Cx
z>RU&YX6sQt$Z%Vx67E4hb2m)P52T*~(svo=+xKaeGsiHC?bDu)(4s~A+0%3>K-E0&
zu{1^DB{M(llHxNmggurqFapG?si)aL*DBxICjR;6Wvy!{1vsDMjSxJSc)TUo8qQ8x
zw_g*r!}G%x9BXMoYDH46#WM-3Ll+9ESZc&aB^*dLj#1*>z}o8&W56)hP|nqD-gbUI
zcA?1dfRbG8BYI#mdFPPswNfZSSe^Igv;}oz%NZkh=tZAdmuuEN`jR%&^MHSqf`@&#
zZSSEVncu6TZ{7#<swP187F7)`sV=`b!pQZ<;PO$X!FoAW+!4*`PvI%#2+*cCK!@qz
z7YC)`HR8^P`1oJG?}T?}vAKCem5MBU<pVq>%?S_c)E;=Z&k}*b#bDC#Z6b#MUnI2l
zeR!9Y0^gA>yr(oRFsr(X7;<f?u1tIdt`HkfWSZxIznou~{fu-vET6#HP~nySnl4R1
zpp@AUx6*9$ib5;sM3X9*a}~>TGd}q)7YS;yUmH?w6-X#HJqpR3jEQt0g{TsU^+_ZM
zdqmwhW;^fW|8dyK9xA??9<3pYlN=!|)GVbAm$Vrz6JCW@jAnhoYJ6Ab;$g;4o+&no
zEB^zddU$?(=~QI0Qpk?UDWAnCz~Qa#tx*$=aKpAT^ZAF(<W2~CE@MCi7<Z5^I<|<}
z3#n{4=b|W$z>B@@{2KMINS;3Mk^2uWuK>k(+O`2uSzg^Ht=hI29NMi(RT_Z_*#D##
z&KC`Beok?EygCF+7o;6vZ4ptq<+xJBei6P&qlmMwiS+kcv7hV>kyxiwrtlPzbW@JG
z@!yD0%+*niBq<tm$>O9xwt)(*G{+(&*$xkq?c5B-MLMA3q;nC{ksv`jPj$y>64D1D
zo8{5R%wl3zjcQk!Q_LYAKNJxjiT_;3UO&v-cwTS|`_@05V^I6;@Xy{5^8KQc!P*%i
zfydv8-meFJ3nAGk(uNc9AI0ac&?sxH*9Kh<<Nib*e@QGnOrRcypTCXI)@jf4wkzhg
zE&$aMq!}IdAiDp3Bwr$ZAQh;Vv6$IP3RR)mcAHe=^-<wRXcy#=>4f=qye&sAoymD7
zMN?sBA>|e{*b`#H{Klr@Qm77jsod^D8EB!zqp<aMth_%BiF~3W&~UH04=@W1_oyQ4
zhY241R^}=sO1-__{oGns@T8z)e%cgnN6d7MO59I<_~oxSc2Muh5=Tf2`O=KePTB*S
zVjkMhzsjh7!OxY-S7`GFmdftIw}_A|Tu0t1uhm=ULcxq_12xS@sK1Cb6kLl7OLo>y
z#EVXL8tAx{RX&=?+kzTTwbDa#0>C2T1#u>Uf-6neIEM8g&UYO*VM~h2W&w<6UZ&Ut
zXPRMKyuY}&wa*3kxW*rH_}*u-6nmE$A9+&c?Uf9NuZeiwl$Urf?LdvL`*^L<Ih>^;
zX%E{PvGQB3<@p}mW(7`ANA(uj*wQ-<uCSA88fP_rjSP%~9$ap`n{7RAj=I<;xWZ0;
zWpiyW=;^GTNmV?>Fyc1@4Ana#D;*?1RVD#)f!83f<=g7d>%R%}|9A~-$Q|trvb#~Z
SrC#L!0rJ5k#8P|Owf_J<wq0!i

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/icon2.png b/src/assets/imgs/icon2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f8ed61922fd7d9d05deb9ee3d958d3014b67a2a
GIT binary patch
literal 5136
zcmcgwdpy(szyIvw&cqOlOq)xE#3H2THe2MLdoB^*DU!(jn^6>|?UUBUC6|rdC8S70
zk=!zg=(2AlOC+gWD!-4;Igju8_xyAI+4gw9U)SgB{krX<qrHukI7S=*04WOD${7G)
zQqb=wqQcPUBC(+b`huNywy^+e29yN=fPPA`GIx#joy$*<3qI`Gbu*-~p)lu#^BoJO
zT&pD6-^W5v&DIfyOVMkWi?p!FFt>Ul5h|*7RnkdD##u|*BjZ^EFd6*nh5v3X#Bs6f
zvS3_M2gmJWyqEXjBfY-99|cKmpYt9J#(np?Gkq!UZPNGO57yTDV_t@+9^H0`7Y@Am
z8E2BLiHMa=KBSq#9Zo#Q{Q*lvbMM}GcoJDB%T>Xz_ZJ%4CkG1S1)cyZ{Pzjd>3i|v
zr*RQt$+qOb<HOCet4f>>S~|yTehCKB5o19?d%i}kszsP450iag48H$(@97L%O>m2(
zNKp>gcy@&w2iR+@T&Yo^tDkk{F`|T%j|Fbe{@^4@TLW4PrlcNc{l%qakuczXY5oeL
zeu>lV;O~%$xaErh4Mi5L*TwaJyPr@qc$GHw`h3<gMu4l16vY%Ezl~g5%QR;V2JJGT
zo_elJKMwo38g#WrbH5yI1VG*RXqp|$Q4_=hWvIr`#MeFO=Bz223)_)Hz=uim?*Ii1
zr-rjg#_zJ_tJ9xP1}*)Qb6<@8z|<QSYnc22Snlr=XsciU8_ajDJdF7O_ZY8trYNXt
zto*}@L#Z0WC~JgS>RXn}p#-Bd+l<TCV=FGFvHf5R_gIgAxqzRk*C!V)$}n>FhijiS
zp2Lw#*B@yNhvtwbVw9*Z12!5iP7V!dn&c@T%g9>$&DGlXc2LRV#VcFig{0(3<KoQq
zUIb_?;NVK{#;yn5cRwauZAeu{@caCa@$xfj#k)-UkXx;Z&bcuSpRp@7<=Co27^6KQ
zNBb%UEdgJ<#TrlA?-;a)Dvk9v|FwmF{)qlXH#z~&Ipjk%aA)V6FCJnNyRUK6L>m(C
zeu0BAcC_F_yuBh^W_$4`(jv>hs?*N@0TTZJ&V4KVC65>>n=4hxNMlE7`;9ZcJtx9y
zH3il0VUDPmdtsDIh=^UuAxMwc<j6}zpKof7WL(%(#&3n+B=B=>n|=XN28rkNC)Y}&
zrdM2+w^l1qeWdstT8Eh=KMt=d`N-rEGFX<eWD4l!D=kkZ8!_!f%<1>#cS%uNfMy+!
z^AeOcUBy{F^fd~Rht9pEb->6#aapqG$=PsP%~Ppzb4(d*ukMA21E9Nbph_@Y4G!){
z@fnVK3(BCt@zzjNG4uw?ZtNo7RJz6eK=~bs9Z=JFmXXZ1ge7WUiz4*gNxgkI?TRkl
z9nq{s{*DJfOKzas0U7N#$NQ&)IkDM|VHeY%-2~A%z{d`d&zgdMq8l_`P<#u{MiQ}t
zbU_sg^g}&zQ*y3?VAd?QR*w+sad-2CN#7TTgX2Fx9r!r$-j>y63gpT8IMu4JxVL+x
zUnd@igH0#)7yq=vu0(=EF;8goPsO);Vun6k+XwiI^_;wV{zZw>78qqG(7I2r_A_kk
z#*{na_Q-j;?NXG7LVOqV8zGnXnQWl*L<1|h1p8@Sm)c4Bo1o}@*rS~H*VmTjoAHN7
zz{;39us{U6TF8EnKYRDh%kbE##}rH6u07`|354LrT+00Zoln-o;a|651tvg(@akIa
zH16pPN=4TRBT&xzA)EnPWUDKg_3RwuKrf>cdKp68?dGI(Fl*jG{ETs;$3<SVJhxW(
z8GBbQZ*yVEFSC7Iu9_K|u>=PMrxclIWO^EMqg<=CsN{pv)%P^W%SXYXHCW0K2*qGD
zL+;n5x!itI?UK_mLN$S!D9Tk87HlQz&nZS5(0s+n2k-7|HH#ferTo23(c9W%H;<7M
zZf5`1uFU0raAN{l_qzPlStFYDCPofQ#y;K0W?Tp_or!!Q>jDzq0DOdbgy!YM;~N>J
z7Xt_9k#$E3C!?^g<1^o06HmyisZ((Igso;1r)|KYT_qJ-=R`a=!zf_`aVufqP=Chb
zR4oe(=qt*f##UF7+q5^(_7H_p9>Vwr?E{1AaaMXw%XQ9d=D=Ye1$JZ3RNO{rxgDb9
zgPKucD$T@k1qKvi>?ZHTCwv}bX}EuLp}@HM&iH8V1Ese&<YzWaM>BHlXH0g)<|mO$
zx4fx1sZO5U0~FtFJbNK%wc~j|Qdkp9^#k0IBKkMB?6hT&QVRGs<F*vi0UOfl=`67z
z2<glHN?RNxq9S+ogowP$kXCZVfIM?<WlD}4Xm`mV!hm*El)NgM+?k3P&kTy{K3&)Q
zyEBc|)dI8n;oW+E>gJD2PuvMKDKsN$Q}RsqpaEs8x9MOJhj}Ks)IdDAajE+BePbOn
z_u+nIh8k870%amIzps)~dgo+icq+xx+2o~h{(>^~DriTFF`&H@CEr)%eijmO`&Hy*
zd2sS1psbAiwFA70+(^;~P{OYPx{|(2uAn9|FjI1i6$Wey{T{qem-zl>?j?=&Ef=CM
zh%MO@dAkUzPKHuGKT)8-E<1F>k@wf>)u9AR+dZ$2t;=`_<R2_H;x;bK2)t_rx6M*I
zh`Eax+btU84i1%diL^vr6YIO0%#J$QBa-@{Ei)*-#^FkJ4D<|*a(^9RylBJ^)6K&*
z90@RrK<&LCu9i9KI+BpR4V`!VwpV!C3Jx4HFq}5Aj|ql{iIMM%bA8)e^C_h<uSObu
zIYWs7Ip2fXZ<|6I*Z*n*evMZV*IUGLh(z9Qptx-EA${uR6}|bUz!`7MN#w%ScJl&<
zMd_5=C<9u%7<pWnd!(KA%4*TNeXO`+mDME$_$uS|Zg^iz{Te+c3c)ACtraS(H|vQy
z;eWW=2r?Oqen$4Tj!Y*P2HF+k;h;S-A~M3R`?6iPu-nLLPS+Y>rTYBm8Bh>xXoS86
zmAHm0*j1qq(Re@S5oGEC>F9#X?0%q1xGt{lP8g*$79z?{W?uo$h@<wsz7Xf2*L0!I
z_YI_IFlq0By_3C^dDX1wYhrRXP@}=AvY7iSn<*!Ph)Gbs(3cmn*G3sXV>hzOQ5izd
zojE8ha%NA@gVfvB=X889V1X!hu5k>nH@UX)&c!zBe1<w!AORGIgq$#6^vlfeGeOK+
zVyNjp<J&h=KLC68%g!jGweq;z0bU!MT={V(eLtI-J@fTQ1(P#*tz0(tK+i3I;gIL)
zgx@gkeCptHgdQzY?3G>pjZv~Hk311N{N2k4tw;NYZcd*9z4%LN^ji4xW3S}cJPkd7
zc2;xcE5gTU7EB^fwzT`%*K6?cXhj(9^X0@uov$;Nm<pk^ZYtbT277N|^j+(8(*o^a
zJz@H=&JP1GIIGKx(?}q-44B<EmaQXb(~WgCWA+HaS!tZz=cDJ12bjqmrY0Q+`#G#U
z%dfHX{|hcCA{V9J)}imCx~^yS7P;T5^;3XR5`gCY`a5hpc^9hC-C21MmnUE0VZm}f
zNh7fA3WdviQkBVJiVaXl&~*fT+rOwmDW|=@A+_m!vR;_${5&@^m@V$kITlG{Z`ol7
zh+G@W(f?O+Lm0)oGzjz?m=8i-gzT`g#i8?ty`aJ&np^^W;^E6Q@77}DEM^C$8UEBD
ziw1&zyK%KVjM58JZZ2Z0*>}|wysj)T{r~WFAcMt91T$LThjXU+mW7ZnL%b)*4-K1W
zg?i3@KbWsfo(u9)wCQ$?KQ8y<pIIm#Umd4SRa{pY+z$DVq;5boP7(_e#eKUg)zh+O
zahw_iHf?APOGWCRXRc0UO?4&}H4^kG-Ww1$`NCDsol@vImUI+4qy9Pjt_Ypo#&F-@
zRcFwZ942Mrj}<mDGg?`xt3P!E`?)&wKI;>IbgiRrIVn;XSfuG~f7Hy`AVcNTI70z2
zZ;T56(7wjt01u3cLM>+q_U4?+@y#1oU%WQ12+@)qbp#V_U)vHyt5|8awIYj@{`fdG
zD%t4v^W9>dyqUUK9Xe`3Bge$>Ul~@;-CB~iC7tgY2`1cJ;zy730n{juRu)Ml7U!UH
zM^BrM${gj*04E=n2mY&!PKXx&SD8$y{r^%{|9tzu%1AjTd;Tc<?8;H29smZB3zmT3
z(XEG?D|0BV%0v0Z8yb3}GobEe4%k$shN&l`DZUf1kmz!kKYo|nAHslbDE{^>=B(_3
zmIeeb)VWN1!({z@5E_WOf2$~Q_r#yFI|BL3KU`PDxJa3-St1r-Ylbp9JC?tQFDMnY
zyLa3VKwnPtI*Q5PtDR-zmdqJi9I4YtJj!d{%yrXoqLY*rx=MDQq&6g~+qq(HBJ0iy
zSA2XN5U{W5Ba76vvuMR<b5d`cX3rM=T`pEP*dI!NDFTLrijIx%>hxath1udJ59{rr
z626*k;x5|xj9l#O7>nRQVRdiMX&d&K#l6Ho3J5sy(>j3afvFZHV;UhdUiO;v&H(dy
zDi=R9UlBIBTZwKq%h=vFthi>1lED40VCKx5-uR|68VXKyC8!wkcpiG|w;xQ_>5c0s
zQlPcL1UC!KlqW{NMhvk?(x1AwL0l(q_r=~#QtyefiQ3c8n<;l~%<Sx#X>!EpqxfUd
z@%I>0v-iKfI@`n<!hQ9E{Ob#0lD**m?!dYf{|xAt=P>x|`%&sruj%VYt|PTO6i9;-
z?37+l3_`A4;gp9WLOWYrmr9j%W%D3r$p*b0%~hP;{>+2&>F0Ozi*NCHtS+wgjzbWd
zT#4e8UT=($T)7;?D5RYxp5{-Lb7mJojB@pxb||KCoE({HvgzlYo^8A3uf-w-Sby|Z
zRv-mP6sG*+fe}(D-?hQ0@GwQq6LVgHIs`#2u9GO#Sx*qx<rPDC%K0pbrv+2xeA#i3
zms+iSdC5WEtwQqG4WZ_@cPbWhoXnZLO)VJ+;{6uGU(^XV1i6g;_O;>Amr1-o)zx)0
z``wf4<>#4}VN=E|(lMcVC&++f$4hGe@xmlA3nruEH$jed$J48K+LrJ#bRD5<&hg^f
z0B`8pmm95sMM(t0qA}iAS)}*!`6W<PpN?Aib>1bcZhOF;?K6jffX^B<)#%Wft_`Ws
zHM5G=RvJKEvc8`_8*~ARO_6S3%Q?>O`i!OxRrTXP_NdsF?BbdEYC^J0y5qCvoLOCC
zJI4ELc(y>R2zOxC?h6{Q$FFdh_OFM%^kBAu?aAq%e0gZ#lN6r{{1)N5lWP<s?b^=#
zf@=Hf@fjsoXl|H<wbsilO9T6ei!Sn#zjj+T5JIbNbo)TX(;MEb$dwpXTHXPgy6#Z|
zSfnudud$WT#O?{qPdq79#ovoNbh(}oTEXh}Qh`z2fw7n_?k@E>N1e-e2%+UU-JUA6
z>4dCxWL-~I``L>@@ixxZcL)_)mqk2r|J|0(fD&hQNL?})J(r2<+x0gA31F+*#=NUl
zu+gWs{VCWLnov<^J^NE0KZ<!^uB-o7fsco?NWo${bh`-q%0J{5|3`9)A7bG-adikk
zh<arF2w8!}3LJnudBsn^@Hb^H?A*q_q*AmK_DSyATpa$Y@H^$B@WY!JQTvlS;i(TU
zPG!PRS)YSCelMWB>DpWvK1S+)glGUQLc(jKct4d5A=1=5G5$5~iH8XP1aOOK0`?i*
z(ymYv4z|JgJ+z^`gNx^gJ~C?1j6ei>Q|}xxkG#3D4i|dB!8hXk*X^+RLyI5%Kk);S
z$T*eowTR5?1@?>03SUrrXvL!BaUpJ4ySbUwBBgz7TZe)!onT85<dfpNWx^aZSBQkM
zQyPx4(6m(Yy|jJz5xYf({|T9ZB+8@|u>V<Pmnrk7Pp@)%F4rI0KC6XBfw7v$Sd`jz
zluAwMH+6a$&@4}!!1ePilkCgWN<~aO;otyJSEZipO{qz+i0jo|mHupv>9@(j!SXKe
zejMd9t`4|?K3ABZ<^HTJwg5W}UMp0W&}ChbaFsbdmP^2#!o%37(WfU;DO-X0zBz83
zhMoxgco4I|=jud_+CBI1MMhkbZQudm=GMrLwk9z-3x8<UR?ug;b<P~d^taH5fo07R
zw_}kDPeheTiz!|op0_|!U$qw4JRf=bY|@Zsh|I>t#pj;m9Tj1caM?2@QU?R4zg#2g
z(l*v9qkB26?d+iolYszA2O7Wv;1bXj+|n#^1)?p1wVtFsjvUp{!_(4%R(jAxKix7r
zu4Htp4~D*%SGz-CKc;)2TS4L_B3GN139u8&NsZQpqSPu+XOJgc*HBqAH!##wbI_rc
z3>SPU4q@6kWT_t6c@Q!@yW#y$e?TBn^6?=7^E%_pIYTRKe*P)r<XLj5N?%FXV@hBc
z4>Uw9hy$kZv7^-om<BdB-UNpe5%3=fkF~)Om-yI~b(lEqnR)SbVd!5y0H9dgTh&<j
Gr~C)j1t?<x

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/icon3.png b/src/assets/imgs/icon3.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c3e20197a192e5466b1eed9186792cf7a0967cc
GIT binary patch
literal 10459
zcmaiacQ_p1_y6qbHHZ=sEJm-1AP6=DyLvBCqehEFud#`U=xc-!HE%WAirz^`bYevp
zy{!_W2Eo_o@82K4Kjz-^oM-MibI;6q&g*sNM(OFO(@@@|1OR{rje2NsHFy8-A}75X
z%goBNt|pkbfx0qKK6r}&00;p6@PSc)^>!#(y|i)Q_9K~ZPwcin3zO2(3%fGjO_`9g
z<NZMFW@Kcf)k*qlLXX={RTX`=^Mxoe8$v&E!YfW{B2Fz%VK}|0XSCBd+xJ4YOV-=T
zsV%rQZ71D(@J04oFs;)5@1sHMs=n#B%BpZxcqW5wqIM!O5m`s<bd3%@PW((AsDo9o
zVEW+o#28QbUs{YVEPw@5g}Rt)XmLl^6`zLDVT4W2{bha~hrxCq9A__|IZgQYO;)xM
zVcbkZ+wNn+N=`40fi<J^%YQScN@`(FRCH(=l3hzchL-lA4QRg6P639|iAYkU=h?t_
z5kMDFy>dk&jwpZ<)5d+WZ<~gm0If*dp936}^QPf(8D#SU5GT!^Cspkv>>(Zp`>P3r
z-P3zzt@>Mium9x=ix3}S0~iD<F59CODdy=Q8#c2SAMGGoqGv*w80ymX74RCTnV;V`
zClWgJ`y&&Ib{gh)@7mfgJ}7v8395|NY-9z9Ml6z4*Ux6hu>T@eg?dDV2`)hVfav(w
z%UQ~0rJEnilTB{3VNj>Oz@_s`anE!_0(kP(5oLy_f&F90P{sYs;vbJgzi`Ss4Jt`I
zpa!~PC&tKtnds#qwNh__@c<kFU6|H*&G<P`1n@S{pu>jwc+jTs-RFQctP9N6e2Ux)
zwl|q7)x>kc0tSdZnm;Uu@)!BL7!Q&luEBQqqSVesf#9TnLs1)%d38kf`wtJZb@nc<
zk8ZcxP`1kef45{vensT1REfH*0Ex>MkT|S<?=?e+NKaB>kqv$a_}k6sYw8=sG?S3$
zcvlWBN6~Jtj{D2P^de*V<@GTomr-w^`&~&_<8G@a{xoUWWpUKLr40uX+?MpwcwX4Q
z&7$O5Q$K!a%-BQz0}*m|sl!swE1PI{K?7YQ4rH5)-4qG7fYwL@RotNv3&(u(clS*=
z8!y?~eSv@074vOL&1P7ce!iZZvl!c#VPv~c0UP3HvH%&;ZnEF&(&<3t>*r7J3zMK$
zS++nZp@d2gKPr?N&TkQIt+7WhSdg&>{lnX^3M{dGI>Uyj=U)25b{_$4^hF)xt<GeB
zzluOJ+43ZmA=K>(=tthI4<Kt`e)#2{64<al>YtPL$J~U54hKjZqlTN%v*mH0;62Vn
z<0ZK}5xnN!VGoP<0S+~MZ=EREvtp$i9nXLAlhJU{8!hdBQudJ5=INFu-s!f-`7zCc
zDA6`YMXB&6(&np332Ao=tXc8LG!gprW=%5K@-s<7f9M!hz^9TU+-942Acv!lQnuj<
z9985%x2jfVns8>S;n!-0Q4l;iQ>${H&L)l6{4(jk>7>{YYQsa3!;@mz-ZMZP9s8Fb
zEPJ>GqV;pEQu91&)ws}Or*n$>lWeG?R|4dB+3csDJ!6EHtI~&<1RGg;WcZgkVN>B~
zwITUWilW<BX1qYm8o$~ZJEX{X1nW%tnIxt99&ysaXn4?&*G-~=mqtTM3>Rhx!)NGO
z?x{LPoBYcPv}QE)o((GP))GW>s@|zg);e_lG(?4Drt^n&b1X1nL?ogZY%VHaZKc^d
zlB7L}7k%Vm{(u>4YyO~@va<aE&5~?nf~|a&$KOjSd!@nb_E8#`V7CZ{R-9AXV>-Gl
zI!3mNXY$AT%glWmoo`bDnd;06p{>zj;vvLZVywWj@{UMHG?!P*p%vgavduGXcOLqx
z%XHU|;Y_0ElAOlDu0Y>}4xP0uonE1C)w#vvY-SG!3x9nM=z@2fo%fVEi(r;(&s>1D
zX%%nx>**Qs)TD3o=7@K10JWYUIt^-XqKFatNy)b+W52P%x&@POb-8-?2XO;Ysih)#
z{<8zK$US99(|3uTm=0~?nhDG=#>C2*)dHYEQPjjLfIa*;dG|63)J=a<YEe7@f16iw
zPel92J&)4cjF?#7p2vp|0S4J{YPXh_cSDlbKti&c0VUBxd<$@+A@__IR7<^k=iPFS
z*O755k7})%e#yLXtT>!5Y;rrKMyoQd|FL1Vt}>8#fC9uHt**OysG4AlM8|~QNTghi
zr@y6nfT#&O?cuN{9(mF!Mi~FtX*zK?@q(=v2@?z@o42MRHOL9;{uy~-<jJYC=O|df
zH53fv?pfeh_r<gR=z(Kl%50yz{eZWT@=>y({7CQ@d%FcQWA&2UB<p%1`{4xoN%liF
z5(HK2Ym%4*5;}E9mqQKWU18vsMgMzb%#SaiQZ<TXpt2131pg?DRL12RXsU0Wx?X#r
zF6{rV(;7MunDY>)NASaM3_R{VvjL7`c5=J96#gSSaRzW2J$IKHmTVQc+Lf4*$`=U8
z{pG?9`}l#7IOOGq$OU3YcdsjLMQ*YQSVTV+ZxLv)k0)#(oauKeYl31vFLL}L)z<b)
z?l5BV7~w=jKGbgD8DAq*p*Ywx>jhgyfkcNhfyl8a=sb2uXODjvz8M1DqVGt&eJW7-
zO{mr^?W@g8QIjVmF0{Fo+uq3CTk_SyNe5#u9=j5~O_mTO`g-`rMs@F{O7Q1bqGJ=^
zqr=$VdPt2iySdwcd!mKQfBLy`)!>I`Sj*oSl-gH%-ooE}7*wMeMi<oFeta+8fe}?^
zoWcaU#Yjmb|I=r>dQ(sEWMzoMD4rg4&{K}oY(;15L<b$cwlUXqAnNtdb5$GQ84r|L
zbR%;~P`H~E$sKv{8CF?lLZ?|wd3Rw~H}T$J0$)RgR}%%DvvXzg)99z#czOlq|0-X-
zV*>r*XgS7qHlh_pjXgD3t91$u2DOJ@;T2KM{pKuGXJ!se8rPYHCh0+$#Rl|C9&fz<
zsIucWfGF1i^%$&at(jv?^6AYwg(1}6{j-69?uPAA*q#aCuW4i}gPJ2g*L|wOP9*w(
zEt&%i7BU_TQpCuoKjUQA-ZP)1`APW`W;by1BC2=xAwIZWzbNBDWv!V#C%*2Ns7WZE
z#Iu@Nr%8|O?e=D7d`UtO5$oE2YLKsh&dH1>XsDJP2F%mMj3o)pg^2YKvUWZQIA?EI
zXW1%v@&uxua-RJS|5CE;J?x@moxdHQSJ$M}Gt#xu1`egaqy60i=E|BqYD%HP@+XEI
zy$!GC;DrLaC#~gq>`-1IHlE|B0)&8M`EpyM6VJqEWxM}gTyI~wzTFn<AoRj>j1E*)
zjBe4Wi(UV%Q{eh-Lx54s{G1gc6T#bxA=PS{-Y=62WK&bOKenZHT}oPxIy^xZd=lIX
zzt7q}LUbM`)Uzaix|72)7M{0m2Gwfbi~~a{+iQrJtg{_T;Ij3j&##Xo2*-CRNyGzM
zweK7*5Vm#2kQ@*2y`94-gP&F-PW{JxE*;%c&~h`IbdRppN!ocJc<EjpzvFUQVEps|
zRbx?GXuNmJ;)Z%@fx65JZFw`t^fe$L=Aib&R*O*MP9zEGB@INsVx3bQ=dTpa8&Ld3
z7U(2odoy$dq+QrD74?hrL#_Q@^&~yVg~ZUACB9DbD@WjevhA7sU#Hve++<o!2fale
zsdRMz2rV1;hXKNGamk6Mct`ef{u&b6!v@kHRz!53nfDh8^TeT8zKs4Wtg!~%6DrYD
z+@}B&dc;%2xCp|)k%qTe=W_)pvCOAFah_S&g(AyU!k;7%?CE|XJNmm|4dOQWZ0;+a
zx}&z|$^0p&q!i?jKY4`c-}te*{m;HbJ{=aPGo0Q@a#Jxpuf<S3KPTFD;b5)-U_Ga{
z`-E<!!021?x_R0^E?N4Sp1h0*($)Aw6LP@_>9Uzg8)+FlBx5cvi6F><>}oznQ^vw5
z5{BTH3f@M7@c7z=t>RYl)L3w`aB9*z^a*E@JDYRI4}B4qMmavh2S5>eo)r`S=K;v$
zQki?`vAbQ&<PiE3Dn&JV)>b!C%|H&FfcFBQu%Y{=>x<xp-Xo)VT;rh<RRiP0Gwz-f
zyv)k;gp}=hHsen-?)Kwlh*6<M(K$50+!B8n{hYk#)3wX=Sqoo|=XdnUILuyWm`uL$
zOUjTBGJz~$7231h!;<Vt^Yx#7rA2|LdN=WNYA@m*qp4L@zVDAFH|7JpzDqr6(f0HW
zac=u4ZeFj#%4Af)GPcE;rC&NI*VxKe$T{lQCwxMOm8WbH_hP1DN#62$7E^OzQHrJ|
zc;K<ixYQxuYm|96{Fug`-}e^l+2Gx_$^67EbB{J)!E#v<dp6~}0unfq|M4LIbagMJ
zTi<u$I9258_l>E!i}@MBL+~%2Cm+j@XNgJ<KMFtMnptI#UbdLH42U)t>@lysWjSqM
zQR%7hKAI^u%ZxLFsz_eZNP4s)G0)zpVP_Cr@lHIubR?t6UQ7`>6kDalq7M*)kKe7S
z!lzfL4FH4H4H1y;ez?dv)*84IL(rGgztUY%j|5^$Wbc6hg8(4torAJXCGMrXqxCfZ
zr&uBq)-4t|?3mgC>H+_cO2QP=d>whGW~zegy@4v+oZ;Djg+`}w`E0^YaXAt!6s2Zx
z&G9^3Ky&^H_e&89MvOyLiNucdm9SMSWBomy_az)F@|<b)7vGie>*#x5K-HBSh`0P}
z^YoQaIXxS|>X|~ELW>oLKNE|&qDv(ynDet^w2vJj`s<>8{f3MFluc5*rMC9f^Al%A
zTy4YY&rJ>fRiP_`4XtT-oH;57aA3xL^sy_y+Fjaay5RYT|Icly!blT_U!mpVE`>)W
z8pPEyz-0#Pn88@gUwzbH$N$n-$W1-aAL6|9^$E2wzxVM|?pT;(uMxR-+;3~3vO`Zl
z-}#x-Cwcg@JEP}-rBB}D7r7d`e-cLLu3`Ue-0<B&UDYjK;8KkX>N+;Aesxq1%zw<K
zroHD}%;*JWsQ)Qv5_l?a5SBY?3C#Bk752^dfA=QoRxaQheeD}veS7`W1B^(Og8J0o
z-5cRVyAL7$c%%0o@5_njufb-5ZG&n)HyYr&D6rHil0b&$Ug5Bs-!iKM3$UyPWDxwQ
zgYNgNi5TeDgnCgnDUm+=!R;&haVrcSAc`qWJdiDT-%ANWbb2OOT2^DhPnje~<iLB4
z7%!7sN<`0YVhWRd41Smh38PLk2j~&PRu4eg$ff7TizC&<YeNg2IoA3aW5L%4d`ZmL
znM>?r4vl~vs^*eab2|ZKfjf={Ax^aWrt@!zw?nI(qsM1ZVK9lJ9Y^BOkZJaUxZPsl
ziemf;>hfnol5*6N5jlK4ngaIjLHvgUD71__1>xou-rI!zr2@#F7Md&N;09eo?xGV$
z-_s@(8|WSz*Z3rSMVnwL_)Br`)GY$x=axc9@FZpP4-ub*4!!W@maB(jPS~aX`FR*1
zMmsMf+!A$Z-GI+s{+Znutcd9-`8hTFiV5T6F#x~rrw)Gz)j4<)Kg*n%OrF0a$6Ny{
z>~^XEF@y`!Au*3gD5pMb@R}z{Ud<nSd>6cA6>o~=LA5%p3)Bri<fIhQCDpBzqxog0
z@Nzj@#!<A#W@t6gab5T}`2|BeS)qZ(*dX<psp&wZkw)*w&_TgEAB@&VfsCd9MQVyM
zf*w=tF(55S$vb(`bGD<@oyH~FJSG!x7|7c5`P~O|E65=xJQ5Zlf$4K*8nm|#n#lGd
zB?LZz_+-OTjg*)wm?e+r3-`qf7=S~G^STgqm}B$KfZc(`QT}y3^9QG|8()e3S{Hr`
zj-U7e?>X+hbRS%>s5V3e9j3CQxiL*d_n0xBE8nlMPCqpww;Tan$mXaJ7{2HVwRBSz
z+?D5a;~O6oItF&{1J+V3`T016V@yr6=omlD(tn;>mK}5LWRAn^h2d><>(>^`r8UXK
z&A9`fll{c0`=ppK7VDhWe4@M=yF(&}ev4AB{Y6dScT@L*1%3cFL(#r720TxU9W?vs
z{38U`ZUJPd;@7g>p=F}x?aG;Ku4*65J0^!fVbt%}6|#Nd=&8FrT9BBbHu5ZDhP2(W
zBVs9b2biA=M!it9cE47b#}B*5Rd)-+iEUoSc(JL5+<Uasc}$d&z4D=s6JgJR&)pfl
zxvj)|f`9VT6@L;vs$)p{?ap>xDMi>dAUp1>a7<pfa2q|5T%-<yP&S3=B|(`#Sgm;#
z@ak8V!#$}wP<X?gGHmmKq*Jr9HJTcdsNfCs4Q9b?I{Pinf@Nnt1+oBW*R%Oj%E~uV
z=tiMCZku^CyBI+lD&D0y-|+p7pHQO|I$ItxvSQ&h4`kvyDM3)zQc94sV?UmZn|?o%
z`ommsv42^mi5t-7US|4+4D^0&4mlpm09)#uyvK*OQ1)A9v$b?0q}N&Vpb{g(uvVr(
z31y?Cv|UDz=6oBB#*YFwZd~MdBX?O&YrwfQyWhdqllJVC^VSb4ZXigbVM!ob(R;;=
z=^m!@a4JOe^rkR?ZjGjSLymY4qw_3m_5$O`c@^l|t6=|3h9t%xJhpAlTE6U5WmtN*
z%=Wnn*gYD2lM?E~fIh1Q(RdqJy$$q-h1wZgt$atT0Z3cKa{P7=zkTQNw0m)ZyJvq6
zjmP=HC?O7gAt6PMj{m#&jzdwH!DgAWCk#C*Gq&HGu#`wK0(sy6gPx+yNdnIee4kyO
z$6lP@MxV7t3a}vTZ{g3Z9~F%-jRZdMK6b2iw)j+(U*_nUsq(JWxDBmw!cS06*3Tu9
z@)_<Eww)*qC4fBzJET#WS&dKgscFMIZ3(>SHOFo|=X<xj_PW_C{K;&<SU}pCo~0Q?
z4(R?QpVTKHA)DX!Db=1#enp$V=VWBX<A3k-uv@$?l;dOtFV4Nxt?1pJ2;X717vA99
z*Ma=w4-{AsR34wX*{5jkLt9bD$-O+{QVy_s_8#x+^SjZ1HfT9E>uLF229CB+kms)T
z%=HiJIP_7LR56Chn%)C`{bLj4qg8G#1fbDRUadjR$H&Y(%3Vp-vH|?)N>A1IieIFy
zW{X3F@Mh8K`0bJ?_x%G&bgQB<-(Itv?q8>kEcSmmu0S(o+E#Lu&S^32=Hv3TO7_01
z+To0So8u>!0A?F*^{{-bLeFyD7A$>So9@nbQha1>|Di#1&$O|8ss0Aq6Q=&LvujBL
z!lAo66vaPUNC08Vc#h=EcU0KQZ;zhcbeNetOCc14Eefvry?sBvj84@u;SjPW8S^zq
zk*DL!(OS?Uo7G3?>BGHTg*zuqKsLp)o<CD7`9#SOJAwtVg3UUsb^8aEleBBJlJj<4
zp!RwfnDWp)9_D#O+F6dUJb12WV`;7nbUAkss$qb(_AMKa(!*tV!whQ8=o9_J{)D39
z1&Uj>ys}#hz?1%kD)l62y7Hrn86Q#zYe|ohn%54JM7yoaqoEcF9vR~~ZWqoIldHU)
zw4=$ef^JFnHpbGV9UD1HLT%eYv)%%i#66ZOt-EhiXt0!^RqyOt;=d{m))S(ovXnYY
z!A2#te458cIQHGTT96pQT*rm3=yxb6PxD9U*UQ|*y94Uft(&odwoi|InSf77yODpU
z)!l<EbeU@L(5?SA7GP=qFU%;BaJ<DkRVdk3kxnhc|EX%_$f6m3--7y@$9rEH=%^|+
z)`aBByN5nF#6Rg0rxyrLZ8T_7n7=pPEY76DdZ9Qa&Kc_N9Nx_QZ_7zx`i+<cP6gfS
zf*h}mE@eP4p-Pu3%5!yE*6h%Qq*X5_Uj@bl>WCqGSwT0A?Z+txCSeOisvh~%4V0+L
z#LTLPSJ?+<O1XM{fFZY-XQ~G(zwYFS?R08%Jk3t~DP(6g==j0BoD#{GWs)48uy2t^
z8<WjL*v%+23WQJT7olZrQanbBVFsb@Q(7~@xEfwn&ucrVz0yVu6|#Wr?Eue(+z&0B
zeik@wC-uw0MhE{n=)JNe?5&~d#K^Eq(Rj~nytV2hB4t$NPRl-`;7N>^6bnN28pQB?
zsR7KUY21q0n0dc>=S#{@zZiS%rcjj>r%FXKj8O?{S~WtYSn)q+k|Uw4M(~8AN4qY(
z0T6V?Qe%v`q(VCmHlyrzxF=c9&`{fp3(7IVLnzU0DVF27YLFZ;_WW;gQ&!lY;N;1-
zO1CToI*<o%z{|%iuPm=h3TWTxOI-D|<fEZJZ;y?FThb;y>A6(%?>h>x67l1lqGMKW
zsw%$#t=X!+yf&}1(6Ag>q~0E7joOuaVHEP~rU(>Iy4#OT?DLysM(-V!21cA|Ksr0k
zMjx)aa4$zsuLU!VeezB>Cj8g@q0kP~lAO0h#DdXMXaZYkki9min&39Y#MKJej~R=(
zOo!zkvKw@3#8)51(J-!0jJMC<^yS{^@*WP9;U=t=Usc@X+bdw`DBorjcOm31DQ79n
z*8^kP`0g|7c7{~az^=zGhz!gqO!1?SE<I-#J>*n=ZuXKtcFjJlVfzfnu1|L_C;8k4
zde(V>-zt@(#}5oFB(~mT?{inl=T;0oBl)wjW!$LKl^7B<jp1cq_VI>2o(a!OZkqgG
zxG_E@;%)X1RB0pp&fE_r-W|jWksw<}tu4xIk4Zld&>)gCLd%QfV?$H(URFdDzZJh^
zy75mR%(eg+us`*f(TWdoD+j;1$XuHAOe<=cBa1|j4^+-%@@BMPcG-UmKE*knj?iN7
zmH7&ZFMb!wZ2I=-3CSno=Kg!ettpm|f)81^3H3t9)^nCyzOm4<gi^eBlTOPi#FeC2
z*#AEh*cx1D+*Yx>@NBJdX9~U!6&tKFSORnhds}N<+u7n4mIfA6P2)pH)m#3gf#)}n
z3W3@s-w3EZEfYyY%sq<r&6}BZ5ntx~fzB7awOZ@BLrIpJsUN7Y5&gg9i8DfOvr~JM
zy}kZD?+%abR-qw%btoa@s5C8Z?7`eE2M^w#By={lQule&Fa5%%FKp)SZQV}o|8C*f
z>AImJXK#%TQf9){<F+}WYTXcN<o5}??G&cY0=lEQ^;{)>0?QaFU00^-%{hh4yt=2t
z9}|_HCEmV|T`oDj!Mjb9lLr6#VDC|`iQhzxRQg|8bk}(%39_JneAwycZS!DXLCsS$
z#BiS^TCsr$;qhTn+lelbRhn;z64+ygTHa(q?yp9w+kz;23Vpk42JU=}JCs3P-1Co-
z`bK%jr{r#v7Y)X8zB@FEVv5l9V<F-%03Ah|QIr9Q9{=WA|D+EojhT(y=r*z(Nrakq
z#e4spT{!k=d*G{DAk@4Se6o{kkE-P>e79WHLv=Ia8rP&ztSF6$Ch1!xi3Hw2KUWNN
z%dP)**HtR4BrX?;TmLew=Ijw)hC6T>CVi|!Oy^tLlbqNg8f`d{Q`GF9>6CVvL7Or6
zakCxV#;^O1NXnm>aQ968Y4qB?1;ukUM}Re%+f!!jT&p8jiD*$eFPyS$J3Ovap_HCy
zc&o0ZTUyn=&|IU!LLSnFR5+~irRzt~vu!HnGQbbk#%dEM&cbv7z$H7w-u-jPwVikF
zp+1y7V*)!+i0W3!qMT^;s~wcjmTdS0_s8F_rv2sDQ|%LXQEp=7B#03h2ptyfXs%_j
zvSoP~%VcZaS+uD%{QRR9Kjq%J%Hz8?xw0J3)EUSy{mSO<r1)ad-v+>ZovPMqkU{0l
z{Cx#j$Wd=^SK#+OHQC|%vD5GNB($R6c>hH^l2`VvillCcGlw!dH0q7?Be3C392`q9
zp<By*mNKb$O4n1nzBMZy(D$SN-kA{eNseg5b*%#B)%;m%<lv_7cb25(8LmMty!xe@
z*TCErFj>KJWLQ8MOhWmGv&$`GrH`PF<gr}$=D55%@(3XcRHbL^NZlv_fM_jSBEZS7
zax3M{^d)tGLnG6&E|9^T+LOup0hA4Wq;PwM1l&A6f4Si=9Rr5v5|Dm^kVk`R^PTK#
zIg-t8yk&7ulK&T*JW(yDX?Ndt$!U+8(Cv#l!y+jT%b2|6ClN<8wv(m5KJktT)(C~w
z@gE)pu@4~vOD_}uSLd$jXrirpY(7Z&d`Lif-I{g6pJ7i_E7GSwXydhu4~7n(`(%w2
zZ+(sbn##?uU={Nw?P?V%I;!@_60&(?sCYc=0$QA_fi?MD!qcT1AD}Fn92c5jX_6oh
zG2wf078Mq4LI==OO&6qv>}gIdwMn3ZwHZ-fh-H(c$eTOk=&_pi^kM>vx3(HH$~qUG
zU!~zHWbZK=9L3>3UAwPg(I&33r|xb3;0>jp0FuuQM}inGH8_LZPw$o*^Y^eq8G@g5
zhPY1tek7WtSOF(v3)9Zdsi90+1h3T6lbWc-Tu?>?v0CwpI@D$wh8Qkdyv9$sp=*J{
zzW@}+11c66<ctEQTQc%^VD7KU%f65Bt8*?}od0C2oNy?BsIY>A2$i|ft6vD=Ch{T!
zZ!+Xbr_<9+pbj$GSiMXR?LAeMh`P)^wAWv~LS&K6OL^?<EXZDp+g2GNEs`FSPn<z<
zSpf{$f@q{)b85Nes;{40f99{E!#DXndR28)G6bRPoMT5zTR+}pqbpfqVfN1;Y5}sv
zO`fxXvwsV=tZr98@b)X|2?J@>P}&Q&Ar!}){G%QZ(Xtj=%)Ko=Po)yCOcunb$5<o~
z&}3XVDDX-U<~hD*Y^S4p)cCujgP@gZ<w$x_*q&Oq{Pv2W!`Ww^i?A=KOn*=7otW}7
z^Utu3tUu|Ezi!!u0Vj#72r46i#=l*`$(=T-TQ0e2qSIq=EN_2l&RJQoS53Ks&*6X5
zgWR+UOY<)BS>R;XoCz6A8O_)<m#37xqz8#7&T=K?E~76dq))%&x`DNeQQWp1(Ve~5
zdE6~^s>^?OT$!T&ntPhkmmgX{xTY3pj6e)|YIo8D0D08^&H{A#&}c#0zV4Mt|Bb~!
za!Bq6q;d*124y>|Yf!n7)$M|(Rre=x%6QHala21c_5Ge5zi)qkQB=NnV3~4?74Z~p
z37Tkir7{-WZLZAwudm+Sjk;V8x#eTGmZZ3GfSINcf82W;<>eDUO)|Bv?fD}~qjcm%
z=*McQIp}+msPx7`a<A{Z87OP`Go2{hyVKtjmmwT_eH4ag=56Y^G>7Q#lAcyKnaPFp
zH@*JB8Zt=&Dv-77i$<8<{NNKU^C(~B+3VERvQc@|k<$*u7^S`X)c-qa5mBdUVj^nY
zl%GJ$()$hruEETyqBC;plA1L+b%&yTJRwglsS2wsO*t}*71_q}5~hVzUTO)tU__SK
z1ocfEa}&A+EQ)Bc^1#Fo#1VOgWa*M0{b}(jYb;gMY)hPoy2p94k2&C1v^U3R<;5>R
z7i=JN)_mx1wWAN2vI!d)Qpj6<b3<{A8Jn^r2J!Y)ZyD3N#uI6e%>)eL5O-Zf`6!I-
zh=1}#2RzXlVG7*U=+n8LDHv_-hb|<l_oOm(M!xa2MkjWkZf>>EK1qLS460UQ8W&lx
zA^oZFNl{-CN!_v-p0or#Xoy=esd~5<Uqcg`4P{*W))-%#6P!ulcAbCH$ATZt%u5Kn
zj_{jtp<$bQ@@17{7A~T|^hfW@P`>5rXl_$xY}fRDjqgb$Hump#oaMu0m85W?QdLG5
zJ<n+8eUotl?U<e^=oi-~ICU$mZnXY+i{5p_VE<{Hnn7ndY3Y~hwPYePmR>B<iEe%8
z%xwd;6snC1k^;IyTyrNkaiHv1hxfjF{-}a?6Qn3fHP7sBWj}WdM$;>v()~G{dzl(J
zxH{6mdtI=pBoLe&pHW<+mwWH9&*!Y!@KEordc-mFx9RmsJx4{mXLqHRH$%6mA6juf
zl<3C?B@QLdC~?1*##k2gPAoCn>dQgPRJr{To*weHHomylu}byz6EM_wQqwr^0q2bP
z<d^jh+)D<E`3%>myZgOD<Ai1E_;S%<G?>KchL&BUJw9;)x8Gp%Oh(Ai$3)olqHlz+
z@q8yK4kZzfwc${Phtwixo7iVPcWX4Qv~yE_`IeTS*q-0_=x-*bbDymBSGF8%|Bf47
zl*w#j0uw9}MDXJ*Xxg0(37mefL4n^CDSGeW&cV($A&z~mC3ae|o9NJYW$3?_xrh+y
zU-79qr7^3ILEX4+G{oc>S`v@jVDFw+06hfnv!W|s{ao@vwlwnFR%r{9(!>|Eouss)
z8wD{sp{PDvMeR!5wy5eUuz1y?D&0@ja?M}-$PgfaE|k=PKpeN9j7Q^^bl;TRR~K06
zx3J*KMIbzH(^%i?_pK*$Zz4@NeWpxC(@WbQfAd@Z-m7}P(Arw1M$*{&1@C6{$Z_d2
zz5QSySa|+b-V)vgg{V~rFtL9_x&-mo8ZTgFOloCI;|;0)u4T5%WHRKK=g8^a)5{t%
zyx5d>=Vv;pKb8KOBXRFhnU}@Xer@j+*I;CCGZlkq1+r8H_uY1qJhyQgdLG%M0gtWC
z;AmC5rIJmg&tT}2oYEB-Co(?Jt=+7njW#-H??Z-AS@vxSxy;N*?ewFgqcN>14&zJ#
zo?%JAbAph0(|bubS*ig|xHJ4-=@6Lj2%S)QVkgqN>r(na8@j*YXUb5bdlg$~k`Ht}
z*vaqcK9pEbTsHa!FnHOi97=@Qbn>gH&=rU6%#|hd8cdluu}d4YXgl6+8hU7TDBb&B
zam|DUZlV^6hLT?&Z9W;u#~UWb$$CuO_<Y-v8nKzrt1vv?z#5rbfuLOa%0NE%tft0D
zmQPmZzc5<r7V=4Wd(N);mpTXO?d}5C7*CsgO=sq#!^1Bi`-GiDgef+N%J{}jGMZYb
z>&r0ZfI7U@&Oe|aBE%0ocV)_Lx7j%zT0Oj|D{J$(Sj@)lk6#9Fdz!w8FG>}%8jJ!s
z=tK>ds=ieZ<U9(!@3p~3jGc0|^C+u2{FjLP;dN82IZ3l!j&7RGgZM#u^S8vCMeq(;
zqap0Hq0N$<+Sqv4`k*r4QYxgFdqZG$=r>6_T7as|1l}rrXuK<on%W5(Gn#}Zt9;kZ
zyH_RsZ;Y6_+{IL*Tkj}I>-BDr+Zm2<W{utA{^Cl*h!bd)o%*kfeC#%BI+!qEan!={
zr1NG#lWlCHoem|Igw!Hh8pKMFCG_@@IZsctydeD^ZF+oo7l_;^^d~UfN;U0{Bn_;Z
zphQ-7);wD6tsmBL{Zwk47=KE4DQA<dww1-rR1g53`#B<AHm8XU|GivmZ4KRh_dw{X
z1>yNvM+6FK4ZaR^Mc<4Gp>muzf9^lV9TXlEDWni1dOJj{Mq!NGqG;7DboSoe75e%j
z3?-5|c|N*Vb1&<c>}dg_>7!i1yX(gj5u?$lCiB8>3to9{S-%gLzte>zb_2V09c+K4
zM>An!xxO)ta`n_H&~~|0?fgRedC7&Oxl~Xg{o1Rq8o9+I@M;qI2^f!M6{r}UC$*uO
z569+52RD8PuTXM*JT`Ac>b}Q7Yh|by#<@%*!4SB!O=TUlZ7j{3{^VBU!S^n=AMF)|
zxw)SwnqN2?0hM=#b*C%xO5o3)DW$_{ZcnDxhHuxf-6#a^Js)j1+p&gq3l)4}n11JA
zZy>zH0h`D0N@tGzG>=c*EOCO4oHA&bF#W5>T62jTV|}uc88p)4b$0!<Q({{oKs?Qn
z2^5c$))WHLR@~BB4U@0q2TFc+>m;}j92u2U9rZjrptl*3GyfF&tB!;T;~q0!ouQ-Q
z)xPdalHGAIVcpwyYlJzyVj^jX{<$LUJm=Y7fQYk0hlL=(D%NCWYykO+v})Amz6)!k
yZjW@$W*xhz&6k+|tt<pg{`Ram2s5Dg7iK4Ze5hdUuyJ)-5kRZzJS<nXef59EOW=6`

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/icon4.png b/src/assets/imgs/icon4.png
new file mode 100644
index 0000000000000000000000000000000000000000..64062f68aa1069cd6c128870edab4733ba547c07
GIT binary patch
literal 10750
zcmXY1cRZWl_fL#iMbXyggQ(g{?X6bKqD5=ANLzb^DAC3$+M;6Bj#-<UB}R-EwNt7_
zh*dj5ZB^g&_xk;jJbyg*p68tRJ@<_Fy>a)<3>fLT=m7u#Bg9bGlKjMzfBm!|^1tW8
ziY)m746roN0aTChYybfN0U)~C_k$gGa_A=HZ7ixQsH(4wM9{|~Bj#?Qk&i9Ik?+{0
zBB_9GH#n)nwX~?{9vjgb(z*gze+gW@M*CgQ<O4NJlJ-@-ae&b^i)wq|VR_BgY2CTg
zMcC!We0v3EbmRL+k1C&w%STU1c#OyKY$GOU($4$syAmKoQK9}kW7>3Rdmnm4Cl?x@
z(f$*E8P>ocO=<p!Qe$J<YhwkBR|(%?=ki{(0!W9GF1<Fqq`ot`I|Ci=`Bk(+RAz>V
z9?<43rERAl*kfkibBW<5drF3NkgXQv*xdPin&9hH8BX$vaFM__>5^YWFbHqpphwt-
z_&;$385+#vopLV`Yu_Z!e<BwPjJgH(kyK6mQrq*5r&I2PbJ&!bF=l5BOVOIJ1>Sgd
z6TKMUX5Z%>mbJK8DY0O1&eU{}_ZoC#%<YFZE=j)D!9Q~F2(_~FhX7iuwGRO>N}xUN
z6%^Tl*ZQRy(Q9(U+mz5FCAsrYxyujM5Ts4z5nR|^E?X_Q)*gzOf(`1+_1JfU9@#;I
z3NV*e@@Yk?;N1(@=-w-lhaH#S1G0<HGv#ZMQlj>_cAUa~X|BiaB-hWs_0J_Bnl8{z
zZ|G&k+TnZ}_V{b=vIKsrC_INIrzqxT?Ztib94BY!XwdO@qpwM@Vb{|$Z<kSHLa5ik
zVS3Zn6xJ-l4A-1FEyVV-dfaM<zpt+4yyEPg(8imAef7#wrH$F7pCjpqJWn??P@o`s
z7^-7*=%r-%4!wHd*}UuY{7gW07+%=n=EDw`p?8-CtBI)9P;D5pctMHlC*2sNwKe0h
zwvx;FQEs`K;=`unV;+%N2VCLM_HF2oHR?SPI>bj;>Cbm;--4iwDiFlS3-^8fqX+Ba
zD7R$+#|pzGH^0gZ-tpz`S4m7Wd8@==Yxe2)AShic?Ca50x%1Q9kP92RP>VWGr*&m(
z5^+N*vc7}+h~wS)f8VG-jw*({tA{bVJ6ofZVeE3D?=$dXrHSRU3nI09&a5=bqDip&
z13Wy7kL}!_5fL-O68f$gwo@AZ5Gm!=8GF)c(Rc3cezb-h#^;goZ-k}m22rMw_|&CN
zM&)-Me!65Adl)c!%CCbLk3^R8>Z>*OW9U3RF->M*2j%cY$-w)6t3Vx{2~2edgC5RX
zS|S@u(4*cJp2f#oLL?Jsp(6J!JscdoyQp?H!l&3f7*pRjdcfhbF@p}T0_GHv<m(p<
zozHV~#m~;D6bh7}qNv><f0O;Y>fXDPbO`>f+h1{qNYG7Y6$tnZYhmmxkNA|qh>`QT
zVV-tVSxu3X84x(Nd7HGLP`~#1JSODbCzvVM2Z?pCL*Ede2NX_fc@)g=cfS1JVx_x?
z9?oHSn+2+m4!j@R0Ys1zm}(E?vUt`}s@b>Rb&MZZN_+3o`@X;2ZYz>A5p+0PKRzDX
zc7;3P-cXoNxN3>S{gGc{6oB$RLaUczn~!2q`99FtJ+Q;*5MV+2h$Hcy61KVM`t@6W
z%jBgXUE3QC^5@l20N4$WyNFEr$%WM<b!6~+K|68FSs6m<Ypv(gVQcja7m6Si2(vl=
ziOuZ$f>RA3!e@HyP$cjnWFcos7092v6pN4zClx1+U~o^X(8;}rxz12P!ksLQeW;x3
zz|hONq5neLwS8qI_y}96%<OGPE3L)y-Qm<H1=k|;ObMzk{)$TBbXC-3rxxdZmRuZG
zmV0dK{|iFH>@Cbf|K(G+WaRSisy_I_b7D1tqki*doRan50=vu6tZ7l=%l*o0-+x2(
zsU7Ie1w*3h3p6OE`UBX0?iwn*0k`=hr86HR)7f@&97V2e%AI<V#N%{sF)PSXR0-(-
zlnJT=xEJ1G`s8)?5E<0hj@O_V4yJCpyv1qA8b}S`f5noY$wUYZ$4FmWgWinWW?WKz
zZ1T4MQoepIWBU8t#iar0!`(b>?Q}kvgx$gfSHXp!UT19$$_o6FTH^_uP+dThL<YY1
zaQK~h^to=zbLfhwHDR{J@^K{647Zc)_Etr%yisU~ww8rkxzw=Ly)GoBuGP}lw>#gr
z)mN$Qw`E}$c7yeC=dan*(}DdRld@VzGQM46X^gp-8WeCLXVuQp{~XRru+Nb(hdsYJ
zStyEu3k2zyepdy&0c#`gt|4UyiFqWZN^N#z+JGrqEB&)z+)0c=bz+<Bmwj!QX6qza
zT*@cFNx?vkj5ko@*>||3<;?ZH93;sgl0N(`Xm?n_tceze;>#2KTezTK*`t^o8G)US
z|D7O{zmh|VNRdpSWv2CUuM8Bb2yi8M?IhQ61Nf<J1^vw^7Ph;O>d?tlZoGDe`}K7@
zb`9sv@~FHT1MA1z8Yu6qrW}hJ@daUI;``E?cj^mX9GY&5fR6Q3QSGa?9n(cF@)3qO
z=9{&CN;3vWOgZ?A3603g`Wo<?Q0G&0L@X`Q7uz>I;n@rkev?GC4&WEnXAv0W-}MR`
z+J1~qjtT${{!mP01i51MpMR{n1_8gM&|o?)1UI@mX)fS3+ft1<f^jG%ZvbMPoojUR
zd-HT8f^4XFHumd{ip2N7fIsKQpS~A8G)<CEU3H<k%0f{|cRMTIQP8OL%&_1!6=9h)
zOX0G|N{O&zuXUtxSO~t`?+M_3&R3suEpF70GEMr?T+-6}s1K6QW!RNJy+ngLVio_e
z(IM;t5X-3C?5qCv08!tY)&u#fY+}M2Pc}Y>OIjX$UbKP+y~gD6jh%0|78x1!!k?T9
zO5Z8?P>bNXYx)S_(A(Yh);8Sh<8-+2;szCBeED^!K!+T40LfGB39m4UR+<ul*iWIa
zoC}^25idrcKbz5^_^jv7^`2_Ie+y%G@Ad<v{Bz@~jB8zc&DD10c)*F#pDXp04voIM
z|53EDOSL>b&vS!#DgvGIU^hDw%c^_Qo{I=i76W{XRb!_ksza`x#8%;)()NwdCHW1c
zgVkR67W6U7nE$?d(N+DQIZi!!#G9*aZ91|VXPg=sZ{rPIc)6Q2elJ{lDaYjwMOVIZ
zp5&^77)1|5xjCl{tWgeK!B=lSb&ENTqxXVP*aYZfv>@>mvN)T@a?%j%uR_3I3X=19
z)?WuP!BXdMsdY8|z7LoFcEV@4m&|*U<?=q^ZO5c?u0XG+ht3w0l%d$pm7ixN(Y!n%
zTiSg+z)*I1j8L5oNitenlDJFBl|q%s5O`>mLp^Co^&mO?!UP_34~|2PDEh5YDxls7
z?MumFUKsaP(cmqJe{*{q$T13%_h57IchllxtQuX|S&_3dmVMaUSy3CLK!~JzW+_Mq
zQhH-U(KJXSVsOF}v%ue<EjdaFOGV+bGMv}f|DFdlu7|$4DrNZ{30{{{a$gUat3?&~
zvb{;`g-cvd2iP^Vah9ngckTr*nuS+`IxcgXa&+Gr6uo&Sun_=USezXZV%;t1!oKV8
zd9!-%>>7S{06AckVUW2rrs<1F1l96>6{}4~SA-|({Pt8WTuqlMb+hle+Svbcu#bgO
z0IJqDz6{zQ1@NogDSQL|)o&Ji`qFs!Nl^r_Nz-ey^ZUP<%y!tRqwv`#(3k?jH@q9D
z5~Ft%nb>nkkFf2Ez3R+(0{WO}ZsLKAH_R@rl>~WCV^67J=lo3MfZju)A4PD&_G#}b
z3Q`WWCxZDrB_JuptGsLram&T&McGQ&BV%>YlXjrp(~fLvn0P}@T_liy;U&wdB?W(O
zDP+G)*W0~cW1x%-b#KR|&Vhd2OFg?#$kd(sg>9C(cri2M1BO>N<>}NgNiO4PnmtFo
z7q@M%&PP#Q?!TAt*P^8KO_W&@r9-eciQ3`<*?tx@Y+f<H&GOl-Tl6u*x(Zf{)!+)x
z8`dGNr1E#S7r+cBnQ->7&juXVM<B4a(Kvy)eol$m9l^KhXKHfcRmW$NXmQ)<2Fd(Q
zkt8V=0Sd}NcmamQL-Ue78X{O(zQosJlCB{>gH@$4?0-+=smab0<85y0%q{T*3UqLm
z2QP+)x`rrG2yxi4Vc`*&SCX>WxpPCo{X&X`>pu{ky8UWj@W44j9kM#cNLag_k>+nt
zM9;ktx?S}i{G!Lh6(k7!ct>oPk=Gt^Zy`7v$ZhR^=b@G&(p~r>Hshi^LtRXX=SQ`_
zI%Th(^)qMW^6Q)J1p(Nmv^N#xnj6u^)(Jj+K-H%om3UBoHfSS6xvi52EFBS-*A{x!
zhFSjWl;x@gPrz6y2i2j3Zq5wK+8%GS6|33_j+_ZD>UstM_<a_r5ivf>%9?teDQ^;J
z14YMn^l8gw(V;n*V>gk+^`d}0NJMpJm_O*MpZTt5(fWTe9cmnH@jYugIgQGDuTjKo
z?2UMiB_`4uG0M}+ggmnfv*6;Ayyd$HiL3@`ykSE5d~K4mEMb7l7pDLhG=s(lD>JWL
zZMU52(+|=-q$6wCgfSS6oT?+*0b99F`UfZwiMQ(qL3g6Wxu4iz70)fLQ3Qf3_lvj4
z>daOXURaGET#U-xx``epznjEEcd{F#KZ16aP!$UI32LmiD$#VtOw*drPiP;z!%1vN
z^@wjr%q^+^T;E+9@!P`xSWMf?!Wb~vd|3Id45a3af!t$XQRMT1N_%Z+29C9V!;`MJ
zT{gmI-Nz=eG0D_}eFC8kKjhO$1GBUmkYlr1!#5B0S88ady0r!AwoZtWAiOx9H_XHu
z`cHqUBy8V9{tXe9vZkD5p%dj`IaKW9VoUFoZ=`zB6ykeDe-Jt}8e@fYt&<fef1q!g
zFD;Q~UqySzhADjsQA0RXfg3xAmS*ryw|xKm`aMN*Mev8MSL8`87z4`9$W4hY1>>>F
z2mjG!QUW-J8>$ny9t8}4o8a@vAt$r5kWVb{X4qtO6?5x{0Wj$R__J*h@p>AE;j_IX
zN<>oT(<@fIb;*+*))42Ohu4ZVih4OcXQ%J(a3YDt#QB&Cw}VDJ=RdojG9*5o=z&A`
zgIMY1%fYq0F3>4@$5?mG6uH5Os**e}cu`v~ej0CLO%B$LF>mh)NGw=%O>#0K=sc+a
zx}1$=9xu}{ooxs6Q0EQDZDLq|i17pKxtCA1Z7BIIxXGm&Z<uu*qSo^eMWvvFFL>cY
z^)YXQ=xgxW6@*@P>j^Ql4&o!P@S)@{?Zf*_)19`hGi1qu1`LgV9P2#SQXJ2n&pD9^
z=}bV1<kZG+GgiN38~8D^xivR5ZPUJ9J+7p^4IC~#xcmVNq8VVO3Dik4oZt4LJ<_b4
zy`pt22wy9GRwt{n4ra*>w5$?j%-63q`*b{_@gWPBT{QdgR-!7^n%1rBX{6ucm2|li
z%OO$K+C077Ij?9^Igw0#<B>EEzF{M)C}EwmTCqkcns&1D6A#69!bzClzLZGjQ2_$x
zzlTj4&Y@Nmv$LuTT913k7*i9?baAe3_s4{1b~Fd))bEEV3DqKWjZ7?APkuHz1BD`@
z6G3iPU9Z#Gq-!nQKxow-eB6(W%6E*d{BrfxS_Q7wZl@Xw58{P){qFG|2Bpo-klshE
z5ZBUSo8N=T!|`~5mQ3<+m4ZvU@^;I7kl0|~A`vVc&V2l`!NhhpEGMhGQK8GcekW%6
zV@qfX&QEf5rWC!*1kOi3i~e9!;x&2xqaYru$9i&Nc3!4+9O+OhKvShGzp5Z8R||{6
zbQP;S<m83X1s9F>tn-A)IHh--DkWwXfpK{ssjS|dSVuZ|>^!hy77GBO3#-*<F9*Io
z(z3y~gGV}JZ^WjVehrQ3S*@~~d{$rtK-g@_7<5b~1RO7r#)2eGp@3Gaxg7RCu5MNT
zw(A4~7G8*k`esmebTLIo{(iPiuFAI*5>Qz!=b<qj-V1wBfQn^$fyrXn<W$+Ez82ZD
zo*yEmH{W3`0Uh<K_#G~8NQjM{Oe5x;>*M!ROF003fM^E&>grZVmd|{26U%PeOlL5e
z*eJ`e{uQ^K8(=0`Xw{tS@0pwmL6Y-x$A-cyTh*;dsE>;vojBrm37tfmRL338F^ihq
zhSGs=MgKlY{hx2EE;Bk`xOC*KqlIqASfwU@B@pO<c#u}E?uT~^E!mVMC+jcUnpX7)
zk1D5Tq!gxY5kwY}_xICc*VLFFDvd}8`zR-ah0mhR2!Uj#<B_48uwTi~XJzch?Dhk1
zDWqmPHq88wpOrP96w!xxQ?I+vj;P*@F}^buzfBbDsE3!pvvS$TuB$~yo64bu3f86=
zV(dMBS5Y`HB6QDOPD|@=uxzs5Pa_2+0sX_k?cayIrzgBW!IT*lE^~qSIO5-vllA4}
zIir6ODTr;?0xl_tSbKb`v~~WyA7B~=mS1Hd20qkcp9%uOL_VuduqUThfyly}%?Oce
zV8LsNWTpFrD0#N)k>0eD)qFyftxrFzUPq9F4}d&ONvakhgV2krSEqljri^QuH^8Y5
zy-V*hdMM#w-@`ekj>qS5@Q3}$t^cPnj}c|Zvz?6?%z0VZgftxv{Z+Py4a6Hh^J?6m
z^xoJj#gQ!jV~eV*d2;H*2=Y2*-P}#J{uQN9qJ>|Ez*d{C!{%zhrGF9}{YW+N<8>*)
z@^3w7Zd!e2tB^<s&!})HBRNvjmVVt&osh(IU|xaC10b$CcXGweCUKK6kQbu;+fMr2
z#T$#TE7Q`HD*LPuvE0gSs&#i})-QJfPSq)_H;Dd3J|=-=-5V!6O*>iD8cq;f)l$6X
z4zb3m&no-G0uuE1@AX%gLc{rzZuGwz=NDF7=C}S8eH!1Oz>X3fws!nT0094i+0jd~
zI*EfCz~%hL`sNcuwb4obz2-KFn>JQ2MYL_~d~a~=;wOik(O>Iwwur8(2dog+W<~uG
zld#a~tzU9E!VXela!(+$l|Qb2KQWLyXOru(?DV>RO1jD}%IWe^8}2OrW$D!z{<2*+
z+|-MGjJG-?<v)h86UyMMs~kUeCGtqbi5)wP1ezPNibAXTfJ^Yg#v*aPO0>?TJE+#e
zo~7-AT;4wg9?8@&p|VG~tl`Q}Ox;pQGu8z0SSOM)Dl>-b#um*98o}dmV=TUC$pPdb
z#&!44a?w_Am2Joenp;{rtHtB4K)hjjDwT17%Z*-pNjyN$GSfQB$7{3Q$@V;5g(Ka3
zEpD=NK^2RtGZv8cx#r$W4Wq0aD;EHFjYIw}7-ev;qXL)jslY)qddpzmo|4x+k?-#?
z{o2!k>ajk3!Lv!J^Th8oq0PH#c@vZpEX0;WZxuN}(b{#t<rUh2A_x3)E_bF-j0G7n
z9^VOXJr{|wzX7?1Z!=!16p(6GaV7a@Xe!DrDLYLT`=u)|thYWB9n;5g&$a~ye1f6O
z?$qB>r%2nrBBxqoeqcVZZ`e(-WGei+Au8OtHYJ}LCM<3}X3e_&J$|4u0N_BhEz)!F
z<P`<#<J;roz?J;eU`*Xedl$Y?IV*-3Kt{q?13m^>!fcgCZx(9NJ9B$hSO;IE4h#Dg
z0Z&?G;$MBmmti>4s9}#M8{sLv;o?5H)Vkp`Gu+hB_AJBwK1Hrc82amnO2dM$AcCr_
z;(*2$IjDTZ6G#En4hbzG(XBsqG;nyx^%?r40|~joPr6P7VsY9_(qHzm_yZ2ZrN<s~
zm&Y%x67H;S*P?Pgpu&v{pa2b55k+50$gym_jqB^ML=69fkPT{BG1t~lM^=j+SLvZA
zp`sfbQ0wlxKqvUC7Y2c*bs0q-0Z~c&XPLijvrRjZ-bJgqY~+MmiFg!V?!8Uq7kj3;
zQKAf0#Jx6pCPDU&hB-+!A@-dukw<w%v<ldw;|kNLanSuqH;jHFjK_y{SOu}B-i6N_
zcdPsVHDC?IaYGPIKo~04CCaGQqw1u>L;!N9);_0oCD;dT4}&)qR@IS>&nJ-NfcU|o
zZ4KTBzNEn7udwXVTf^Y6`JtDkk9QOO#)!nriJ(1dSfRu)Up(Gp_?=3qxZ7r$8S4vQ
zhZarqz~h+2qHhpJanU}8kP^)0H;Pt9iCKk6GgcFO-NdW6vXccxbi8Z5P8?Wi);~56
z9eR6hKYv@y{XA7T2me(@-Hp6yQqo*hOMitCnes^^aYbxHm1W?mn7N$F(@9MB6~8qL
zqM6vaU^LhJ11>oa*Xvng>tJnj!~I`hWSdRGG&`IO!$eutFv3zt1zikW#u5C<Em2|$
zkdQ!z>tAk@sju=4iL`3xB%@64+v|_otL1rlwuqxr<8)pg2BO^fG$X;wL>-~LuY)|m
z+@h@yoY$Dyo$_fMjTHTld)_2Up~b`8RhmZIs6}3wrQh10$1mQvR8qgE2a6UTky4~+
zyFM--hCEi2^Y9nU*(Ub!Osr9~GMU>J#es1)Tny<ZexagqrECS}{{H;%(J#V8ZWl2<
z$fJ%gI@n}bREEXxC0RxzOcUmAP^jUJu~ohr0%;c1+S@u5nJyF_7K2f|q5rVB+8$>1
zoa2En<mb#U9$gDUqnj{~b;1jv1B_bk0^F5P3-33|$Sf9*t!b;muodGVDu8OPrxR5r
z;0{fG{A1h~tTB%SVz%mu;CV#G<DFZL?IPr+uTrOI;6_A(Pm8@nxXtI#DcaP#?t{E}
z69=mFyWmAVglkM-(Fv_tYE!`n@t87YsP)C)d+-<rat9ZqN2{3BtH`YUFu56qLYHoJ
zZ@sz;zx34=Rqn&tk_~&4aq%cd`L_dzAhkYrRC^PJzF3}(*SSNpN=f`%&#*3-DY-5b
zXJ7YKFvV)d(MZrZlY~+@EychY5#Dv6D(Qm!aFI9}h3;v8odZVXRw_RC(|WTXyiPuC
z$IV;5pwowQ{n1vT2=5gXwN#nM)xa9Esof2<Q{M(c*$5rk9v{xtKiPFQ<l~d)a_YON
zVaj^?uSV7Ftv<oxSU5xWd4OBPb2&5(&4v-^^}oCzdZ0OuVYpI$UCH6Rjp}nv&<Eot
z$kIgASy*b@B>tHGn?yoNrI-sNc<-x65l7zD_5bXPk#1R69DVF@8PKCa-Ud6Wwg|sZ
zL{HJn;vOCq#peUEmvtC6!wzJ1y#fQbH_LkNb7<o5-2B_Q3+-sJeueY{3b`#=ZxI5d
zV20^Vh;qIbE%LnCz6ZA;tUff9yD&z2MEqO!1()jH=yE<sDI;J!^=&l6`<RKCTmPC@
zzP|HeSF?@yuK(=m%!3vuz_C+4-BT4vL>jZ;{DXZhxTXgX&ym@AtG4;DN>yMiETU&t
zLH?b(4a62Cp=)MMAq~Izi2I=N?nLsasU_=5>(rxhrl74DDfHlTnUm0whcZWzbAdCc
zj>ph+_ve}?$8+T#*RwzFP&#&<E{NmX_h>&>bhI{jEUJZdVisJ14(yVk8AFx9A-=JR
zKzcH3t|zA|akzrb4$T`4e2`bP_F=kErD1{6QA)K_fvGs2d#a%4@J(ieEwQHc{8$1l
zZu#{1s~v?(cZYwOnvdV{*Ee-|d0ds7_B*g^hXI@;)&DCqam<_SN91nP6o#;Qq^0<w
z{Fpf<z`?v17pN@7@g-ooBnaZ5R_<W!EffXGxVt|qh2E-zg)5*OC#=_B3Zf&cuKcJ|
zP@c!<%iC5Mc3V2%F4*URlTZ(?@^*g8E3y-gn1A4vFdR;-FKTGM&CRH>oN?u|FnU=v
z#%EOF#e2+eiia4(kjxBq0pG=^t)Xns?>T?2lS1v<E2R2rXwbB7y1#mlg}<C$g*OLE
zU3)H=maraLusiG8AlE8o9#gbDybW=fDN&f9xg3r-ic~Zm`swtXBbXU>?V(d@LT&lz
zEZd25okNixB^ihE-Fxv*zo82^H<Y1A%e;I_w(UwMH(3H*P)iT93LK8KroOF?%LJU&
z?nFHaNxII}AFX6c#sRW1y>e7X<vS^+MMt}v*#s}ttU*<KLQP-12t`MJNiQYY|JW@b
z=#HW~iM4bpA|GtJ(kr%>i%_&mMKdd|8pZ*t9|2`MfqWSR4|a&+o%#~X$9<}DsDmo#
zSB($%vPoBl_6LX~^Px#a;gUdytn{i!gQh&32S9sypCx{vWBR)j?L0dOT((|O;YtY0
zx>yn{zISm-c=m|!p~&#hYmB0vEpv#A6~6>~zbcEd!I1E$bgw#M&z=Cl2G4A#hNQXP
zGXu8TB6OYq>kodhR7~~H{`99otXcfW{B0vAl_zFJSIgk#)PmcM=Q)p^g^?~#1MOpI
zw%^hP2NR|QQMss~go<i-#Xr)5q(Fzzl}e$Pz#>RV5}yO=7||{kvW*hY>Z*}ztk@k3
ze#50JiS=#S*szE%kqmCIf$VX|_Uq)%8L#f8$}OJMFh?i4hm`IWly7~l->Q{x?J0el
zRJb>NnYu7?)&^?JO7}S`ewFGi)9!qp$IoLp#OHSXtm3<XJ+ps3k`GVY&aJZhN*+MO
zm+XjQ_Dr2~NeTz{*VT5ds?wufdX{tqJ`z!cFFOh>%hrFdpKj$Yz~^dpddXWzcb(1v
z{9XrvXd^}85F+=|j)HFiQ2`pkD~X;V6Yri*8%f;`&`GNve2BmG_(3!>v=XC;qk=wT
z-5li{<;8|haWLl<ZDmaJ%fGwegKL&^z~n2ABgv<LD!!Cd4HO#GXJ#F5i<;b}lFMe2
z=|-v!)IQ4<U-eD&J6`xE*$O_f4lY}xI+8{zem*plCuQ=eg-X}Rth*D0KC@L!MelE;
zW&eI3;+xXTSC%x}IsRuA^Uck6_mqnh!pt=aBAFAOtKJf)bJvVe_up@%YE!59nXk)g
z&E(N+MBFC&Z2s#Z(D5JyoM8?S>V>6Y*^mGmXv(DS2!9(voY-vnbqf6WNY=*}9&|-d
zu*|rK(Z#>%-52iO9;vwU|8B$p0CbiA?gE^QnKzmo(Gy=TI{!ml$242ASpqkq7q5Aj
z_bEI^(5pg^)o0D%4!*ZnYs$^;NES}g@tOMUO-Aek#!6ZmjN1JiVEsoj1K5#)oXXlU
zVWs{rtEnpwcAV!d75R^Zn^!=R`jJ00v?vNOze(2L(!!aluTey2(R0^<*gvZt_zQ?q
z&2@+=<}*0DcD>R7Cd%|F2nYe*PHnkK$FV+X_WnHfkoXsCq1{J70pzhRvo8*j`y;0L
zZuvUf;aiM9gl%%48>LBAUFTeJMKwccuS6rc?^I~B{*kg(Ya@E?^V0>J-cGK{5yoSO
zW(ph=f{qvXcwv(g!eQh@*<zGe;myPZVbTi_Fpdl_A!*sss?gh7_Sc!-q7HPWlk*oK
z9QE6tZ~k?D1-YL<9jq4PMFEt&!K^bQm_)9mFa~!&-nAQS{MTCHVrxTeJKwV7C-vf$
zKQ4aAFU2AVD(#q+^_82?Hf)(u$u$`*r<Oi~f5aS~fJr2x>2;siwuyPh*z=Ad=P!Rg
z3}n`cd$8tC-yP^K4Ex@Qw-wW&Jt^S-B`(AkQZt04G+c_zWZp`Zl^?r3kPx^@7;bsl
zp6z4ih4SazJPw3!p2mxzyxpO;MJ4EjtCNx7k#p~HnHL@GH5<fN4=*}c#wH~ehLcw@
z0a~-*5&vhcEV%4BMDsORy1bnG(>0!(U!>d9c<Mu2R86QnSRk4?5`5G6Ksw<qqk{db
z*JCqRYEk3d)Z`8s4zU|CJW^4%>a*rA^LW_8#6FNzVm5)h(E1iM>O~{!INI!BA)p7D
zQmhXloJ+T=rai4f{pwPjpTtF*`yETk4;&9$vCcbYi+I`X&tlGJH+e<=v6rzo385qr
z$_lO5GJ7uydnZyy3|JTPdgZHAM9B<W@BQq_J@^>K9lXwj?EUFYIQ)1jbu+N^2vwad
zF|Rt;z9)y?3E^!T7H30>P^);$+!lS%cg2S8)@hDttDDdtjz;$W747tADkn`K&m^Io
z_rLG55(A!%D~h2`ez?E=?|F6}*x%GIx8Xsp1H?&5d2EvJQJcy2lMeA(m8T!qZ#3zU
z<GIMEot*OG<S1{T9lJZGWcI{{wkk-*hV>C!wg}aQB1CBTi|ap*QL%sav++gU19~NS
zz2+;AeksH(l|`7bhHtFs)wOf!XlxNH$46qp8gA8DEsOf7`GJ2s#q1A|FXl4~U09^9
zly06q%e%l=--`=w*eaa(yiWT)r_So3dZ4DyZ_e5^?kPFD5>HGB@GbUa{1;W4;;Ss8
znxpUKx%}v|y%~39txsNTK1{MT9X8q!-v%MXfpwxeW~5|8xxU)}GPGo!Kd@`O4X$)s
z#8lco=Z5ssQD}@f7_E}nPV@t8e7In!;O`o}L$STF^y6UR>!JFEfwA-0dl%rOx*uO=
z&lreI@{mGL$#wU%L=sz54oeIme8RRvn~gIgtBB2arE(TmY~o8FsT)Kw3CnYbDp6<%
z#%V3Gf=JqwX)zS0d4BW&@>$2z!B8*tbsXi0fZOT@*tGb*b8N`L`=X+jGxxi%zC&6q
z_S5tWLdC+g^Sh4wH4+jdipJctEtDP@u?NN;@s2E&5B{mftaTh7&5Tfx!*dKnGks~o
zZd03RbXr(7DWZx2R(6ByPhv|$c9UI1H<1S(QvoYB42jH01!M*&)q(!D)JQ3gJFyPb
zM8R2Vlh~FlNVvvFW0n8%=40i_d>^yN6)$64BFAKDJ#_@*O8qIqY>b@9t=5TQM>CN(
zlc1NAYkFTlU56V*P`kM3_E>!Ms{g%eZ1+}7=0_Nq9t#W9z+>@o4|l-zROEf5nM{Ui
z{>E$N0X(<*doM0N1{kW}z?It&?RDQwp*|fGTAk3<u_wH!d{ebmH`tFQS1~x(egNFs
zWXg0a_+jhI5}s8eX+uS0=l>`q=h@Y)#Lu0vTA8|0kf#HwM9D@NN-E>SJ5i$lrxCX4
zh4<wZ(m`;P#a+~5peOh5Flf-`weC)9a<Mu}8&2u_2bQX;e~T}OjNPu^uimEQXUCS|
zb&Tdu*+UfD(t`ncKVeC%W5N}5Z}*CgL~>@>Qh#?p%U<mAfWG1TRYJR}L=e&sT4tr<
z{>?;Vw|$N5h81c#nq0Proo2Zs)>82T<Xa*_G=Bx<DO=<_jDxW>Yaf!L3OBca7Y`hi
zf}eWlbVi5RZ`D?-W53$wYmwYpRq0f`HTIhB=Z?_&Fn9+haQ;-NdNk4G52?B`8Yh@7
zn4|0-Ub6PScRm?^G5Q*DkDJJ*#Xr8R67^v37zF<a!afs>OSv6E-M>#<nb(xbsQJJt
z3RyeOSQ&|^h92%xSQ9Y1S{Xc*lpSGTR)sAzcOa(ARWptyCx%VMUgKL{R<2v;67U!^
zA1^^V!Mv}wJrQx+;nFYeFBWb~Zu~*DbXmS<u=K|8J#As;C;*I%{M)ky#OWaY7k0Fw
zl!(xGZo=fU-9}Ex`nN%ZIp@&NQI4f>TF1O|FLgn>cMK<`BFDmVnA$V=gRt|4$@aF4
zJ%c0FOVp`vAD?vXS;`)CDLk4~)GUEkMe9Hegm+VUsHP0^|NJh@zvAiA)r}KoSEKnJ
zI@AeV#H@=3;<B(Dk%39NAli|_+g4$;kP0nZ;EpN?6L&%RN&O>W6;0R7u+C*Io-<Xu
zLlwm`kh->tR%WdnwkI6_SAKc5=e}!%%Rv%V3(ElJn#UY;(Vhhh+|_miI_T$=(O)5O
zi*3}8QgnA;`T65)_(q2B6Ffz*jD$}z!BjoW#0X0b<K>I#owZc96Ks>@t;Wqn?JzoX
z&mAtnpS1klDE<PM9oM$HQDEe_L{v`Onm?{ZR%=D0d>3s9Z+Dxn*?ZN9jzlfLR+*4$
zKY70+oaC;nBl*e-)htqb-KxyM=Lyh3D*&Z*zlP~2rI0HID@*<J%@d*eLNm1Xw>N;`
z&wD~$ba&^dX9Hk=pm1r%C1ThGHB9~f2Sa0^Q%dtHVX`a<^pnfVGsFb$@4z;!Ofw0P
zK}Fg7oAY>D(QnNewz&>O`;!UD)jJc5$17(~XCY&rx=PnTp8RpJ+`D=AzZ|UhrkS`~
zFSyY7&nc}5wbL?9Bx24VaV}>5a0B9z=AKJlK!igMi0Xo(si_r8IpQ1o+Gs=^+sA*f
zR!g}{6Q+Cks$5Zf$MK>otmjhG!sxWaY?#b*YR{t3tuC|E4Q_%#%(Yb)p--Y_9bQXJ
zkS`tTL<f51zA+}dznB1P^Bre9PB1=jyBHtjLFfb;Z+e*Y4-xvw7dinDJu}^E9p{Mu
E0RcAAPXGV_

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/icon5.png b/src/assets/imgs/icon5.png
new file mode 100644
index 0000000000000000000000000000000000000000..935e2967da7b35ecffc031cb63a7e259f1613d00
GIT binary patch
literal 6387
zcmZX3c{o&m^#7eP2q9$OChm~6kTA9pGGmSGvLs7(g|eG06~ef-7E3gd>_U-c%GRWm
z@v&tslCfvs`;PDPdw$RJdwzf1d!KvXujhTv`<&M~@Ao-3@rtPdE3*JI0068wteyq!
z`RVvN!9crL*jDD#9<U$_gG)eVuMiag_$qLEI+meMOO9d9A%B9S^BcP2pE9{JUwS3Q
zDscKGXBMCM37uF&JywPI$6`2o1xpUaO_s#c`-qCd|8fNcyl!B{EYEuLT#6MCY5TLk
zb$GjNeLQGlb2(_MF{0qj;L6>9jS(&V;X^@#>g9Lk#H3IJPCgk}v9ASO>fT>YES`9W
zh>*Y{VTw043Bi8ATe`sd*?>`gm7nv`j8kwx8@}oYiLN|PDd)t%-59))UV^|rFw9GG
z^tj^g$IS~@<t8zK+Exy#yFrNqPuQ^GC-H5JfnR$CO3QYlfPBNX<|bEiOE!WMTlXIe
zP6f7l2YBmmr$5x03hp*n3fgV#aUtbAY$+4KMc`dz@~?H-UoGS~+)-eDioAsb6XEkn
z<^~2>DVJ@?U-YCKPMGOj7)dN_$OB3rtKn1_1G@m(?zvZ{61$(03MG8R?;)@W(pWSv
zDV1A)uVe2l6tH;p!Ts+!2y9?BC=8$K)Y;OiJp@Q>U`$_k?`FLj6M^&vyY_NYh4EdT
zfbe(^R!jW+j2jtceT@;+6eY1tqXOZ8%(RX4XUjK+;e2>q*qEa2ju_-Pw#fKQRK&ra
zK+46fbw&OG7Pf&!)3tJ7<%=yCM*V|wi63iYzs#2*>1dLKMpB!ARx7u$j%pdQ8Dp5|
zX9=n!Aad%}1|P&ozXPG7YCfZpUS`0GRM0P5h!L@azV4L^wsE~WI0?N+&;T%tK^QKL
zF7VnDuDfEpqOjIpTQCYB`6n<$W7h=oLR>#c_iAFVUqWf}k~r>#wOt@j(k8i)J`;x!
zJ)3#+S+m`_#GC!w2rNJH9DH>VQpHuimqls9NIphU^wpZ=0LGo{eD`t5`V}Rl6pXTs
zo3D;xBGe&;Uk|O8nc_jr{i;skR3r=ns8?F<JBPqQm|~>dav*|<fWSVOS3Y>ng=8Z9
z^ttsw97{u^EvtUo<N-MRN#|sBAsrf;QW(zKHjlu<-FEE9exBf@q1gs}cB~{ZoXGZ}
zUu*^h8anuuQ+pMfCWOD0=dNlj4NcVD6o?+63Hh{I|E`?_q@n*`m0Uc4^k7XO4G263
zj4JQ$R#MC-g`Ed?cZFUpDFG8YYa8-EpqWMUR43K+@HL4;4A7mq_cVY)$LVcb%<z!-
zURmnXofMT(rjoe#Ee~fFJnbUjZrKzeC&vny7?lA?WvI6Kc7G}K9V2uwC%cygJV`kH
zz`;NUf59$0*XQGi<G$fJ6n~11`kj;f1H`I+^@3<CI&d!;U9imSu&c*qyqBZjt8lXK
z@2m*1B7Wbok{Jo*vK*KkicqXuMlrYlHAI=RP^@n!o6Da(h3nP%+j);ILK~8-r$)eu
zDgW`57_(w}5rL!k*ba*%4u`jW_6v;4?GxpAVoo5rIePbH^D?l@HlrWvkoBAnvPWkz
zxxm_dmhL|gKWUR)di}29?2q$D>ggIK#p!iOWs1GVgct@~Vw*bT){P0vDERhvEDs`f
z1FAx#`Z!kM%e4|iNKT{<S^lg80$D|O>TB+WZBP-aWS+VT`13q|p@h49o7KNkI>#1P
zDu3Pxf&4?aS`n7Wh79vfEKOd?lJvEa^wO?8g~D8NwYM!kfjP~0s0Q9;UJdCIqlN-$
ztQP_qp#qjwzvCFQv`8kaa3G;d#8fQl`x3a53pjhqLR-M<1cr`XjQXhhj3GY0qpsQ*
zg<k}weD3wFnBCUJS1DyD$yS+3?56dlf|w%6-nf+$6PX!)$7OCG(m;`h_>+k;z`OI`
zNrhk<^J;}`jUv5+r7g>+96-w0+n>UFWkKeCCXH^EuX@&MBxscCDcR%}KW4e~f9|`s
z$4vg+zn8>u%uVk3+Q{-_{;hdMbv`^EVh*v>8ayWQZe6Qu$1(pCnq)<NXdJJNw0Bnc
zb<EmJj@fC-G#=Y&RaEiaq77LT%J+0XrOA{n7_@n$N*gM@lJon92~B3U*@DdF-2YD<
zd05AXVX;E={;EWj1E9_R=x_vd7MdFU1nCGCK~3>ylzL#1b*jtc(~mOPJIg4OPR=&(
z+g9k_kuYGwa80t)g8Srg1ar?TKCz;-0=dbZVKPI>T8nzcpjn<iBPY@w@0LAU`$(wz
z+pRt^4pq;>x9Mmt_>>e_^4Ti`kTQ$Df5<N`jx$|fdUS&=aKa{>hn!QlbPY~CNt@Q^
z6P98EQ_TpxP#f(aoTuN&9%`niSZgp|)WV5T49v~sansXBIr8I`Qa8PDR&dID+(cW)
zg}oL8L8B8&^&K4Iav#l*eQSF4XD~PFNB+!PBjf2-BeXE7(yyoLMq?bVwYK;Wft9cE
z-stR}Fk=i1wknKPn0)Oqolmn>{D2MR4$#W%@+`3MNFh3YMzd(#kY>!HCf9|(0svzI
zi?8be8$JNo@pErH@jhs1hd^RvP!4v6(k=OqGt|c<6uHqgS4rZMBv3tcN%ffxky0ND
zj);X;g?76Lmq3v&@hUJ225i2o-|famQGCCc;qTFn%}>1I)Cxd^b8cE6TzYCrJkF?L
z?6pkDUZ==F^A~tlaLHfsE);ABw5q*jw@q9&p=^tDNzoiGMg7#Z0!_fCbYQd3GBi|3
zLrlrU2k=m%=WE~71CFiQ%s7HLC8;&;9{VnLd?5(@hkl-$SA$Io4{3Weqhu(Iqv>sk
zu65Ok6sZ4Y?W(d~MYrnyLS^}m!nVi3Iyfo(x>{EP*IPzCc$zUM2X0G+h##+DS?8i1
zfescqLV7&Q(@G?~*^#H71k`!w_mJeG40k3ZH94!*_RaT^#z79mr?&L5ivMa5*pb*7
zg#cV~_*N9n-k$nWIkuW~m{N5e{1>;xESd*0H)`%qav^<;ah-oB6dC<?H1H)E2evD9
z;rE4)JuzrmGE1aBR@ORV$9qDNLnk+@-&*0&Jf!FZtaM|CfKpsNkJ~5S1a102KC;cG
z^)vOk$HW}?Sx2}8#sfhp^rtwpOwofeWB1s$S`Be;83Q>1XRC63CIX87;rKh@<*uA?
zBQt2xh5BNz=g|pqSZzGe$cZ~w23g}U(75U1>zE#^fB8(9HHj#U3N<n5FDD^b4JZL@
z!_F#aJlkky<o~Wo3sqSd?g0=gkMHm2_3;Z6He7pEdsgMvSvjnwW!%q<U^5^MMSUyI
zRXUTL#RJM=aSs@F9Vx$YPS@rmnUIZ)I2H>^VZu>9Ewu#5*YMc?OOBI)fjPD;O&!q8
zR6uI)a+?f%$8KG5RWkjhf%zMr_(BBXnycJ*&NA|Wo9Ige*zm1bwgP&WxT}I+#4D`|
zYAoScdjfqm67px6N&vQe3m>H_hakvr95RI?(-GJ(c11qt^1ecB6DuI<#XIT5cwyvv
z4BHv13#*YX6M>%oA!xw2QT0!j>@S<@vro3O{t@E%Rj0=tcNsqE*O$kMxy`Of(tHR`
zo)%>@PHh>pP>7+MN(VhzTeHXcosB7?D%zY8%GXwIt*S#mF+Z3Hwe<YP-x=8TDcA1=
z6*M;ZIsSA4C)FO@u~)8PP_>>fh2!9E_W(*?t#@vGH0#tds6B2Nr!EUp(|~4HQqpfe
zzpuzJBzZEc$sA4#Cswya6#2T2ut;$Jj3!wQdo-ybC|8dnJH2N=x7w07Gx4&CmYY}<
zA6}Kk70^%F1lMmE0a_pB^u>g1RuaKH$rfIa>IS5pxHJ0|l!QwiQ+#C`2?>RacUPP5
z!2r5R`N`Da+H_D2_SI3~Zs2640omGZd<7@{p+>PmFkK^N48ujsej5|9*xM5%tm(<L
zt*BO9L9nj8*Z%B=<Wus+x@(C=6|Bxifw{(O=@~za@R=}*4~rPtNSx6pl@QQTAbQ<b
zHc9t{+Rc#o22_}N{H;L^xew;ooEi&I_!&*?Hx(*#)5i-vrRqaxONiPqm$vde`0vQJ
z^F!|(zIqJ^(h08hE$_2=ibAGvbh;rxzFPhq4&|Qhq3G2e%9Hzy44D_5x1QDG9KP?|
z%HyA#6vS$wNh(S_IJSiw-8};6gqhYpI0{dsr?%1WMtPwC7wO+w8)ty%Vsv6JQca4^
z%2F~pa=lteCJ&20UHsx3doftiJbhLwYtp&E)>UBJ5ek@%($!9EHMsr0!B4N}E0@sn
zRk+(Q(0DzAxq|4d4rx?%T!0}PL>k00J}vC_5bCO|B|-Aud_*b*HFb0Ur)Kxf565Jp
zOrx@i4$9Bw5}DPOj<6J~XF~C)&dJo7Z9`+fHlteZauWq%bcMiB$^W7Q@S!-aTkG#c
z$N?sWkIhxGjRrzLU*7MxP35x3zo`FhOLc$~>-^_bFd8v;-pS-WU&5_97cr}SmZaVS
zQe`s#agfX2`rY`r)_cQ&H*iJ-JpU|eg7|(PvM%uyQ7QTZ)fr%9pc(96v$Lm<;ADrl
z-Y&+4n{`57I<ZP>06v#_>L}r7WWN`H{h?5k1Uk}@)J!%qaPDSEFC!(cc{)`}ETZ@}
z0Mwl86NKxADU&7XcN$#M-6ks{7(b6cAcmC`x8lX&v|Viep9$?ec<t1GpCh1yZDdtW
zfR^dzXcFgP><qV|ao-B$#6I=c{OEqw{Cy4kyIvXj096g6(FYyzlj7nsL=1I!>vK(>
zbrUqs4j<`V#A%&;<@h=To?3^z$De|xGmRKJHTT(;2d6^6nw5n1)fXE6Sw652NnEYg
zrEfV&5{}&ra}J7vv`?;?2^geouNrFR-4lm#KJGgM5NpJ$=mIe=*cY;s^iw7WDL|;M
zlaVRs{PW<e=Bq^Cx)jq7=>U^46%YJUfB26faEVmy(dk+i^4{yl?iRNY2Y$vRJnbB_
zL49+W;=UA+$~d5W2q(#d-|~vj;QX?!u1*pR_OJaQN@5rg1dq~9J)kO8nshocf^aY-
z^?5(AaA*q4!ufc7&Z{@vpE6VpnlY|Y@GOQHxI@hsu=dv}5>5Q8?o%*|Eu;xF3zOXG
z+8@>Kw072nwLJ1M(S;cxXuGN+K7w%T>5q5q>T?}Y_CD(<`a`zqU9e5T#1U#fSXZpR
zkJhH~>Ip@JR*kse%Z<aiLi)Bvwk!G!f!1l&uT@MXVS)9pMXTUf7M5%Mk5&4fT`089
zaQ~Od-v;1L&^3F&^!2pv<AIH`E``6ea=~ORE<Ida19D=TlH!=K(pX?lMPOYTc$knr
ztTvR*r|&cVElGD(5^aD`Z_HSk-JtNXtrS*BsbMl%)j?a?**E;Rg;21}E!sg5LE9|4
zqD9gF%c$sA-Ocw3Lq6A@n8M-_mLQDt6y-!u5&qa?`v@!sTV~6{Bt$Dm$0RZEOWw9T
ztpE4r$HwcLubKt{re$3zie@#;>ji)motycGbRMF{_L2Ky2t1E;3hkaAd>Zd*b&(R$
zQ=^z)hxF2s4%z42(q}ZVC*Zw_^mY!|9)PwQIEcJgVV6x$n;sudq#v=s_8|Vx=ifhq
z9x;O|)J7cpJ+~2AgN@TN&Zp%`$sbR_CC=l}oTMP>1+^zcI-k3jA)&)QJO8|?Khj?(
z4a<KO0IQRpuw1>hbw9L4Ep6?nHby3iRiS|vmGnqG!35c?^x#H`>iWt0l`FrTHxG?~
zRMhU%B*iBkZ@_Z*38K*&{qu8hpH~@1BnCc4c&G&4XE69?{E*aw)8ZpLFvjt9iJMN5
zon--rQgeMM1yq|Uej}GP=K^gBGN%*&z*IFzk@}D}`zmX!J`|@RWIi%tnr-#<jZ0hF
zc9MtnhW;PTGiv6ZhCt(K{6F@MxlkxZaBAU^J|!QR;JP_=9Xyob6~pyj{Ta!PYU-)`
zTV%-kWg+65?1OFo-m1`gwyu9sz_!?K!mW@TNc#sbwFEe-``)O84S!MRZ&_pAN~`Mi
z)a_x-l2EXGn@$E8(A6SURahz8?F>61c~DASm7Yij#`0!jDy_8OrwmS}fu7Bb<g~iQ
z8Ou(Pc1Sjv4S{nzmPmvfT;QcuWz!cyVYDX!q>ccKxpumFzMoJ_2-4379@&lFAD>5$
zA%1DaWJ<yba~uWh#;T{IJrifTS+7`t=`WKDaJT<F9Z{(Q4Y-=4pXa7=ZL_RyroKd}
zHq{E5{tlGDFZ7yUai*_cpVLx=pK@S#NI&6tV#*858)^#j?)@-6C>NKKKuJp(M3MP(
z@_BsQi}w^jzdi;Xxox35+tgXcQj^q=+;)PtZ+)b8USLI<ntVBsCJ+9x;I9VhlXX)4
zM8-!ZFSA&!j=LGVku12addjjsgX3`gw?3aw2ic=T2F!V8icnTVam8S>+=srz-#3Hh
z1iZc7zf6cn*zMec3LKO@-)>L9@!UsAI<T;?=Jt71=xHRI&F(!H@hJBQ6gh76jw$6C
zu-M;l@cOn>>@t=zc*hY(IrB9SW1@|wGoT~fg@t0ObxY_%KM`O2n0>h82Q2fI_iu|o
zQ(C+aP=d$uMwExKlf${J)XV+g)6C!-fKy3tEE~wLhR)Y_@EJTq*5)}^<@@}NyVZ*u
zTAx!S=rr%SsR~vSSpgAYz7-y+3Ln6gzJ_T%vG4m_A&oqW+_>ATzgJPy@m+(Pw$~u8
zMIlG2N2YQ#T@GQnd~-u#T6Ps`3Yjw+QqKNRR`%23Tuqsi1P|aY{puN@6(hu~ndY|C
zcr;vt+mi&|sFpSjg!|4o#5Qwnr<<QKT1#+|%1La#X5TXTP`ZfNw&8>#wcR6rK#%bH
zR3w2*18(xnb#Ins4KnIhdW~@uDL_Qa{bc}>Ut#y^#UR`*oL1s`;x*O~e>H2gI62y4
zlpDRx55<@(;Rl+b#Q_KO?>$bkwhuj_3wjrK`Mu+#eZw@#uxmDX$;J9->tfoylrHLb
z4^eIhH~q0~j~zy5&T)e;43-@RxW5F3z{n|0j`bY^I=@%})f-p*28$q|_;7juK^!*v
z_KzgP->C7bbe$Q_TNU%B;O?-6dVh2PQ);7K>a2lElg?!FjQZ$jJxV*!tac?@@J~zt
zE5XX6??`d$PRrHjee!m_Tcsy)D;%?iUmas7CH1a3Ufv%p<>rU03gGq3m;x@Z$@ody
zT5RP1W&qpNlrh$@PA#RoK6qDcf%g*om#SFS><93xrSa!L?FJEf`4@CPsj-J~Kb0%H
zSK26}3BBc?u8{hGj+`)Uma{#}{lxnjGrB+kyJ6km-H%@Y3vao$Z#Hn~;N9Hg&(?o#
z+bdU^K?ik3!I$=Ap>w4|LmpdG>N&|c|LIFiga&B&R^yr27d2w74>v7*I9r~$EpX}K
zdWBaqhH=62<P;`TE~KXQ#zn`Bnf8o|u?CiquOYfxA7Vq-7fm+6TAPlqxajxRS}CLC
zM&O__iqmiFvnl>R!!Y3BgEKiReFH9(LO&vi>6rd`2>vU+BMnCJku>4ImyOn1yma7@
zfOIk_nt&GF1Ls+3)=^E1*l_%J1THyqi{Z9Llg5%A^(cqKSTCJRzl0?+i2cA$rH9-+
zx2iSTmZ~hgmia33+w^w~Bdyn0x<1g7J%iz4yIJ#ec6pX_=^g0Yv`6omDa5zDG8le!
zLgQ7CP`Ng{^;S>ULd1I6a2>5>#QMa9vM=<jn7>^L++JFz)zZ4txU8s++3~xssaJm4
zR7d}-`TMFNmQ8XucHn^4N1?LP8WVp3`P{BFFQ@5%*uY$Rm;JE%5ybfFvtR?Y5o0ET
zS}*1zcMcwm5FZxHlxLgHO8wLPj%j#Gd`j*tOp)cUhj1Pi1I2NOjN*PfSnnaB==t~D
zRxl#d3N`ta(YM0>kq+;xX3@U<^kP&pa8%e{qn$J(*gYT$e@HBYucrUZQ(wGkt!W1@
zV3;a-&PHvswB#7Cy)4i6^m>?SB#$}bAs9j3b0cModqtsE>m{;%D`d!fTj2~9Dup>h
zSy5^HmVZXW)irt2GQ@!=1A>eEk7UYj7DX>!rYOA4ruDc@+c~y<MCW%?+smG}W6^WE
z55<7LY;7}R+}^TJJS1S>XwB}u=o?ZvXhro-z?hf64`UaHj_QdqHIw_L{XbgINWIj)
zInCdc$<<&Qrv(vXOfoKZUfF6%bPkCw%iI>1uI9ve=XMwQNlf~prp{mN4f{3q6Q`7o
zaZBV*$<>;!bPwU?+~L4S;n*}ad^-t$+67<_C#_;mlj>*tU;4T;GwmcU6@uac?@Mla
zgeCF7T+OjRYQpB6!r2-%poJA|p7kO>Xto@{`=I}gHemLB@)<`=sT%Ds27uEy)vLVZ
G68k^BKaHUP

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/icon6.png b/src/assets/imgs/icon6.png
new file mode 100644
index 0000000000000000000000000000000000000000..976d00b74d6d9c696b11761d864a99eb72f0c9e1
GIT binary patch
literal 5382
zcmd6r`9D<e`^OI^#*&7p2pt?-wo*pcx3Of7wa8>kV#vOvh@lv=(>Rv0gfbD5eaY4+
z#U#l{wnCy3A#3)}^e23O`~Gmw{rus6+}Anhbzb*%U3dIBbEExS!dw6V?1%9Nmdvs1
z--Tvp-pg&C<uM1AKuaS%;MseT82}KV!3MYsHywXp;;!|zw%*l|PyZO5-i1D<+m1O|
zhcU!(rX>}GMNlo-5nW?hVKQ&zR}4RouhYiFLv;hbMZR>cu=a=!%P!E$<fQ>UGDc6l
zb;avl;QI5=q%%Lp11nlTjga>Ca$Rx*dK<4kQ~$B~X>+%AZ}ol}niItusmkZ%bP$bV
z^^(M(;)nUr?{vYVILPO~gelMr+%zo^Lks9llmWYZw4?YjhptZc8e6mk9Ub5`<Miql
zSjigs1$Mm5pD~6?trd!}U>j;B7F^N9*zAi;gvBoKXNjQHkI*=b*@f!aB8AXe@l%J5
z#nYp}3O0Yw65y3D_<>9-!#|V1W64X-MNM>Avc!DRE!Y>C29Jm+NZ=?El`(w@XcX=^
zS@c;^tS*Ka>T-zhqJfhy`q~Y{4=)G8z(rFdweK+?DUAm?b5`pD0H5U@z3i0+;*aY6
zS>MnH(JHrHgtgzs>0%(s`&T@7F=+C;@%v}*sz_i^bhO+3?Eg??a9ORWuP})jM};g@
z^!-32*tMPPu_7zUilZbs#gzOXmPuPkrOL1kano3UXRQ8g@K!?;3RkKx#(Py9r1Sf=
zaM9Q<{tS<vTJ|hFj4DaK`Pcp+3*5<e#+BW`C^d{^hK>SN`*<(cbp1I9%wN;3Riyi!
zS*d=4!d26boZXZFX99q>pOt|adZK8k?FBMu>%=1&&Ud8Sz+w1qRfqK{Wx{88K{JQD
z_E@(84;jEwSP!;T(7`Tm)HhB>aEw_?I0izi{E>6OZi9FXb&e;eag_<gNvlThzc>nr
z9~Qy}%rc>?qu76VF$xUS!@xm=F7qs34yWbnez$|O!K{^UOMg(b8Xk=kFCvay6N38*
z_R>dxjV(F?dpr|dNaqc|TbC27Fv0xYEyz>$M+15yb_vqP@B7qYmy*A$IE3zU2o><2
z9qv56I`}{_p)5J*Rn05vabC-B;PYEfv26l7AB1-f8ZgFLhw47XX>2>_E=lpW{yL7#
z2`*OtN*N6L8w~yCCtT$upAk=6$p^&dE>t`WlA*^A`hOgVrD_7+19g{hI}2&1!p&e@
z;00({G}<Tkm+Hqh-6dF6<i@J_Obrk;JMyex_cxUGMhQJBA_xz%4!tUI)b|mEo3k}E
zQdbB-XNqj)EPg(V-vZMSpH0;VS_c13;70O}-c)rS?uez9vxJp3eXA3lhnJetZ<0aL
zb7|MXh(wLkat}i_BiP_uMbUp8usKJ`F$3?PdrOamD8i&iQZR-p>5T-jR33{cW~n57
ztn0vX?g`VRAfI-p6$!dZ+O|?eG27qa%!meH(ZHy<jh%MOE#9Zp?rYC1JT_7JyvP_s
zJrLT5J<95m6(_HGI<xWYivx&{bo4{(f4>3`xg%rryya=M3dv@YQ{}CPz4DWPVvl*}
z6cqmxo7`XT*!55B)?qBp;-A>4VxLw@6o{jQ*7%U~$V}ig9}N{Zsg{4&a7K&JDvLcd
z`9`I}#qC{<aiGHM`BXp6!u%j!9~ortJa;09SERnOkY`2aK7ZOcC2$woNFnG836epf
zb{?x8K6i7|QSHN;JWUFFC|apWc=d}|-$P{Z%OclrWAy2R%UMAZ4eA-BV5z~JMouzM
zWa!^q9;Wl?Jk}@;6cfbH9mr3^F`b<CFhMs~mkFp}UjtQ`c9lMLf$t}V2{F3bVdm^i
z-x6bvvx>4Z0rMobmkwf3S?|sn7U(lUh;?;QU5IJ+G@(-Tbu<(73&eC}qL`bCioReZ
zZzL1YA7A|-GIt15w<nt%$LT6hM>7ap!R6!S$R{6QZhULUoU!Y7g=wHpeZ`rRK;FQ|
z8{_}ETvTTBmy58Vc*`47`h3EzaFosahgTc>%vyc`H;vC<olUl19q(pwFkAY?wOiVR
zCSSPIoOB948xsZ0?Vsp#ZE1YE>t)sWT@Sg~WS8V1hgMl)$rj9m%0_RUjyU<rq+t#s
zxUYQY)K6jxWmExIyLH@@ir`3U<R%>V6^%Fr+u7FAVGL1EUwY=sez_zOdo$VVCZjG;
zNp}Bn4jmjtM3zt~KGXI6hG#L?yz%qOm)UD0uJTT4|Adc$8O?x*PUN{(@wU7vImc=7
zRpys@G(Kt1xXV_l9eY_x<a;a7Htfwa!aj)wu*!4G;m`rOxx$7G5buZXK0;YJ103sa
z@!nDcp1H?4McYWc_PksmwL`2K^(9svlYC#nI;7}ww>)M;2U>XReyXel#1qaeAMsjK
zO%e%zO-S)R*t-UK4{nWPv9fe5|7A2S=<{u-X%4*Df88ZiBW&~X7Hj3sVM)tl8@Ke4
z-nEmKr9K#{Ky`eOlqk!@@A#g3IS;rel!Yy~2R-W{?ZXi><+&4=B{yvD-i8l&b}i)q
zyvwy&4+CZC!RxiDtsxjllRCpL)hbLoR%}m`0>;iRWoH&gXrJ^pr0-rb^946dE=^Ka
z<N*cwW^HTBX&dA!6|2;zgtlZIK;<B7fWMEPm6x+C%X?`Li)2FTbwW+PiplzEq_a-g
z{vkLM42ZBz#9tc4Zjz7|r7E8_HymY-5~L<O^8*-iv%6U3B65`yW^peDd5ZM&D*EUc
zGaO%OBtrHqr;uEfQ_Xw!h<q83le|heN@T1qBNJ%jnJCtXxh5EKuUJIw9u%vr`M@jo
zSehZDhNUI&P1$F=`UQ96@^H1`kfInI#Z<Q_JC(R4@?xxNhlIC#UJaEPVz|v27HoeP
z6B5qnHSQtA_nHb~`Ro0hWT-u}I2GEuzSElW$s7#v?8N3g8HBp3UEunN#qE@U7l~8d
zn)UQjF%+Gvc>F$9jqObPxHBAh5y@W|a;vj=eZ0a(UeshW+}?He$etW@dA!OD%S<R(
z*_{~vi%-S$mc(A%t5c1=N%mfW)C-0SXBZh@@FP91fAOPAcsCfN4UU|n5snKMQXZWK
z)m;=+6)%2MAMl&`kmWf3T;s3pZx63K20pz{%*>@d%7P4|!^@4UC(N%84U@W>`;l90
zG$YXfrLvZ!sSwc>d+S(fygvVI|HJb3vEmb5yLc^}M$$Q6Yq-AThxP-nU>WaVjk2U@
z@ITLZF+l6f@bmSwuqrFH96JnjH2rrBG%QoJ?y<-TY$4lMnx}n*T|oS@K-HJEyKFb3
zYdCr(JdT|hfY6qlzrH)=Kd{-^7u&s8<1!8TUH=(G5aPxOBP~2M_4npsaZ}v6O|~EZ
zWoK_S#-GHJFXQ!5iH1Z|ln36q!j7b_*?f#Ha*@Sho(wA8-;`7Bgy%k|U()hS^Ha09
zYd<PrwWp&;9<uuCeD$`Hq=(6CYi3jyH#qZSPiBzz(pkiBNw(-$QZm?M)j?SEzSAqI
znYx`|R8?V)p(>M8){r^T(XqPG4)c|fJflASP)VsSouKxz{RQ6_2IiAdxLiqwkr^U&
zbB&79&Yl_$4+|MdN&UB&uRz<!zF3RY(|UsUK>U?BO(0C3{+lbdhIp$36>>ac_Q4S?
z?DUft{cG%Xyx$IM&RlBuk^VLVIDT^{iNU>I_g{VV&Zy$2w$B~|=H`A9GX|f6aW2s2
z6MPdVO^NrYvh>ESSVzB%)Po&?qC+PdQ>OA-+ucuMP;znpX~fM#vE1ESOa4eEYjI;z
zF8G3dq9Pa6LZ%vWn_y2I1sV!VhHTevY#Df`-A(;mVJ0^?-f2qtt~#r^7Wwt(f;@h=
zL|@rf3XSkwBI(0H>Rn2lb@5*m8@8LRiL9uqi#_AlBF;~p`0?ge6qs@zZ=E{zWqTxn
z8tzF*<-~L}*W6;EKYATS2KN<Hsl6=jCbTtC#M&#|Gy=TKF;QZALkjLb>|ja;Ul&{&
z@vC%b%p7pZ{A|Doe5qznJqX4<*53&>iuHpw5_wyR86aNedd*SeO+FyVyVXod#zS6h
zfH;Rb2|~jOj`o}}qj;TC$R9`1`)OQVD3vEXIe<mqYu4Z+hY8Zw6ki1@!(|UGnZfQ9
zWDqaH+UjoO2206zUfK-I8K9jx8}q-?rXND(Htu|!WP!*VGlK1;jvX|TsrxMZCMWB}
zR1$7DIH7`+IE~)~BBDfh8zgO)=1qyJ0X%wFGk72K@PZyQMrHA7;N!^vSCe$2E2!0Q
zJYSDN;7(-PCV|$pf~xX{^6U;Lp2g^ImqV8|xi`VCqMz?BIV!*$tc_jmFADK%<+9WM
zf%$J~7L;jSM+1gqAwdv6jGg{EvPoDOB5C19CM>p_sl_aRlL|L-;I{UM_sm=&lzRSD
zw(BS~%o;0ml~AAlw2VarMaTZeszUVAmt)^gT-GlCjz_E1?8ZS`ldXjKMpv5!@eK^e
z8~Sk^h4^#isD{iV>-@USTLT8j<DMBSlM_Zye;`_6Z{$Di0e`Cw8O@UmOISE?mZ^cY
zX+#SQ33-Por`Bfw9H8opeM3%`hZtHjJ^@<mS~^AyW81^bZsDZ+Jwo-IW?cB;EUDnM
zFq`%h1XabE9N<<_{rH=45^Pu1Tjxwti8v}!CHTVVASxh9uQUO&e_cKB6g!+sH0JBY
zHlNy4qGvv=k?Hj1ELD9T36(WX4{Isz?kJ)eUI{(EpRcgCWlv@8)3@!fg-ES6#h>f%
z?2JA?z2!U>s$+&^)T|LLv>s3ggyp1h6z300t<J;e<5dSY)vjGq?6qp2cRQ&#(+<qD
zF9NacY_Q$$SI+z>IriWDII$6)`p#}F<hL&Sz9t1K>+!V?80~n*uN60SU_@YRTN};b
z&^EG%@3Ad@4%JMjx*l?HPhH_H+nWczGIM#r&s9rK@(Q`4wTddqvTfTetpv@$7bZ@q
znhC;dcB{(oPnY*fZlp4__mc(A+AvapwmJVmnFtw5?eyRs0eFk8@nc^|^Ip}BWG!bL
zrqg}JI+eKLrnump({g8Ob|n4#>H_kNbwb^G(HFVI6(OyE2nENyA3ui-Y%Pl5Ye_?d
z(4M7!rF8tJ4{&>aZlxV+T_xm7U%bf8e5&3-8^#!*Gu<CEtC!mU3Hq45AV%P5Q#3?Y
zJAI|+b(cu08q7{Aa%odRlt2qqD{j6@Y57#58KMf`2Am$$NG?Dj(N+x&b{MK!v<@5M
zh?-!{$0|u|=oQaX2OwKs$F0So_P*4;eU<X`7r{T>&U2E9k$qPU5Ld<Z@3c@B`hg7v
zi;E_Vc)<MH+JpkKR$Ic<$Mc+WtJ`nx39e!j(%@J=wP6zJpS$@{L&UhYV8J6#>~iUF
z6o@yg9lU+GDnr=5>Q7e>ls|DkH#-ID4sm^6(Zb07+3xiu(Gf%CwiCK8HEf*R8ffon
zdDp>^k*5_XCAv^JBwZT5UU_M)l$k2I)<ds~rnD;?1+&v#IM8)*CU8E-2dSCss~v~B
zMGue#vRG@9jjM^MHG!(K$BrSq@WT4xik@Gg$S#W3Cn{ne6K2A@p3Li0UBZs5#trvS
zpfY!oc?020($t3NXwunBj1Ztnj88px>bd?63ABp9((L6ra~A)wPK>!^h(jkfs??-9
z^jHwOFYSltHyaD7ke8Hp4qS}EZEbkYG*zl;UIIIulKXOBnOoi4wLr1H$5ELX*LZRs
z<0vVG1U>DqCS`a22$Jr}c*r;z$ssAM6w5nn>_}dq?dvU3lpJqWZzOerb?9YrYy78S
zU<_+ONUw9ws3oN-zD@`T%2-JKT<uk8xrw7#b_LbS)2kE0T3u>fZ%E$D$koZ2YB=b#
z;`{08dt2d$N@W-1cXSe{GOk_=H?`Txpji6x8T<&FZoXAZX78sw*|P!`;T;OvX|=Y?
z9cSL0uf3kxs||;iUUQ9SR?O&0T*)J*g%Z40HxzcvN<X7%Z8;8B*A@&AsX}H~U&CU9
z?YK~Nx==H%R&@D1v*^C?s!Hd6k=}eK%aCDNn{(QNCy-gWY3avVJCJK!El`sAp~oDu
z_o%MtAIuvvdhk>NJt_1u@;dZ@cS1Gm%TZf}lhHdv^D8mqidUkkKH1TuYYT73lLgeL
z&mhIqr|*vvFp%1#tlx08S^Ix)y@PnZJL)k=k=~UzqrfQKLa+k;_{sf2pI;s;G3iIH
z+q;fiG}m$vxX3(Ofa5wcr_-#MKQiz|?(Kmb(vPdWHx^Iqs|E2~o^180#LJXqS*s>V
z=Y8sfskQH<(h#tV8Z+DGl%r)?alPoRQ0cw;Vi${~NjW`}8z<0~T*F*JInz$0>>&&L
z_HHgdAO8T8<&MfPJFp3c$avMD^S7vIe3@mgfBS;+4Eux<knep<Nj#)eMAvI*gi(JL
z_pt67;h5G?alk29;YQM9ibq;2JmN@mNTBxQaMiDgzDC!Cx2KGxy~GDdMRdbs_8$hp
zBIaAt9D7Tk?gVEey{B_EqH(pQ%?C{5CSK$u8*1X+RV|)@Ay(uEuqr3n)U$C3CGSy|
z+~pi?E1k0A+dRAGVlcG0MJbM6UeV|=#z6ZU-0MJQzj%mPP?+Pv1crYift$>1{c!9W
zO<6I_Q=<PjQ)m+WL|?02s#&D_v@XqR?TYV`v-%=BL$}}*vnhU0F^n?Q1JTv^LecQw
zNxB&7DPo^fD&~kb?x_IHHu1DX-{5)ibG1~5l&OK<eT!eu;|{ee@Uv<nwM*9wAr72^
z__Cl`$fN`=rcc*tKZ;prPFE$ueq<XWQqSh^NTCj$x$|{Pa?udEtGwUz5Ltmkj_!HK
t=Iw3yFd=?)x-JcyTOsZdSl+n(AJz70_`&Dz`j`is0BmS(@J!E%{6CbE#Qp#P

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/logo.png b/src/assets/imgs/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..87c1d32cb902c4171ce38ae5bbbfc5fe9faace4b
GIT binary patch
literal 16773
zcmdtJ2UL?u7dQUUQ3N}^C@8uL0-~sNL<Cm^%L+tAsuZb0=u!j~SGo-l0#Q~_Hy}j;
zk&X&VNf1S)BPGFrfb{;&gb+g6cX!|O{?GY;pXaF0b7$txZFA>0ll%OBTt}00CI3nU
zK{$_S9Xg31%xDB*v}I=nlvvcDC-`rLqZY~;LAYMSzYKSGatR>F%462*>c@{;IiMY!
ztsERT9Z^@`<mlvJVQqT>LEP&wr`!x~k8mqDk6c)-ckoMJTBPk2L{tpNUbY7HaLp~m
z<m#Grs&B5{SgE&R<JwrQ)35zMt<=KY_=eq{ZK-zi#+jhg=l1^)X-InE?b+MYGx2#M
zml#W&tn$FG_FKD7JfidAMdZNAYl`w;M8b5nUcbxpW8A3K!n|osXL+$D%NqpgWAbqK
zL8q!rGCXrY7!k)$ySA(=ZJi0oIWDe`Y>GfyMAs2H7{X5?WxIYW+klkuBB`e`%vU0J
z5X9Ew@<CDLDJRlBctn{6`SRp;0}t}$q2LpCB!mHp-mbZYQS}vKeEP~s3C6-=1dCG@
z-Njs(!r+I>+^xyzm&by*h8l#gRy9Waq7O<`Ae;6xBI?5HE15QFGhwAa6tp}sa=ezU
z#efu+->r;1`ayO>_FV$M+t0q1Z=1gr+ol~f;rV5a#fo;(*vJ^M^;$$G?W$D>!ar7B
zG`(LXoY>jk+G#<w?HzpcaN4HNK~#BjfAe&1Fe5XvMhD+pXVlSA%j8(fkm^!k^W-d2
zr-xWIj~U9=ufU#JN$?yC^4LGADjfIVc$uP*;7SgTo~@=2@}%2>lxJjH9a@5XhC%Ce
zy=NbC>Aq@oa$!Qi)Fl&p*OZf?#B%0?GWH`xvFXxlzEh#URDau(c1~jB&3=R5vyY1&
zEA@DJGUCwYcXz+7>+;>*FLG~c#celE1b1DxP$!e^MY(OE&kqL1ATEOsu86A7fMhT~
zM+CCQa?fs$5d^tiFczk|lL4uW{G$y)a!I`B9^c{7e#?#^hp<<6q^hy4D%yZ6<ccj4
z$}Qw!G+{lYx@t?I;+li3?S6tQAMoB&<NK{p{tNSqR3?7x+WW0*o)^jN=OnhQJ9mZb
z$ir&P8&}Mmdwm77S{eI#lg;us)|!TX5v^k9i4J8JHPPC0%kPg(T{kwI5PehT^ataU
zgBK$VwZwi(I&C-*a!z$TyuNJH?wgZ0b2Vk|TuDE{^pVj;_2pv`{+n;H&eiBWs}23`
zJ+!Ije=e-#m-#TM`Y6c-jd<S-HS?>M;j#$+YH}_(P{a6l1Ag&RZnF-9y?SAL&4dj0
zxo#9Fj5FzF-@+K=x4xVG{M9wZw*KMang-ei>W{Z}i#=bL!>+#~;HpgVHqqOUb)Rqb
zTsQXG-Bdm;+~6=y{KsbD&2d}LZ{u2TbX#i+*SlNoIx9DC4c~o)<A{w`y_V!3r~Xj>
zu*N!8Tbvwj_pYg(J>3ttDKa7}e08|)t%-Lf?O7Y--`x17z2f1PlYiV<_v_vZDjm#^
z;&&g6#y&k!`6TWm`_mip@n??MVO@_)oeF%ievixjt(7s{>g9h(CVV2?x3;t%v6AXS
z=d5T95Y~t!M1HU#v2_u<0tVeyabD*PDAh9E&S%5t#h1jJ#U~Z5oybxX8C~|9^yl3I
z(UwuGqa02f>=@p0d1J);b$8|O>fQCZOMLp<Y3I`_pFEy&{PySR)qkGX^G-Z`I^%fT
zlNBGi|NQhs==7^6aw%0O-A;xb$Dc4t$TynuA2;Jnzkcm7_PSQWZ)RC<`9d~xzukSI
z-{4@alO7XU!Y1mN>DlzLZf#eV2?19rFYQz6&QC3H77-Sh&P$aHTyN7_`VM@J{k3Xy
z6=#)~B$K3yWLoXTWQ$~<<b8FXb@_FsJx)E`J><Gx7e|aLMglV=Zzn(EvLZ(==S0r6
zoO&1hcjX#0vPaj7q4z^vU5(Y6Lw17+Lp<MmYkR9j_DSzymkZ~!mDz9BR}pSTvWc?J
zuI{_q`gm=*RZhfftAy$!3EQ&8e*{{#?RDo-w!k?En&S2}U1+dTG%>Z_UH`}HKi;(G
z|5AC!=DtNv_468ZMMarJ1MUm%U3ch#Pq8*}Ci!1;>nB65J<^DM^J|b?Q0cw8dzZ^u
z?j5@~f{W5q*7MLC())}%QhSapLAI;aw>>VPAG0b(KBheLadJ%ZYu6aN<_+IAg#Gg2
zm!VVkbu!(P-7CBAceC~!7&aN+I&3$L7pf3kCseC|R=DhhcByc+b<8FI(YmMP$?GR2
zUHX;+mJggU1ABQAkA|18i*$|TIc1l0Gs!;Qv;1xc|BsvxFKUJoVqV2GB!9L0*jS<T
z#{18SW4mGm-WirC^{Nf_jTn5pRMCb>ib*OS2q#LNcRi0fKanS_n-MD>S1WB-R{#2J
zOJ2E`vAnX<h4HE`Cgr!vjPaiFf%%E~qRmSAVm`G#(LQXGaT5yT<x^p!1+5-Gx%+ik
zj2Vg;IvDb<@L$PbvSAWoj%I$uwwEP@<rS;cD&>s_SFPYgi8$SMDCGGmFlHv(U@39G
zdgFU`%*HbU<I)x4+QPMKL$Bl6o7ea_B#vo!Rb;Z?XwkI2ku74)7tJ%~z2TP~yPxj*
ze&YEl^d<C&L@llzHDQ?-+8_2L_@zSq#Y`txOWZ}<leT8vG1-3EPqVMM2aam=N3KJ!
z-?F0T_x9IcUMv0H=FCX6y)PTve*d?7XtR`#hKDbCI=iaM<J=Tcdr{$+_g{-z7n!co
z5wPjtaVcKijwJhILhFBCjk%_)k^eB{;fb`Y>|Ygcbz=1H4)1SN@KztUx~_ZJ<*n=r
z-IF^#BKU5-6dO3Ecc``rhyQx%tK@+@v3Ft<PI6k`d%p9tbk_DPU5lMNZ*#VLblSZa
zxE=U@q+M*xd7yry?KSP{gy$zyj&pHqOFiD{ewO#Fd$v}d)|rp8%@)(&$HX}Nxi9C1
zrykEv&G?e-j_Pj_Ezo$yEf#c&$8DF4;mI6xck8|n-sM*1>G!6Ne=|6F`sYQDhM%D)
z13o-@q`uQ%f6v_~cixrTrwpEXX|~biuKDTSi;<ts>iO>Axod=T#63<KO+B35`AuKP
z=+osP54*a$reCw(_mH*7e~|5QBdCIBzvf+3`$V|j$C)h9AJQRUWcO<m`hn-gq0q|b
zmG3K=_L}VNIa`s5tN-~xE@9Xc<7-&1H<kQnR{mG<y4r$9H?IM%0HKWvO}%%zb6@Oq
z*SE>j@E)@N@Wa0`jNeosr=ZiPF<aA3_f1@w*CQ{sVU1q$MYMx$!?S{d^c8j|<wAtD
z<Q+R={2c0HdhWZua6Gevt5~h0Xj^mQWv{m5qz6?c4JDP$(Y{$j>|`yEogd^2TyT;J
zc37ncdA+3I1dPymA<g`(8J}L6HZzyfy<z%sSj={%{;_ud+igkaNpTn*6{U~S4IU%f
zlhHPYCk*o})$wsEJm??VSw<u82AYUrhJCq?gQ6p*^;@%!CM%^VY5F)$wQ4;(>p;FR
zQr@Gln1UWWMpmfqt??bdSoq2L^XTVYhVdSGy>Gh(vh2kh1+%y242`-D_wcx_{Gr`o
z=o#kzY%;%Y>O0%`>hHeKr_(MJ+O>=t7aHSBP^){nRs_aP-<hciZ2h2Fq4`PduvkbK
zMnpt_lRxjLdDZRKr1Yfq`1d|~Gah8;KZ(s#-zJXY4JN<zaf}7w3sO9u3^?`v`Q({=
zsaUB<Zk2~pf8u0vRlRp_c5hB|X`V>*_DR+0;{(;>W~E64-4SKt<>^VOk*fm}TR+6h
z0<^iwOzY$^1o7O8AbtS|GByML??Mn4X$1Lhj3Dw+2*TrV%jnHv1d&TWa!Bnr_qy)J
z8Db;LOld#S$Z1P-^t&y$E6gn{cFVro5*_xk!d(2_x!o4Gj&$BqvJ^ie4w@sQw;U0_
zy~X)R+^y($=DQ=043C)*FDv)zcscY+5zEQtJ%RPTkpn)lpAX<ChMHd8z!{6Os*}ZR
z+|2X%QQO4G2h9zC$B`pkc!0bHX=+BVN*Z6e%^bXeGR*zD7WGWCcC2hXY#%phWtaEY
z8DOm9h;Z4Fo<Aba2uNz01Z#`e9y`)QHEJ(7@B_*kG&81in!75oRpmiWTL|nF!XY2D
z7VXJ<Y4~lP%DL`J20-(11|zLrdx)lo9;!W^z((a|{~EO~cz-jWJa|XH?I`n<Oc(BQ
z`qFilz;~!Nzihmr5Ddl+DF2RAGF+wL%`P8Mc18rXO_Y33h6zDbd(Q>o_T>zoRWRfN
zEp_}O(;TPYasXZpA-L6|<R_Vdm|d(GHS?Ze96ophpc}ltR#x|+HnrvvR`v!?sI?b>
zHUuf>P>8AHcFkFXW{r4pX_QI&5Fi>qn%Q7uceYrkKA>t-x(>e(ph<6b$lUz>`Cig0
zQL?J}l!X<b6<$4Up7*6awI&m?<cx56mkp?XzbNpGOrIk9SM4yXGBJZ@u^_pc_c+u!
zke_cQ;X-ghhnWGf;+^KPoASq21Mxkr4N8KcVWN_3B3>k~FiCo+X1NB{%L^4ENSAgB
zx!mVR3kTt(R>6^0kHd(3F88^i%u4C@yztONaMTyGF>3|_|Cst@1tJhZ>b~iiEA1mU
z*INGyZF)is63={Zkx0;4?++ClF9McCB;C+@CoG%bgd(F?AVuhsDfbD>I7lH*Vu2g{
zLJ#cic`W-3syX0O2)d|hV&W`5Mr#uKV-A2<zvhqDCkXxfz<CStQ}*!UKVf-~qQR&d
z)L+Tj{KE-LJvB?|Ns-<_fRK^F>ggkgF(_u}p@9H6si(bVjDMA$3Rp0RU(QBUSk`7}
z>-!?SfS}qKg4=m}G)cc^6);y$I~xli_VHNi3%De1M6+J%RVnWXgr@0pdzLKzU3({~
zyFUO1pF6hl*h=}ZL$wY*+rcZc8tw9^;E`+>)P%!l6C@pVve<gU@`D;NTm*6`Oz)1i
zB%lOPzT=x=vqZU6`IIE)2#e6nM|j>e?$D9i_Fa1ise7mx%8h%UiDJbR_2~!X_QC!;
zM=DSH9<_V{)i2F!fu!}9thm)IF+6b57@OMf>c~Rttq0C?spa4VB<T|lN)q33;w0Oj
zjF6-Dn}iy6`Dxh>@Ql<re^)Dbl<@&O5X=Ktrt#BS?cLBYW>P!AYvFI0bKQX5I&|Ei
zKQwj4>qF4DO#`O0Z)reqDRJ1-wjsOOp-W;PNwEJQrR`(>Cusk>JZmA}#C-l4NlXVb
zrt!Qgc=vnxCHoe|-{%!6ucM!T4G85~4ZA8&|16D&<VT+$E`~O)_>=;MshN9sYC!R$
z{#<=e0G$gL2r@7<L5eq&+)5Jc^M_sc6jwcB#pvc5z{U{Ai@!iC`MRgUSN_(dGJZt~
zQg`1$O4s+}fh?G;TrEmhr#>~<)yOM?(zT<Z#6Og01$f4yQr>)Nu14{qGu^LH+N>*0
z)rhG)a5-Tk&KpROF1Npd46Xji>g9n}{}cqpBxpr)bI6|;1do0eIl>&%(m%J86kD%R
zx;`&p!6==FX~XYu{T^ZT`H_d<8QD{Jv`vi|%mbqjTOAtAh6$o}@^VuoUGCMG9jwa(
zGtbm_>g&!nwbCGHae{3DJ4|;-kCQ?=YXWv4iU&p<cH^`ZnE8!CT1H8;qp5sV-ItHK
z)<&m>9)%pM^qIK-G~UkE(<nD;hk#j=y+*BD#Ly9QOeiiP!evu>To}$S;)P6ltwya_
z(=+FOEA!+qT+(%wFr|ngCv%}7oNUC9b;HDJmd4Brb=+t<4;j6UX#Xc`(TM_RTU$?N
zOc$$=K#Z`OWsX|u+eCGO$vvMioRlcJy-&6)nx(pMB255)Tg}{#k2U^O#L#K;sn5gK
z7YSd#y#dKzNR16_3TlM4;BhoYM2wtQHm+%|^dql<OsrU6(wsA1NZiVqYOw*G=_Lbt
z&-U$OISoc&?ZIx-O04AXH5Be^K=Gj10%t0I==KU(*fwqlAz%u2pipc8R*bZX1RlAR
zhR&Mj37}r(>Z9H`lg3)7zQtS0aFAIb*R^OU3}u1`&#E}X9D8-er?fpUjm9W6SuWz^
z&$Yf!-8_$bI$S2hLr!TON>h})tyhUA9kbBHItsIUy)|WZU3q1K@u$2*$+Eo~bX~wB
zn_6I?mrA;v=jsnw;-}75m63tzLljHU_2V6|H%}gEN+`l7heQlL7})_-np24Ks9LKT
z@uJ8plv}AFj>}h-kERU8vTM<#CsJZIF(dqvKA}A~aXXvJY1**MQy$et8iH|5O=f74
z$M8k-#{Q<mi)F}}baTqhB0bbBZvH&$Dmnq>6Gd&ZMm8$BXXb4{6?o#sD7L1P(rzSf
zWWCbmw`2I&C2h%rnjm+de^`otsjtXJi-%cns0GT6z4c<hD2@Ik%Ro_!Sx8|0oSTYN
z()@>&2CBT|C|W?);DL)WG2yqF!KN!3@m{4$ViZwfcu_14J#BTLC(ohf0Y0B8ZX=~T
zbsUTocKJO;&mvyD@nXF<Ia$9E<))}W4U1XD72y1x9i?TS4T&aS<uq$K@oT7trb%y7
zn;(SJ?BUb1RX4wD`8y>7skVkwNbl6o)if5Z<@Bwobk?B8KFy#}PaX19j33q>uGNi`
zq^dI;zChHH=jVo+{GPZgrl)wlrDHj(`fXRcQM|e>Z(>_lSxygXL6kri+V3%Cb>^?6
zUGSbwO9%gqZ7i;c3!6}MUZ5}#Ebx=(n+XPs>0rh0Uzae&eLT|35>@Z~!EP&cnbBM?
zQBQ1QlOD0`$cocgqRGiAZdBOU9TknY<208x_N1M%su*x8u)MX{dVSI}>AqGCvIE|D
z@g;_r(YF)fpJ>SK;@b-J6=nsZ%sLf%cw`{h`=D9Ra4=k)s~M@OgraQVrP3Z@{+VvY
zHWVC4iz8^Y;7Q{F!hIsq1usDzLUVMhy?IaiQLB)d{)*WJPbW}Sox<}Ue4f=AN9l75
z45D$nkYfkQiXC5<Of@y_V?riW5lPl~>BVz(#T)eqo|%!Ds>#r%as=6y8q-~o`gUv2
z^d7_SrfD^|P?A)9GB1%T1_m=N@6#s^XqUl~%?ekm_IE~$&ni8iEF0Y#^B*|lKPtr8
zEwCYYsj+)jzX@Hn0xw6KYfg$36<Yy$>kwkh;)&3ok4ywqDeJ5J45qDLXbNCSjJ;>^
zG&UpC<L!#M)eEf-T%a>@+2S){%#!RD=Rz+;DAvr#Uni^kg%T-OUx`eeoSHI9^O-R}
zMjI201~$@*r%5O(s@~OGCp6eOHlAh~M=u}@X>^I}tAHl=YFXVm+rn)L@~rF4QBv=X
zOY?OfULYWdS)Esy^aCV}bDZ}=@dB`B<*Ki`hq@Q&Dp<rW-{Vq$ugIBukz^05cM*Fy
zJttzPie-;4nZL^~Pt8H7f7OP$#7E7*7}qm44urEYicDYwo0FDej3jTLOf%9{#&D+P
zgT;!DHgP;J*T5fCD`gV^Qqz{R&Z}Ho8-kan62}s5hH`cMgK@4@ugtF~$)ACoOmSI@
zbZ1I1%ukaw9?g}+A6lrV8o@fyt!EYQ_-ok{OSEh~t-y3W)JuFNeGot!D=6An781@c
z$84`F>nf$5=<W2u3nOQk!@W}!5NT;;{|zA?ZG*2;(!&)~jTuWOzu&_l!1Q*q<?9ko
zmBSB07|eEg$Sn~o1CuIaT)`F>vPgYwjqS{H(6R!5c(L~V4J>sXE_8H3Zpz>qTYNpQ
zbms-S7T`t*bgVOl<XD3}-Yp}tT?P=$)oU5S?7;NF*Oz#UGpp#WpUhb$fyMqUb)CpH
zOf0WbbYq#tKeO>A_=bz4{*9|0PyI&vz!T)&FJb%HHO;VI1Ne}(Q(Q9GFOg~p`|Hzh
zXhkNisi}qv8L(x+yn!sU+&{ZQCbaMs<mTd-<-U=E$EXdCv)o@8+UnB>&Lx8{Q6<Gt
zmKTOpi_MBe;SPF#29we?2skg#XI4tk+l~jAeJ+uJ+)B@f(n8UfO|2BDRp@F5%|LT9
zCEr5%p%LiRg4SGYw7JB+l+Wze5_oNaT4^%WSr+r5>P9s_)jYWmXqJX{v*iKSp*V}S
zZCx^G0bZdvcV6FxTG8i|1=7qn%o}Gp7gFMeHsf0K|5lXcqKV?~<wODTu_T%(R#_ZP
z&?<|ffMykFMOv7`hy_+*gqB@Sl!Xxh18UxL3q<LzSSFIF-2X1H|1KaYNcEovBy_79
zVPPOa?@=Ob@%reV10eq(1gI+pF021-2vC;%|39Mfg(3C4_m7t8@;Q={^{C@1HY+u`
z0+N8;=X}uePoo+v>ZLjIFQYnD3ie)<BdHm9aoS(#J8E3OfSJoA`h<S^<Mw_DLGCXp
zJ$1V>chc|9Evb$MUv_2Myvhs$(1QlF+foZnOaQH?E`>s-?x~wdOW4dF@BWs}F2I2X
zZ9+?mO|AgeJ*KZ{j3GGS;t0G3Xh0e|sK74I#UaQIXh8af7=lhCxVcin#X?bN4f7iP
zr6{wi%#QdUi(+F&Rg_}k&=N+VC~yTu(Rus^CS`%HurUKpqDd}BqN(%+dV|(LRSEQ7
zo)0kCN(kHMCV;+!yrC(V@}UIBVlSD@_Fl?onNZp<(OnLLW*I&-ZNcpx?K*{)$QNwd
zf0=5*f~HT|lr%UC3;-%vocXDM>7VZX`Eb@{FvK!@|G&y_%t8(pv<$K^@l)hq4vA13
z=o9~}Hk5{iiJ#U$O-*o1q%npmf!;854gaMm05vY&a4B2javScy+xtIP{YAE221(BP
z`X6RVL2kLu<uL>$moLT;rEmXDwgo7V&hWs|v|VAjjhhNF7ht#9yHglui#Bde0u^G?
z$H82<gP9h_!CJKKzXAXbR{sx0CBTfdbwFnrx`P0Sd^$hTtpnNuSuUC=XndKY77e}A
z?YVz>)LMKdp^36gV8a90((Pa2-yD%(5}Oa~zYWMLAP$7hi-GO30SS!^VKe1CIFCkV
z6XIetLV>z8WkK)%keDbrW!8oNWn%h^5TG0$X|X|PndL%&a%`Y$_}_~1Uqxe5iJE2M
z$Jq@WASU{)75<dJ7)3BaY%vERg20vy01+1i3zU5yLOBY4Vwd*=oBw_Zfcqc-qvAe4
za4p*gu%IzSUle%YF3UmbNdq60o|{MrzzB=M6aujq9jJpy3W&1=(NV-%4CgihL_-fN
zp~z6ge?4(s^ej$Up!6Kx{TrnzNEhC~LiGYD)^@dk0C?Vv6uD_;gr=p*4a_(T*yiM(
zH{+baQf26{EyX(Yz?Op3C~|}Sirx#e!)FDWM^->cVgj8Ps34tQBpT446Nw(>{}UfV
z)VS1#;HuZ`Z%jECKkEOt#Sb`*ED78t0YG;S`A-2ru{ITE&s&?`gR~U`j{yrNrknwm
zOuQuW<`(dL<b8>zTZ4b)KWdtoJ5qu8h9|SdEBG%*!`1nBD;OrC<-*RD_5bU%wQvQ`
znR_;n|2AL3g!SL%%cT>icvF6zpm6*T23wLkmXDlF8>6{X9(|q%8qTK<`XoB%0!p5z
zJKxXc`7e>P=g<Efcnf!qxs*2_c<!(O0Q^Y26c?y2xn5!xg2iU^_Y<>ldGTmZqDWK4
zDc|Er@WAERI9=~d1-f(oU{PRG1%fWy8{b2}(|J2q#qjxYy=={Bq`SULTCLn~!HQM4
zAG39%yJzkSI0|`?%D)ON=JGX$4>78m(+{4idz?NkLn{HZg&L5Z7tAI#J%~lHVsaDb
z=x6K4B7UwORhBuu9P`L&+&p049z@8IV3|X=Vs+vb$()?3Y=R@vKj=1rnr%{E>P!R%
zk#TK$#$C6w@*Xgd{K}PUgy=xoc)LGjJ!<M&vxxb*p;V-hM^=z~n3BWlcKL?}vLF>7
z^x`}6cTx~6<*KSHVO!o42CFo6<?;o5t>X9XMI?vg@J@86N{q66*D+4jpn^Nz#Eb@d
z+lTG)GDcdC@^NtpWK!>NOPQDu3zHbUWApm?yQsmhdJeY88Pa3C;{v`4ogtj690lRt
zow5t~;`0XyK#kpk+^)8BcMXB8h;~he@+)u6`K?pER@lKFInyo_-$)-R=6S?QAa8!~
z6e**gPToMAk<xyo@4~9UYm)WU^-`l;pI5|Sb;V3MgWeLOzLvRwT*Q;s>uo_FoP9I)
zp6;MzPj@WWl`h^|d*epL*|0@Aqqv1+<za*YTVzyhzo=naxc@L4_R8>RFnxcMOPaaW
z3|1{XslF478dSV)fO<lK%gPI+ag_4NU?OZvx-7SlY~&G+5U^54zT>tF_*=WWmoO2K
z(#zuX{Zr91!_o{`2BTb`f#`0!uq^p$JCMj`9D05PwUBH$sLD|2K%~z+HOjAY`x&B2
zcvALxvo7H76shzZ5|yUuJuOeS%u_ul^2QjVS|gL)yoVPyd{#0*q9P=f-RNBs73=Gf
zjYtPboiQ4#aG|rkNxGaDJ0h*|Y!pW$!)uJdcN29?tbV_s)}wqEH+Aj*wwbALL%y+L
zA0K&E;aPMTxC-gHM6mo5f0=SkN6Ed~&HIG+AliN9pW>CzQbnTtyb%@Rrf7>q74rNk
z<()`Xfs*T`&q{f0M^bM}o!)l&-hu|NnGhVO@G1mXcs@P>1nsquuM~v7lO(O8uZTtr
z5|fIXE9o<+$q(hh76xNJqr{Z)ZZzH1?*qP2uTdoRs?^Du;pi^9%iJ~=>wD_Ls)%CC
z(T`rrJB4UJ9)jN#LD_HQGsUY2?+oKmCSGg)N&@_RmGsrsYYjtcOL@)O_>lSS44?<_
zdobCAxh3e7xzKPli8d9;E{~b~q9AgeyXxhd9@~hV8Z92o!K=<QUyGi6V2;!cT<FTi
zD=#2#t7Ndk^E|3i9+<!R(;#%+YZE?>V5V=Oi!3qp7paYd4+1x+5^-TT2k*BB=*~Aa
zcFl)s+l03xm{HTgbLNddzjo4zsiV>misMmCMb1n;0$E6wUWD;3yVa72uhiUcOO$(p
zIwHBOj?~IRxG8lI6p`u28_wH9lqBu+g=rPG+Q`3Z6z4SSkr(h<pIPV!F{sS5E?^b*
zgptqr8#trOhbcl*lTAQDG817^N{K8=&c$z`2tobP${-X}4>zlG8t*c4Z|Xa66>mI$
zlE8ry>$;9sR_WVP@@!({9K107xi#v}(USOAfr5qY1uc_e>C<f)tn{b-#EyZox*iiY
z=?Ez~DUJj5o4xeW=EJoNtCjpN_(p>w<FvAz)(mF)v7H@RW%6rLy6y<0V&Bn<;WBx$
zGZTG>`<>;jDk8iREv+nrV?pIPW%A$SPq%{QG<yyK7vfxY>AGJSJjZpPo)5x3^X8(R
z_W*2Gub&D3*;?lLL46&G#B(P(!bLGXf1rZ?=h?trIcrfwQS#j~&-d!<t-2gqY=dxO
z5iT<6Kio6vkFx5`lYA%;0nugh`zL*0PRUAQe=$<5Jycs&Hg4H45%5;U-JZTbQ_w3R
zRI_GnQiO}==*-pLFkEBAkhZzq4P5EBXTE+Yc1GdBvwJy``KDzF$q_FsdG9pez>SEK
zPnu8dUsV-XN)N*dR|&Fauf}U$PHcS%&V-aa0>C!-Gg~rB|F0yMe0?4)i$;=D?Ll>=
zy9|6jV^X;tln|T3=jX-78_;omv(Gz8ik)vD)k>ehH`|xLHxo-Kg56cnkmt3Jn-yb}
zN2!kvalK$d_`PhrX|`b1Dn4{!jcaT_wGcL<A3KmkErdPKzgpfacXoWHwIZlxrB=Qc
zxq}H$z^VDk<De?{DYYthSBPm<F?M~#Pz06GbY6laIQ$Lv-1C7Why^1#TbO(JOojoW
zKQIE;)!rwbkr)jq8{v?juL3TPk`+darZ@c*g+2DXF9IdQLg%-DXTQU!nN(Q6tde^i
zydoier-G-ZVkcNIH*mE2;~nXyzo-%Ycwm`5cCG8Ky`)imB(zIKb8m@GMmu&Ong>>B
z8>cAq4&8sm48}(0Spfp#{KDp?TB*t_M(`XJFOcAC|Dplw+!O?>j-`2K&V0Fej~@u;
z>eUZ>cbc~S3O^-y&%qAcPZ{l+B<huOf@PtZdjocmec_N>4N9{|+sfc;hO^mZma`r|
zdcKT%V(<M9RxtmzyeP^5nW*0g{qfS2j|TE@-(CfH;oVO_D<od5G_|vM1k0s)a#LaF
zQ<pBLHCLgI0ms(0zk$WeQ8zV3K3<qBLI)q}Qi{+?U`_!bb*%@*;NqQ~C8kwdU^#iH
zR~lq3{*7?*e#OOrs_ow=zp=o%4epj79qWlb0?nFt9t|jdr@v-?<d%JcZBsGh0`I9#
zNs;6A2PhKSh>=&T02<<VVeG;I8Blb;?OT(`kNyBiGssaYx0AljB|qJ@5xf?Dz@UCO
z5Vgffhs;5pZo$|U*h!J_>F(=TYZeUe^wV$=D0tyFxo6MwK*c|(iMLaMtHN)>)9z6L
zMz#_wds9Ag(hrc3>2KW^O{<>IN>2HD;JBL@`Ta$+DhYp`L$!J;5^x~=>_GQnR)r{F
zW)m+0>-7oF3fn%NwOETje1dpG1Xha^PEBm<*G;w%f+QgoRY1a8hHCHbtdJ)KKdhSY
z2?rEa-CU)vDA_P50&!9m7|$<M;Xp_f{DuNhri>{Rd8OniSv<CFp9>h`mm<HnGD@}=
zb`Tj=gJB3h#Hf==TA^mS!9{1B@@WS6Sc6+836#xma0#V;zTx7iCzEspQij17?m#|K
zH&OCS)Z5rZ7R-r{UxiWoR>3H>%Kj64;UdiW$Xd;^y}E3?SQ-%hu8+Id7Tm45j+Gs^
z!??|UT@n>N)!!z^3I=<~q}vO?#UX9^S=6RJ*GxyizpCthS&r3yKrD>C{PAiy{P+co
zEn$VF>=lHb>=C05d+iEq@Ewl^hSTRPB|@(_M+|AL7dTSyUsasyyeZwDAAW-*ZL$$1
zwWlY`34DITeI0ZAI{c7DyDa7y*8#&7@(GVKWYTx>!jErK4~iVBt&@8lo5GB_W@71O
z?rm`ukPFut^2%M)yBZ6=^a13gRA@8B!cvfg>ksNg27tLT_NG?}`~t|*gFfa;pK8Nv
z0<js=-C*lqAK_B&2)uxGOVOwm0AG-(HGL1SNy5qsyA6*K4ZsirNBp7MxRgV&%50Fm
zow?BOxZYJT1mxSu;CrPrqk*9;n2u5mXG!+Ji&ikXD*3W<@P3<D!cNSXH*H|uz|Wv=
zp=)BG1I~b3cK7eqWu7LZy+7=|P5~0U`glID&)xM<ZD52;V+=GQI437zt`Nt{Jh!Fi
z_b0+QdC44m$)Bs7OEE@_e7s>oK@n`Z@lEGI=azk7rr~RGLnY1a9^Sm3`N24wCb$Yy
zpEkeldgIW}E?+qr5?3lpj?Nw_ja;o!8x!Foo?fL{`=~5O5T!3hCYFKCF$=6htNgY~
vu%1-$rlE15s8XCA%&aP6#Sp}dnGr(X<=##U9=HP+CUQhW=TOQ)WB>mHb0+$#

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/logo1.png b/src/assets/imgs/logo1.png
new file mode 100644
index 0000000000000000000000000000000000000000..572b2e0ee836f8947eecf6561a297112d3dd7782
GIT binary patch
literal 4927
zcmcguc{J4j*Z<5QGxlT`#+o%t>6?9s3=!EC*~v1<KGu;)31d%|tT7CQ3CWgy7iAkn
z!X*1T*`Mh-zjL1REayDuJbyfYyzlb9_rBlv{XX}+?tN}}SDT)Oiv|DydL4wO5t;Y=
zU62c8T47O{OJ-1SgrzS4Fm(J~pfm{vZUCUscfEDX(D0F$pO^0=FK?L6ty?f}A1`ND
z4<`T!BIFncTBMNJROd)ejAj~>TU8kzk$`|84${M9S-_MG*ga)phIdBC(wMQZUd%?A
zc03uQLFB|P<cZe1sK1E4A7^THbAxZD<U?5S=KA{a#Bn1rn|LyW8fHXaWEM$UE^q@B
zjG~nlC;1W$5FNcuXfP{co)X5i+~4Lx)d>Jw6sVwZzxQe<pm$yX81NpuD#YCV<2<Ut
zP{bU7B?0pS%tTrc#t7)SYSP03^l$+0jcXiffK&kRK!s`u0A=*R+MbRo6)=fSnPCSe
z3oc_JKs*S@6x9|2!#@GGrjbUH;MO)E4+j^xO4(WoLR;3#X@k*CR6sz21%?rB3!pPK
zBnJT4O)zka_tGE*OphW@X0&A<YvUbVj{pI!{b_?4cSf(V)Te#n3f$S6U*KP8^Qh9W
zV;5s`hAs+ZXJiRpLJ%qRhUfr*>u}`r*-bSJae48_vNO?RbFZ`D%zevCK$U-c?yT`8
zm=a*RJG@D-Sy~#W@a_h^_iu5>J^%=2z@xcC>ub}{y!$j?f)C?RH&5Wax%q}Y$~>28
zXld7l?em*te#WVuU;E)T9~XW=ww_G~Zvl^A!!s*d3!_dS+j$058YK|>DK%t0NkqZ3
z?&yfq1hJ8Y>s3~gtS`1Lp4S@+=y#(&8YOA+_ogi{uSCdg^QE6cQv&G$T#P~M-CF7o
z{T{918z68TgT-h701w}lddWqb1TeW=mqU>NAf@Fn5iS7&1~ZC&0zl(04y)2scD*hL
z0BGh#ioaK<ru)o-Yh}p(%+uJ)4z|0X38xckRc6w-u!z1)lh2W^&S}!BI7#{8Jq1_Z
z#n(TW@SkOG(i7*Its+;w*)P~~<hF4%#y~06dmxwW_!VO>+9ym33_;j46DS4j5Z9B@
zMX;4vmU{x7Jw8QXtcF{XH9~Ml%7;ZE-U@z%neKtfy*PQ%s4bfsS$&V<8`vNIv6PSN
zMOU8hh~ITaYjk>n`v@1FR|Q>LP%?7om%kqn_9DRnJtE8C{Bp|9>g6*n+vgTsBHe5b
zOBV8GiSiCS7XJjWa<}H%Z9;^=ap+5HkcUs1+B}|MFxnP+7Pm@;*97s*4G?o^)Kl5E
zD*`E{26*9M=EII4d&Me@#ciC(20t%<uJFSv43}(D5JC*S$%}Vs_=PcYI<z|Oh-rjW
zk#UjgD3fcpp2#W&+53GFQjNyJGLq^rj2MID<KFhgIu^yw*abakfsj#ADzmP<liCtx
z@f$gf%)GLDgV@|}kg{0CH}`drc>#vf#?P>quKT|h9?W99)n6o4IQHeWtBWh?k@SjR
z19UcuS1aR7#;E%*>J{Qj)LtMReGGk6H^N?&)15PfvxK9LQ#w=cE!EeI%pMb&2|4ae
zmsgChyi6^`55z-Rllqv`6w}Po!qbRlCZ@ioYGbG}T9a~9#`1?|VQ+7n))@Z8Lcg(<
zk70RCKVffF4jBa+B^nOjvng!0Iel{EKwljbeLF7(QE1{&*Tosn&(<a9v~8g=?qf!=
zD(U`8-~K`M;hJ6m)iHN~bcmkuE#ER{oO6<M&hq0y5JOkh{FcI0w(b!B5dBby6or(U
zRMog!g>yxC#Xp2#LNmdB-DjO`eU-53@0|nBk<8gwL@JW}p$#`0?lnX=O#2W2R{iR*
zidup0_w6&R%#LX9BlimT*?(`2Z;tT&BXb>c1H<Vdd(&ZS0ORn>{grF|$kx*zr5F1j
zH6(RBDjd-%yizZ+@yz9?d=R^;GtTR>J?{E<rx|x;J9}5T>7tIJ&c$Z2!BqFx&J82@
zuYLmqJ(4rHNnGz*g2Gs~d#+vcRO9qXd~~r^cBgLKjkxY~LV9RFRl0sU3HQoO)eL2}
zZ#IF`8Mj)MTt$wXdl+(?XVGOTX7$&WR%BIl1Y{xSSQc0k#YV;UjXepnYbR?oYp>TX
ztScPY9S9#F4~BULE;I9tEBPsf`uO<|1bBEit`_~c-j40Swy&7GaJ%ID=IqL|zrBO$
zXU+)7U^hmVyeRQ}6WpJ+#I?~d`r+$-Vb-UtnTjdox7h)e&am=h{i|8rz1Hn2o9cU8
zB#VW|13z<0vP#-^F+}Ny0S_%79yjqC)MSg~j>{l>raK<YH}!|uDyphD9SyBesCKD>
z-vqyT*8H|vU{0l3Fnl~bGo1P)_gLwu|1|MW%Ma8J+xA^5ThM3F5~wMXE3$^doq~@t
zld_mvo+_T|(*<cdRaOl;D7_`0Pl{J7`wsV^!?hU~$=4&SeUKd1``kw|10s67;};WR
zh9PrI;a+bK^;QOIA+ht?9<lX&uAG_dhhZ#Y;&NqIf8WC!`#ts}Nsi+dEstHA61Eeu
zFFz_xyVd#xxZvD8j659Hvg*<GW%ZFk&;Dp_XE6I+5`wNjU+kFdP<j5-7fkeceJy+O
zwMn|4L*>#;!AJJxm7)IJKxIpLOHAm^=vT}c)oM#oFbzX#4uho<Pko+CJ5RHs4YZmI
z;tTFo)z#}NCokuir5)UyRSLUx^eD#Qwtv?(sDY6LDv2}squ{Q-ndbO+-0;-nDJg~2
z?9}W+BYM|#yu^e|ooJnbvxGzn{UT}^*~gvotdF!Pc<8%3&FT@YH&Tc<sx)L^(~~Zh
z2ztQrAgCVEgt-6h+MM&*??XY_Cv2fjnD>VD?`tOOgDkh_1zNN|u?fZ*vj<+4wKi&S
z407EX4eNi@U!8txxL{#qy5okL*-0>p8Z9oqCGo`kdKxyhx8JjJ@BT*zR=YGu(@nRG
zu?J=m;_PWQIB#5O<)8Pr>z5bI@7j!o?xT<d!gt-ezV%haYSF4Ej%3;LPPfTTee6rj
z7JUWxcKi~z4N~{JUw*LLe!?Jruy2q;-cEk~!9Xo;dME!z;X!atgmu5!X+?Qm^OOi-
zyk#~pWS1d|hgIqOX6jnw2Z<na_a?2deb3R2C$ouM_S_9E%i**2+JOe0xrrggA=C$2
zo2zbqULG^=T3V{1NTVC^ya+|_r7W};A#440;0N#f;tXx-OP{aIy$ucdY4|IDsC}k=
za4s{VZXdFWKuL@$w)o?u3Xyp#`AwU@UKZx?Jmk@Ct~(Fkl>O=8-z}eLo|~5=s<M5!
z_$1|LiDOA_&RsQ?Z<#YFlHN(CyY)TmCYM{oxoYfw8+vs%q~6`{#6;_@M(;fVlKr%B
z-JJ@RN)_#J@6#WMcMrT)ok;!b=E{|Rd-|(NBb#3%j@(+ud?)@)T(y3KYTE2t<F4}*
znY~;u+_3*A;9#9SkY+<~#yU7L=-o*(;q*845##R&{8^P#D{}siZL95YyCvf$1N2$$
zS?c-MXFo=@2eiioZwtmJ=J4@x({nZLI1Z)!D5);FG~5?%c8*&0Eho;ME*#$(wm6yG
zqCJcoZmC3JcYQX?vF{YS1-tnghfpfpZ%-<Qro%StHyh@<oA@$CPvB>UyCX*q-6dZP
zNUFrpvlD63)7@j?(Kpw~(<aOTVWbZL!NLH5jsk$gb24860Dl<(_-zXSimw2G-7DFq
z^ELoLJajbGO@at(Gj}|!#yDHIe{zil2(Z+Y0-v8~vWf|px=D!ItG}=iPU8~iuac=C
zRIfOU2&IV&FqH?Sy<j8oc0Zokfjp;x`eV7TFi<6l=xRWqD9qEzY|ap8k3^M#u0;0`
zXJx*)nJT^Y$I8UuwU55%+DFob?h&Np-kqFP(c<{(Qe9W$61+kwzE>3av{bWS6iJu~
zs}K*Gpgp0M*UhTX&4NT-;bZeB)xG6_-w;JAa>%8r^K7U}(_q|+<DE-QVq61TDk5hp
z@d|@5>`SGe8>r9laZzNYESv^Dk$R(?7UWYm+9h+7#;|MlI16l<k3W1Bc@H?AoIOWH
zt~naA%ySVbs*^w$Gvj?h*kxY^0YTlYp_T5IYiJKU8O^WAOlVQxDM#*SrdiRqc<c}e
z>j2ZNDeDI*bjZXy`y<4VZYZZ5(c$tP-7I~&C!z+rS?gq`hB3RKp32u_`j;Y-)tQ#4
z+n8bj4N4{fG!y741f~h_gCQ5;<gNdZ{)_QHyZy`fKc7K1-oFeprRPWO_r>A^m8b%X
zrjz)1*J{q5Ol&;2u&!&GPHMMKz)j5}!`81bb}z*)eaO0+*dwK+VK#B9+msY@r+s|)
zyN_~}Q2*Xw)5XK7kkg%=!=lD1S@CBLmsdm5%B9wNniKA!Rzi(_Cv-Ti=OR`puv47L
z53dN;y6nmxb02I)z6w&93%}+Tw(ep;ci*PYT}aC21ErCrSCL?5ZS#S<x%P`%I4hwi
zk#JNbwT1{5m*`YYF}6G;5*@1ZKh)tP{etW5T2vKnPpQ=E=Xeojn#~`Ed3(GPui)N=
zIf*Vodk!OYR^9&zSF}o9LU~8%C6M%bd~yyvwKt}@K@hkuW6!b!l=F^@)5qb~KdH*Q
z;c9TeND&@>KH@L-VfWLeC;-&6LxI}(mY4ebu#=kNuL?q~*{CF^jj9x4aiOFNQ8-Y&
z2RFMBvskk#CbsWe9oTmCSP>4`&w3>YcSsYl2RF$cesJ;Ccq_f4P>RLVU-c#cCF~BB
zql5dqKP!4pTD&Nw3ruK9dJIoSOsAL2bgw!ZDEb2z$0wb4c7;)spHBAgq&AvnIoSI?
z>ys1rJk?~Jf)b{6!Do1NR(M-iC;y6aa(Y@kKRK=*zA<|#Nr%yECHGejCd#h6%$K*B
zNdENlfM^gHvjDbSz1Txym{ijbE>rOgo2^etB8ZUVIwEmiD^<-0iF51J5I6v4LX$5A
z$e;B8Bt8;k<a<voAh45D2Y@kh7kr2k*468adCDOL?|sgf4<h_Pl&~dQM+J)iQ%b6!
zon6vV7<AEGo0@!nR-L^IV&J_BCVjY@CfvG-#f@HJd~SCvKh;DY5MqLtacS&K?WcOP
zg<lmhA{QjUObH_wq5|VTlCea;(6%EHP=^aV^~TQT7mf!uty3XL7MMDioG<LJ7AgtC
zz(AIBqwV9;TaMKNjO&RYAq3oW>SFTOZD?%-i1^6EN?dtH2>pjCcJy}m;b&mF1-)yW
z_~sbsD1mz->H0e<6GMnfe4ST{on0U>b;<&KQuo|Sk|e{j@(LEGyc006s}GJ%j1)yK
zGP+b2+9m9sVDq(5om4PYYI44d((K8xuO2^C&e+?FQ-JqD5F20jTdX;5$Hbnjq%0OR
z3qdh*K=NvD`{U;?ox#v{x)LYj2Xh52T67pWF!?g2hbzhKs+W@`Zha1F+h4KO%~g{Z
zvf16@bC{!x%_xc1&(Kx|^#%pe?1nMI!*^^#U=%-%i)n=>`noXWLP~0R$dS%?EK+nW
zGo4&}4l6jv>VI-~{uJw(IZEcFk+*Vs@!7w#FlrIWsoD>MmDReeA()!e6tipnj#^w-
zQOD4QqIH*pQfin%%e2?23hAYjE?<vT#G?;x<`!m~8|mb+Vd-o+)+^Z7#^kSV`l(He
zT6SVH&?Z7qVD)vOnGMPM9pT)u+zrxuIv6nVaN=@WTKqvx8ItC~dT+yWX{dui$I&ot
zIz1$5(;o6aW9ol{-hW{#|9?T`{|##UsD*lAu{#tW`~Ff_Cnn9q$djbM7+?MTFEuL1
z_sY-}SURPS-WEeL$dW~#zm0=KvnE)Py6C>^C2|k>+L?M|OaZ3rS`(emq+e(1TIdYM
zni2fuI0U|~1pi@XD#lOsc*hPfzSTeB`>S-KMO#l#@9-`I)f%q8>FW0YrPYn|MtJJz
zvS+b=Y~(#O&Bu^;Y+y|><oMPdC8}Q;JMzAYuc%{<2s8P3g?8ZI+vCS-P;$u0bSn%?
zH!XX5bAkesnTS^65GQw4-7I=q!Z8>vTC5*`3>AD=jIpudoBF*`C4K>8Wx7F|u-+(c
zAbj3;6t7a@OR9ZuT}LTbGo5<FKonUkfjle3f5hQAO$bHx3izkRGfkh?Hhu&IN_*{A
d&)LuccP*(;=R;cQ$ukO|qjguaQp5JizX973<qZG;

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/logo_w.png b/src/assets/imgs/logo_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d8b3fe41993a4de91c69b7c54591cd61b63f9ff
GIT binary patch
literal 17324
zcmdUXc|6qL_y0>#B&3B(QW><6q|L}o@-CE+7K9{~WH;8V@h-h9OQW*QFr|`Gl&ocW
zw`szRrR<R<W8WFO@4YjY8G8Rd@6YG={yx6n?;kzPJ?C}rIrp6BIrrTAy08Aw)>P$N
zw0aSOAbjd-zv&<drvrk_v*ca?C<Oh!%is@>t(ra#LHIwwe;jwW@QWbGq9f)iD%#o?
zZ5(WH7j10UsjH~0v$eOmU~YLHL0l?`$DH+o=|Y$q`gwtq`^&mshFD%fHi*Y@e_o>h
zU<n>E`F+XKeIKu0UvzT$3PFO}i4Q*C7O4@h*O4}+nknD7e(L54!#y2hRWV5(mpj|r
zM@mQD(g?IsiYryXTX3o5?ZyX}5Cxs9d(mZLfm&)G$Qj=AR;c~pT(_h#_njHnM+E7b
z@9N^|kboWKh_^xJA-3PPqL${=PWYy4OX?!)ZX-W7ET!>s1nD53w;unz9QnKwNjR2x
zZV_?^K`dR}_isR+@*!<~>KHDhEH=1G7%6+OCYBrV=Rm?Xs-ouYdxM-gaYaXZUiLeL
z6t{1~R?h4f9NzlL+g0azXK*1-0eV3K`_3TVVf&@?kac_JAu4N^<<DQIF`u-pDC<Y8
zvF+7VH4Y>@_ild3;Uf9vsdo!jJNI<`s9Rt6&hq7c6X8uuF7PyLAcRDSFH@t<*Ptv$
zkkvzle~$0L2GJTDY8x-mEIa!?J{Y&?ve|%H-(55Q_SQU3WQiuVv%>i2&yxAJIUEU&
zSr)MdNX1FyV$G0|d?gR*)S`mRLpNRbjP6?-d0+eUUePs+czN3;&fd@1R(}&SAzy3r
z<EG~T;Eq>b?n3Os_k}&rj`kh1GqHAhp%XyM<=ii4O{a;E=Unv~3)oaxx8tRu^okqZ
zdVi#9Z#a_Unx=F6xAo+^bxWJQws(u&8{-Lf=0oDHX=Q6BFHFj{%=YZyn0J$3ugD46
z=h-WBYc=m}WQp01?XGkL3C<b{+_!}T$q#v0k05WGRvJFJBdqa>8$o^}UD=$Vym0ZK
z%j2^734e;d%@&?#vf#IUi&5Eom+W8A;Js$i{gwBWR~^qrmvJT~%wJ6s46j}C`cJt%
ze6$}+4X?D?3NJXbGV<NZx7T<$l|OSYGg*(mE_gPeYy*W`I4pp3gNfP>y!XR(&DWP7
z-SF|V{lj^&`!C%#QWNiyv0tv>Z@6zbsPgl=?Kehmyj7LEbLG|1`CsQb?n`?jw)(~=
z60Xo;hk%jyy$2SBt6#5G@=ksbQ+T+^(E;(e5n$?FD93-{R=J7cEx!Y2{?J=3nImNS
zQ*Y<Vz@4U|db^!gh-62abaJES-Sl48#(nztCGRYKf`U}_H1t%SNVJK+UYgFW%j5gI
z+&ifa!B4baOI%($^ugsU`el&b!8pl|^=sEhN}QJBUuGPvhT<pV8#EWKmk8Rf&Z};r
zR;ecQ@Yq94(GqilhGc7y6}h^B`;~Xxx{%u`K>|Tq_!08^hLq*#kJsxocpjj19^P4c
zXy<wCPtHeC+xLf&o*vDQjr_{}^g24~l)4qkNn7@qU+l6Sj^Psd5ke}t4`rgi6@;6c
znbR-IHan#AeD_^@AfzCq$f9XsGp*UT&v`N5H9p@QwX+*nS*&tf6|*vBm28;CW3J+m
zu+PW0m2MXaGYb_6wK<`;d0?~qirZh7-bLR%dDrtU?dkCoxD(iKu1|T7KRY4t?DR>G
z#|KX&YS+i|d=+~3Emrizo7i11C_2tMf!frg#?hI^V?M*Ce6OxuJxIEy7Jb|_<<lzv
z^+KPvpYPV&Ut)i9eyg-a=#jGquZG$*oVZ3roMhcJj;Y|DUWmJJ`vS4iE}w({)5{-S
z3gv`Dl=T!oikr-Q8LZ69l1tAoJokLQyW(<1X2scd`*xxB){0I?TjD;VG_fCTg{C|5
zr0+^UntnCC(vjMNDK>3&ZRY9!($C-gy->B^sxP`<xTUkCvrugJwjJENf>v3|?J@1j
z3o>o82sKYF?E1a-iD2%<^xGdUMi;6_OQlM7_?gx3bP>i}h_hL9Hf~4t`6`ROCTGpJ
zS3dmk@MA;fru;h=;TO^iUl%*%<$ac}iYtpFw*@GCBUnV5WR}0J9QD8Y=m6p4p_{vI
z=G?2e=bp=T@5nuRT<A&6N!OG8CrjhhOAK43TdhiTEwx2-BNj)XBXX0UJdb$(!70M3
zW_jK6z)eM)`j1&x$hD2OEouvIThOjBU@{;vU^PG$&0Dinv_#QC(cRv`G0(};_HFCK
z+8ys>Kg7Oo)-@9`yN@IG?i7A}I4E~%h*OC0F{_vxG1gI+bMO9K-H~3DRNNmO@g}0`
zdAZfs?|DieJ)Vsm*%~22HhQnrsod8^*Q>M3t0%@p#JuYbqRF0iI<0?tBx9{sB0(~;
zWSiCJ$`1xVGIHI{pfO74hbhhTF`qE=qAo}IWj@Z_P@|M7?pfj)=DBb*azt@BcPwx)
ztJbwgs9Tfk49A}wKRGh4tiF;s-(tQPXBg+Bg*&<Yx!x?0U5r_=e=!fAzL<TmO}224
z$dIXgm6>#S;fgQZ#1*GRhPUNOYOF0047f(+u36$~^LR+3IWL*}`VUph>#1VqtHOkb
zJeF_Ty#49cmZPtaIoLVSrAy)(^heAx0=ffZZ>1?#UP`uiGK;%psbgu{7Ln?m`ZV>5
zi{IdZ?vSMp%TPS+e>8k3`=InkJ#HS&GF+a}5PtlggXxQ(RS(jH8=EP)k<NSdcj^bZ
z@3|VfG~^Zbr|-J`+OjLPe#TfI5na~vd&E_(1DOx}9~^y|l6q(_zL9wH?!cb!iXJM%
z7q4j@bo?aGqouRO_4X=!nt1P#lfRWz$5G4e%4HPp5bhA7b@<Hhz1~u~EoEbh)`cxw
zg83R;8?C;G1p9rVH;516dMj60Uezd!ey#IDn_oyn_Q@6(gOvs@scIQ&r@qS9To`W|
z66f_1a?c1#&`wQAEK7CK@BXnN>%bc!@tenlowv#v>7<`?G4Cq!$i0~R>fV@kou1B#
zo=dJ(JpnqtMUNh-Z1K_EaX0o3IoJ9{->Edy6()Djo#?z2^3C9+*Jk0n#&NcBPhJcr
z987Jj)73Qo=HBmWRZ&rWDCJ9gt6J;BR_i#repdXUj7!Sj3a)kWJs0Wr|0!Z@b*S3m
z{^d*k0r{`<zvR!~X|l83ATK$tvgiJ;=z+^bFQeR(W6z(ZWR^=-lw^H(cI)N$6<wiN
z-Fc_&ZPFGOU5ktZ9{tuu9X{U!SDzJ0&uaAio~r7s^)WKg?UCEUfdiebmmF*?tKze=
zUh!Dz?DAi$hPM3~;cZh9(H`!cWP55e|2yTMe@fLnc6Y1SZn{r-U-dq}Cd@0PpSxAf
zbxRRC%P~$S+KQxfKclnhRy0xcw5V!k%7ka9T)nAd&dxyHND^_QQuk1UPjG$AxtK_z
zCRXWdSd}YXV>Had=%`VKnF=)$E9}srkz!0I_g2#ajk@02_HCe_t&~VP{9NgUlB%ce
zSgl&TflcdqdTzV!-WLviM_LsNJBz)BFJ*tjl@69}HHvc0=={_sl433SeNC!FdjFu)
zK)bN>q7IEJqsxIV@uQg)V=W7Z1zNmbkH0*hZS`aDO!gV-dwqdUejdNb@jDa6ezira
zd8*&U4~qK-62-(s_*Q51oTCKS#=MGIM*ZS>a>BJ0_l#CERyT5(syABJ#XEG9n)Sjp
zw%5M%S!_HyM?6RDEyY!-`|;>=N~K3<YG-;)PKH?6#?gJ_+P#Itra3VMT67G}eSB1w
z{(J9;L{XGHs5aM`s_7g-kjoMX;_ZtdLlfX{GlDp7Ly(p;2!akp5Mdj<@yCM*vZq}A
zH|66l6>Z-qVoK=~Io-V>Z&5f@*g3p99u<a?C!@q%599MRs_oS-Y$t2rQNe)IC_~ne
zRF{;`sRV!U=X&ln3=GveQmScV6+@n<sim#m?ig9&jw~;NHO-MyKWv_%iocbbX=qk=
zQldPpp%@htY<SonOAZFQB8LkL#nNdv6JEO{%8(0Dy1}EB^c8@9{7`|QgU||FCn<&C
z2H_eNK-y;O6F`!Wzn-|2+>LVfpaN2M0T0@Ta?6X?%p-k*=bJ^16d-Efp-4+LJ@gPX
zvq_(@m4g(lk7k9ST?uN{;qBJFkl^N{87^XX^0A2B+A;+|*zxH*DoR5Cp3qg|uHOkB
z>YfQUfO_$5tGd%8E|Zv8L9-M1W9p|Xwgc*GN<Atn=1(t+81waJxbz9$6M%@Q+sl#D
zcSyJGkZ7>fvd=xp0j$2t@bIfmd_0Pd0t%INH93HUG<KfC_s6=H#aevUSL|L0dnT+D
z4vteh@?KNalwuw+A5exHZhqa?@^w?g8nvEx6hQFCxP>;<f8E&jb$vserhRcTq}?!5
zr+c*+7Lbe1QUnd=0n&n|6Zo-Bqc*K~hP}#epmtk=3J_U|w>f6}byK&^&o=dxYfy*9
z#q}ryoik;dWE$PAwgAFDlYp3nC&#`_tnWk(6=DFzd%s7B&jU>!uPtU4_!uYHYq|Aa
za>eVtO%6q4y3vr(Qs;;lkZ;I(E}s{Q%Y)k;?{M^;^#_S29|^_dRp1ftaK(G;4-id0
z5N?jYh3#v5?ymohsGLLCGEQK$6@ocbiOQb{&&J&uZFB_3K~XPxXcrQ8!N6|E(Fo`s
zWDK``{&n<;976n<0-ULg{Jk5|ns?>Q@}k5*vp{F$n90}J&5donG^ohys)4T?n=A)t
zT%ZvYqF#N3&qq^=Z0dCyv=MduNbC=6MvHS^S~Hag5Po<W9*T<A#F|pnz2NMT;$dlz
zTj;Sx=r^Nju$^~FWziyZF8*zo8I->5S$AKvO><v8HYvT43O#n_H06=NQL|WOS^^d-
z@6A<ycl`q53iaw?7?Oxykg9%NO;LB$DKJfBado-$`WES3O>O;-@M%4~%&Id5%@0R(
zLA-+ITQ~iNnj(FTJcZg;K0qiC_LKJ}B^H&g0u7Q)q?w@CVYB;QiZpyY9DSd$M;O;Z
z;#E#!e`Y3VBX{*87x@HCgxQ1N-Yo?3yzzS!cVEguV_ir%<o`HOIVQM4(fAmnNu=zZ
z0DK>cTV^C6AoB}DNX6>*f0ix<jWg>4VziVQQ~J{-+;vojnC3$XjTZ;3?0xOIOQBg+
zj8#C>`^xYp9N?GxP&AFPkZ@lw;s7U66aOsJ2{aLv?h`_*z}^@@GC+UAt|82aqHMey
zG`;Uv+~$H08f0F8Y!yd2-o<G6YjJ5*SS|KV_|~R1UH#DV8{ZA&$u}9&lbDULJn<$6
z{M+uyW@lI<_Du^Py3(Bpd*67q8OKSK_3&pj>^CMt8H$-8?;*&6G`xZjKm2vxl@RHr
zYIdohyrC7kQu|?H-V%p^!3xM+Zti@68(lNZY&4&H%!4MP>N9si-huS6Rg*(p#&4R~
z)^n~vzrGbJru{mLi)fT7$#}{jDw2fzTFMC;q>FAv%N!^};gGT1N?J*ob}b$Pa9<%M
zMyhGF&Vt#yQ(gj0Yj5vP2$qc%V||>Wu*a8yjSPAFp1(bmQh)0f$~C7HYD^LuUxc=B
zml0|&`XF3%0vDnYx81l*_mOkuhs}vKnVU1P8gWI&Zw(z6z8~05_C=Kj6OPzRldqt}
zB+BvUtnhc$?+tm1ev#37wV9m$2R6`1onKNRvcWKY;&Yp9^LYNkCnpN@J1t&5B+1up
zR#c9uAeoweBa)6;6})`eqFE3-C@iZ>=0Ptmic<H~u)kbqR`h98VK&`V9;1a;-*tpD
zN?zUbP>)z~%vVw(xpY5B?3|)fP26Zr#;?JM8oZ%ePavvu__TFDEic?*qU75Ftn8-j
zrgH`5Ef(v+lRg2<Kp&d$ab?wlD{l|kJJ!+ipL81S&ZSYlp!|x)sBP85B_`P?H5U-A
zGKIi0A>OnHJZi`IRiGn_CuqHTPk(Cgj#i+$tW$WxRme91E-;*;$~j;KVT`Wqmz=)6
zo0~q?JUkZGXP54UTL{>y1<K&LC6iC~{TZ*0x#{(}jIS}#Tp#}ul{HeL!Wf6~=u26K
zP<~#z2fjU1`1=xUjFUv#PXj?fo*4v+3$5I(UNXGafy?8xl^PvOpFisf(tIU~)?OF)
z&NLltN{M7zo56}XPmoj8PmV<5b`FnT#*TBGpH`M>TpxZJM@6zwjm3*kQKpLcD*E$V
zz$)BmXiQQ)<Kg>!kx~jj-12rd^|lqG;yo-N--mzNe1Z-apY~>^7^>LlkB%@q`ZC5~
zI&O8N37(i4Z^(<O96-4?8myhIp~`oouCazwgR5v>jcevGWir%XQR#S#Zd#QTW&y*(
z3mFd)7&5++m1<NdkL2y@F-sXt)q<CDfY0=)b~<mS7h$B*tono)A4B0OkU(Jh@IM-k
z=@g}17_CyQ6=wo&vg_o`cZiK-+F4Vmne#E58Ma`@<e@HUvSf`sC4Z#XMipO*L34^S
zo?;4L2ShB+wNbB5GN%c-i{SV63vOtF#7Q8*X_yqOMd@2pDKf(+rCgh$e`COC$}>RW
z_oOPiQk|i(_4#zKVm@WonM3{W4wuvYa2^>e)II5ia|XY^xju6@;aNlVk)98#w@9o`
z0c!erx)D0O)}DP&If3hxa{U>7aJF!jthbu4s-1|>MloG>;<Hu1Z;W|uKwB^{luA_%
zm^1jJ;SY3Q-291KdmE#f!NEGKv&4anA5{eysf_1yOeS3>kSRbA88-V##oU;~%`3f$
z>MVPTQ^}&cui;^ZDGb2Scq6A4L%FDs5f9W{X0Gl)r=eX`Sk2(YrPHwrj0_F4E!eKo
z`9&EupN4q=jFaPc1rT9!U<Tyl#6k>l%Yf7H^`#)j#W+DPCPbjrCdYRj#4Y2Ay@bHc
zZ1`cQ)b}i3Q8$80mBPG&15f7>=*#u$PGyg9Nof<kw<Q2DV8Ae84V@d(_C2k_<63oB
z;T)dk8~=)jxTH6ZnDjYgn$tUllRFHRu&UHyZkP{eawvE<#v`&k4VN?_?a>;o!6pt&
zsd#Ht#RFVYmaO|7HZ|cqD(VG9oL|UA#l*WmoXf0D5Ji`UDt3q;nKP!lR$FD-Cy&RO
z1BH^4b7XiG&fh#adRLQSeaD@^U6Y1m!VFAb6PNMQiniJ{8dE(rMTVnb0OdPYj1w%{
zXe}w2y1C5PpCHq!Taazy3~`YLPVI*ESOc-aCsUT0Ok`!Cn2~m~qNaVSiNUn64a$uk
zkZ9VG6Sb?IK-Hbaq4-9hrc@Gf&xhQ{D5{Zcn1Q~|Px#hBu*mml6W3xj3`7rc*zGKp
zlGGtT;2(%#n?1}AE$z4R6-v|J)J4zfC~DwD`PMox+{8A8dcig@<mL0Zlp(@_S+e%-
zX!-dxL!q>SS}x|nxrj9ZLBJi;TG*DKR#F`rxNoi==2u}ygHCbnS%U&;L+=BK7Gq}Z
zTg0xi1q8(0U`DBeZv30tXzhY--+YLe=^POo;+x!P*xDHyxPPv^^Ut3vlnxj3&oVTq
zA8zm7)kf%b-NFhYkm%R0?6;><2)JcYDFPm-xswy1wdX19wk!Q5FRCI8XI-Z`sJ47E
zP^Q<ln6;P$d0N$n_Ws)&XG!$YRJz6JS52SG3m8Mw+#5H5F4IHh_?FfCVB9WdQPLu*
zRalQ5bCpaMv&vH_#bpg&oU4ds2!pr#m;H|IY9zF#-NdZsn#?WJR^C*JW%P@2pDV8(
z2c4tX5`A>qsV;gzV*tD_1GoJZXqP)kfd}U}=Sy<_Cjw3>B}X-S4${w8o-qaUt88W&
z6OIUx{_1&>9L<nw&OHYu%dL~3H0#7)NV81IuXOwtNgS$L!IrI6U;15bM^`2pnZ02f
zZ?7}~Fe<htTfAWio?7p^6S@+zovegG54Hu=MbAaA>;<v>1sH4vtNZIsYWGT8mI6k_
zRv=+!<=ZR0S31F{@}rZLF56nUR%oqI8F>0dq7j?T)(Y)vG%<NYak46PVpNe+>-VGt
zr<X=R@>JCbMEUw%_2UBiC%0PaPJ0F-2}%IOQZNl5VX8>{#3?GkO9K*;Zvx>!(Mf|d
zpzv2pF{hnq1k3?qY^HFX8HqV*ZuBl@zMiySsS~k%3b@Sb=~qg@uzml|6&SYtEKrM~
z)09>MyaK#%3c#{}K6p)N+UV>f&6H1Tg(&aeF<m#UD@-nM4rkr~Ls6W#SWB)SCbg{g
zW~vE6!t^M#H_VMQRRycP;VL&(r2O*=G3Go|P|UXWR9*Q0f*1n;GfrTDxjVu3SIFQ&
zPr4sCVGCR3#_ojK3jMc16)H6CO9q6e68tiU$vMvn=q?br2_VW@0~*?iWh4eFm_^eb
z2)y_60IVw=!JJvEslN;PSx#V4h*7pN!jqYL7%-YH)dKvk_5w{|Vqgu=X(uoe!&L0U
zC}me@a&Qn6E_!<ec)<)nl+4Z-CRad+GcwhzeDO~!)C()zza2Rs&KI#(;eP@jyaSoy
z7rBt({?fO9F*lgDr&mmv;-L3I+Gb5V{~Ga)=O=UFRPu*r{CDsLVZ)3mi#Lq9v7ZyL
z<_p$ZojqSL^D}!YgotD;CX*))b4Oyv;@<`RRJLMEg{<2P80a7pz+wWk@a#Z`E5<Ju
zHwNfgH}|s?f<-5b9~f3*uXb3Ya4Mo;pZ{@%lH}&Dw*O!y;s4)SNeujCUD>7!8J3le
zwUYSvk}6||!;*VIEeRu#nFe4y%!$N*uK@4~@L+Bk=SJc`kXTg<y7Q$c^F1@zXKJ^Z
zP5Qs64w-3Ys!{>dpGjox5Z=tQEcTH8>*{89_W6$#YR~(t;^v>IB`nM)%O_^eU~C(h
z5SY#xGpB%)MZ@1MSHXJd4@*GyB9mFTO)qe4g<ELo+<eFo|4&uEp`joN&MFTXK?L*Y
zY;1@(mBGjVjfz4Jo;m(%s3|1OiXoee;CW`9J4>m*z49{l2ve&70PZYH{ckFwe_6Bs
z^~wP%1U7KYSm>9)|7Fbz%cXy!q?oB$XV-7j`wx}?n$dJl{RVfG%>5onA~3tc>hYHd
zW1fz&ua?YM_|;BkYRUhbsdf73jit!>>*f2ei|GGdH7m@^(??7!3)#O}ME{2e3g)&2
z&8c6QD+F}IOtu$qLg11zdwYODZ6`Nq(}glWtd-_$47>qK=1gb_01sIBXSM{KqBVIw
z|33r3J;lDsqMK#QwaftlSe*lvb+dsBRfn3+!oO4#@+-*hgPCtC--C6Cxj|*`KN;x@
zp<=W5%3#px`eynp1}e&2v%$JKdBm_snWaBVnqaZtbdH!ml|oq$au_C^dx|sJe<q|^
z&BwN9nb8Vvi5Qgx^wXgGa@IwMu`hrY1m())Qp-Mre-u@!1swm%s#7~(ky8a6zbf5X
z%sR7?V0Fv%E@IlOGpAQ}Or*}<#REZe4|W)W*k=!H1d%#>%?5&IRjSaTY%w);EC8o8
z=a7ok_|tU`TS!cu$-ya2hV;zY1grSzlg4S=fz;3LP$s13Lh?U{6k{owI(M7gY_cjf
zvyc8ICjV}pVTLq3r(`*I0QV05R+@k=nzjk+-t_+_o|23v&r1GfmYX^y`PX<151HDR
zvxd{0EXQ`t#e(OViW?A_;S>r-oH|^A*ku%obFv)!$^&x5oO0cm7dUx(Shn(qJ$Fym
zKC`0quaaCbdZH`eaA@IG9Hl>!n$yzZhOJOy9<(#Eh^C0)Kz<tm_d=Oo7U;y99*Y;~
zy2~rl2o?oO{n6i9j~!nB=~$CTQJ}4MkR7{7XWhP9*%t3k#8J`~jM)!V%pT6!0}j`l
zy9yks!n0+@v3<+=D%e9IivZ7-r_xx=>B!*=P85aGAcNYR^r^)RrU>(!DVU7}9A#(2
zuECcbtgE!U_8uAm*PkvhrbZv}nK|e;5B`>Up9p&V;2*lp)}x|feoX<Khpp788v8u#
z3wFPT^QbzHEn+iQ1fh?w9hi&5xirv$&0LbD?kdn+*|Ha?Km|6lZ0~sgPJu=+&I3oT
z##5nL&!CAkSPev1buOBD#}VUS-FpPe_~cv`XwN3&;E4M%AmdrLQCD;on@bAKYrcZ1
zTpB%GJ|FvqO=Xeq{a0#%$z;!iH!=x~cRS#KwVOfXt4kgf?4WbbygDep5aD48Wz>rH
zinGfox2q|GG6s3eWw7tqWJG))xX+Mr4#;>pErUTj;VL#**zU|CL*-TO?i66&)!$1!
z9o$&oHsE<P(}1tOHHEya8EqP1H6n`YZVNozo4XR=$8s7!X3uPFf!}wg)_a~~8*03j
zz~l@bXcNZ1VpW%aqQA<|4=C`?hA39bS}OWwjeOpn1~@*Qcf`KU;!qY|ha4{+w-(hT
zR#2K;&UKFlHrvwWG$h#03d+#(P#XuJ9@qH10a@$=HYMao-uuA;-&rS#QQ1VLwRh)t
z0058_>s1rk1X*K;*4a@MbPHsSZN@IL*(Z;>tELOMXA!Ujip>&@oyHgq0Du);H%oc3
zcs3<?6F=_G07|T{K8n4;&T)Rf@CM|J7xljjJj;s1_jPSu{+$GzHFuV+N3CiCn~L2X
z!`eW_-9HREa^l%I%>yHi&VZ9`oJ<)hY-P2RUb+-U52(o3v}@=k8>cBM-aQrgT_juf
z6n5w~J1?FO!wGtwaETf`I?bsF1Bd2)HKJnMfHgL!7ou!NpY%^5iE-@nRIX9wlLF0<
zE9;C=uXxF1ATc(^?w^6IXH?Oi=x<baMpQ7$l_%9oVmrWa!-Kis46vsr4aHbEOtxhX
znA8Jr31sPg9}xe>I@$t@Kmjh`{=<WhTJDHFnshSbt<g4@3H4VM3w?ow4^*AT9%LKR
zrDLQ3*f1sAKzPEMWrL$zVA8a8<OgJV8$bRu*3`#%K{a`pey8?#0Wl!0ckn=qvFEwV
zGp{?iM8DXVEery(^gaJb|DpP5X3qrQgnoIQ;|H1Mo>$P#st;!|lZzML2Fy)ad;NzB
zn`Ykifw#KE%Y)f|fI0MW6Il?uREhN+@q+-6*5w%I(o+SR%EwWfF39Q><IsR%L6)Ho
z6vXbH(0+xZB(;V-TISj3I-|OvLwIe1fD}lqA7u}jjeYK&nem3E9l1PW+F-yYWBiMu
zqqG^_4iuO_&c!?gUa?ErOs0B%U>~vlG~U^Rw1;LW?kP9CjeHne!B+6LcWowHi|K(l
zYc;+RFl5)rHgHTZ<~0CaR>;)*WJdk*l}bcec(?#m$#@D@+-(RGGh(a3B}KbA8VR@q
z6H6T^ftx2cT^6UoO301Ypyi-CN7ex&KkytXCpO#`JId@kxvkkIJdq5n$u|)ac~||#
z@a+bsKFn9>{Jh<J$ev=CKw#Z5cEQk1xv{=V)4OE;!*;vL{9@LC8)WRjFX39JDga?P
zwbJ@|rYUsOI#eLGCwM7X{Agw1YSt|Q|B0dXWKA)+7>5{J@-I?gD`gfm(@+cDn-pkO
zK3-wXC~#plR!oBJiEBR(fJ^%&gNOqFpVuGd;SG2(5w<4|;S|45xRd06x&!M~jNZ)s
zg377GJ_B#MCf{{|jh(jm$nT;wLtZcaX4H^0Srofq`o#&X3hq-p)$CDZHw=o1;~V2T
zkHarhUpx4j?UiN0Z(6~I>OJasN6Zc)Zs+Lvhr#C#gWIFK@oxtTr#H-u(X6T^(?S{y
z@hZ*ZUTI@yrzmMUp4}^tyiy`#i^mrFd-cEcXH9HZ!ZHr^9L9Ho8@=?2Wtmtq1tk(3
zr`e-9P8T~P<U_zEjy(^L-5uWHwIE%A{NfMNs4JdV-CA<UYQvr>3^C3duW;<CBjAeH
z42CtjZw07gBnocECG4d2P4M>d*IOjU^=NtK9pwDc6%NV6rx=`fUo<$0M>2(ABWYXs
zAEd<UQh1Y@B!mv*hBuQT<5F!rsW%`V-pJo413IIb&wq4V!MI*dI=NP275NUSH*fN)
zG#y-mzJ(h4IN7WL7o@AYCT~O!^>Gq$llQAd4r>)Cv`pTdR%+%!zi|g&zku7{$rvSN
zGylo^)o8#FHC_hj-e;A_i<Ql)O5ukBB(>f0g1GGrNhOmMDS4Fwg*pr7UGVQ=>zgcl
zk{B1Ui!Oq@;NvFe;2=GFDR;b<C=_!NXD*a)l9K`wQRI-xE9MG!6nrSVjK$&e58}S8
zftT+6<Dm}w1U<E=Sy92}J`^>4YvxHnLJsT+&Ps_e_oZ+c!*4RYH&{~l`UXr4F)s1f
zj>s2}(oTj+G*$KNgqp2<dNWM2@!U0%JidVx55Eh@)^7hi4|HgQpQ4{}iM()aq6*%B
zpSgX1;kp7C;1;U9*#chZ-?rQ$@iVyT-&0U30K1T^&F(R~+(wyZUIQd#ev)h=JzT*z
zz-tW@amMz-SWZx)HwicWae!GsXs|0M@iwY+=oEDM;tvEbMXBD!=y9n$Xtbx!XphBc
zarIrp;gEg&(vIHN9liYE7JaF^5qw~?on-H5rGoyxf>r9Ts!Jh;NK13&Ck`f(;8zIb
zQejAm&&-=Q?xZQS(%~RJu5TxFT~h>2|4bfv1N;Jk$Jhc;yfgO@xIPi2H#BJ+B&uds
z0}^uBe)r8mF#I_<d}-+#KsuwIe9q43LZNcb#4QET&aNZoZ<uh>ytf1nuGaIZ6n;{2
zMtSXd9yzJQK>6nJ_ey|*<kh^8ex4((&@`wO58I8MhW7?ja7BK=3Fq|j!sB}(^}^0b
z%m+f>rlwoqdycD+5?X$(FXnxp47k%z=%Yb1Y<o^Eipe4dV-^s}PjJOi(EiyIsdq4+
z2z?3+?Z*kQCmuyFriBJCf-uP+kAtM1?c_JjUT(1{Fj`x$8MFlW+U58XoX*jLuv=);
z@hU*^zE=^oX#Ci-<7*rwqba51qYT=r!&l{`RxAV}d;PJhfJBned|VeA%)tq@_!uPx
zNCmbr^4@^N1xeqcAQB6-&E!ddv_RDB7{txRr}C?S;k|t+=f0*jQ6VrcUO%?VHjli-
z2apunso=jiK%S(TuG*hR4q}iRsqh1aC$TE4bih-vV|gbPTKUQCQguw;5>w4<3{6W=
zTJ4Nbt8&37t+GD63AnPl2ZgPGSws6t=k|uIyTS8(DGfCxLly8#9q)IG+r_Y&d{D~J
z9`Y6g*!x<W9bRUWbmPNplDuoQx^)@+hGrY8=5cmV@H<9lg|qMjm24#A5Z&wUo3c<y
zKKE5$)XM-)@JaPuRIZNGme>OYVXK|^QLfeofVwYAN#m8`)rseXuiKh5_!MK>!T&0N
zGzH7*L<a?jLq{g=BJX5;za`Xs7QZ6aBv1W_FXd}O;!d)R2>kq`vH4W`k^A@7OYw1|
zkG-c1a4Q00c3$S;S8_WA6wI}uv|UnZm!cv0cN=`%VU_)wt5-TazD7Kut|{Sao&p#J
z=)hq2$c_n4*J!|8<8Zm2k~v6y2{<Ia7gFVSuN@@3-U#*Eg1;r<dZq?;S?P>-zqepi
zB}dSq@s{GVVt+;FwzYt9iRR}ZPHC8EbFtX3c?ymNVyW6;;`T#YCIkb?iId2^H#fLV
zlb-d)?WY@r?hUD?RP%`i)MQjh@ZN4ENct$~Q1x~mRaHGx)1FF)R#|Ll7QW1(%4a_H
z8p^MD%-O|Lv!{d(WBd4HM-C|;O7?#0Q-=vjYN3M)wH+1cK?Q!x_Ia1D0Y<+v;UDRY
zx747E8Dj_yH&Haa;Sqaz@^@6d`nX!p4sx!;#FfU<%n;D!qJCcCGEU+r&h?=71a$-`
gy7*$a@@yxt$RmNw#KdGt=z2u`faY&6_Mh?jFV&+~+yDRo

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/profile.jpg b/src/assets/imgs/profile.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e4bcf879884f76657292f2e792bf9efbb4090f63
GIT binary patch
literal 7885
zcmbuEWl$Vlx3*_+2sR8pKyW8G!Gl{E+$C6m;1)=L-~<M@;6rd3+&zL$aJNB%I|&W}
z0*B{$-><%^^Y^UXf4aJQ@4l+;d#|-uKg>U@0*KX=RFwcgAOHY-9Ds*KKsW&F-@wMf
z!N$YG#ls^cz{e*bBqJhz9AxyQl%$UrJuMRrH4PK3AUiWNyP$*suYiP#jEstjfr*b#
zF7W?4!9zCygahaY^rHhA0B9f}ItcjC3!nu6(9qC<|9tCz0|N^k6NrWlz`=b$0dW5F
zU~BN5Cs7V9yYHR&>nUuH`e`If0hiOFuWs1gt%FfSI5%4^rs_!KMZCtC5u3t}&@c;_
z^^f7sE&dPNVoV8wtCy;yeuY8Um6fe*;=A8Q>KEL9rLSBMYSx$zT*)=8Tj~g>g#1+q
zX|XPEZg4l*`~+Q2TaWG{_C7RA&05y~w2-Txv#9UAgZ}(o%<GH(SN@7^MVpR(;r&;n
zn)$=|CUU!If3Yed`fQv<p+8^&TAf9QJ*wv~guJr1L+_IhRP=b7cHf-GzIGM%oYZBr
zu<@YVh&p*PR&AD)Lf5}X^E?L?Z7`9~_~)SAY>Dh7Ra0$0$CgLzu(*QEU{v4gh}1VC
zB_K*~=s9vGC~tLwwMHB?d;TY9BW?ahqWojat7*qDilNTm=ZX%BB6UNrCVr1ecUib?
z8;Wu=Ia%=v9tY*mkbyqBQ9;i(*_0Mzy`T6E4k5-~uLQIx73{RPO@H`$nfswXpmZFI
zYu?4SgDxOreH%XQvwUwV?Ia&C{xu}iZ#~F(q}hv<2AS?(5T244Od8lVi<>9VZT)fS
z%g2~3PmTesNqXzKz{#Ul78eE?q!nN5&K*)7qk+vcHmCg;l{c)r=R`m`x?TJRsLtwT
z4_~BZF?AX!-0`)Zr$52qEFykwhjb8TjSFPuX=3+9!-gEjzs_Dge1FXCY|8{)<Mvem
z(+z&Q*&Mlo`o%BmZ1<0oONP$5(dqqIgs74tZ_edmm&$xD{nd+_Tp+C1pYumQcTa-t
z7vJDUI<A&R{(O`gH4yNR(Eh*D0BGnKKmaDzzdA!Be$-#4Qp)>akI0sFjW38jH&5sD
zzz>3-7oez^fP`c_Z`mDhvPgu*aINr!hQ!g38N$wm&atRwnlM{aEkVetsWF*+dB1b!
zqwwx9?`S#u?HoGp5Wwvx)z?-_Hd&_K7s#K+r+88ciLGvtQ)geqt+)K{g%-`e!kUiv
zkCd}e2HW45rWXXVCR{!c?>nn4DY&vIm#v`^GM?eq>PT3*BL48A`MWUCTd4yu8%Y*X
zZve(lt>!2-LZ!Wv=kBwVpI1ca*2?%LQ0i7z%szpW+d{R8Qjgpa;3Me&;syXQFtM=z
z1xNn}e1W~oK)vZ_%;k~zaN5WIQ^~P!9K>HN^Mk;>f30+wZv^SQPC66HO4fZ2={KII
z&x~imcK2suK4~8+>i9id48znFqPG^;l<fTDGVysk;0tggwmC-QMB_40>XQgzO#kN_
zU#bh^Gye@=k+XKm&P6LP@pdQaSbnvICv-V^$vXOeg@SblPhP2*GVFMf(&H6QQ7apF
zbMnM@OnHBDuxkjQgNZq&$!K!9=x}oCH^vpJ1tWNhO&o*C+dBlS_^f5UeR>i;ahdEN
z6+dM+z^iC6e*iq9a}hs+q5;v-G0*|%|L!l3HyD@zED#Bp0h^Scn2b??iCIucR_?!h
z4G<Hsz(`|vifF-Q(N_=X-(!3CwCEFSpGz2FJ<H;J%8f^+Az3$>v>|Z<V@!47Fob`7
zK^3OOYm^jz=4#{I_x_NJi?O8Yo5}w8vr5*VV=#g~T)|oS=npkz+})zFz0VtTg546Q
zlP#yS)~B)xCPfj?>iV&*NmVMP58VwSakK^6IaS%AwFJYuT0fxP;#0%HGT}a+ZUIc$
z@=83A7;?_WX(UYmQ@{7w3#gCL$uB2vB_S+Y153sFinyzauR529T0Ro_vMARuBCERW
zY_u~n0uZ#9g?Wd=X|s_`Z)`zD4G)pbdlA)$P2Azue$BC;&EPa=YL5`O+~2><ju&8o
z7gfu6J_|n+CWjDS2$`ibkkshM51&TyZ>8bFqM~7$-S+W5Pp>~zd$uX63z!5laO}sS
zvq@U`?WYm8`O11B{vx0lr1*-Qszl6lAi47Lt!N`lnTcj-K%)5*KE*I&v!Xt;cQzUr
zUFt8wy#}6Ay_fS4#|Bo{NA!4~aJNge-^Cwf!AS#Cd2C4SVd}q@50a)4S?e5yiAhf7
zT)OkxGWSovOdoh`p$@ZOrd6RC_Ib>rtn1aq02#TeDpi>e0CqEKnD;YBXOX|tVIuR1
z>myR)b<CY{AJvCgEv${d>MXWw?G0-!4v32nc#n4A286R_e+1rVJC3~5RW2}`eGcM5
zM$gw~i@H?w24_T_Cr^qJkc65A-+F6`x4QqDKE=RbBR#+At_i7?;ozSS-}<5@lVi_n
z*23vyv{IGLJ7+quP*u|B?o>l1R5KB*13qe=HaTY*%3E)ypzF#k_=DyF%h=5YSgSG$
zR5b6F^*gFX@>)e}Ml>ejZE9v1WK;JyPHETW*nqMck{F(*Xd5%`54KF<nso3sN-w$*
zW@H)X$?be0M2I@s%~t16e+OJP<@Xk8@aYnZA+0ZL)(;%smN`>M9;E2t-(Wjc+Z6No
zGobOY=)UFik0DL^srCG_lF@5G%T(f}YsVLj@#%EYxF!lS7vnz4M2d1uw}=A~wU@HX
z3)Ml^bKV^>QO&~SWUfMz>q2cPB&9rL_e;byNS~s)9Wz<JEx<R%(A^aYTa1lG$m5Ys
z(l6$1C+zk0Z&UxO5!9~Dx&k$`Y1=pr<`b6vsd3IE=M9huKqNOtdOI$Iy=@FrI)4dM
zd>Urt%(IT?v>P6~P<h{np{q>xvET#4xSWl3va`@?RUyU}K`o?SMskmIL~FmJ$eq64
z>t=5Bj4-#)+g{F4z&aL8ud#r{^=_KI*%w&6h*BSjYJc$r?pd0jS|Rc|X;K(7Kp=sV
zYk!Y@kok?9$Q@g1eS#267_@ces@UWpdHwkuPYuDZeFWZk6q7jx=)mwsxUBFMR^DI+
zE^5$`#S}bD7w5d7E4Kk&dq46DM~Yoczg>FS+p>wX*3rKOpE{%uu9_m7K5b$j`i7vY
zVNy6yPw+Y8Z&w^-D?iR0Z&<#?bx$PAw-)sEDzlrfcU3hrQcY)5f0)G^`5hVDLq8NG
z+o}sk8GztqZ715g`17$t3JR!aO8N)nD&y9SmW^Sd<Aj_i*>SJip14Y>zbX)NC(6(U
zkhCP@d_C^SCckb;g|?3IZ6AZSldX-DSr}5A>g!?BpbEQLMRfz*Y3~Nx^=QUQdBp%p
zw&~i$SCHKAK8C~w`M>`94Jla`I>XV*(x;bIhzao0luAT;Ez8#X^~TgIW`<6Q`s7c%
zF`FH;_iW#L^oOIcfDlsVoliH(tGuT!v@Rp_FhllnlB!m+`irQU-|`Mzh38eyvJ@ua
zD`Kb~nZ8}K^L}~^(zBS=fXejxHX4^6@-YC$*;=88GVosSCB^C(<dyj{uH4jX>5?-2
zz!3)*E3@uj1~rx!c$A&nG`ifEtZkP&Pp~r1)M1IcM%TW&NrqG~yb5?Jrx`~&LDpH=
z2H?*d&Fcri>Dce~E+4Z$sgp@SV>_DNxZxT%UFjih-(FZ@7$yazicF>wpL%t>t<ELF
zLQY=aa3~c0Ed+;<G<F9u7o^yyL6*z-<eC>}>S<Gjiq7XsY!FJNT9D1~EyS-Mh0a7P
z{_(RrW&eDy6R2oZi%I!zT}TZvMkQbc4HRWkZ`d5$*m}8^y7pajU{pf=Zh@DmFsfTp
z)H<R@z%?(OJ+xC~e)T+>qre7DEg9F;4}IVW%r?a4Sug%>?8GJZ#f-EnpCm=sw_E<z
zN^Hch0rxoHT@4T)wFa=7&vZ={3@}U-M4}8ygg%e*T^j)fLYrIydDDd8HlH#1b-O>*
z^gI9#$CBZyD`YI)Iy*_d+!z=N+M^yI@!$}C_4k-Nl$b3YrS8-*9I_-_Zx%Ibbn`ce
zRv%vsLIq`i+Z`J|zt@xN+t-uZ9bL6{H)5A$d*dG0NrJCPHiRorf@$t)Fe4*GveCwM
z(R;dj_nBzo16QEzZ;T1A6vNcx@{%YRJh_jgOTlalMAoGvPo~fOogb8j5a{=`QIolF
zM|@p-_Ixu8u5b1<|E}RiGHQ0kNUZ0tZ#O50yVG>VV~&;}emnsH(Sev)XgHXd|0HQ3
z8UP)H!N5;K43^cl!lY*u@CecIBxMqm3r$MSCzH4Kn!wVvsq6Z0&c=EHnDWLa@h6fQ
z{-Js@b37JWRghRL!^H3Pl&?kB_LUV^Eqqj6)CTw)QsewvfF^0v((u{@JVPqgMVd2Q
z)reYikc<s`s#@yzIeDwwD09!jwL#~v4{BK<Bx=QYlnJy@WMb|&F&gwqbRO68j$7Ft
z%|lu>xfK*{t8NLuoG0YV3-a{|^tJ;dX@hfugGszNr}lcJW?S_XsaRsap?Hq)xC5lD
zewU%O(nS#FtUCFe$4z`rA}>$MNeGS2g#JE6x*ijKRBPbf1~uXL%^@dWjLQcYgv>5!
z!l5uY?kPtO`7EhC#=MKjwsih@m9vN|A4Z$dtiebc3t?}(Po(<SnY}<b@kL^OX9LL1
zaV6cQQkjq?(0Ij4w};h1su0RPCQq9iN@>|UKBYCeca}|NR@X35>gy^JuWM`U&LmCj
z=sfu(6~Re_`GQ&T(l7ep)yv?8oT+9#+^Q-#W|i`lpkeVlZjQF`0Mc7zLq=8%@%*fj
zPI+X4CQE1faL><q7p__wy^Le+J@hh6m;@RHI_QGh@%H=T+H-te8yMY<W6!Kptx@K#
zo6O|F+b$P9W@0RPUi#UU7xJC>0^%JI5JYsilW(4T8vVOKw1bp0g{RmkKdh##mh}TZ
zn$g?KtV*s>Lzj|*4hW*X-gIoK>yW8V-;f&#fIe>s*?XIBp?C0upjGjL)x9iul?b?Z
zPBM6KEqMCknN(o6)1hPNO4j5c@~)YwEFgBbJOr9X&n@|+hCXCt(_Y^8iKkc>4dtpH
zG4>KKuu}%!^QRbW<gp{n(mcS|P+NZn2e$E7mTXUrN3QB`bG<*pQR)&!4-%b4t;NL#
z@F~#dHxM%DE|iJ@muIQwZ|L_0&pSjKwEDNt_x}VHTUsLvDYf@_S^~wfCru4Cp(crB
zcTtcq+8z<y&G+%L(M2EIo>I|}DE0bLl_B)92|C!Rm@_VB4*$xF1B~9%hUCna7n<&b
z2|ZHrI?XfEqzLD(RZT6Uq2r*I-E^0X?k4++14-V~fdWINihfgc+KJA;zKswSl$OfM
zX_zavy>EU(O7zpZVi%*ji8*Pi7G`Gk(-YrL#xLE2VEP`F-a|waf@vZpD7=@fp^tVB
zUrkm<N!N$#Tr97Iy9)HIgDM{YI9h7J;Cn^_XcLdGB^iZ#f&Ov=49NY`C~>Iwi${x|
zdrU}YU1Vm|Wjy|`)Ic47&l1c2uHHRq+BEj#s-WgG#k9XBbGFERjc&$yGb6s;>JB~-
zEiSEmF0WD6OUKK!DoA_`d84z}B;Y4WZ=P8@)Wv+u`Y^(<CiUm|nCro9Jy+F8Wv|PO
z5vKB4oK4^Zpzlf$nm<|QR8z}nZ<Vqm)ZWoF^UA-MoRI_QMGWmM{%Q08c>e&%=xcre
z*qfvV7kwMXo+FuN`tb4_|CK-~maFJV=1C}5-D3W!^ppt|x^YQ;?YE=$2f&X=t;RA-
zvG1QQjzvC(dVM`p(n6atDe@yEx=i<n$QC;uIGvTZwv1{w<6+x{Sy+seeBr(ceg{@H
zY&f*X>hlNcv?4>IF5`A1%sZKHkjM@G<T!l;;x=0h@D*79o>q?C#PBP7tM2QW`>_1_
z6Y~ro2>VTnxUk>LH_k`1t=PN%qKEXb6(ujK&h*<1gwuKzG@ysX2O}re&np7k18xrz
z8p!jfx!YG(<GfCu%0E`0UJ10VJioV_hiY%Wi>$xh<4{UYnRIIq<=xCvo^b5mu~Rmm
znZAy)sAl<=IFw+`$$(FIwt&*KUm6G)yEUJ?u<@~p@+mwYn=D5jP?o;rzO14yU)pn>
zhUicDwVQ@<6v{#Smd(DYb_0K<^<s|#*ES&1OxQg(U&k#FlTR)<^kok%1#QS6nPrzB
z8P2nm1FL`4c6uZdUPu3S5|j9hI3nL0ijFCJ061SLH`Xv;fLe!9{!DT(AXHrVbM*!y
zcHAOX+{{oqTrIG`QSt`=O|9ki;2~F<%=f4CQ>G;zpBgl+o23-$v)au*Uc+?qa?RrH
z44S^1H-iRGragXP&N)G#(}K&hA&2O55;#v)k9e%xL1~RlHA{f{3gK5X{t_#gLLZ+_
z_m0`@z0DHWxjiJZ9nL>uH$`7}KD5bKJMK-Hs!N?K-6h*0N3YvMqP-K3|D*<E(A%l_
zk-6M{!Ng&J-DhgeT8?VGd{J)}QN2a0_BD-4hRLo8c$<;?2}(!w=K*l{$!+Ty#%Ue0
zNJ(1D=0rhGS=SzYPZ$+xNm3<Mt$L~-9@icp1jl*0&a~8`x4}`0UOL;qPBFT=?HDwx
zN3_nr*WfkVL-*O{M^y0_n9!67VagBTV>T^5bPi_x;CJVOcIyJfm6b(gR*3;P3DpmP
zQmB65?HhP1@Y{*dRJu;hGQ##$bcyP4Yjj7Oo%@4=dnq$)br6{tb|95nIqt9^B(7fL
z?XdFe%8ut*g{pC-6B<*4C#VfAfU!lpE35^oLRsInvTzY}O^haD1!l{Zd%Cv5B>Jbm
zXII^A=(wjP7NjBaeZ}7G)kwrO(k|QFysbQzC-t5fxdYa~J&mN(9>y*T9M$_7&2eIY
z{RjFirk!02;a1-5$x7;iZ5N}0HH$*`qhBsHcy1&90KmTt<xK86&GUl8K;ShkV053z
zE9D|nV!M{58yW1gVE<;l4bFYN1bKD~R^(}{Z6u8g8Bv@UH0?OH3s=3XjzB~ZbLR;E
z&lW1wlYQ#>g^>q2`7skdE23d2w~mr{$A|6x{z1bBz8U!Hk$3`+*i|U{z0*ta(TN*V
zG5!nYZ+rTi&L0vev)-D0;^ME%E+ak<!9{N|epKlf1ny;(r8MykY-G8ta^8q$h^&)U
zp4f_QkZo#NI=Bxed82tovb?im2o<sJ2(%)vpadDs_k=wkfNQXUJ%skUcx`e!WLqS0
z5bGNFMRA!#su$oIbhgZWdzF~;qZ>+_TouNwfx+3@tMhkJ>jq?%Z>!%&Z^^Q=ytCN>
z6NpfOJ+P*>a=E9by303*xSw+7Ay;(6ZX<8|ESR1MTIsz`p+4oq?IvP5qzx5~mtwf-
zqD+F9kAw>^mty#a;7q>i`at}fB<9?HO@eQUDp6|K#{}zW5*uX!lpIrGFS|#WV%)Pn
z076I!0aqS7{G@)DM1yRCQE<!e)U~S~3n60gOSB1<6SJ4Hn~kT$Q?lRJmV$N_7j3V?
zK@@Wh*9sdAHuKNn!`oh{%I92=GFvgWSjzt7{-z&x{a7n#BpCLRDIuixE4q7&cZ`-)
ztydvZog?~x*j^S(u?zSaU#CqgbqzB}YA}XuVbGo25cXZD4zE~6D9m5}7CA({T3s7F
zM_f3RR#tO+i@YclY6SlnRy>A$?zX%NIRnS4^}ok*w!?)V2~gWKP-b(ldkFdI@P&jW
z?O<<(hYdFktgb>6-dyS3(DhoJ<H9vqS&`t!3X>lMKm($oV_{%Ewt@bQe=AH927U};
zMgdt5u;4#crd&uJDU*DXXXwO#`hh^;3qYQmx?C4$vVHXD`U);$g%alo0w$A*_aUtZ
zXk>3j*9(HvbrB!q4ae0S%{wx(1uy{z?4l;d=cyU*<M?GJWM0<=55~`DD!){mq_TE%
zO|GzYsG~n2|I2_H2Rj8RaUn|6E8E3bEmhY_T0SB1jT{jOorMr9j@flQrFJEEg4kZU
zBr$kq1A||No6`z!&p3O(DOp2ZG!L|+UyE>!!*ish^rK2r(&P!<Wo_+wYE^tDfpz^y
zO|YclMHUVb#<k8mDvVAaBSj=3CcJXLtcb7#yF2&&Ci&N!*CEo3y;J&EUpmx`btzJ#
zgO6OB?{|7|g{imo2GnnCseh|wmv5Q~=Gl07frW0nyDF8=X#|}|Yw5nLrR(7_xH6V}
z5OdLw%=?Cta)iDmd}4A5)?&5Jj2pJjX8ZYmQg<s`G22o5H<x4BZ_fM^-b1_YkRgr<
zM4~NExN{%;%W3W4ltc(5nbvai0q_PhV%3Gib8v@nDoB>gnoRJiN~3LU(M$AbXFS=m
z*-MgY5kkNgAVV=jeyhj-JC&>fIsLAUQ!8Z9ti(m{0pR}SYevE5&q>SLLFa*pjMO+q
zX3k|ZfM#(aEyL*=Ggu_9B<^i##99v|lv}2e+q<qgeUB>7LE(6CC_4KxdR`;FwULUj
zTjzA@PNA|Y;_ox2$92MUSfEL@61HzIX9M%9z$zsQp^%c6=doVFgV>>T3~%PF(Mr<A
zUed5hN9ai6Nnw<~czsDcwy~txMORm5K!#)K9fwf@70Nc4(q75o;|u+B8zZkEKtqo8
z^G$Tu4;MEFbrXYA)5Zrt%JtUA(W7EQdIbj+^Iqqq4$5;(rGl%iPpE$JDaT>e=Hyv=
zB307?hoIhje({W%?(^+blc5!%Jkh9lQAne95p~om`E!vNRRd&MYKWsV2Ga>-2n_1<
zGm5^!8ALJ>@N=-#a5^ke*;rbt_n%d@h^~^18(`YZWE4wIBPV$od+%@vH!7W@;<5<G
z4|oMTNz%F9p}|o<fMJycHo(>#g+QO*5IziCUS57RWtJm|P5{=bccfA2iFlNDm3BwJ
z7%nWn<9N{SyQYyQ39Ma6%KA-1St==o>+wprEzcKmpD>k3a9z|8VFYVf=K-fzOTg^q
zif~kAnX|;8S*7(Zn><*v^QJJ=y!fjuu+h1ncb`>neXmVOa6eW<@J--L*uvUx$}ng^
zxELc$Xeq~XJ6?1x{STIXZ4RkFa+mQJRGoSdKAt`Nl+i)!HiRNWJ~O6dYn#uD@@^;S
z(f-dK?f>ZiNB2MeY5ITm2ciGtei8vpMp<nSFuj}=R!C@FQvQF=l#ku=7k~iDK^A*?
ze+3L>@{PpEL52M~w0tF&vbb<FOMdzsJ44FxI&t>QPEElrA6=QuL~yc=sjRq_(PqW`
zW}X(?72&a5m(vxoCiSq#ae|?X91-675Ap=>U4_@Se$rE;!B2ABqznDkbH>LC1~U#P
zB$RtLxd|7)b8EzxU~LcS_O*s|7uc~Iak1tujomfGd{`jDC$?&TRop<cqHrBNzmwAL
zKHqPaN81wriFzd0H~fWseD=PeG*kGDVI!oc^WHvt@7kfieREK*Aa0;-?OV6Tt0zyk
z*9BOW$n{kKayc5(jL~FctY<x+0+igWEY1X+5<~bZe6hMqqa5PiPG{syR+Un$&9{zn
zMGU2DNBpo@xQK~^k>w>6CPXPZ)46r7mRYl1+Hu-*2ij|dgr9)lkKbm%=DdsMyA*qM
zWt7Pu02`2`mDj)E(s2I!ZCdyPKo>$74fid^Y9gc`Gz-xk&*+HK{`mR<K-oXW+4jh@
zQ4v|=#rGC&ov`W3Wju_QNO8aaJ}i`<=Qic<u&sXD6>B*5p!F{?EVD=i6o!Ger8l%J
zsvcIXyIh#11*ozbupbd@F_5q9FCQ+-Q7|uXWf_H#tNX$v^e}Pv>O2he1|_GSyxo*P
zw4wK2DO>K@e!=?scTftyz=dIzY+Y3AR!p>P>f4FF5Axyg9+o>82BZD&FxB97<m^I5
ztx&#Zr!~(T!wmJDqgz2xWwh_Jjg3ShSHX&4y<N))@kob+aAX4B>#rsD`G){<%aO^A
z>cOSq!5_sU6`2GJU<yCayEfX`?>!}X@eb<d=79=SYH8$eDDrQ`m0#tP)jwkan44ky
zXN26ua0V(TepmUqZDr~PW7W-reb^837^#a0a7~h<VBKa!M+iIsmT3F6qR%M}&LBYa
z;W%&NDWW7^lN=K-;=W($;y6*!Z>Iy+{d$%rMsxY%<sGiOT0=2I^ZBn}GOf#(Os*^r
zIKgi$4=wheB@fegalT&aoA;DXbiw%?!HDARH6PxiTdFn-Q2ji9nL<>`)On{azhwdA
zI&%BFm7<6ya)zSa*&y~M$HAfNjOC9=dY36|1@YZya(jUjImq%i0_0_*b=C8YHL~%8
z;t@^7A+`6@>B4FIO{<?N@+d|h9G0hbal8YMdYJAaVyexJ)tDHnI2_1B9;>^=LgarO
NvOP|&09Jii_#cBOpN9Yd

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/wechat.png b/src/assets/imgs/wechat.png
new file mode 100644
index 0000000000000000000000000000000000000000..6afc5e41cfc29d258e0c6135981a7a09b7bcf126
GIT binary patch
literal 1881
zcmV-f2d4OmP)<h;3K|Lk000e1NJLTq0021v001%w1^@s6=HGKh00001b5ch_0Itp)
z=>Px+6G=otRA@uxT5F6HRTlovt)4-Yt`>DxqM{h1piEaoG!it+;>Ku9<e|d&%*J&M
zBTQEV$!2|FcJPt7Mv>`iG12%)6qSb>G)jC#QP~(>XJx8!Ncf>R3nRXU>6!tR>8fLH
z&-BPlcUM(+R|8q^kNH#I`M&erd#dK%bDQux7!;JpamncoOxXzv({Uli+0)aoy&Fxi
zgW|7-ry`T%jK<l5l?5Q4!N3FpCIAQ(Nn|e=dzh#la5kg9ersQI`w!J5TuH2NlVM}p
z#e$r9%$Nt@oJz!oV%`O?RoP#+dfy%GnJRdEhkBYEyDD~SeaN|&iEi=D>JPYsh*xLg
z=_mZbD@VDSjI=d2u_EpTV{+vZ?vV_<2cWG_H(#rjMoE)uN^1inQ7hpBUdB=@VJ2&#
zSJb3xM4tobrdkMkaJE{yxiV<o0+XttJr3ZupoPld3*6`klMy5KF9!dkjD%_eWyY+&
zg!xfW<ijSzDeYEbJn2EaPktzfun{(<KwtrYsXmk04Cb{Y=yYbx0Wi}ojubvCvn2hc
zPi|M(ut_x)`!|>`Dvjn&heT6<yyJ^JCY+4kOhnIkB|_k)jGo?*$3=|B3mD=*9^c)!
zt&{CJXzD!Z#qaezXHrdR*Mae(>&y}!$;8dSkH)Ae?JF=Qm5e2{TXFM(B5|Eyoa>Qb
zi=~@uyi9mKA2ex1-va0|S1@Cjl`zjd6m$He(<V6~XD5I<w^%{Sq~7@FUmuE54edJs
z4XzUlel??~ul6$G^_(Kf=%q~bju%iqXTr_OfY{W#d|NM8%^a)N_1^~2Dz8`qJ##RG
zdwyEnu}5NadtZq6z2d;=%i05z4=msDjVIOxK&qiF0q|IvB-;R-0^kqj#4*7n#z{l5
zr9y26z9C>YfOA2lTk($P%F!8(B{iu%3c|8#NUDitV7DNwa~y0EA>Nbu?!+#%Zpl`|
zS!mMGWT{>nB&i=RX1p&z>&T{cvi!#-r=KUtUPy$~m@yH+X#h_IhzaOoa2J@m2-Ja)
zvp%yVz0Z%1#K>~p3*cnG0Ri9!K=e0Rf?*>%ML^7F@KpdVER*{sfL|vCo4pKE#L#v#
zaB7(X6~X03!V%dU_cx$N-CK7Lh*wlZbZ8J^7c=hf)6J(!aZw}{eTA9iOxAj=v~;sI
zoQhpZoHI8gV8L}x2>16dHn$hNlaZu$7ZV-`Sa1{_zisL1%hhCb1&HpenHHmm34a}Z
zHl?tk%_U${&4huEE#16GO=<}c+G?mXNX_VT$eG)(Z{L#FlJDf13<R<fE+`XVJ3HcP
zCi`MPd)xpg;D1DzpNX6Q&3#?vpRl2AB;c9=Me<b3$l<Ll=(8GdyHhgSt;FD-dC+81
z`y&xP3^<W){-rL4G1&(QyvU841TUh4$_6`R%kAD$2G1^qXV4RUdPlQrM6V#w?F{^>
z<X2VjqD)Kr$={AzNo@@Xi-R&spoic%>wT=^8cR1@^18<x(`GwxO6_aEuynK0Csw|n
zxz+sb(7alkObR{*Fg^&QitWU*iqhh>ig2*fT57iXNu0r3`t<ZAez3zI9pdH@?GLq0
zYlXl+12FlurJIu?NiEHU;h8VV%Y2itl{fs9D?kZL?=bw7Yfg`7ZDAuT6>R}is!F3D
zS-LqZVrT~#7+WP*wc$I8wj?7)>{<rP<BjWK*hT#X#m?SoE1?kw<!ZC7G`?hWIbvvk
zW<VO1=f<)IgCAt@TfPp)WieL<cD*JTzq(Pg712=v^@}1a?s7uTR~5tt9^z_JzT5!4
zS%K<K>&FwOswejRRN_jn0?G<Q7(ck03@5b>M7iE-*~8LJ*>%_n!r5g92N}TF>amg<
z7w8c^%fQRTd_F)^0ge^BuM9CJW(o4j;mRO$E|-g#7nL+QE)|_6m_8UH&4TE8F+eMO
zmv7ruN+{Q&tVcr#*}XmAJKu&+2whHunqA3x8Xmpl866NYqE9nuF2FB{tg_0@oST?x
zXs;is)g<C(dCBW?KN-7E4A4`Rn#&sxC$%|8WHlL&TM1LPTL(`eqsOtv^ivM#pLctf
zgHJ#>8GVq5Zubcf0@iKm=5XK2^EU%QC`yjQdGD#%*)#Sn>+H(se%MS78C?tDhM*>{
z2+z+#h?%`D+hm7-cpO%fIisoQ3NXoT-I##Qerk*Cy!|bmvX4As9Cnj~MztAWNTY%M
z50#sbQj>N>Oy-kOliFX1_$mg?uX<Gp*IRM(rD8ls)MP#(`MW%M55nMu1RA;rDO%2-
z0Q@N!p8#UYhz>ksla(-wPS#Ojve@iP<BG5+!e$ycroQ_?b9=!ZW%%LqPogmcvh0^i
zj#4Fi)S4`(e8;b8)NDt&+kx{~e>`2#b^O0DIsA?r(JL%Hz4@s4x|Xv_L12Fc30Q=P
TM8y=K00000NkvXXu0mjf4<3N5

literal 0
HcmV?d00001

diff --git a/src/assets/svgs/403.svg b/src/assets/svgs/403.svg
new file mode 100644
index 000000000..450059617
--- /dev/null
+++ b/src/assets/svgs/403.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 800" enable-background="new 0 0 800 800"><style>.st26{fill:#fff}</style><g id="图层_11"><linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="401.773" y1="162.104" x2="401.773" y2="717.596"><stop offset="0" stop-color="#F4F2FB"/><stop offset="1" stop-color="#E1EEF5"/></linearGradient><path d="M485.03 203.46c-38.37 30.29-120.74 33.81-181.17-2.22s-172-31.38-202.22 34.87 37.19 131.33 12.78 178.98S8.66 530.13 64.45 611.49s126.6 60.62 169.22 52.45c84.17-16.13 189.79 115.67 308.62 16.13 68.47-57.35 170.44 42.09 210.17-81.36 32.78-101.86-85.67-139.5-49.97-208.03 37.96-72.88 30.67-159.24-10.46-201.06-38.31-38.96-140.75-38.46-207 13.84z" style="fill:url(#SVGID_1_)"/><linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="494.782" y1="599.604" x2="494.782" y2="428.659"><stop offset=".34" stop-color="#B0B9E1"/><stop offset=".866" stop-color="#EAF0F8"/></linearGradient><path d="M406.65 428.66h216.44l-22.53 49.03s59.19 57.87-14.13 121.91c-134.28-44.17-221.74-37.1-219.98-38.87 1.77-1.76 40.2-132.07 40.2-132.07z" style="fill:url(#SVGID_2_)"/><linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="116.855" y1="542.49" x2="116.855" y2="405.316"><stop offset=".227" stop-color="#B7ACE0"/><stop offset=".789" stop-color="#E8E7FA"/></linearGradient><path d="M117.64 405.56s-.22-.57-.52.04c-2.7 5.49-27.15 64.96-29.09 110.86 0 0-4.08 26.37 30.11 26.02 28.54-.29 27.78-24.6 27.68-32.79-.39-33.22-28.18-104.13-28.18-104.13z" style="fill:url(#SVGID_3_)"/><linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="116.857" y1="420.547" x2="116.857" y2="571.681"><stop offset="0" stop-color="#ECF1FB"/><stop offset=".818" stop-color="#AFB0E7"/></linearGradient><path d="M116.86 571.68c-.55 0-1-.45-1-1V421.55c0-.55.45-1 1-1s1 .45 1 1v149.13c0 .55-.45 1-1 1z" style="fill:url(#SVGID_4_)"/><linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="617.984" y1="450.968" x2="617.984" y2="362.644"><stop offset=".227" stop-color="#CCD4F4"/><stop offset=".789" stop-color="#ECF1FB"/></linearGradient><path d="M618.49 362.8s-.14-.37-.33.03c-1.74 3.53-17.48 41.83-18.73 71.38 0 0-2.63 16.98 19.39 16.76 18.38-.18 17.89-15.84 17.82-21.11-.25-21.4-18.15-67.06-18.15-67.06z" style="fill:url(#SVGID_5_)"/><linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="617.985" y1="372.451" x2="617.985" y2="469.764"><stop offset="0" stop-color="#ECF1FB"/><stop offset="1" stop-color="#A6A8E2"/></linearGradient><path d="M617.99 469.76c-.36 0-.64-.29-.64-.64V373.1c0-.36.29-.64.64-.64s.64.29.64.64v96.02c0 .36-.29.64-.64.64z" style="fill:url(#SVGID_6_)"/><linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="463.902" y1="88.362" x2="429.148" y2="148.558"><stop offset="0" stop-color="#FFDB80"/><stop offset="1" stop-color="#FFBB24"/></linearGradient><circle cx="446.52" cy="118.46" r="34.75" style="fill:url(#SVGID_7_)"/><linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="421.565" y1="118.828" x2="421.565" y2="176.282"><stop offset="0" stop-color="#F9FAFE"/><stop offset="1" stop-color="#E5EDF7"/></linearGradient><path d="M466.3 137.41h-34.57c-2.23-10.61-11.65-18.58-22.93-18.58s-20.69 7.97-22.93 18.58h-9.05c-10.73 0-19.44 8.7-19.44 19.44 0 10.73 8.7 19.44 19.44 19.44h89.47c10.73 0 19.44-8.7 19.44-19.44.01-10.74-8.69-19.44-19.43-19.44z" style="fill:url(#SVGID_8_)"/><g><linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="688.586" y1="540.208" x2="688.586" y2="512.38"><stop offset=".227" stop-color="#AFB0E7"/><stop offset="1" stop-color="#ECF1FB"/></linearGradient><circle cx="688.59" cy="526.29" r="13.91" style="fill:url(#SVGID_9_)"/><linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="688.635" y1="515.894" x2="688.635" y2="560.69"><stop offset="0" stop-color="#DDE1F6"/><stop offset=".818" stop-color="#A6A8E2"/></linearGradient><path d="M688.64 560.69c-.24 0-.43-.19-.43-.43v-43.94c0-.24.19-.43.43-.43s.43.19.43.43v43.94a.44.44 0 01-.43.43z" style="fill:url(#SVGID_10_)"/></g><g><linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="2622.045" y1="266.481" x2="2451.058" y2="562.64" gradientTransform="matrix(-1 0 0 1 2941.346 0)"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><path d="M248.82 393.99c0-24.52-.03-49.03.01-73.54.02-14.37 4.24-18.36 17.97-20.53 41.87-6.61 82.03-18.72 117.91-42.29 10.38-6.82 18.3-7.59 29.06-.47 34.85 23.06 73.26 37.11 114.55 42.8 13.12 1.81 16.84 5.88 16.85 19.25.04 45.72-.4 91.44.18 137.15.34 26.77-8.17 49.99-24.02 70.73-31.46 41.17-74.88 63.76-122.21 80.03-2.5.86-5.83.67-8.36-.23-38.47-13.74-74.58-31.84-104.15-61.09-22.97-22.73-37.84-49.56-37.79-83.22.03-22.87.01-45.73 0-68.59z" style="fill:url(#SVGID_11_)"/><linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="2625.25" y1="279.944" x2="2462.749" y2="561.403" gradientTransform="matrix(-1 0 0 1 2941.346 0)"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#BACBEE"/></linearGradient><path d="M247.94 401.44c0-23.21-.03-46.42.01-69.63.02-13.61 4.06-17.38 17.23-19.43 40.15-6.26 78.67-17.72 113.07-40.04 9.95-6.46 17.55-7.18 27.86-.44 33.42 21.83 70.25 35.14 109.84 40.52 12.58 1.71 16.14 5.56 16.15 18.22.03 43.28-.38 86.57.18 129.84.33 25.34-7.83 47.33-23.03 66.96-30.17 38.98-71.81 60.36-117.19 75.77-2.4.81-5.59.64-8.01-.22-36.89-13.01-71.52-30.14-99.87-57.84-22.03-21.52-36.28-46.91-36.23-78.78.02-21.65-.01-43.29-.01-64.93z" style="fill:url(#SVGID_12_)"/><linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="361.421" y1="346.477" x2="449.513" y2="499.057"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><path d="M411.59 435.75c23.18-5.61 40.41-26.11 40.41-50.49 0-28.68-23.85-52.01-53.17-52.01s-53.17 23.33-53.17 52.01c0 24.38 17.24 44.88 40.41 50.49v85.2h25.52v-36.38h32.67v-24.96h-32.67v-23.86zm-40.41-50.49c0-14.91 12.41-27.05 27.65-27.05s27.65 12.14 27.65 27.05-12.41 27.05-27.65 27.05-27.65-12.14-27.65-27.05z" style="fill:url(#SVGID_13_)"/><path class="st26" d="M407.67 439.03c21.8-5.39 38.01-25.1 38.01-48.54 0-27.58-22.43-50.01-50.01-50.01s-50.01 22.43-50.01 50.01c0 23.44 16.21 43.15 38.01 48.54v81.92h24v-34.98h30.73v-24h-30.73v-22.94zm-38.01-48.55c0-14.34 11.67-26.01 26.01-26.01s26.01 11.67 26.01 26.01-11.67 26.01-26.01 26.01-26.01-11.67-26.01-26.01z"/><linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="484.836" y1="475.674" x2="565.754" y2="615.828"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><circle cx="525.3" cy="545.75" r="80.9" style="fill:url(#SVGID_14_)"/><linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="482.787" y1="483.323" x2="559.605" y2="616.376"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#C6D5F4"/></linearGradient><circle cx="521.2" cy="549.85" r="76.81" style="fill:url(#SVGID_15_)"/><path class="st26" d="M538.5 547.62l23.01-23.01c4.44-4.44 4.44-11.63 0-16.06-4.44-4.44-11.63-4.44-16.06 0l-23.01 23.01-23.01-23.01c-4.44-4.44-11.63-4.44-16.06 0-4.44 4.44-4.44 11.63 0 16.06l23.01 23.01-23.01 23.01c-4.44 4.44-4.44 11.63 0 16.06 2.22 2.22 5.13 3.33 8.03 3.33 2.91 0 5.81-1.11 8.03-3.33l23.01-23.01 23.01 23.01c2.22 2.22 5.13 3.33 8.03 3.33s5.81-1.11 8.03-3.33c4.44-4.44 4.44-11.63 0-16.06l-23.01-23.01z"/></g><g><linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="232.569" y1="558.709" x2="232.569" y2="484.191"><stop offset="0" stop-color="#C3D5FD"/><stop offset="1" stop-color="#1A90FC"/></linearGradient><path d="M224.88 484.54s-18.08-2.5-23.95 5.81-8.02 29.58-8.02 29.58l13.61-.72-1.15 24.78 25.11 14.72 35.77-19.24-5.44-22.45 11.43-2.98s-3.4-32.58-19.31-27.77c-8.17.87-10.74.73-10.74.73s-2.15 6.85-9.53 6.27c-7.38-.59-7.78-8.73-7.78-8.73z" style="fill:url(#SVGID_16_)"/><linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="233.602" y1="471.483" x2="233.602" y2="495.089"><stop offset="0" stop-color="#F4AE98"/><stop offset="1" stop-color="#FAD1BB"/></linearGradient><path d="M226.69 474.3l-3.76 16.76c-.18.79.23 1.59.98 1.89 1.94.79 5.83 2.13 9.82 2.13 4.15 0 8.06-2.27 9.86-3.48.62-.42.88-1.19.64-1.9l-5.75-17.09a1.643 1.643 0 00-1.86-1.1l-8.61 1.53c-.65.11-1.18.61-1.32 1.26z" style="fill:url(#SVGID_17_)"/><linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="-816.068" y1="920.854" x2="-804.529" y2="839.612" gradientTransform="rotate(-8.082 -2795.015 -6505.71)"><stop offset="0" stop-color="#C3D5FD"/><stop offset="1" stop-color="#1A90FC"/></linearGradient><path d="M204.24 487.44c5.26-1.75 12.4-.58 12.69 11.22s-11.28 30.62-7.13 37.16c4.2 6.63 13.17 16.05 18.89 21.41-1.33 6.3-4.91 11.61-4.91 11.61s-21.05-9.71-30.21-19.44c-9.17-9.73-4.54-32.03-.3-47.9 3.19-11.95 10.97-14.06 10.97-14.06z" style="fill:url(#SVGID_18_)"/><linearGradient id="SVGID_19_" gradientUnits="userSpaceOnUse" x1="-6575.898" y1="102.823" x2="-6564.359" y2="21.581" gradientTransform="scale(-1 1) rotate(-8.082 -118.103 -44396.273)"><stop offset="0" stop-color="#C3D5FD"/><stop offset="1" stop-color="#1A90FC"/></linearGradient><path d="M259.39 487.44c-5.26-1.75-12.4-.58-12.69 11.22s11.28 30.62 7.13 37.16c-4.2 6.63-13.17 16.05-18.89 21.41 1.33 6.3 4.91 11.61 4.91 11.61s21.05-9.71 30.21-19.44c9.17-9.73 4.54-32.03.3-47.9-3.19-11.95-10.97-14.06-10.97-14.06z" style="fill:url(#SVGID_19_)"/><linearGradient id="SVGID_20_" gradientUnits="userSpaceOnUse" x1="232.569" y1="531.798" x2="232.569" y2="579.152"><stop offset="0" stop-color="#275C89"/><stop offset="1" stop-color="#013F7C"/></linearGradient><path d="M206.79 579.15h51.1c2.31 0 4.38-1.75 5.19-4.4l10.3-33.89c1.34-4.4-1.33-9.07-5.19-9.07h-71.23c-3.82 0-6.48 4.6-5.21 8.98l9.84 33.89c.77 2.69 2.86 4.49 5.2 4.49z" style="fill:url(#SVGID_20_)"/><path class="st26" d="M204.75 594.74s-.79-1.74-1.4-1.93c-.61-.19-9.35-.54-12.53-1.36-3.19-.83-12.38-2.14-16.32 1.59-3.43 3.25-4.56 10.84.66 15.2 1.96 1.7 3.89 2.2 11.14 1.86 7.26-.34 17.78-.26 20.09-3.63-.07-5.55-1.64-11.73-1.64-11.73z"/><linearGradient id="SVGID_21_" gradientUnits="userSpaceOnUse" x1="-5720.751" y1="599.589" x2="-5703.986" y2="599.589" gradientTransform="matrix(-1 0 0 1 -5504.059 0)"><stop offset="0" stop-color="#F4B9A4"/><stop offset=".652" stop-color="#FAD1BB"/></linearGradient><path d="M212.86 592.81s-8.44 1.9-11.45 1.62-.49 11.87-.49 11.87 8.05.56 15.18-1.51c2.4-9.3-3.24-11.98-3.24-11.98z" style="fill:url(#SVGID_21_)"/><linearGradient id="SVGID_22_" gradientUnits="userSpaceOnUse" x1="209.839" y1="581.112" x2="296.322" y2="581.112"><stop offset="0" stop-color="#18264B"/><stop offset=".652" stop-color="#2D3C65"/></linearGradient><path d="M209.84 592.37l4.39 13.64s94.25-12.41 80.78-43c-11.27-25.57-85.17 29.36-85.17 29.36z" style="fill:url(#SVGID_22_)"/><linearGradient id="SVGID_23_" gradientUnits="userSpaceOnUse" x1="190.339" y1="591.445" x2="190.339" y2="609.24"><stop offset="0" stop-color="#FFDB80"/><stop offset="1" stop-color="#FFBB24"/></linearGradient><path d="M203.66 593.42s3.45 1.35 3.89 6.17c.44 4.82-.99 8.05-8.33 8.94s-9.21.56-13.81.67-11.29.56-12.27-8.2c-.99-8.75 7.96-10.98 17.24-8.75 2.92.56 13.28 1.17 13.28 1.17z" style="fill:url(#SVGID_23_)"/><g><path class="st26" d="M263.56 594.74s.79-1.74 1.4-1.93c.61-.19 9.35-.54 12.53-1.36 3.19-.83 11.75-2.2 16.08 1.49 4.01 3.42 4.27 11-.29 15.18-1.96 1.7-4.02 2.32-11.28 1.98-7.26-.34-17.78-.26-20.09-3.63.09-5.55 1.65-11.73 1.65-11.73z"/><linearGradient id="SVGID_24_" gradientUnits="userSpaceOnUse" x1="251.623" y1="599.589" x2="268.387" y2="599.589"><stop offset="0" stop-color="#F4B9A4"/><stop offset=".652" stop-color="#FAD1BB"/></linearGradient><path d="M255.45 592.81s8.44 1.9 11.45 1.62.49 11.87.49 11.87-8.05.56-15.18-1.51c-2.4-9.3 3.24-11.98 3.24-11.98z" style="fill:url(#SVGID_24_)"/><linearGradient id="SVGID_25_" gradientUnits="userSpaceOnUse" x1="171.993" y1="581.112" x2="258.476" y2="581.112"><stop offset="0" stop-color="#445677"/><stop offset="1" stop-color="#293861"/></linearGradient><path d="M258.48 592.37L254.09 606s-94.25-12.41-80.78-43c11.26-25.56 85.17 29.37 85.17 29.37z" style="fill:url(#SVGID_25_)"/><linearGradient id="SVGID_26_" gradientUnits="userSpaceOnUse" x1="277.976" y1="591.445" x2="277.976" y2="609.24"><stop offset="0" stop-color="#FFDB80"/><stop offset="1" stop-color="#FFBB24"/></linearGradient><path d="M264.66 593.42s-3.45 1.35-3.89 6.17.99 8.05 8.33 8.94c7.34.89 9.21.56 13.81.67s11.29.56 12.27-8.2c.99-8.75-7.96-10.98-17.24-8.75-2.92.56-13.28 1.17-13.28 1.17z" style="fill:url(#SVGID_26_)"/></g><linearGradient id="SVGID_27_" gradientUnits="userSpaceOnUse" x1="249.053" y1="466.067" x2="218.202" y2="466.067"><stop offset="0" stop-color="#F4B9A4"/><stop offset=".652" stop-color="#FAD1BB"/></linearGradient><path d="M248.39 467.6c.56-.8.91-2.84.46-3.44-.83-.67-1.61-.28-2.21.3.14-4.88-.31-8.94-.41-9.97-.3-2.99-3.35-8.48-13.3-8.48-9.95 0-11.88 7.18-11.88 7.18s-.65 5.08-.46 11.24c-.59-.57-1.37-.93-2.18-.27-.46.6-.1 2.64.46 3.44.56.8.91 2.69 1.02 3.74.1.99-.62 3.65 2 3.31 1.56 6.25 7.89 11.47 11.82 11.47 4.3 0 10.01-5.26 11.63-11.48 2.68.37 1.95-2.31 2.04-3.31.09-1.04.45-2.93 1.01-3.73z" style="fill:url(#SVGID_27_)"/><linearGradient id="SVGID_28_" gradientUnits="userSpaceOnUse" x1="213.957" y1="454.142" x2="249.774" y2="454.142"><stop offset="0" stop-color="#4F5C7C"/><stop offset="1" stop-color="#274168"/></linearGradient><path d="M240.1 443.88s-1.94-6.12-9.39-4.65c-7.44 1.46-7.95 4.98-10.87 5.12-4.99.23-8.97 6.45-2.58 13.03 2.85 2.93.44 4.19 1.79 6.78s1.34 5.12 1.34 5.12 2.38-7.6.81-10.84c-.81-1.67 2.77-2.13 7.24-1.73s11.51-1.08 12.06-4.12c1.32 6.23 2.64 6.88 4.31 7.83 1.68.95 1.78 8.48 1.78 8.48s.3-5.53 1.47-6.78c.96-2.04 2.85-10.07.72-12.02s-.32-8.19-8.68-6.22z" style="fill:url(#SVGID_28_)"/></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/404.svg b/src/assets/svgs/404.svg
new file mode 100644
index 000000000..5244d8d4d
--- /dev/null
+++ b/src/assets/svgs/404.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 800" enable-background="new 0 0 800 800"><style>.st49{fill:#d4e4fe}</style><g id="图层_5"><linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="401.193" y1="159.763" x2="401.193" y2="715.254"><stop offset="0" stop-color="#F4F2FB"/><stop offset="1" stop-color="#E1EEF5"/></linearGradient><path d="M484.45 201.12c-38.37 30.29-120.74 33.81-181.17-2.22s-172-31.38-202.22 34.87 37.19 131.33 12.78 178.98S8.08 527.79 63.87 609.15s126.6 60.62 169.22 52.45c84.17-16.13 189.79 115.67 308.62 16.13 68.47-57.35 170.44 42.09 210.17-81.36 32.78-101.86-85.67-139.5-49.97-208.03 37.96-72.88 30.67-159.24-10.46-201.06-38.31-38.96-140.75-38.46-207 13.84z" style="fill:url(#SVGID_1_)"/><linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="484.537" y1="604.68" x2="484.537" y2="493.367"><stop offset=".34" stop-color="#B0B9E1"/><stop offset=".866" stop-color="#EAF0F8"/></linearGradient><path d="M285.1 583.44c1.77-1.63 77.74-90.07 77.74-90.07h321.13l-99.5 111.31-299.37-21.24z" style="fill:url(#SVGID_2_)"/><linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="616.023" y1="627.266" x2="657.332" y2="555.716"><stop offset="0" stop-color="#B0B9E1"/><stop offset=".866" stop-color="#EAF0F8"/></linearGradient><path d="M604.49 620.61L659.43 556.93 633.22 624.12z" style="fill:url(#SVGID_3_)"/><linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="116.275" y1="540.149" x2="116.275" y2="402.974"><stop offset=".003" stop-color="#9A9ADB"/><stop offset=".789" stop-color="#CECDF1"/></linearGradient><path d="M117.06 403.22s-.22-.57-.52.04c-2.7 5.49-27.15 64.96-29.09 110.86 0 0-4.08 26.37 30.11 26.02 28.54-.29 27.78-24.6 27.68-32.79-.39-33.22-28.18-104.13-28.18-104.13z" style="fill:url(#SVGID_4_)"/><linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="116.277" y1="418.206" x2="116.277" y2="569.34"><stop offset="0" stop-color="#ECF1FB"/><stop offset=".818" stop-color="#AFB0E7"/></linearGradient><path d="M116.28 569.34c-.55 0-1-.45-1-1V419.21c0-.55.45-1 1-1s1 .45 1 1v149.13c0 .55-.45 1-1 1z" style="fill:url(#SVGID_5_)"/><linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="617.404" y1="448.627" x2="617.404" y2="360.303"><stop offset=".227" stop-color="#CCD4F4"/><stop offset=".789" stop-color="#ECF1FB"/></linearGradient><path d="M617.91 360.46s-.14-.37-.33.03c-1.74 3.53-17.48 41.83-18.73 71.38 0 0-2.63 16.98 19.39 16.76 18.38-.18 17.89-15.84 17.82-21.11-.25-21.4-18.15-67.06-18.15-67.06z" style="fill:url(#SVGID_6_)"/><linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="617.405" y1="370.11" x2="617.405" y2="467.422"><stop offset="0" stop-color="#ECF1FB"/><stop offset="1" stop-color="#A6A8E2"/></linearGradient><path d="M617.41 467.42c-.36 0-.64-.29-.64-.64v-96.02c0-.36.29-.64.64-.64.36 0 .64.29.64.64v96.02c0 .35-.29.64-.64.64z" style="fill:url(#SVGID_7_)"/><linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="463.322" y1="86.02" x2="428.568" y2="146.217"><stop offset="0" stop-color="#FFDB80"/><stop offset="1" stop-color="#FFBB24"/></linearGradient><circle cx="445.95" cy="116.12" r="34.75" style="fill:url(#SVGID_8_)"/><linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="420.985" y1="116.487" x2="420.985" y2="173.941"><stop offset="0" stop-color="#F9FAFE"/><stop offset="1" stop-color="#E5EDF7"/></linearGradient><path d="M465.72 135.07h-34.57c-2.23-10.61-11.65-18.58-22.93-18.58s-20.69 7.97-22.93 18.58h-9.05c-10.73 0-19.44 8.7-19.44 19.44 0 10.73 8.7 19.44 19.44 19.44h89.47c10.73 0 19.44-8.7 19.44-19.44.01-10.74-8.69-19.44-19.43-19.44z" style="fill:url(#SVGID_9_)"/><g><linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="688.006" y1="537.867" x2="688.006" y2="510.039"><stop offset=".227" stop-color="#AFB0E7"/><stop offset="1" stop-color="#ECF1FB"/></linearGradient><circle cx="688.01" cy="523.95" r="13.91" style="fill:url(#SVGID_10_)"/><linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="688.056" y1="513.553" x2="688.056" y2="558.349"><stop offset="0" stop-color="#DDE1F6"/><stop offset=".818" stop-color="#A6A8E2"/></linearGradient><path d="M688.06 558.35c-.24 0-.43-.19-.43-.43v-43.94c0-.24.19-.43.43-.43s.43.19.43.43v43.94a.44.44 0 01-.43.43z" style="fill:url(#SVGID_11_)"/></g><g><linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="2879.853" y1="308.382" x2="2737.462" y2="450.774" gradientTransform="matrix(-1 0 0 1 3207.18 0)"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><path d="M270.73 392.79l91.4-73.3c7.43 11.92 20.65 19.87 35.7 19.87 16.43 0 30.69-9.48 37.6-23.26l92.11 76.85 10.83-12.98-98.5-82.19c0-.16.01-.31.01-.47 0-23.18-18.86-42.04-42.05-42.04-23.18 0-42.04 18.86-42.04 42.04 0 1.8.13 3.58.35 5.32l-95.98 76.97 10.57 13.19zm101.96-95.48c0-13.86 11.28-25.14 25.14-25.14s25.14 11.28 25.14 25.14-11.28 25.14-25.14 25.14-25.14-11.27-25.14-25.14z" style="fill:url(#SVGID_12_)"/><linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="2814.247" y1="259.815" x2="2814.247" y2="392.836" gradientTransform="matrix(-1 0 0 1 3207.18 0)"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#C6D5F4"/></linearGradient><path d="M268.75 392.68l88.31-70.82c7.18 11.51 19.95 19.2 34.49 19.2 15.88 0 29.65-9.16 36.33-22.47l88.99 74.25 10.46-12.54-95.17-79.41c0-.15.01-.3.01-.46 0-22.4-18.22-40.62-40.62-40.62s-40.62 18.22-40.62 40.62c0 1.74.12 3.46.34 5.14l-92.73 74.37 10.21 12.74zm98.51-92.24c0-13.4 10.9-24.29 24.29-24.29 13.4 0 24.29 10.9 24.29 24.29 0 13.4-10.9 24.29-24.29 24.29-13.4 0-24.29-10.9-24.29-24.29z" style="fill:url(#SVGID_13_)"/><linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="2966.463" y1="329.794" x2="2654.707" y2="641.55" gradientTransform="matrix(-1 0 0 1 3203.43 0)"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><path d="M230.6 619.91h326.35c17.89 0 32.39-14.5 32.39-32.39V388.31c0-21.39-17.34-38.72-38.72-38.72H230.6c-17.89 0-32.39 14.5-32.39 32.39v205.54c-.01 17.88 14.5 32.39 32.39 32.39z" style="fill:url(#SVGID_14_)"/><linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="2716.773" y1="319.563" x2="2914.293" y2="661.678" gradientTransform="matrix(-1 0 0 1 3203.43 0)"><stop offset="0" stop-color="#EBF2FA"/><stop offset=".525" stop-color="#FDFEFF"/></linearGradient><path d="M223.6 619.91h328.59c14.03 0 25.4-11.37 25.4-25.4V386.73c0-14.03-11.37-25.4-25.4-25.4H223.6c-14.03 0-25.4 11.37-25.4 25.4v207.78c0 14.03 11.38 25.4 25.4 25.4z" style="fill:url(#SVGID_15_)"/><linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="2815.495" y1="361.334" x2="2815.495" y2="425.526" gradientTransform="matrix(-1 0 0 1 3203.43 0)"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#BACBEE"/></linearGradient><path d="M198.24 425.53h379.39v-38.79c0-14.03-11.37-25.4-25.4-25.4H223.64c-14.03 0-25.4 11.37-25.4 25.4v38.79z" style="fill:url(#SVGID_16_)"/><linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="276.445" y1="488.742" x2="350.685" y2="531.604"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#BACBEE"/></linearGradient><path d="M328.82 457.46H307.7c-1.27 0-2.46.59-3.24 1.59L261.91 514c-.56.72-.86 1.6-.86 2.51v23.15c0 2.26 1.83 4.09 4.09 4.09h41.34c2.26 0 4.09 1.83 4.09 4.09v13.46c0 2.26 1.83 4.09 4.09 4.09h14.14c2.26 0 4.09-1.83 4.09-4.09v-13.46c0-2.26 1.83-4.09 4.09-4.09s4.09-1.83 4.09-4.09V525.5c0-2.26-1.83-4.09-4.09-4.09s-4.09-1.83-4.09-4.09v-55.77a4.059 4.059 0 00-4.07-4.09zm-39.3 57.35l13.74-17.74c2.39-3.08 7.33-1.4 7.33 2.51v17.74c0 2.26-1.83 4.09-4.09 4.09h-13.74c-3.41 0-5.33-3.91-3.24-6.6z" style="fill:url(#SVGID_17_)"/><linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="455.095" y1="488.742" x2="529.335" y2="531.604"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#BACBEE"/></linearGradient><path d="M511.56 517.32v-55.77c0-2.26-1.83-4.09-4.09-4.09h-21.12c-1.27 0-2.46.59-3.24 1.59L440.56 514c-.56.72-.86 1.6-.86 2.51v23.15c0 2.26 1.83 4.09 4.09 4.09h41.34c2.26 0 4.09 1.83 4.09 4.09v13.46c0 2.26 1.83 4.09 4.09 4.09h14.14c2.26 0 4.09-1.83 4.09-4.09v-13.46c0-2.26 1.83-4.09 4.09-4.09s4.09-1.83 4.09-4.09V525.5c0-2.26-1.83-4.09-4.09-4.09-2.24 0-4.07-1.83-4.07-4.09zm-43.39-2.51l13.74-17.74c2.39-3.08 7.33-1.4 7.33 2.51v17.74c0 2.26-1.83 4.09-4.09 4.09H471.4c-3.4 0-5.32-3.91-3.23-6.6z" style="fill:url(#SVGID_18_)"/><linearGradient id="SVGID_19_" gradientUnits="userSpaceOnUse" x1="339.488" y1="482.174" x2="441.31" y2="540.961"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#BACBEE"/></linearGradient><path d="M356.4 566.16h68c2.26 0 4.09-1.83 4.09-4.09v-101c0-2.26-1.83-4.09-4.09-4.09h-68c-2.26 0-4.09 1.83-4.09 4.09v101c0 2.26 1.83 4.09 4.09 4.09zm49.76-82.76v56.34c0 2.26-1.83 4.09-4.09 4.09h-23.34c-2.26 0-4.09-1.83-4.09-4.09V483.4c0-2.26 1.83-4.09 4.09-4.09h23.34c2.26 0 4.09 1.83 4.09 4.09z" style="fill:url(#SVGID_19_)"/></g><g><linearGradient id="SVGID_20_" gradientUnits="userSpaceOnUse" x1="871.514" y1="4485.232" x2="872.065" y2="4498.77" gradientTransform="rotate(2.333 95904.663 -3670.234)"><stop offset="0" stop-color="#FFDB80"/><stop offset="1" stop-color="#FFBB24"/></linearGradient><path d="M605.95 610.6s3.25 4.88 10.55 1.06c3.91 2.72 8.92 4.97 12.39 5.88 3.47.91 3.68 5.4 3.12 6.61-4.66-.47-18.14.64-27.3-2.94.72-7.53 1.24-10.61 1.24-10.61z" style="fill:url(#SVGID_20_)"/><path class="st49" d="M604.06 623.84l.43-3.23s10.54 2.63 28.38 1.03c.17 1.66.35 2.48.35 2.48s-13.56 2.02-29.16-.28z"/><linearGradient id="SVGID_21_" gradientUnits="userSpaceOnUse" x1="-1427.263" y1="-235.579" x2="-1409.896" y2="-215.318" gradientTransform="rotate(40.6 -1575.457 2818.52)"><stop offset="0" stop-color="#FFDB80"/><stop offset="1" stop-color="#FFBB24"/></linearGradient><path d="M520.47 596.12s-.05 5.81 7.27 7.94c1.95 5-3.73 11.79 5.37 12.42 3.34.23 1.75 5.12.73 5.63-10.95 4.01-14.63-10.12-19.62-18.98 4.32-5.09 6.25-7.01 6.25-7.01z" style="fill:url(#SVGID_21_)"/><linearGradient id="SVGID_22_" gradientUnits="userSpaceOnUse" x1="-3772.01" y1="604.486" x2="-3772.01" y2="502.198" gradientTransform="matrix(-1 0 0 1 -3222.68 0)"><stop offset="0" stop-color="#445677"/><stop offset="1" stop-color="#293861"/></linearGradient><path d="M569.3 502.2s-14.44-.26-17.67 18.85c-3.23 19.11 1.57 23.66-5.38 37.29-3.62 7.1-27.15 41.12-27.15 41.12l6.83 5.03s37.94-34.72 43.52-48.71 9.83-28.83 10.13-41.46c.28-12.62-10.28-12.12-10.28-12.12z" style="fill:url(#SVGID_22_)"/><linearGradient id="SVGID_23_" gradientUnits="userSpaceOnUse" x1="-3839.642" y1="559.801" x2="-3786.238" y2="559.801" gradientTransform="matrix(-1 0 0 1 -3222.68 0)"><stop offset="0" stop-color="#445677"/><stop offset="1" stop-color="#293861"/></linearGradient><path d="M572.72 506.19s14.87 3.53 15.75 3.98c.44.23 2.89 7.07 5.24 13.95 5.04 6.87 23.02 32.28 23.21 45.51.29 20.13-.96 43.67-.96 43.67l-9.24.11s-3.5-38.9-5.85-42.31c-.42-.61-1.29-1.95-2.42-3.74-5.14-6.22-16.5-16.65-28.16-27.07-16.45-14.66 2.43-34.1 2.43-34.1z" style="fill:url(#SVGID_23_)"/><linearGradient id="SVGID_24_" gradientUnits="userSpaceOnUse" x1="5317.908" y1="132.095" x2="5317.908" y2="56.817" gradientTransform="rotate(26.086 2112.504 -9908.036)"><stop offset="0" stop-color="#C3D5FD"/><stop offset="1" stop-color="#1A90FC"/></linearGradient><path d="M603.14 448.91s-10.69-8.37-16.99-4.36c-6.3 4-14.27 18.91-14.27 18.91l8.85 4.38-23.8 39.67 40.69 21.83 14.6-42.28 11.79.69s7.96-25.24-3.62-27.43c-5.45-2.3-7.04-3.34-7.04-3.34s-3.49 4.27-7.99 1.18-2.22-9.25-2.22-9.25z" style="fill:url(#SVGID_24_)"/><linearGradient id="SVGID_25_" gradientUnits="userSpaceOnUse" x1="5161.945" y1="1134.369" x2="5171.26" y2="1068.78" gradientTransform="rotate(18.006 4848.87 -13687.47)"><stop offset="0" stop-color="#C3D5FD"/><stop offset="1" stop-color="#1A90FC"/></linearGradient><path d="M589.15 443.6c3.88.61 8.04 4.05 4.56 12.85-3.48 8.8-16.66 18.5-16.06 24.82.6 6.4 3.37 16.58 5.33 22.6-2.8 4.17-6.72 6.78-6.72 6.78s-10.33-14.75-13.12-25.23 7.07-25.25 14.69-35.41c5.73-7.67 11.32-6.41 11.32-6.41z" style="fill:url(#SVGID_25_)"/><linearGradient id="SVGID_26_" gradientUnits="userSpaceOnUse" x1="-8924.659" y1="-865.525" x2="-8915.544" y2="-929.706" gradientTransform="scale(-1 1) rotate(-34.172 -2504.53 -13720.806)"><stop offset="0" stop-color="#C3D5FD"/><stop offset="1" stop-color="#1A90FC"/></linearGradient><path d="M624.12 463.5c-2.79-3.19-7.68-4.9-11.53 3.69s-2.35 26.64-7.02 29.97c-4.72 3.37-13.34 7.07-18.62 8.96-1.12 5.12-.49 10.33-.49 10.33s16.36.44 25.19-3.42c8.83-3.86 12.82-21.97 15.06-35.2 1.69-9.97-2.59-14.33-2.59-14.33z" style="fill:url(#SVGID_26_)"/><linearGradient id="SVGID_27_" gradientUnits="userSpaceOnUse" x1="-3813.896" y1="480.898" x2="-3841.811" y2="423.883" gradientTransform="matrix(-1 0 0 1 -3222.68 0)"><stop offset="0" stop-color="#4F5C7C"/><stop offset="1" stop-color="#274168"/></linearGradient><path d="M590.9 439.68c.43-4.69 4.5-7.9 9.3-7.17.4-1.31 4.44-2.98 5.38-4.6 3.5-6.03 9.26-7 14-3.56 9.79 2.79 8.01 12.2 4.75 21.55 2.8 5.61 1.52 12.41-.06 15.18 4.75 5.07 2.09 11.58-1.39 16.52-.4.56-.82 1.06-1.25 1.52-.21 5.85-8.34 7.86-11.32 4.89-3.17-3.16-3.57-4.49-9.32-1.76-5.75 2.73-11.24-1.54-11.3-7.34-.06-5.8-4.28-4.1-6.12-5.63-3.33-2.77-1.15-5.93-1.15-5.93s-4.85-.26-6.01-7.38c-1.33-16.99 11.95-17.08 14.49-16.29z" style="fill:url(#SVGID_27_)"/><path class="st49" d="M515.38 601.24s4.92 12.03 5.91 13.61 5.9 9.27 14.26 5.05c-.04 1.49-.11 2.43-.11 2.43s-9.42 6.26-15.33-4.62c-5.91-10.88-6.75-14.63-6.75-14.63l2.02-1.84z"/></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/500.svg b/src/assets/svgs/500.svg
new file mode 100644
index 000000000..9c020927f
--- /dev/null
+++ b/src/assets/svgs/500.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 800" enable-background="new 0 0 800 800"><style>.st26{fill:#fff}</style><g id="图层_16"><linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="402.832" y1="159.843" x2="402.832" y2="715.335"><stop offset="0" stop-color="#F4F2FB"/><stop offset="1" stop-color="#E1EEF5"/></linearGradient><path d="M486.09 201.2c-38.37 30.29-120.74 33.81-181.17-2.22s-172-31.38-202.22 34.87 37.19 131.33 12.78 178.98S9.72 527.87 65.5 609.23s126.6 60.62 169.22 52.45c84.17-16.13 189.79 115.67 308.62 16.13 68.47-57.35 170.44 42.09 210.17-81.36 32.78-101.86-85.67-139.5-49.97-208.03 37.96-72.88 30.67-159.24-10.46-201.06-38.3-38.96-140.75-38.46-206.99 13.84z" style="fill:url(#SVGID_1_)"/><linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="117.913" y1="540.229" x2="117.913" y2="403.055"><stop offset=".227" stop-color="#B7ACE0"/><stop offset=".789" stop-color="#E8E7FA"/></linearGradient><path d="M118.7 403.3s-.22-.57-.52.04c-2.7 5.49-27.15 64.96-29.09 110.86 0 0-4.08 26.37 30.11 26.02 28.54-.29 27.78-24.6 27.68-32.79-.39-33.22-28.18-104.13-28.18-104.13z" style="fill:url(#SVGID_2_)"/><linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="117.915" y1="418.287" x2="117.915" y2="569.42"><stop offset="0" stop-color="#ECF1FB"/><stop offset=".818" stop-color="#AFB0E7"/></linearGradient><path d="M117.92 569.42c-.55 0-1-.45-1-1V419.29c0-.55.45-1 1-1s1 .45 1 1v149.13c0 .55-.45 1-1 1z" style="fill:url(#SVGID_3_)"/><linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="619.042" y1="448.707" x2="619.042" y2="360.383"><stop offset=".227" stop-color="#CCD4F4"/><stop offset=".789" stop-color="#ECF1FB"/></linearGradient><path d="M619.55 360.54s-.14-.37-.33.03c-1.74 3.53-17.48 41.83-18.73 71.38 0 0-2.63 16.98 19.39 16.76 18.38-.18 17.89-15.84 17.82-21.11-.26-21.4-18.15-67.06-18.15-67.06z" style="fill:url(#SVGID_4_)"/><linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="619.043" y1="370.19" x2="619.043" y2="467.503"><stop offset="0" stop-color="#ECF1FB"/><stop offset="1" stop-color="#A6A8E2"/></linearGradient><path d="M619.04 467.5c-.36 0-.64-.29-.64-.64v-96.02c0-.36.29-.64.64-.64s.64.29.64.64v96.02c.01.35-.28.64-.64.64z" style="fill:url(#SVGID_5_)"/><linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="464.96" y1="86.101" x2="430.206" y2="146.297"><stop offset="0" stop-color="#FFDB80"/><stop offset="1" stop-color="#FFBB24"/></linearGradient><circle cx="447.58" cy="116.2" r="34.75" style="fill:url(#SVGID_6_)"/><linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="422.623" y1="116.567" x2="422.623" y2="174.021"><stop offset="0" stop-color="#F9FAFE"/><stop offset="1" stop-color="#E5EDF7"/></linearGradient><path d="M467.36 135.15h-34.57c-2.23-10.61-11.65-18.58-22.93-18.58s-20.69 7.97-22.93 18.58h-9.05c-10.73 0-19.44 8.7-19.44 19.44 0 10.73 8.7 19.44 19.44 19.44h89.47c10.73 0 19.44-8.7 19.44-19.44.01-10.74-8.7-19.44-19.43-19.44z" style="fill:url(#SVGID_7_)"/><linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="689.644" y1="537.948" x2="689.644" y2="510.119"><stop offset=".227" stop-color="#AFB0E7"/><stop offset="1" stop-color="#ECF1FB"/></linearGradient><circle cx="689.64" cy="524.03" r="13.91" style="fill:url(#SVGID_8_)"/><linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="689.694" y1="513.633" x2="689.694" y2="558.429"><stop offset="0" stop-color="#DDE1F6"/><stop offset=".818" stop-color="#A6A8E2"/></linearGradient><path d="M689.69 558.43c-.24 0-.43-.19-.43-.43v-43.94c0-.24.19-.43.43-.43s.43.19.43.43V558c0 .24-.19.43-.43.43z" style="fill:url(#SVGID_9_)"/><linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="289.384" y1="477.19" x2="289.384" y2="411.226"><stop offset="0" stop-color="#B0B9E1"/><stop offset="1" stop-color="#E7EFF7"/></linearGradient><path d="M202.07 451.28L270.1 411.23 376.7 411.23 315.15 477.19 237.41 476.01z" style="fill:url(#SVGID_10_)"/><linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="454.145" y1="502.809" x2="454.145" y2="420.65"><stop offset="0" stop-color="#B0B9E1"/><stop offset="1" stop-color="#E7EFF7"/></linearGradient><path d="M386.71 479.55L431.76 420.65 521.58 420.65 423.81 502.81 394.37 495.15z" style="fill:url(#SVGID_11_)"/><linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="589.016" y1="472.132" x2="589.016" y2="397.68"><stop offset="0" stop-color="#B0B9E1"/><stop offset="1" stop-color="#E7EFF7"/></linearGradient><path d="M501.26 458.64l64.79-60.96h110.72l-48.99 66.61a19.243 19.243 0 01-17.85 7.7l-108.67-13.35z" style="fill:url(#SVGID_12_)"/><linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="314.267" y1="607.349" x2="314.267" y2="497.361"><stop offset="0" stop-color="#B0B9E1"/><stop offset="1" stop-color="#E7EFF7"/></linearGradient><path d="M212.23 592.77L303.67 497.36 416.3 497.36 297.04 607.35 247.57 604.7z" style="fill:url(#SVGID_13_)"/><g><linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="515.604" y1="312.867" x2="613.092" y2="481.721"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><path d="M564.35 296.53c-41.79 0-75.67 33.6-75.67 75.05v51.43c0 41.45 33.88 75.05 75.67 75.05s75.67-33.6 75.67-75.05v-51.43c-.01-41.45-33.88-75.05-75.67-75.05zm23.82 137.83c0 13.05-10.67 23.63-23.82 23.63-13.16 0-23.82-10.58-23.82-23.63v-74.13c0-13.05 10.67-23.63 23.82-23.63 13.16 0 23.82 10.58 23.82 23.63v74.13z" style="fill:url(#SVGID_14_)"/><linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="513.839" y1="321.619" x2="606.64" y2="482.355"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#BACBEE"/></linearGradient><path d="M560.24 305.91c-39.52 0-71.56 32.04-71.56 71.56v49.03c0 39.52 32.04 71.56 71.56 71.56s71.56-32.04 71.56-71.56v-49.03c0-39.52-32.04-71.56-71.56-71.56zm22.53 131.41c0 12.44-10.09 22.53-22.53 22.53-12.44 0-22.53-10.09-22.53-22.53v-70.67c0-12.44 10.09-22.53 22.53-22.53 12.44 0 22.53 10.09 22.53 22.53v70.67z" style="fill:url(#SVGID_15_)"/><linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="217.031" y1="307.363" x2="316.583" y2="479.793"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><path d="M333.72 412.6c-5.55-58.15-65.99-54.01-90.14-49.98l2.26-15.28 71.49 5.88 8.98-5.88V307.2h-109l-9.09 7.47-14.81 92.41h43.6c22.73-19.99 38.77-11.37 45.38 0 6.34 10.92 7.27 43.26-19.71 43.87-23.34.53-23.13-19.92-23.13-19.92l-41.55.58-8.06 7.52s6.18 59.41 69.73 59.41 77.3-50.09 74.05-85.94z" style="fill:url(#SVGID_16_)"/><linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="212.735" y1="311.982" x2="309.699" y2="479.928"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#BACBEE"/></linearGradient><path d="M324.26 415.94c-5.19-55.89-61.65-51.92-84.21-48.04l2.11-14.69h75.17v-38.58H208.14l-14.95 96h40.73c21.23-19.21 36.22-10.93 42.39 0 5.92 10.49 6.79 46.38-18.41 46.97-21.8.51-24.41-19.14-24.41-19.14l-43.54.66s5.78 59.41 65.14 59.41 72.2-48.14 69.17-82.59z" style="fill:url(#SVGID_17_)"/><linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="368.459" y1="304.731" x2="452.448" y2="450.205"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><path d="M387.26 461.26s-54.09-36.72-56.49-83.83c-2.29-45.03 25.47-81.27 76.27-81.27 55.29 0 78.12 47.95 78.12 73.99 0 26.04-10.63 63.25-55.73 93.35-23.53 0-42.17-2.24-42.17-2.24z" style="fill:url(#SVGID_18_)"/><linearGradient id="SVGID_19_" gradientUnits="userSpaceOnUse" x1="366.623" y1="312.428" x2="445.175" y2="448.483"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#BACBEE"/></linearGradient><path d="M384.76 461.29s-51.7-34.94-53.99-79.77c-2.19-42.85 24.35-77.34 72.9-77.34 52.85 0 73.47 45.54 73.47 70.32 0 24.78-12.03 58.72-55.14 87.36-22.49.01-37.24-.57-37.24-.57z" style="fill:url(#SVGID_19_)"/><linearGradient id="SVGID_20_" gradientUnits="userSpaceOnUse" x1="400.418" y1="454.748" x2="417.994" y2="485.191"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><path d="M414.59 486.78h-16.64c-.85 0-1.64-.44-2.08-1.17l-11.39-18.8c-.7-1.15-.33-2.64.82-3.34 1.15-.69 2.64-.33 3.34.82l10.68 17.62h13.84l10.6-19.05c.65-1.17 2.13-1.6 3.31-.94 1.17.65 1.6 2.13.94 3.31l-11.29 20.3c-.44.77-1.25 1.25-2.13 1.25z" style="fill:url(#SVGID_20_)"/><linearGradient id="SVGID_21_" gradientUnits="userSpaceOnUse" x1="397.841" y1="454.748" x2="415.417" y2="485.191"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#BACBEE"/></linearGradient><path d="M412.01 486.78h-16.64c-.85 0-1.64-.44-2.08-1.17l-11.39-18.8c-.7-1.15-.33-2.64.82-3.34 1.15-.69 2.64-.33 3.34.82l10.68 17.62h13.84l10.6-19.05c.65-1.17 2.13-1.6 3.31-.94 1.17.65 1.6 2.13.94 3.31l-11.29 20.3c-.43.77-1.25 1.25-2.13 1.25z" style="fill:url(#SVGID_21_)"/><linearGradient id="SVGID_22_" gradientUnits="userSpaceOnUse" x1="395.626" y1="441.888" x2="415.816" y2="476.856"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><path d="M429.22 468.35h-47.66c-2.76 0-5-2.24-5-5V452.9h57.65v10.45c0 2.76-2.23 5-4.99 5z" style="fill:url(#SVGID_22_)"/><linearGradient id="SVGID_23_" gradientUnits="userSpaceOnUse" x1="395.022" y1="445.756" x2="412.776" y2="476.507"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#BACBEE"/></linearGradient><path d="M425.57 468.35h-44.01c-2.76 0-5-2.24-5-5v-6.93h54.01v6.93c0 2.76-2.24 5-5 5z" style="fill:url(#SVGID_23_)"/><linearGradient id="SVGID_24_" gradientUnits="userSpaceOnUse" x1="396.171" y1="472.261" x2="416.697" y2="507.813"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><path d="M418.79 505.46h-25.7c-4.09 0-7.4-3.31-7.4-7.4v-19.75h40.5v19.75c0 4.09-3.31 7.4-7.4 7.4z" style="fill:url(#SVGID_24_)"/><linearGradient id="SVGID_25_" gradientUnits="userSpaceOnUse" x1="395.099" y1="476.159" x2="413.018" y2="507.195"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#BACBEE"/></linearGradient><path d="M414.04 505.46h-20.95c-4.09 0-7.4-3.31-7.4-7.4v-16.47h35.75v16.47c0 4.09-3.31 7.4-7.4 7.4z" style="fill:url(#SVGID_25_)"/><linearGradient id="SVGID_26_" gradientUnits="userSpaceOnUse" x1="370.752" y1="345.042" x2="439.366" y2="413.656"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><path d="M404.4 311.4s-17.23 79.51 1.33 135.9c47.84-62.43-1.33-135.9-1.33-135.9z" style="fill:url(#SVGID_26_)"/><linearGradient id="SVGID_27_" gradientUnits="userSpaceOnUse" x1="352.936" y1="350.49" x2="415.513" y2="413.067"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><path d="M386.43 316.99s-15.24 26.94-16.34 62.72c-.75 24.43 11.93 66.85 11.93 66.85s-20.76-36.07-20.76-70.23 25.17-59.34 25.17-59.34z" style="fill:url(#SVGID_27_)"/><linearGradient id="SVGID_28_" gradientUnits="userSpaceOnUse" x1="389.798" y1="347.846" x2="456.792" y2="414.84"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><path d="M420.65 316.99s34.1 22.12 34.1 60.99-29.68 68.58-29.68 68.58 23.5-42.18 23.5-70.9c0-14.24-13.98-48.76-27.92-58.67z" style="fill:url(#SVGID_28_)"/><path class="st26" d="M386.43 316.99s-62.13 47.12-4.42 129.57c-7.06-15.6-36.21-73.62 4.42-129.57zM420.65 316.99s62.13 47.12 4.42 129.57c7.07-15.6 36.22-73.62-4.42-129.57zM404.4 311.4s-35.48 79.66 1.33 135.9c32.24-57.5-1.33-135.9-1.33-135.9z"/></g><g><linearGradient id="SVGID_29_" gradientUnits="userSpaceOnUse" x1="234.692" y1="561.708" x2="234.692" y2="486.088"><stop offset="0" stop-color="#C3D5FD"/><stop offset="1" stop-color="#1A90FC"/></linearGradient><path d="M226.89 486.45s-18.35-2.54-24.31 5.89c-5.96 8.43-8.14 30.01-8.14 30.01l13.81-.73-1.16 25.14 25.48 14.94 36.3-19.52-5.52-22.78 11.6-3.03s-3.46-33.06-19.59-28.18c-8.29.89-10.9.74-10.9.74s-2.18 6.95-9.67 6.36c-7.49-.58-7.9-8.84-7.9-8.84z" style="fill:url(#SVGID_29_)"/><linearGradient id="SVGID_30_" gradientUnits="userSpaceOnUse" x1="235.741" y1="473.191" x2="235.741" y2="497.147"><stop offset="0" stop-color="#F4AE98"/><stop offset="1" stop-color="#FAD1BB"/></linearGradient><path d="M228.72 476.05l-3.81 17.01c-.18.8.24 1.61 1 1.92 1.97.8 5.91 2.17 9.97 2.17 4.21 0 8.18-2.3 10-3.53.63-.42.89-1.21.65-1.93l-5.83-17.35a1.681 1.681 0 00-1.89-1.12l-8.74 1.55c-.67.11-1.2.62-1.35 1.28z" style="fill:url(#SVGID_30_)"/><linearGradient id="SVGID_31_" gradientUnits="userSpaceOnUse" x1="-1535.437" y1="750.954" x2="-1523.728" y2="668.51" gradientTransform="rotate(-8.082 -1929.216 -11692.611)"><stop offset="0" stop-color="#C3D5FD"/><stop offset="1" stop-color="#1A90FC"/></linearGradient><path d="M205.94 489.39c5.34-1.77 12.58-.59 12.88 11.39.29 11.98-11.45 31.07-7.24 37.71 4.26 6.73 13.37 16.29 19.17 21.73-1.35 6.4-4.99 11.78-4.99 11.78s-21.36-9.86-30.66-19.73c-9.3-9.87-4.61-32.5-.3-48.61 3.24-12.13 11.14-14.27 11.14-14.27z" style="fill:url(#SVGID_31_)"/><linearGradient id="SVGID_32_" gradientUnits="userSpaceOnUse" x1="-5585.118" y1="175.804" x2="-5573.409" y2="93.36" gradientTransform="scale(-1 1) rotate(-8.082 -118.041 -37329.02)"><stop offset="0" stop-color="#C3D5FD"/><stop offset="1" stop-color="#1A90FC"/></linearGradient><path d="M261.91 489.39c-5.34-1.77-12.58-.59-12.88 11.39-.29 11.98 11.45 31.07 7.24 37.71-4.26 6.73-13.37 16.29-19.17 21.73 1.35 6.4 4.99 11.78 4.99 11.78s21.36-9.86 30.66-19.73c9.3-9.87 4.61-32.5.3-48.61-3.24-12.13-11.14-14.27-11.14-14.27z" style="fill:url(#SVGID_32_)"/><linearGradient id="SVGID_33_" gradientUnits="userSpaceOnUse" x1="234.692" y1="534.399" x2="234.692" y2="582.454"><stop offset="0" stop-color="#275C89"/><stop offset="1" stop-color="#013F7C"/></linearGradient><path d="M208.53 582.45h51.85c2.35 0 4.45-1.78 5.26-4.46l10.45-34.39c1.36-4.46-1.35-9.21-5.26-9.21h-72.29c-3.87 0-6.58 4.67-5.29 9.11l9.98 34.39c.8 2.74 2.92 4.56 5.3 4.56z" style="fill:url(#SVGID_33_)"/><path class="st26" d="M206.46 598.27s-.8-1.76-1.42-1.95c-.62-.19-9.49-.54-12.72-1.38s-12.56-2.17-16.56 1.61c-3.48 3.3-4.63 11 .67 15.43 1.99 1.73 3.94 2.23 11.31 1.89s18.04-.27 20.38-3.68c-.07-5.65-1.66-11.92-1.66-11.92z"/><linearGradient id="SVGID_34_" gradientUnits="userSpaceOnUse" x1="-3991.106" y1="603.193" x2="-3974.093" y2="603.193" gradientTransform="matrix(-1 0 0 1 -3772.525 0)"><stop offset="0" stop-color="#F4B9A4"/><stop offset=".652" stop-color="#FAD1BB"/></linearGradient><path d="M214.69 596.31s-8.56 1.92-11.62 1.64c-3.06-.28-.5 12.05-.5 12.05s8.17.57 15.4-1.53c2.45-9.44-3.28-12.16-3.28-12.16z" style="fill:url(#SVGID_34_)"/><linearGradient id="SVGID_35_" gradientUnits="userSpaceOnUse" x1="211.625" y1="584.443" x2="299.388" y2="584.443"><stop offset="0" stop-color="#18264B"/><stop offset=".652" stop-color="#2D3C65"/></linearGradient><path d="M211.63 595.87l4.45 13.84s95.64-12.6 81.97-43.63c-11.43-25.96-86.42 29.79-86.42 29.79z" style="fill:url(#SVGID_35_)"/><linearGradient id="SVGID_36_" gradientUnits="userSpaceOnUse" x1="191.837" y1="594.929" x2="191.837" y2="612.987"><stop offset="0" stop-color="#FFDB80"/><stop offset="1" stop-color="#FFBB24"/></linearGradient><path d="M205.35 596.94s3.5 1.37 3.95 6.26c.44 4.89-1 8.17-8.45 9.07-7.45.91-9.34.57-14.01.68-4.67.11-11.45.57-12.46-8.32-1-8.88 8.08-11.15 17.5-8.88 2.96.56 13.47 1.19 13.47 1.19z" style="fill:url(#SVGID_36_)"/><g><path class="st26" d="M266.14 598.27s.8-1.76 1.42-1.95c.62-.19 9.49-.54 12.72-1.38 3.23-.84 11.93-2.24 16.32 1.51 4.07 3.48 4.34 11.16-.3 15.4-1.99 1.73-4.08 2.35-11.44 2.01s-18.04-.27-20.38-3.68c.08-5.64 1.66-11.91 1.66-11.91z"/><linearGradient id="SVGID_37_" gradientUnits="userSpaceOnUse" x1="254.028" y1="603.193" x2="271.04" y2="603.193"><stop offset="0" stop-color="#F4B9A4"/><stop offset=".652" stop-color="#FAD1BB"/></linearGradient><path d="M257.92 596.31s8.56 1.92 11.62 1.64c3.06-.28.5 12.05.5 12.05s-8.17.57-15.4-1.53c-2.45-9.44 3.28-12.16 3.28-12.16z" style="fill:url(#SVGID_37_)"/><linearGradient id="SVGID_38_" gradientUnits="userSpaceOnUse" x1="173.22" y1="584.443" x2="260.983" y2="584.443"><stop offset="0" stop-color="#445677"/><stop offset="1" stop-color="#293861"/></linearGradient><path d="M260.98 595.87l-4.45 13.84s-95.64-12.6-81.97-43.63c11.43-25.96 86.42 29.79 86.42 29.79z" style="fill:url(#SVGID_38_)"/><linearGradient id="SVGID_39_" gradientUnits="userSpaceOnUse" x1="280.771" y1="594.929" x2="280.771" y2="612.987"><stop offset="0" stop-color="#FFDB80"/><stop offset="1" stop-color="#FFBB24"/></linearGradient><path d="M267.26 596.94s-3.5 1.37-3.95 6.26 1 8.17 8.45 9.07 9.34.57 14.01.68 11.45.57 12.46-8.32c1-8.88-8.08-11.15-17.5-8.88-2.96.56-13.47 1.19-13.47 1.19z" style="fill:url(#SVGID_39_)"/></g><linearGradient id="SVGID_40_" gradientUnits="userSpaceOnUse" x1="251.42" y1="467.696" x2="220.113" y2="467.696"><stop offset="0" stop-color="#F4B9A4"/><stop offset=".652" stop-color="#FAD1BB"/></linearGradient><path d="M250.74 469.25c.57-.81.93-2.88.46-3.49-.84-.68-1.63-.29-2.24.3.14-4.96-.31-9.07-.42-10.12-.31-3.04-3.4-8.6-13.5-8.6s-12.05 7.29-12.05 7.29-.66 5.15-.46 11.41c-.6-.58-1.39-.95-2.22-.28-.46.61-.1 2.68.46 3.49.57.81.93 2.73 1.03 3.79.1 1.01-.63 3.7 2.03 3.36 1.59 6.35 8.01 11.64 11.99 11.64 4.36 0 10.16-5.33 11.8-11.65 2.71.37 1.98-2.34 2.07-3.35.13-1.06.49-2.98 1.05-3.79z" style="fill:url(#SVGID_40_)"/><linearGradient id="SVGID_41_" gradientUnits="userSpaceOnUse" x1="215.804" y1="455.594" x2="252.152" y2="455.594"><stop offset="0" stop-color="#4F5C7C"/><stop offset="1" stop-color="#274168"/></linearGradient><path d="M242.34 445.19s-1.97-6.21-9.53-4.72c-7.55 1.48-8.06 5.06-11.03 5.19-5.06.24-9.11 6.54-2.61 13.22 2.89 2.97.45 4.25 1.82 6.88s1.36 5.19 1.36 5.19 2.41-7.71.82-11c-.82-1.7 2.82-2.16 7.35-1.75s11.68-1.1 12.24-4.18c1.34 6.32 2.68 6.98 4.38 7.94 1.7.96 1.8 8.6 1.8 8.6s.3-5.62 1.49-6.88c.98-2.07 2.89-10.22.73-12.19s-.34-8.31-8.82-6.3z" style="fill:url(#SVGID_41_)"/></g><linearGradient id="SVGID_42_" gradientUnits="userSpaceOnUse" x1="509.948" y1="612.061" x2="509.948" y2="547.57"><stop offset="0" stop-color="#B0B9E1"/><stop offset="1" stop-color="#E7EFF7"/></linearGradient><path d="M452.67 596.16L498.32 547.57 567.22 547.57 506.27 612.06z" style="fill:url(#SVGID_42_)"/><linearGradient id="SVGID_43_" gradientUnits="userSpaceOnUse" x1="461.835" y1="563.724" x2="495.632" y2="622.263"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><circle cx="478.73" cy="592.99" r="33.79" style="fill:url(#SVGID_43_)"/><linearGradient id="SVGID_44_" gradientUnits="userSpaceOnUse" x1="455.798" y1="564.313" x2="489.595" y2="622.851"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#BACBEE"/></linearGradient><circle cx="472.7" cy="593.58" r="33.79" style="fill:url(#SVGID_44_)"/><linearGradient id="SVGID_45_" gradientUnits="userSpaceOnUse" x1="479.001" y1="231.35" x2="503.267" y2="273.38"><stop offset="0" stop-color="#C8CBF2"/><stop offset="1" stop-color="#AFB0E7"/></linearGradient><circle cx="491.13" cy="252.36" r="24.26" style="fill:url(#SVGID_45_)"/><linearGradient id="SVGID_46_" gradientUnits="userSpaceOnUse" x1="474.666" y1="231.772" x2="498.933" y2="273.803"><stop offset=".116" stop-color="#DEE4FF"/><stop offset=".847" stop-color="#BACBEE"/></linearGradient><circle cx="486.8" cy="252.79" r="24.26" style="fill:url(#SVGID_46_)"/></g></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/icon.svg b/src/assets/svgs/icon.svg
new file mode 100644
index 000000000..7024becf5
--- /dev/null
+++ b/src/assets/svgs/icon.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M115.147.062a13 13 0 014.94.945c1.55.63 2.907 1.526 4.069 2.688a13.148 13.148 0 012.761 4.069c.678 1.55 1.017 3.245 1.017 5.086v102.3c0 3.681-1.187 6.733-3.56 9.155-2.373 2.422-5.352 3.633-8.937 3.633H12.992c-3.875 0-7-1.26-9.373-3.779-2.373-2.518-3.56-5.667-3.56-9.445V12.704c0-3.39 1.163-6.345 3.488-8.863C5.872 1.32 8.972.062 12.847.062h102.3zM81.434 109.047c1.744 0 3.003-.412 3.778-1.235.775-.824 1.163-1.914 1.163-3.27 0-1.26-.388-2.325-1.163-3.197-.775-.872-2.034-1.307-3.778-1.307H72.57c.097-.194.145-.485.145-.872V27.09h9.01c1.743 0 2.954-.436 3.633-1.308.678-.872 1.017-1.938 1.017-3.197 0-1.26-.34-2.325-1.017-3.197-.679-.872-1.89-1.308-3.633-1.308H46.268c-1.743 0-2.954.436-3.632 1.308-.678.872-1.018 1.938-1.018 3.197 0 1.26.34 2.325 1.018 3.197.678.872 1.889 1.308 3.632 1.308h8.138v72.075c0 .193.024.339.073.436.048.096.072.242.072.436H46.56c-1.744 0-3.003.435-3.778 1.307-.775.872-1.163 1.938-1.163 3.197 0 1.356.388 2.446 1.163 3.27.775.823 2.034 1.235 3.778 1.235h34.875z"/></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/login-bg.svg b/src/assets/svgs/login-bg.svg
new file mode 100644
index 000000000..bbe06c160
--- /dev/null
+++ b/src/assets/svgs/login-bg.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="5760" height="3040"><image width="5760" height="3040" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAFoAAAAvgAQMAAAC1QKagAAAABGdBTUEAALGPC/xhBQAAACBjSFJN AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABlBMVEUsNEr///91v/yPAAAA AWJLR0QB/wIt3gAAAAd0SU1FB+YBBQYyN1c3BnEAAAhjSURBVHja7cExAQAAAMKg9U9tDB+gAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAACAtwFzzwABY3VrRQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMi0wMS0wNVQwNjo1 MDo1MyswMDowMCfNlVoAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjItMDEtMDVUMDY6NTA6NTQrMDA6 MDCTNxNoAAAAAElFTkSuQmCC"/></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/login-box-bg.svg b/src/assets/svgs/login-box-bg.svg
new file mode 100644
index 000000000..ab1004030
--- /dev/null
+++ b/src/assets/svgs/login-box-bg.svg
@@ -0,0 +1 @@
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" x="0" y="0" viewBox="0 0 700 700" xml:space="preserve" enable-background="new 0 0 700 700"><style>.st0{fill:#e5e6eb}.st1{fill:#fff}.st2{fill:#84a9ff}.st3{fill:#050f64}.st4{fill:#155bcd}.st5{fill:#ffbd00}.st6{fill:#ff654f}.st9{fill:#f5bdc8}.st10{fill:#ea8096}.st11{opacity:0}.st13{fill:#dca000}</style><path class="st0" d="M101.8 176.7c21.4-19.8 48.8-33.2 77.8-37.2 92.4-12.6 158.2 78.1 240.3 104.9 40.8 13.3 85.4 12.6 125.4 28 68.5 26.2 131.4 117.8 101 191.6-23.7 57.5-79.6 71.8-134.6 54-33.5-10.9-64.1-29.4-97.6-40.5-38.1-12.6-78.7-15.1-118.9-16.7s-80.6-2.4-119.6-12-77-28.9-101.2-60.9C40.8 343.4 48 260.8 73.1 213.7c7.4-13.9 17.2-26.3 28.7-37z"/><path class="st1" d="M82 257.1c5.7-23.2 18.9-44.7 37.3-60.4l1.7-1.5 1.8-1.4 1.8-1.4 1.8-1.3c.6-.4 1.2-.9 1.8-1.3l1.9-1.3c.6-.4 1.2-.9 1.9-1.3l1.9-1.2c5.1-3.2 10.5-6 16.1-8.4 11.1-4.7 23-7.8 35.1-9 12.1-1.1 24.3-.5 36.1 1.5 5.9 1 11.8 2.4 17.6 4 .7.2 1.5.4 2.2.6l2.2.7 2.2.7 2.1.7 2.1.7 2.1.8 2.1.8 2.1.8c5.6 2.2 11.1 4.6 16.5 7.2 5.4 2.6 10.7 5.4 15.9 8.3 10.4 5.9 20.6 12.2 30.5 18.8-10.4-5.9-20.7-11.8-31.4-17.2-5.3-2.7-10.7-5.3-16.1-7.7-5.4-2.4-10.9-4.7-16.5-6.7l-2.1-.8-2.1-.7-2.1-.7-2.1-.7-2.1-.7-2.1-.6-2.1-.6-2.1-.6c-5.7-1.5-11.5-2.8-17.3-3.7-11.6-1.9-23.5-2.5-35.2-1.3-11.7 1.1-23.2 4-34.1 8.5-5.4 2.2-10.7 4.9-15.8 7.9l-1.9 1.1c-.6.4-1.2.8-1.9 1.2l-1.8 1.2c-.6.4-1.2.8-1.8 1.3l-1.8 1.3-1.8 1.3-1.8 1.3-1.7 1.4c-18.2 15.2-32 35.7-39.1 58.4z"/><path class="st2" d="M183.1 543.2c-.3 1.2-.5 1.8-.5 1.8-.7-.5-1.4-.9-2.1-1.4-120.8-82.8-72.6-232.2-72.6-232.2 115.7 67.3 80.1 213.8 75.2 231.8z"/><path class="st3" d="M183.1 543.2c-.3 1.2-.5 1.8-.5 1.8-.7-.5-1.4-.9-2.1-1.4-10.1-29.9-20.1-59.8-29.8-89.8-5-15.5-10-31.1-14.8-46.7l-3.6-11.7-3.5-11.7c-1.2-3.9-2.2-7.8-3.4-11.8-.6-2-1.1-3.9-1.6-5.9l-1.6-5.9 1.6 5.9c.5 2 1.1 3.9 1.7 5.9 1.2 3.9 2.3 7.8 3.5 11.7l3.6 11.7 3.7 11.7c5 15.5 10.2 31 15.4 46.5 10.4 30 20.8 59.9 31.4 89.7zM137.9 384.9c-.1 0-.2 0-.4-.1-.3-.1-.4-.5-.2-.8 3.7-7.2 6-15.3 6.7-23.4 0-.3.3-.5.6-.5s.5.3.5.6c-.7 8.2-3.1 16.5-6.9 23.8 0 .3-.2.4-.3.4zM154 430.5h-.3c-.3-.1-.4-.5-.3-.7 3.4-8.3 7.6-16.4 12.3-24.1.2-.3.5-.3.8-.2.3.2.3.5.2.8-4.7 7.6-8.8 15.6-12.2 23.9-.1.1-.3.3-.5.3zM137.4 440.3h-.3c-9.5-3.9-18.3-9.3-26.1-16.1-.2-.2-.3-.6-.1-.8.2-.2.6-.3.8-.1 7.7 6.7 16.3 12 25.7 15.9.3.1.4.5.3.7 0 .2-.1.3-.3.4zM125.9 390.5c-.2.1-.4.1-.6-.1l-19.2-15c-.2-.2-.3-.6-.1-.8.2-.2.6-.3.8-.1l19.2 15c.2.2.3.6.1.8 0 .1-.1.2-.2.2zM170.7 478.4h-.3c-.3-.1-.4-.5-.3-.7l10.1-23.5c.1-.3.5-.4.7-.3.3.1.4.5.3.7l-10.1 23.5c0 .1-.2.3-.4.3zM151.6 481.6h-.3l-24.3-10c-.3-.1-.4-.5-.3-.7.1-.3.5-.4.7-.3l24.3 10c.3.1.4.5.3.7-.1.1-.3.3-.4.3z"/><path class="st4" d="M182.3 543.2c.3 1.2.4 1.9.4 1.9-.8-.1-1.7-.2-2.5-.3C35 525 11 369.8 11 369.8c133.5 8.2 167.5 155.1 171.3 173.4z"/><path class="st1" d="M182.3 543.2c.3 1.2.4 1.9.4 1.9-.8-.1-1.7-.2-2.5-.3-22.5-22.1-44.8-44.4-66.9-66.8-11.5-11.6-22.9-23.3-34.2-35.1l-8.5-8.8-8.4-8.9c-2.8-3-5.5-6-8.3-9-1.4-1.5-2.7-3-4.1-4.6l-4-4.6 4.1 4.5c1.4 1.5 2.7 3 4.1 4.5 2.8 3 5.6 6 8.4 8.9l8.5 8.8 8.6 8.7c11.5 11.6 23 23.1 34.7 34.6 22.5 22.2 45.2 44.3 68.1 66.2zM70.7 422.1c-.1.1-.2.1-.3.1-.3 0-.6-.3-.6-.6.1-8.1-1.5-16.4-4.5-23.9-.1-.3 0-.6.3-.7.3-.1.6 0 .7.3 3 7.7 4.6 16.1 4.6 24.4 0 .1-.1.3-.2.4zM105.6 455.5c-.1.1-.2.1-.3.1-.3 0-.6-.2-.6-.5-.7-9-.6-18.1.2-27 0-.3.3-.5.6-.5s.5.3.5.6c-.8 8.9-.9 17.9-.2 26.8.1.2 0 .4-.2.5zM95.2 471.7c-.1.1-.2.1-.3.1-10.3.8-20.5-.1-30.5-2.7-.3-.1-.5-.4-.4-.7.1-.3.4-.5.7-.4 9.9 2.5 20 3.4 30.1 2.6.3 0 .6.2.6.5 0 .4-.1.5-.2.6zM62.6 432.4c-.1.1-.3.2-.5.2l-23.9-4.8c-.3-.1-.5-.4-.4-.7.1-.3.4-.5.7-.4l23.9 4.8c.3.1.5.4.4.7-.1.1-.1.2-.2.2zM142.1 490.8c-.1.1-.2.1-.3.1-.3 0-.6-.2-.6-.5l-1.5-25.5c0-.3.2-.6.5-.6s.6.2.6.5l1.5 25.5c0 .2-.1.4-.2.5zM126.4 502.3c-.1.1-.2.1-.3.1l-26.2 2c-.3 0-.6-.2-.6-.5s.2-.6.5-.6l26.2-2c.3 0 .6.2.6.5 0 .2-.1.4-.2.5z"/><g><path class="st5" d="M259.6 503.3c1.2.5 1.8.7 1.8.7-.5.7-1.1 1.3-1.7 1.9C164 616.8 20.9 552.3 20.9 552.3c79.7-107.4 221.4-55.9 238.7-49z"/><path class="st1" d="M259.6 503.3c1.2.5 1.8.7 1.8.7-.5.7-1.1 1.3-1.7 1.9-30.8 6.8-61.6 13.3-92.5 19.7-16 3.3-32 6.5-48 9.6l-12 2.3-12 2.2c-4 .7-8 1.4-12.1 2-2 .4-4 .6-6 .9l-6.1.9 6-1c2-.3 4-.6 6-1 4-.7 8-1.4 12-2.2l12-2.3 12-2.4c16-3.3 31.9-6.7 47.9-10.2 31-6.9 61.9-13.9 92.7-21.1zM97.3 530.8c0 .1 0 .2-.1.3-.2.3-.5.3-.8.2-6.8-4.5-14.6-7.7-22.5-9.3-.3-.1-.5-.4-.4-.7.1-.3.4-.5.7-.4 8.1 1.6 16 4.9 22.9 9.5.1 0 .1.2.2.4zM144.3 519.7c0 .1 0 .2-.1.3-.2.3-.5.4-.8.2-7.9-4.3-15.5-9.4-22.5-14.9-.2-.2-.3-.6-.1-.8.2-.2.6-.3.8-.1 7 5.5 14.6 10.5 22.4 14.8.2.1.3.3.3.5zM152.2 537.3c0 .1 0 .2-.1.3-4.9 9-11.3 17.2-18.8 24.1-.2.2-.6.2-.8 0-.2-.2-.2-.6 0-.8 7.5-6.9 13.7-14.9 18.6-23.8.2-.3.5-.4.8-.2.2.1.3.3.3.4zM101.5 543.2c.1.2 0 .4-.1.6l-17 17.5c-.2.2-.6.2-.8 0-.2-.2-.2-.6 0-.8l17-17.5c.2-.2.6-.2.8 0 .1 0 .1.1.1.2zM193.8 508.4c0 .1 0 .2-.1.3-.2.3-.5.4-.8.2l-22.2-12.7c-.3-.2-.4-.5-.2-.8.2-.3.5-.4.8-.2l22.2 12.7c.2.2.3.3.3.5zM194.9 527.8c0 .1 0 .2-.1.3l-12.7 23.1c-.2.3-.5.4-.8.2-.3-.2-.4-.5-.2-.8l12.7-23.1c.2-.3.5-.4.8-.2.1.2.3.3.3.5z"/></g><g><path class="st2" d="M608.8 430.3c-1 .2-2.4-.3-4.4-1.4-3.2-1.9-8.3-4.9-10.2-6.1 3 6.3 5.8 12.7 8.3 19.2 4.5-1 7.9-.1 10.1 1.4 2.2 1.5 3.3 3.6 3.3 4.6-.1 2-1.8 2.4-4.9.3-1.6-1.1-3.7-2.6-5.5-3.9-1.3-.9-2.3-1.7-2.8-2 .8 2 1.5 4 2.2 6h.2c1.3.2 3.1 3.1 3.9 4.1 1.7 2.3 3 4.9 3.2 7.8.1 1.2-.1 2.6-1.2 3.2-1.2.6-2.6-.3-3.5-1.3-2.5-2.8-4-6.5-4.1-10.2 0-1-.1-3.3 1.2-3.5-.8-2-1.5-3.9-2.3-5.9-.1.6-.4 1.9-.7 3.4-.5 2.1-1.1 4.7-1.7 6.4-1.1 3.5-2.7 4.1-4 2.8-.7-.7-1.1-2.7-.3-5.2.8-2.4 2.6-5.3 6.6-7.7-2.7-6.4-5.6-12.7-8.8-18.9-.1.8-.3 2.2-.5 3.7-.3 2.6-.9 5.7-1.4 7.8-.5 2.1-1.2 3.4-2 4-.8.6-1.7.4-2.5-.3-.9-.7-1.6-3.1-.9-6.2.6-2.9 2.6-6.5 7-9.6-3.5-6.6-7.2-13.1-11.2-19.4v.3c0 1 0 2.5-.1 4.1-.1 1.6-.2 3.4-.3 5-.1 1.7-.4 3.3-.5 4.6-.8 5.3-3 6.6-5.2 5-1.2-.8-2.1-3.7-1.7-7.4.2-1.9.9-4 2.2-6.2 1.1-2 2.8-4.2 5.2-6.3-3.8-5.8-7.8-11.5-12-17 .1 1.2.2 2.8.2 4.6.1 1.8.1 3.9.1 5.8v2.8c0 .9-.1 1.8-.1 2.5-.4 6.1-2.8 7.8-5.5 6.2-.7-.4-1.4-1.4-1.9-2.8s-.8-3.3-.7-5.4c.1-2.2.7-4.6 1.9-7.3 1.1-2.4 2.8-5 5.2-7.6-4.2-5.4-8.5-10.5-13.1-15.5l2-1.8c4.5 5.2 8.8 10.5 12.9 16 3.1-1.6 6.1-2.5 8.8-2.7 3-.3 5.6.1 7.8.9s4 1.9 5.3 3.1c1.2 1.2 2 2.4 2.2 3.3.7 3.5-2 4.7-8 2.5-3.1-1.2-7.3-2.8-10.7-4.2-1.7-.6-3.3-1.2-4.4-1.6 4.1 5.6 8 11.5 11.6 17.4 2.9-1.2 5.6-1.7 8-1.8 2.6 0 4.8.5 6.7 1.4 3.8 1.7 5.8 4.5 6 6 .3 3.1-2 4-7.1 1.6-2.6-1.3-6.1-3-9-4.4-1.4-.7-2.8-1.3-3.7-1.8-.1 0-.1-.1-.2-.1 3.9 6.4 7.5 13 10.8 19.8 5.1-1.6 9.2-.9 12 .7 2.8 1.6 4.3 4 4.4 5.2-.7 1.1-1.2 1.8-2.2 2z"/></g><g><path class="st2" d="M552.1 373.7c-.5 1.1-.8 1.7-.8 1.7l-1.8-1.8c-105.3-101.8-32.8-241.1-32.8-241.1 102.7 85.7 43.2 224.2 35.4 241.2z"/><path class="st1" d="M552.1 373.7c-.5 1.1-.8 1.7-.8 1.7l-1.8-1.8c-5-31.1-9.8-62.3-14.4-93.5-2.4-16.1-4.7-32.3-6.8-48.5l-1.6-12.1-1.5-12.2c-.5-4.1-.9-8.1-1.4-12.2-.2-2-.4-4.1-.6-6.1l-.5-6.1.6 6.1c.2 2 .4 4.1.7 6.1.5 4 1 8.1 1.5 12.1l1.6 12.1 1.7 12.1c2.4 16.1 4.9 32.3 7.5 48.4 5.1 31.4 10.3 62.7 15.8 93.9zM533.9 210c-.1 0-.2 0-.3-.1-.3-.2-.3-.5-.1-.8 4.9-6.5 8.5-14.1 10.6-21.9.1-.3.4-.5.7-.4.3.1.5.4.4.7-2.1 8-5.8 15.7-10.7 22.3-.3.1-.5.2-.6.2zM542.2 257.6c-.1 0-.2 0-.3-.1-.3-.2-.3-.5-.2-.8 4.8-7.6 10.2-14.9 16.2-21.7.2-.2.6-.3.8-.1.2.2.3.6.1.8-5.9 6.7-11.3 13.9-16.1 21.5-.1.3-.3.4-.5.4zM524.2 264.5c-.1 0-.2 0-.3-.1-8.7-5.4-16.5-12.2-23-20.2-.2-.2-.2-.6.1-.8.2-.2.6-.2.8.1 6.4 7.9 14.1 14.6 22.7 19.9.3.2.3.5.2.8-.2.2-.4.3-.5.3zM521.2 213.5c-.2 0-.4 0-.5-.2l-16.5-18c-.2-.2-.2-.6 0-.8.2-.2.6-.2.8 0l16.5 18c.2.2.2.6 0 .8-.1.2-.2.2-.3.2zM550.7 307.7c-.1 0-.2 0-.3-.1-.3-.2-.3-.5-.2-.8l13.9-21.5c.2-.3.5-.3.8-.2.3.2.3.5.2.8l-13.9 21.5c-.1.2-.3.3-.5.3zM531.2 307.6c-.1 0-.2 0-.3-.1l-22.3-13.9c-.3-.2-.3-.5-.2-.8.2-.3.5-.3.8-.2l22.3 13.9c.3.2.3.5.2.8-.1.2-.3.3-.5.3z"/><g><path class="st4" d="M526.6 382.8c-1 .7-1.6 1-1.6 1-.2-.8-.4-1.6-.6-2.5-35-142.2 100.5-221.5 100.5-221.5 41.5 127.2-82.7 212.8-98.3 223z"/><path class="st3" d="M526.6 382.8c-1 .7-1.6 1-1.6 1-.2-.8-.4-1.6-.6-2.5 12.3-29 24.8-58 37.5-86.8 6.6-14.9 13.3-29.8 20-44.7l5.1-11.1 5.2-11.1c1.7-3.7 3.6-7.3 5.3-11 .9-1.8 1.8-3.6 2.7-5.5l2.8-5.4-2.7 5.5c-.9 1.8-1.8 3.6-2.7 5.5-1.7 3.7-3.5 7.4-5.2 11.1l-5.1 11.1-5 11.2c-6.6 14.9-13 29.9-19.4 44.9-12.2 29.2-24.3 58.5-36.3 87.8zM598.2 234.5c-.1-.1-.2-.2-.2-.3-.1-.3 0-.6.3-.7 7.6-2.9 14.7-7.4 20.6-13 .2-.2.6-.2.8 0 .2.2.2.6 0 .8-6 5.7-13.3 10.2-21 13.2-.1.1-.3.1-.5 0zM580 279.3c-.1-.1-.2-.1-.2-.2-.1-.3 0-.6.3-.8 8.1-3.9 16.6-7.2 25.2-9.7.3-.1.6.1.7.4.1.3-.1.6-.4.7-8.6 2.5-17 5.8-25 9.7-.3 0-.5 0-.6-.1zM561 275.5c-.1-.1-.2-.1-.2-.3-4.5-9.3-7.4-19.1-8.7-29.3 0-.3.2-.6.5-.6s.6.2.6.5c1.3 10.1 4.2 19.8 8.6 29 .1.3 0 .6-.3.8-.1 0-.3 0-.5-.1zM585.6 230.8c-.2-.1-.3-.2-.4-.4l-4.4-24c-.1-.3.1-.6.5-.7.3-.1.6.1.7.5l4.4 24c.1.3-.1.6-.5.7-.1-.1-.2-.1-.3-.1zM560.5 326.2c-.1-.1-.2-.1-.2-.2-.1-.3 0-.6.3-.8l23.2-10.8c.3-.1.6 0 .8.3.1.3 0 .6-.3.8l-23.2 10.8c-.2 0-.4 0-.6-.1zM544.1 315.8c-.1-.1-.2-.1-.2-.2l-11.5-23.7c-.1-.3 0-.6.3-.8.3-.1.6 0 .8.3l11.5 23.7c.1.3 0 .6-.3.8-.2 0-.5 0-.6-.1z"/></g><g><path class="st5" d="M482.2 415.1c-1.2 0-1.9-.1-1.9-.1l.9-2.4C532.4 275.4 689 286.2 689 286.2c-37.4 128.5-188.2 129.3-206.8 128.9z"/><path class="st1" d="M482.2 415.1c-1.2 0-1.9-.1-1.9-.1l.9-2.4c26.5-17 53.2-33.9 79.9-50.6 13.9-8.6 27.8-17.2 41.7-25.6l10.5-6.3 10.5-6.2c3.5-2.1 7.1-4.1 10.6-6.1 1.8-1 3.6-2 5.3-3l5.4-2.9-5.3 3c-1.8 1-3.6 2-5.3 3-3.5 2.1-7 4.1-10.5 6.2l-10.5 6.4-10.4 6.4c-13.8 8.6-27.6 17.4-41.4 26.2-26.6 17.2-53.1 34.5-79.5 52zM624.9 333c0-.1-.1-.2 0-.4.1-.3.4-.5.7-.4 7.9 1.8 16.3 2.2 24.3.9.3 0 .6.2.7.5 0 .3-.2.6-.5.7-8.2 1.3-16.7 1-24.8-.9l-.4-.4zM584.6 359.7c0-.1-.1-.2 0-.3 0-.3.3-.5.6-.5 8.9 1.3 17.8 3.4 26.3 6.2.3.1.5.4.4.7-.1.3-.4.5-.7.4-8.5-2.7-17.3-4.8-26.1-6.1-.3-.1-.4-.3-.5-.4zM571.1 345.9c-.1-.1-.1-.2-.1-.3 1.5-10.2 4.6-20 9.3-29.2.1-.3.5-.4.8-.2.3.1.4.5.2.8-4.6 9.1-7.7 18.7-9.2 28.8 0 .3-.3.5-.6.5-.2-.2-.4-.3-.4-.4zM616.6 322.8c-.1-.2-.1-.4-.1-.6l9.9-22.3c.1-.3.5-.4.8-.3.3.1.4.5.3.8l-9.9 22.3c-.1.3-.5.4-.8.3l-.2-.2zM542.1 387.4c0-.1-.1-.2 0-.3.1-.3.3-.5.7-.5l25.2 4.2c.3.1.5.3.5.7-.1.3-.3.5-.7.5l-25.2-4.2c-.3-.1-.4-.2-.5-.4zM534.4 369.6c0-.1-.1-.2 0-.3l3.9-26c0-.3.3-.5.6-.5s.5.3.5.6l-3.9 26c0 .3-.3.5-.6.5s-.4-.2-.5-.3z"/></g></g><g><path class="st2" d="M445 229c-.1 1 .4 2.4 1.6 4.3 2.1 3.1 5.4 8 6.6 9.9-6.4-2.7-13-5.1-19.6-7.3.8-4.5-.3-7.9-1.9-10-1.6-2.2-3.7-3.1-4.8-3-2 .2-2.3 1.9 0 4.9 1.1 1.5 2.8 3.5 4.2 5.3 1 1.2 1.8 2.2 2.2 2.7-2-.7-4.1-1.3-6.1-1.9v-.2c-.3-1.3-3.3-3-4.3-3.7-2.4-1.6-5.1-2.7-7.9-2.8-1.2 0-2.6.3-3.1 1.4-.5 1.2.5 2.6 1.5 3.4 2.9 2.4 6.7 3.6 10.4 3.5 1 0 3.3 0 3.5-1.4 2 .7 4 1.3 6 2-.6.2-1.9.5-3.4.9-2.1.6-4.6 1.4-6.3 2-3.4 1.3-4 2.9-2.6 4.2.7.6 2.8 1 5.2 0 2.4-.9 5.2-2.9 7.3-7 6.6 2.3 13 4.9 19.3 7.7-.8.1-2.2.4-3.7.7-2.5.5-5.6 1.2-7.7 1.8-2.1.6-3.3 1.4-3.9 2.2-.5.8-.4 1.7.4 2.5s3.2 1.4 6.2.5c2.9-.8 6.3-2.9 9.3-7.5 6.8 3.1 13.5 6.5 20 10.2h-.3c-1 .1-2.5.2-4.1.4-1.6.2-3.3.4-5 .6-1.7.2-3.3.5-4.6.8-5.2 1.1-6.4 3.3-4.7 5.5.9 1.1 3.8 1.9 7.5 1.3 1.9-.3 4-1.1 6.1-2.5 2-1.3 4-3 6-5.5 6 3.4 11.9 7.1 17.7 11.1h-4.6c-1.8 0-3.9.1-5.8.2-1 .1-1.9.1-2.8.2-.9.1-1.7.2-2.5.3-6.1.8-7.6 3.2-5.9 5.8.4.7 1.5 1.3 2.9 1.7 1.5.4 3.3.7 5.5.4 2.2-.3 4.6-.9 7.2-2.3 2.3-1.2 4.8-3 7.3-5.6 5.6 3.9 11 8 16.2 12.3l1.7-2.1c-5.4-4.2-11-8.2-16.7-12 1.4-3.2 2.1-6.2 2.2-8.9.1-3-.4-5.6-1.3-7.7-.9-2.1-2.1-3.9-3.4-5.1-1.3-1.2-2.5-1.9-3.4-2-3.5-.5-4.6 2.2-2 8.1 1.4 3 3.2 7.1 4.8 10.5.7 1.7 1.4 3.2 1.9 4.3-5.9-3.8-11.9-7.4-18-10.7 1-3 1.4-5.7 1.3-8.1-.1-2.6-.8-4.8-1.7-6.6-1.9-3.7-4.8-5.5-6.3-5.6-3.1-.2-3.9 2.3-1.2 7.2 1.4 2.5 3.3 5.9 4.9 8.8.8 1.4 1.5 2.7 2 3.6 0 .1.1.1.1.2-6.6-3.5-13.4-6.8-20.3-9.7 1.3-5.2.4-9.2-1.3-11.9-1.8-2.8-4.2-4.1-5.4-4.1-1.6.3-2.3.8-2.4 1.8z"/></g><g><path class="st2" d="M100.2 255.8c1-.1 2.4.5 4.3 1.8 3 2.2 7.8 5.7 9.6 7-2.4-6.5-4.6-13.2-6.4-19.9-4.6.6-7.9-.6-9.9-2.3-2.1-1.7-3-3.9-2.8-4.9.3-2 2-2.2 4.9.2 1.5 1.2 3.4 3 5.1 4.4 1.2 1 2.2 1.9 2.6 2.3-.6-2.1-1.1-4.1-1.6-6.2h-.2c-1.3-.3-2.8-3.4-3.5-4.5-1.5-2.4-2.5-5.2-2.5-8 0-1.2.4-2.6 1.5-3 1.3-.5 2.6.6 3.4 1.6 2.3 3 3.3 6.8 3.1 10.5-.1 1-.2 3.3-1.5 3.4.6 2 1.2 4.1 1.8 6.1.2-.6.6-1.9 1-3.4.7-2.1 1.6-4.5 2.3-6.2 1.4-3.4 3.1-3.9 4.3-2.4.6.7.8 2.8-.2 5.2-1 2.4-3.1 5-7.3 7 2 6.6 4.4 13.2 6.9 19.6.2-.8.5-2.2.8-3.7.6-2.5 1.4-5.6 2.1-7.6.7-2.1 1.5-3.3 2.4-3.8.9-.5 1.7-.3 2.5.5s1.2 3.3.3 6.2c-.9 2.8-3.2 6.2-7.8 8.9 2.8 6.9 5.9 13.8 9.3 20.4v-.3c.1-1 .3-2.4.5-4s.5-3.3.8-5c.3-1.7.7-3.3 1-4.6 1.3-5.2 3.6-6.3 5.7-4.5 1.1.9 1.8 3.9 1 7.5-.4 1.8-1.3 3.9-2.8 6-1.3 1.9-3.2 3.9-5.8 5.8 3.2 6.2 6.6 12.2 10.3 18.1 0-1.2.1-2.8.2-4.6.1-1.8.3-3.9.5-5.8.1-1 .2-1.9.3-2.8.1-.9.3-1.7.4-2.5 1-6 3.5-7.5 6.1-5.6.6.5 1.2 1.5 1.6 3 .3 1.5.5 3.3.2 5.5s-1.1 4.5-2.6 7.1c-1.3 2.3-3.2 4.7-5.9 7 3.6 5.7 7.5 11.3 11.6 16.7l-2.2 1.6c-4-5.6-7.8-11.3-11.3-17.2-3.3 1.3-6.3 1.9-9 1.9-3 0-5.6-.6-7.7-1.6-2.1-1-3.8-2.3-4.9-3.6-1.1-1.3-1.8-2.6-1.8-3.4-.3-3.5 2.4-4.5 8.2-1.7 2.9 1.5 7 3.5 10.3 5.2 1.7.8 3.1 1.5 4.2 2-3.6-6-6.9-12.2-9.9-18.5-3 .9-5.7 1.2-8.1 1-2.6-.2-4.7-1-6.5-2-3.6-2-5.3-5-5.4-6.6 0-3.1 2.4-3.8 7.2-.9 2.4 1.5 5.8 3.5 8.6 5.2 1.4.9 2.6 1.6 3.5 2.1.1 0 .1.1.2.1-3.3-6.8-6.2-13.7-8.8-20.7-5.3 1.1-9.2 0-11.9-1.8-2.7-1.9-3.9-4.4-3.8-5.6-.1-.9.5-1.6 1.5-1.7z"/></g><g><path class="st4" d="M106.8 558.3c0 13.1 8.1 23.7 18.2 23.7h455c10.1 0 18.2-10.6 18.2-23.7H106.8z"/><path class="st2" d="M155.4 290.9H549.6V538.5H155.4z"/><path class="st3" d="M556.6 264.8h-408c-7.6 0-13.8 6.2-13.8 13.8V540c0 7.6 6.2 13.8 13.8 13.8h408c7.6 0 13.8-6.2 13.8-13.8V278.6c0-7.7-6.2-13.8-13.8-13.8z"/><path class="st1" d="M155.4 285.5H549.6V533.1H155.4z"/><path class="st0" d="M295.7 558.3L196.6 558.3 196.9 553.9 197.3 548.4 294.9 548.4zM508.6 558.3L409.4 558.3 409.8 553.9 410.2 548.4 507.8 548.4z"/></g><g><path class="st0" d="M188 451.7H222.4V455.59999999999997H188zM235 451.7H269.4V455.59999999999997H235zM328.6 451.7H353.5V455.59999999999997H328.6zM374.8 451.7H413.5V455.59999999999997H374.8zM342.3 465.1H359.90000000000003V469H342.3zM342.3 475.3H359.90000000000003V479.2H342.3zM342.3 485.6H359.90000000000003V489.5H342.3zM342.3 495.8H359.90000000000003V499.7H342.3z"/><path class="st6" d="M209.7 465.1H222.39999999999998V469H209.7z"/><path class="st2" d="M209.7 475.3H222.39999999999998V479.2H209.7z"/><path class="st4" d="M209.7 485.6H222.39999999999998V489.5H209.7z"/><path class="st5" d="M209.7 495.8H222.39999999999998V499.7H209.7z"/><path class="st0" d="M399.7 465.1H417.3V469H399.7zM399.7 475.3H417.3V479.2H399.7zM399.7 485.6H417.3V489.5H399.7zM399.7 495.8H417.3V499.7H399.7zM234.6 465.1H252.2V469H234.6zM234.6 475.3H260.7V479.2H234.6zM234.6 485.6H267.5V489.5H234.6zM234.6 495.8H249.7V499.7H234.6zM180.4 314.6H306V321.5H180.4z"/><path class="st4" d="M180.4 340.4H198.20000000000002V347.9H180.4zM216.1 340.4H233.9V347.9H216.1zM251.8 340.4H269.6V347.9H251.8zM287.5 340.4H305.3V347.9H287.5zM323.3 340.4H341.1V347.9H323.3zM359 340.4H376.8V347.9H359zM394.7 340.4H412.5V347.9H394.7z"/><g><path class="st0" d="M180.4 355.7H430.20000000000005V358H180.4z"/></g><g><path class="st0" d="M427.7 446.2H181v-90.4h-2v92.5h250.7v-92.5h-2v90.4z"/><path class="st0" d="M405.1 355.7H407.1V447.2H405.1zM382.4 355.7H384.5V447.2H382.4zM359.8 355.7H361.8V447.2H359.8zM337.2 355.7H339.2V447.2H337.2zM314.6 355.7H316.6V447.2H314.6zM292 355.7H294V447.2H292zM269.4 355.7H271.4V447.2H269.4zM246.8 355.7H248.8V447.2H246.8zM224.2 355.7H226.2V447.2H224.2zM201.6 355.7H203.7V447.2H201.6z"/><path class="st0" d="M179 355.7H429.7V357.7H179zM180 378.4H428.7V380.4H180zM180 401H428.7V403H180zM180 423.6H428.7V425.6H180z"/><g><path class="st2" d="M203.6 396.2H219.79999999999998V446.3H203.6zM248.8 385.8H265V446.3H248.8zM294.1 410.5H310.3V446.3H294.1zM339.3 373.7H355.5V446.29999999999995H339.3zM384.5 393.3H400.7V446.3H384.5z"/></g><g><path class="st6" d="M201.6 396.2H217.79999999999998V446.3H201.6zM246.8 385.8H263V446.3H246.8zM292 410.5H308.2V446.3H292zM337.2 373.7H353.4V446.29999999999995H337.2zM382.5 393.3H398.7V446.3H382.5z"/></g></g><g><path class="st0" d="M179 471.1H429.7V473.20000000000005H179z"/></g><g><path class="st0" d="M179 481.3H429.7V483.40000000000003H179z"/></g><g><path class="st0" d="M179 491.6H429.7V493.70000000000005H179z"/></g><g><path class="st0" d="M179 501.8H429.7V503.90000000000003H179z"/></g><g><path class="st6" d="M473.5 352.4c.9-5.5 5.4-9.8 10.9-10.6l-.2-5.1-.5-12.6c-14.7 1.2-26.4 12.7-27.9 27.2l12.6.8 5.1.3z"/><path class="st5" d="M491.1 366.7c-1.5.6-3.1.9-4.8.9-2.9 0-5.6-.9-7.7-2.5l-3.5 3.8-8.5 9.2c5.3 4.5 12.2 7.2 19.7 7.2 4.7 0 9.1-1 13-2.9l-5.9-11.1-2.3-4.6zM516.3 361.3l-12.4-2.1c-1.2 4.6-4 8.4-7.9 10.9l5.9 11.1 2.7 5.2c8.8-5.1 15.3-13.8 17.5-24.1l-5.8-1z"/><path class="st6" d="M468.2 354.9l-12.6-.8-5.9-.4v.9c0 10.1 4.1 19.3 10.7 25.9l4-4.3 8.5-9.2c-2.8-3.2-4.6-7.4-4.7-12.1z"/><path class="st4" d="M495.9 339.3l-2.4 4.6c3.5 2.3 5.7 6.3 5.7 10.8v.8l5.1.9 12.4 2.1c.2-1.3.2-2.5.2-3.8 0-11.3-6.1-21.2-15.2-26.5l-5.8 11.1zM487 336.6c2.3.1 4.4.6 6.4 1.4l5.8-11.2 2.7-5.2c-4.7-2.3-10-3.5-15.7-3.5l.2 5.9.6 12.6z"/></g><g><path class="st0" d="M446.7 407.2H525.1V411.09999999999997H446.7zM446.7 441.5H450.59999999999997V445.4H446.7zM454.4 441.5H525.1V445.4H454.4z"/><path class="st4" d="M446.7 456.1H450.59999999999997V460H446.7z"/><path class="st0" d="M454.4 456.1H525.1V460H454.4z"/><path d="M446.7 470.8H450.59999999999997V474.7H446.7z" style="fill:#6292ff"/><path class="st0" d="M454.4 470.8H525.1V474.7H454.4z"/><path d="M446.7 485.4H450.59999999999997V489.29999999999995H446.7z" style="fill:#da5544"/><path class="st0" d="M454.4 485.4H525.1V489.29999999999995H454.4z"/><path class="st5" d="M446.7 500H450.59999999999997V503.9H446.7z"/><path class="st0" d="M454.4 500H525.1V503.9H454.4zM446.7 417.7H525.1V430.7H446.7z"/></g></g><g><path class="st3" d="M522.8 556.7c.3-.3.7-.5 1.1-.6.4-.1.8-.1 1.3-.1 1-.1 2-.3 2.9-.8.5-.3.9-.6 1.4-.8l2.9.1c.4.4.7 1 .8 1.6.1.5.1 1.1.1 1.6v.6h-10.8v-.6c0-.4 0-.8.3-1z"/><path class="st9" d="M532.7 551.2L532.4 554.5 529.4 554.4 529.2 551.4z"/><path class="st3" d="M494 555.5c.3-.3.7-.4 1.1-.5.4 0 .8 0 1.3.1 1 .1 2.1-.1 3-.5.5-.2 1-.5 1.5-.6l2.9.4c.4.5.5 1.1.6 1.7.1.5 0 1.1-.1 1.6l-.1.6-10.7-1.2.1-.6c0-.4.1-.8.4-1z"/><path class="st4" d="M535.3 503.7c.6-11.4.5-27.5-2.6-36.6 0-.2-23.9 2-23.9 2l-5.6 22.9c-2 8.1-2.9 16.3-2.8 24.6l.3 34.4 4 .3 7.5-45.5c2.8-5.4 5.8-11.6 8.1-17.7l8.7 63.4 4-.2c0-.1 2.3-47.6 2.3-47.6z"/><path class="st9" d="M504.5 551.2L503.8 554.4 500.9 554 501 551z"/><path class="st10" d="M481.6 394.3c.7-.3 1.6 0 1.9.7 2 4 4.2 7.8 6.6 11.5 2.4 3.7 5 7.2 7.8 10.5s5.8 6.4 9.1 9.1c1.6 1.4 3.3 2.7 5 3.9.4.3.9.6 1.3.9l1.3.9c.9.6 1.8 1.1 2.7 1.7.3.2.5.4.8.6.2.2.4.5.6.7.3.5.6 1.1.7 1.8.3 1.3.1 2.7-.7 4-.8 1.3-2 2.1-3.3 2.3-.7.1-1.4.1-2.1 0-.3-.1-.7-.2-1-.3l-.9-.6c-.9-.7-1.8-1.5-2.7-2.3l-1.3-1.2c-.4-.4-.9-.8-1.3-1.2-1.7-1.6-3.4-3.4-4.9-5.1-3.1-3.5-6-7.3-8.5-11.2-2.5-3.9-4.7-8-6.6-12.2-1.9-4.2-3.6-8.4-5.1-12.7-.5-.7-.1-1.5.6-1.8z"/><path class="st2" d="M500.2 434.6l9.4 7.3c2.8 2.2 6.8 1.9 9-.9s1.8-7.2-1.1-9.4l-9.4-7.3-7.9 10.3z"/><path class="st2" d="M521.8 428.5c-9-.1-16 7.9-14.8 16.8l1.8 23.7c10 3.6 17.5 1.6 23.9-2l1.1-25.2c.7-7.1-4.9-13.2-12-13.3z"/><path class="st1" d="M531.8 433.5l-.2.2c1 1.4 1.7 3 2 4.7h.3c-.3-1.7-1-3.4-2.1-4.9zm-9.9 37.3v.3c2.2-.2 4.4-.8 6.6-1.7l-.1-.2c-2.1.8-4.2 1.3-6.5 1.6zm5.1-41.3c-1.6-.8-3.4-1.2-5.2-1.2h-.2c-4.3 0-8.5 1.9-11.3 5.2-1.7 1.9-2.8 4.2-3.3 6.6l.3.1c1.5-6.6 7.4-11.6 14.5-11.5 1.9 0 3.6.5 5.2 1.2v-.4zM508.6 466c-.1 0-.2.1-.3.1l.2 3 .2.1c2.2.8 4.5 1.4 6.6 1.7v-.3c-2.1-.3-4.2-.8-6.5-1.7l-.2-2.9zm-1.8-20.6l.9 12h.3l-.9-12h-.3z"/><path class="st3" d="M524 412.1s6.2 1.5 4.7 8.4c-1 4.6-4.4 7-9.2 7.8l4.5-16.2z"/><path class="st9" d="M517.5 423.7l.5 7.1c2 1.2 4 1.1 5.9-.3l-.5-7.1-5.9.3z"/><path class="st10" d="M517.6 424.6l.1 2.2c.9.5 1.9.7 3 .7h.2c1-.1 2-.5 2.7-1.2l-.1-2.1-5.9.4z"/><path class="st9" d="M514.6 415.4l.4 5.3.1 1.2c.3 2.9 2.7 5.1 5.6 5.1.3 0 .6 0 .9-.1.1 0 .2-.1.3-.1h.1c.4-.2.8-.4 1.1-.8.7-.8 1.1-1.6 1.5-2.5.3-.7.6-1.5.8-2.2.2-.9.4-1.8.2-2.8l-.4-4.6-9-.7-1.6 2.2z"/><path class="st3" d="M523.9 414s-10.3.6-8.2 9.7c0 0-3.2-6.5.1-10.9 3.6-4.8 8.5-3.2 10.2-.9 1.7 2.3 3 6.1-1.8 8.9-.1-.1 1.5-3.5-.3-6.8z"/><path class="st9" d="M523.7 419.5c.1 1.2 1.1 2.1 2.3 2 1.2-.1 2.1-1.1 2-2.3-.1-1.2-1.1-2.1-2.3-2-1.2.1-2.1 1.1-2 2.3z"/><g><path class="st3" d="M503.8 450.8l-7.4-8c4.5-4.2 6.9-9.8 6.9-15.9h10.9c0 9.1-3.8 17.8-10.4 23.9z"/><path class="st4" d="M514.2 427h-10.9c0-12-9.7-21.7-21.7-21.7-2.6 0-5.1.4-7.5 1.3l-3.8-10.2c3.6-1.3 7.4-2 11.3-2 18-.1 32.6 14.6 32.6 32.6z"/><path class="st2" d="M481.6 459.6c-18 0-32.6-14.6-32.6-32.6 0-13.6 8.6-25.9 21.4-30.6l3.8 10.2c-8.5 3.1-14.2 11.3-14.2 20.4 0 12 9.7 21.7 21.7 21.7 5.5 0 10.8-2.1 14.8-5.8l7.4 8c-6.1 5.6-14 8.7-22.3 8.7z"/></g><g><path class="st9" d="M471.1 455.3c0-.8.5-1.5 1.3-1.5 4.4-.5 8.8-1.1 13.1-2.1 4.3-.9 8.5-2.1 12.6-3.5 4.1-1.5 8-3.2 11.8-5.2 1.9-1 3.7-2.1 5.5-3.3.4-.3.9-.6 1.3-.9l1.3-.9c.8-.6 1.7-1.2 2.5-1.9.3-.2.6-.4.8-.5l.9-.3c.6-.1 1.3-.1 1.9 0 1.3.2 2.6.9 3.5 2.1.9 1.2 1.2 2.6 1 3.9-.1.7-.4 1.3-.8 1.9-.2.3-.4.6-.7.8-.3.3-.6.5-.9.7-1 .6-2.1 1.2-3.1 1.7l-1.6.8c-.5.3-1.1.5-1.6.8-2.1 1-4.3 2-6.5 2.8-4.4 1.7-9 3-13.5 3.9-4.6.9-9.2 1.5-13.7 1.9-4.6.3-9.1.4-13.7.3-.8 0-1.4-.7-1.4-1.5z"/><path class="st2" d="M515.5 452.5l10.1-6.2c3.1-1.9 4.3-5.7 2.4-8.8-1.9-3.1-6.1-4.2-9.1-2.3l-10.1 6.2 6.7 11.1z"/><path class="st1" d="M529.1 439.4c-.1-.7-.4-1.4-.8-2-.9-1.5-2.5-2.7-4.3-3.1-.3-.1-.6-.1-.9-.2v.3c2 .3 3.9 1.4 4.9 3.2 1.4 2.3 1.1 5-.5 7l.2.1c1.3-1.5 1.8-3.4 1.4-5.3zm-3.3 7.1s.1 0 .1-.1l-.3-.1-3 1.8.2.2 3-1.8zm-4.2 2.6l-.2-.2-2.9 1.7.2.2 2.9-1.7zm-4.4 2.6l-.2-.2-1.5.9-5.2-8.5-.2.1 5.3 8.8 1.8-1.1zm.2-15.9l-7.4 4.5.1.2 7.4-4.5-.1-.2z"/></g></g><g><path class="st10" d="M234.4 464c0-.8-.5-1.5-1.3-1.6-2.3-.3-4.6-.6-6.9-1-2.3-.4-4.5-.8-6.7-1.3s-4.3-1.2-6.2-2c-1.9-.8-3.7-1.9-5.3-3.1-3.2-2.5-5.7-6-8-9.7-.3-.5-.6-.9-.9-1.4l-.8-1.4c-.6-1-1.1-2-1.7-3-1.1-2-2.2-4-3.2-6.1-1.4-2.6-4.7-3.5-7.2-2s-3.3 4.8-1.7 7.3c1.4 1.9 2.7 3.9 4.1 5.8.7 1 1.4 1.9 2.2 2.9l1.1 1.4c.4.5.8.9 1.1 1.4 1.6 1.9 3.2 3.7 5 5.5 1.8 1.8 3.9 3.4 6.1 4.8 2.3 1.3 4.7 2.3 7.2 3 2.5.7 4.9 1.1 7.3 1.3 2.4.2 4.8.4 7.1.4 2.4.1 4.7.1 7 .1 1 0 1.7-.6 1.7-1.3z"/><path class="st3" d="M190.5 450.4l-6.3-10c-1.9-3-1.3-7 1.8-8.9 3-1.9 7.3-1.1 9.2 2l6.3 10-11 6.9z"/><path class="st9" d="M181.4 505.2L189.7 554.4 192.6 553.9 193.4 504.8z"/><path class="st4" d="M194.2 504.7l-13.6.5c-3.7-9-6.9-28.9-3.1-38.1l15.2 3.4 1.5 34.2z"/><circle transform="rotate(-16.739 184.847 470.406)" class="st4" cx="184.8" cy="470.4" r="7.9"/><g class="st11"><path class="st4" d="M184.8 470.4L184.8 470.4 184.8 470.4 184.8 470.3z"/></g><path class="st9" d="M165.9 503.2L161.1 553.4 164.1 553.6 177.6 505.8z"/><path class="st4" d="M180.4 462.7c-3.2-1-6.5.2-8.5 2.7-.1.2-.3.4-.4.6-5.7 8.3-7.5 27.6-6.3 37l13.2 3 7.3-33.4c1.3-4.2-1.1-8.6-5.3-9.9z"/><path class="st2" d="M180.4 497.1l-1.9 8.9-2.2-.5v.3l2.4.5 2-9.1-.3-.1zm-11.9-25.8c-1.3 3.5-2.4 7.8-3.1 12.8v.3h.3c.6-4.6 1.7-9.1 3.1-12.9l-.3-.2zm-3.9 23.7h.3c0-2.2.2-4.5.4-6.8h-.3c-.3 2.3-.4 4.6-.4 6.8zm.6 8c-.2-1.3-.3-2.8-.3-4.4h-.3c.1 1.6.2 3.1.3 4.4v.2l8 1.8.1-.2-7.8-1.8zm18.6-21.8l-1.7 7.9h.3l1.7-7.9h-.3z"/><path class="st3" d="M170.4 556.6c-.2-.4-.6-.6-1-.7-.4-.1-.8-.1-1.2-.2-1-.2-2-.6-2.8-1.2-.4-.3-.8-.7-1.3-.9l-2.9-.3c-.4.4-.8.9-1 1.5-.2.5-.2 1.1-.3 1.6l-.1.6 10.7 1.2.1-.6c.1-.3 0-.7-.2-1zM199.5 555.1c-.3-.3-.7-.4-1.2-.4-.4 0-.8.1-1.3.1-1 .1-2.1 0-3-.4l-1.5-.6-2.9.5c-.3.5-.5 1.1-.5 1.7 0 .5 0 1.1.1 1.6l.1.6 10.7-1.6-.1-.6c0-.3-.1-.6-.4-.9zM182 428.8c9 .1 15.8 8.2 14.4 17.1l-3.6 24c-6.5 2.3-15.6 1.5-23.1-.7v-27.4c-.5-7.1 5.2-13.1 12.3-13z"/><path class="st1" d="M169.4 457.4v10.4h.3v-10.4h-.3zm12.6-28.8h-.1c-.4 0-.8 0-1.2.1v.3c.4 0 .8-.1 1.3-.1 2.1 0 4 .5 5.8 1.2l.1-.2c-1.8-.9-3.8-1.3-5.9-1.3zm11.3 5.3c-.8-.9-1.7-1.8-2.7-2.5l-.2.2c3.7 2.7 6.1 7.1 6.1 11.9 0 .8-.1 1.6-.2 2.4l-.8 5.3.3.1.8-5.3c.7-4.4-.5-8.8-3.3-12.1zm-.6 36c-5.9 2.1-13.9 1.6-20.9-.1v.3c4 1 8.1 1.5 11.8 1.5 3.5 0 6.6-.5 9.2-1.4l.1-.1 2.1-13.8h-.3l-2 13.6zm-16.9-39.5l-.1-.3c-1.1.6-2.1 1.4-2.9 2.3-2.4 2.5-3.6 5.9-3.3 9.3v6.4h.3v-6.4c-.4-4.7 2.1-9 6-11.3z"/><g><path class="st9" d="M186.2 424.7l-.4 7.3c-2.1 1.1-4 1-5.9-.4l.4-7.3 5.9.4z"/><path class="st10" d="M186.1 426.9v.8c-.9.5-2 .7-3.1.7h-.2c-1-.1-1.9-.5-2.6-1.2l.1-2.1 5.8 1.8z"/><path class="st9" d="M189.3 416.4l-.5 5.2-.1 1.2c-.3 2.9-2.8 5.1-5.7 5-.3 0-.6-.1-.9-.1-.1 0-.2-.1-.3-.1h-.1c-.4-.2-.8-.5-1.1-.8-.6-.8-1-1.6-1.4-2.5-.3-.8-.6-1.5-.8-2.3-.2-.9-.3-1.8-.2-2.8l.2-3.6 9.3-1.5 1.6 2.3z"/><path class="st3" d="M189 424.6s0-3.1-.1-4.6c-.1-1.4-.4-2.8-1.5-2.6-2.1.4-2.9-1.4-2.9-1.4-.6 0-1.2.1-1.9.3-3.1.8-3.6 0-4-.5-.8 2.4-.5 5.5-.5 5.8 0 .1.1.3.1.4.2.8.5 1.5.8 2.3.3.7.6 1.4 1 2v.5c-2.2-.4-4.9-2.8-5.6-4.7-2.3-7.2 1.6-11.5 7.1-12.6 4.8-.9 7.4 3.5 8.4 7.5.8 2.3-.3 7-.9 7.6z"/><path class="st9" d="M180.2 420.3c-.1 1.2-1.1 2.1-2.3 2-1.2-.1-2.1-1.1-2-2.3.1-1.2 1.1-2.1 2.3-2 1.2.1 2 1.1 2 2.3z"/></g><g><path transform="rotate(-180 274.437 454.01)" class="st2" d="M269 446.1H279.8V462H269z"/><path transform="rotate(-180 260.511 447.387)" class="st2" d="M255.1 432.8H265.9V461.90000000000003H255.1z"/><path transform="rotate(-180 246.585 443.424)" class="st4" d="M241.2 424.9H252V461.9H241.2z"/><path transform="rotate(-180 232.659 439.712)" class="st4" d="M227.2 417.5H238V461.9H227.2z"/><path transform="rotate(-180 218.732 441.217)" class="st4" d="M213.3 420.5H224.10000000000002V461.9H213.3z"/><path transform="rotate(-180 204.806 443.424)" class="st2" d="M199.4 424.9H210.20000000000002V461.9H199.4z"/><path transform="rotate(-180 190.88 447.387)" class="st4" d="M185.5 432.8H196.3V461.90000000000003H185.5z"/><g><path transform="rotate(-180 232.659 462.663)" class="st3" d="M183.1 461.9H282.3V463.4H183.1z"/></g></g><g><path class="st9" d="M227.5 461.9c-.1-.8-.7-1.4-1.5-1.4h-6.9c-2.3-.1-4.6-.2-6.8-.4s-4.4-.6-6.4-1.1c-2-.6-3.9-1.3-5.7-2.4-3.5-2.1-6.5-5.1-9.3-8.5-.4-.4-.7-.8-1.1-1.3l-1-1.3c-.7-.9-1.4-1.8-2-2.7-1.4-1.8-2.7-3.7-4-5.6-1.7-2.3-5.1-2.8-7.4-.9-2.3 1.8-2.6 5.3-.6 7.5 1.6 1.7 3.2 3.4 4.9 5.2.8.9 1.7 1.7 2.5 2.6l1.3 1.3c.4.4.9.8 1.3 1.2 1.8 1.7 3.7 3.3 5.8 4.8 2.1 1.5 4.3 2.8 6.7 3.9 2.4 1 5 1.7 7.5 2 2.5.3 5 .4 7.4.3 2.4-.1 4.8-.3 7.1-.6s4.7-.6 7-.9c.7-.3 1.2-1 1.2-1.7z"/><path class="st3" d="M181.9 454.2l-7.7-9c-2.3-2.7-2.2-6.7.5-9.1 2.7-2.3 7.1-2.1 9.4.7l7.7 9-9.9 8.4z"/><path class="st1" d="M179.6 434.3c-1.2-.1-2.3.1-3.4.6l.1.2c2.6-1.2 5.9-.6 7.8 1.7l.7.8.2-.2-.7-.8c-1.1-1.3-2.8-2.2-4.7-2.3zm12.2 11.6l-8.1 6.8.2.2 8.3-7-4.4-5.2-.2.2 4.2 5zm-18-9.1c-1.8 2.1-1.9 5.2-.4 7.7l.2-.1c-1.4-2.3-1.4-5.3.3-7.4l-.1-.2zm7.4 17l.2-.2-3.7-4.4-.2.2 3.7 4.4z"/></g></g><g><path class="st3" d="M630.9 587.7H74.2c-1.6 0-2.9-1.3-2.9-2.9 0-1.6 1.3-2.9 2.9-2.9H631c1.6 0 2.9 1.3 2.9 2.9-.1 1.6-1.4 2.9-3 2.9z"/></g><g><path transform="rotate(-40.957 194.403 297.627)" class="st2" d="M179.5 288.7H209.2V306.4H179.5z"/><path transform="rotate(-40.957 148.955 337.083)" class="st4" d="M103.6 323.8H194.2V350.40000000000003H103.6z"/><path class="st4" d="M294.2 300.4c28.1-24.4 31.2-67.2 6.7-95.3-24.4-28.1-67.2-31.2-95.3-6.7-25.9 22.5-30.5 60.4-12.1 88.2 1.6 2.4 3.4 4.8 5.4 7.1 2 2.3 4.1 4.4 6.2 6.3 25 22.1 63.3 22.9 89.1.4zm-76.9-88.6c20.7-18 52.3-15.8 70.3 5s15.8 52.3-5 70.3-52.3 15.8-70.3-5-15.8-52.3 5-70.3z"/><g style="opacity:.5"><path class="st2" d="M212.3 282.1c-18-20.8-15.8-52.3 5-70.3 20.7-18 52.3-15.8 70.3 5s15.8 52.3-5 70.3c-20.7 17.9-52.3 15.7-70.3-5z"/></g><g><path class="st1" d="M263.6 217c.2-.4.4-.7.8-1 1-.8 2.5-.5 3.2.5l20.8 28.3c.8 1 .5 2.5-.5 3.2-1 .8-2.5.5-3.2-.5l-20.8-28.3c-.5-.6-.6-1.5-.3-2.2zM252.5 225.2c.2-.4.4-.7.8-1 1-.8 2.5-.5 3.2.5l20.8 28.3c.8 1 .5 2.5-.5 3.2-1 .8-2.5.5-3.2-.5l-20.8-28.3c-.5-.6-.6-1.5-.3-2.2z"/></g></g><g><path class="st3" d="M410 551.8l-12.9 6.5c-.2-.4-.3-.9-.2-1.4.1-.6.5-1 .9-1.3.5-.3 1-.6 1.5-.8 1.2-.7 2.2-1.6 3-2.8.4-.6.7-1.2 1.2-1.8l3.6-1.7c.7.3 1.4.8 1.9 1.4.4.5.7 1.2 1 1.9zM422.6 556.4l-14.4 1.9c-.1-.5 0-1 .2-1.4.3-.5.8-.8 1.3-1 .5-.2 1.1-.2 1.7-.3 1.4-.2 2.6-.8 3.7-1.6.6-.4 1.1-.9 1.7-1.3l3.9-.4c.6.5 1.1 1.2 1.3 2 .4.7.5 1.4.6 2.1zM416.5 508.6L416.5 508.6 416.5 508.6z"/><g class="st11"><path class="st3" d="M414.6 478.3L414.6 478.3 414.6 478.3 414.6 478.3z"/></g><path class="st3" d="M416.5 508.6L416.5 508.6 416.5 508.6zM416.5 508.6L416.5 508.6 416.5 508.6z"/><path class="st2" d="M384.1 510.1l18.8 40.3 4.7-1.9-12-37.6 9.7-15.3 11 57.2 5.1-.3.1-73.2c.1-.7-30.9-2.6-30.9-2.6l-6.8 30.4c-.1 1.1 0 2 .3 3zm32.4-1.5z"/><g class="st11"><path class="st3" d="M416.5 508.6L416.5 508.6 416.5 508.6z"/></g><path class="st10" d="M352.8 484.7c1.5-1.5 3-2.8 4.5-4.2.4-.3.7-.7 1.1-1 .4-.4.7-.7 1.1-1l1-1.1.5-.5.5-.5c2.7-2.9 5.1-6 7.3-9.3 1-1.7 2.1-3.3 3.1-5l.7-1.3c.1-.2.2-.4.4-.6l.3-.7 1.3-2.6c.1-.2.2-.4.3-.7l.3-.7.6-1.3.6-1.3.3-.7.2-.3.1-.3 1.1-2.7c.4-.9.7-1.8 1.1-2.8.4-1.2 1.4-2 2.6-2.4 1.2-.4 2.6-.4 3.9.2 1.3.6 2.3 1.6 2.8 2.7.5 1.2.5 2.5-.1 3.7-.5.9-1 1.8-1.6 2.8l-1.6 2.7-.2.3-.2.3-.4.7-.9 1.3-.9 1.3-.4.7c-.1.2-.3.4-.5.7l-1.8 2.6-.5.6c-.2.2-.3.4-.5.6l-1 1.3c-1.3 1.7-2.7 3.3-4.1 4.9-2.9 3.1-6 6.1-9.2 8.7l-.6.5-.6.5-1.3.9c-.4.3-.8.6-1.3.9-.4.3-.8.6-1.3.9-1.7 1.2-3.4 2.3-5 3.4-.5.4-1.3.3-1.9-.3-.3-.6-.3-1.4.2-1.9z"/><path class="st4" d="M383.8 465.5l5.6-12.2c1.7-3.7.4-8-3.3-9.7-3.7-1.7-8.4-.1-10 3.6l-5.6 12.2 13.3 6.1z"/><g><path class="st4" d="M389.8 435.7c-7.7 1.9-12.2 9.9-9.6 17.5l11.9 36.1c13.9 1.7 20.3-2.7 29.7-9.7l-12.4-33.5c-3-7.9-11.4-12.4-19.6-10.4z"/></g><g><path class="st1" d="M403.3 438.2c1.4 1 2.7 2.2 3.8 3.7l.3-.3c-1.1-1.4-2.4-2.7-3.8-3.7l-.3.3zm16 43.1l.2.3c.8-.6 1.5-1.1 2.3-1.7l.2-.2-3.2-8.7-.4.1 3.1 8.5c-.6.5-1.4 1.1-2.2 1.7zm-27.6 8.3h.3c2.7.3 5.1.5 7.3.4l-.1-.4c-2.2.1-4.5 0-7.2-.3l-7-21.2-.4.1 7.1 21.4zm20.6-3.7c-1 .5-1.9 1-3 1.4l.2.4c1.1-.5 2.1-1 3.1-1.5l-.3-.3zm2.1-26l.4-.2-3-8-.4.2 3 8zm-32.6-.2l.4-.1-2.1-6.5c-2.3-6.8 1.2-14.1 7.6-16.8.3-.1.6-.3 1-.4l-.2-.4-.9.3c-6.8 2.8-10.3 10.4-7.9 17.4l2.1 6.5z"/></g><g><path class="st4" d="M353.2 491.4c8.2 7.9 20.6 10.6 31.7 6l-11.3-26.9-20.4 20.9z"/><path class="st3" d="M373.6 470.4l29.2-1.4c-.2-3.3-.9-6.7-2.3-9.9-2.7-6.4-7.4-11.3-13.1-14.4l-13.8 25.7zM362.2 443.5l11.3 26.9 13.9-25.7c-7.4-4-16.7-4.8-25.2-1.2z"/><path class="st3" d="M373.6 470.4l11.3 26.9c11.6-4.9 18.4-16.4 17.8-28.3l-29.1 1.4z"/><path class="st4" d="M346.7 481.8c1.6 3.7 3.8 7 6.6 9.6l20.4-21-29-3.4c-.7 4.9-.1 9.9 2 14.8z"/></g><g><path class="st9" d="M371.3 467.3c.5-.6 1.3-.7 1.9-.3 1.8 1.2 3.7 2.4 5.6 3.4.9.5 1.9 1 2.9 1.4 1 .4 1.9.8 2.9 1.1 1 .3 1.9.5 2.8.5h1.2c.4 0 .8-.1 1.1-.2.3-.1.6-.3.9-.4.3-.2.5-.4.8-.6.2-.2.5-.5.7-.8.2-.3.4-.6.6-1 .4-.7.7-1.6 1-2.5.3-.9.5-1.8.7-2.8.4-2 .6-4 .7-6.1.1-2.1.2-4.2.2-6.4 0-2.1-.1-4.3-.2-6.5 0-1.4.5-2.6 1.5-3.6.9-.9 2.2-1.5 3.7-1.5 1.4 0 2.7.6 3.7 1.6.9 1 1.4 2.3 1.3 3.7-.2 2.3-.4 4.6-.8 6.8-.3 2.3-.7 4.6-1.1 6.9-.5 2.3-1 4.6-1.8 7-.4 1.2-.8 2.3-1.4 3.5-.6 1.2-1.2 2.3-2 3.4-.4.6-.9 1.1-1.4 1.6-.5.5-1.1 1-1.7 1.4-.6.4-1.3.8-2.1 1.1-.7.3-1.5.5-2.2.6-.7.1-1.5.1-2.2.1h-.6l-.5-.1c-.3-.1-.7-.1-1-.2-1.3-.3-2.5-.7-3.6-1.2s-2.2-1.1-3.2-1.7c-1-.6-2-1.3-2.9-2-1.9-1.4-3.6-2.8-5.3-4.3-.6-.5-.7-1.3-.2-1.9z"/><path class="st4" d="M406.8 461.8l.4-13.4c.1-4.1-2.8-7.6-6.8-7.7-4.1-.1-7.7 3.2-7.9 7.2l-.4 13.4 14.7.5z"/><path class="st1" d="M392.2 449.3h.4V448c0-.5.1-.9.2-1.4l-.4-.1c-.1.5-.2 1-.2 1.5v1.3zm11.3 12.8l3.7.1.1-4.1-.4-.1-.1 3.8-3.3-.1v.4zm3.7-11.4l-.2 4.9h.4l.2-5-.4.1zm-12.7-7.9l.4.1c1.5-1.4 3.4-2.2 5.5-2.2 1.7.1 3.3.7 4.4 1.8l.2-.3c-1.3-1.2-2.9-1.8-4.6-1.9-1.1 0-2.2.2-3.3.6-1 .5-1.9 1.1-2.6 1.9zm-2.6 15.2l.4.1.1-3.4h-.4l-.1 3.3zm4.5 3.9l3.4.1v-.4l-3.3-.1-.1.4z"/></g><g><path class="st9" d="M383 434.5l4.8 8.4c2.5.2 4.3-.9 5.5-3.1l-4.8-8.4-5.5 3.1z"/><path class="st10" d="M383 434.5l2.2 3.8c.5-.1.9-.2 1.4-.4.1-.1.3-.1.4-.2 1.5-.9 2.5-2.4 2.8-4l-1.3-2.3-5.5 3.1z"/><path class="st9" d="M377.6 430.8l2.1 3.5.9 1.4c1.2 1.9 3.7 2.7 5.7 1.7.7-.3 1.3-.8 1.7-1.3.1-.1.2-.3.3-.4.1-.1.1-.2.2-.3.5-.9.8-1.8.7-2.9-.1-.9-.2-1.8-.3-2.8-.1-.6-.2-1.1-.3-1.7-.5-2.5-2.3-4.6-4.7-5.3-2.1-.6-4-.1-5.6 1.6-1.7 1.8-2 4.4-.7 6.5z"/><path class="st3" d="M385.7 429.1h-.8s0-3.2-.8-3.9c-1.2-1-4.5.3-5.9 1.4-.4.4-.7.7-.7 1.3.1 1.2.5 3.5 1.7 5.5 0 0-5-5.2-4.5-9.4.3-2.8.8-4.8 4.3-4.8 5.5 0 9.6 2.7 11.2 8.4l-3.5.2-1 1.3z"/><g><path class="st9" d="M385.9 429.5c.6 1 2 1.3 3.1.7s1.6-2 1-3c-.6-1-2-1.3-3.1-.7-1.2.6-1.6 2-1 3z"/></g></g></g><g><path class="st5" d="M305 499.7H375.1V558.3H305z"/><path class="st13" d="M281.2 499.7H305V558.3H281.2z"/><path class="st13" d="M305 499.7L295.6 517.6 269.4 517.6 281.2 499.7zM386 519.6L316 524.1 305 499.7 375.1 504.2z"/><path class="st5" d="M386 519.6L316 519.6 305 499.7 375.1 499.7zM305 499.7L299.7 519.7 269.4 517.6 295.6 517.6z"/></g><g><path class="st0" d="M38.9 241.8c3.5-18.6 10.8-36.5 20.7-52.7 5-8.1 10.7-15.8 17.1-22.9 3.2-3.6 6.5-7 10-10.3 3.5-3.3 7.1-6.4 10.8-9.4 15-11.9 32.3-20.9 50.6-26.7 9.2-2.9 18.6-4.9 28.1-6.1 2.4-.3 4.8-.5 7.1-.8l3.6-.3c1.2-.1 2.4-.1 3.6-.2 4.8-.2 9.6-.2 14.4 0 4.8.2 9.6.7 14.3 1.3 4.8.6 9.5 1.5 14.2 2.5 2.3.5 4.7 1.1 7 1.7l3.5 1c1.2.3 2.3.7 3.4 1.1.6.2 1.1.4 1.7.5l1.7.6c1.1.4 2.3.8 3.4 1.2 1.1.4 2.2.8 3.4 1.3l3.3 1.4c.6.2 1.1.5 1.7.7l1.6.7 3.3 1.5 3.2 1.6 1.6.8 1.6.8 3.2 1.7 3.1 1.7 1.6.9 1.5.9 3.1 1.8c4.1 2.4 8.1 4.9 12.1 7.5 4 2.6 7.9 5.2 11.9 7.9 7.8 5.3 15.6 10.7 23.5 15.9 3.9 2.6 7.9 5.1 11.9 7.6 4 2.4 8.1 4.8 12.2 7.1 2 1.2 4.1 2.2 6.2 3.3 1 .6 2.1 1 3.2 1.6 1.1.5 2.1 1.1 3.2 1.5 2.1 1 4.3 2 6.5 2.8 1.1.4 2.2.9 3.3 1.3l3.3 1.2 3.3 1.2c1.1.4 2.2.8 3.4 1.1l3.4 1c.6.2 1.1.3 1.7.5l1.7.4c1.1.3 2.3.6 3.4.8l3.5.7c.6.1 1.2.2 1.7.3l1.7.3 3.5.5c-9.4-.8-18.8-2.7-27.8-5.6-9-2.9-17.8-6.7-26.3-11-4.3-2.1-8.4-4.4-12.5-6.8-4.1-2.4-8.2-4.8-12.2-7.3s-8-5.1-12-7.6l-11.9-7.7c-4-2.6-7.9-5.1-11.9-7.6s-8-4.9-12.1-7.3l-3.1-1.7-1.5-.9-1.5-.8-3.1-1.7-3.1-1.6-1.6-.8-1.6-.8-3.2-1.5-3.2-1.4-1.6-.7c-.5-.2-1.1-.4-1.6-.7-17.2-7.2-35.7-11.2-54.3-11.9-18.6-.8-37.4 1.5-55.2 6.9-4.5 1.3-8.9 2.9-13.2 4.6-4.3 1.7-8.6 3.7-12.7 5.8-8.3 4.2-16.2 9.2-23.7 14.8-7.4 5.7-14.4 11.9-20.8 18.8-6.4 6.8-12.2 14.2-17.4 22-10.6 15.9-18.3 33.3-22.9 51.7z"/></g><g><path class="st0" d="M658 370.2c6.5 13.9 10.3 29.1 11.5 44.5 1.1 15.4-.4 31.1-4.6 46.1-4.2 14.9-11.2 29.1-20.3 41.6-9.1 12.5-20.3 23.5-33.2 31.9 11.9-9.7 22.3-21 30.7-33.6 8.4-12.6 14.9-26.4 19-41 4.1-14.5 5.9-29.7 5.3-44.9-.4-15.1-3.3-30.2-8.4-44.6z"/></g><g><path class="st1" d="M639.8 422.2c.4 9.5-.9 19.2-3.6 28.3-1.4 4.6-3.1 9.1-5.2 13.4-2.1 4.3-4.6 8.5-7.3 12.4-2.8 3.9-5.9 7.6-9.2 11.1-3.4 3.4-7 6.6-10.9 9.4-7.7 5.7-16.4 10.1-25.5 12.9 8.8-3.5 17.1-8.3 24.6-14.1 3.7-2.9 7.2-6.1 10.5-9.5 3.3-3.4 6.3-7 9-10.9 2.7-3.8 5.1-7.9 7.3-12.1 2.1-4.2 3.9-8.6 5.4-13.1 2.9-8.8 4.5-18.2 4.9-27.8z"/></g></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/member_balance.svg b/src/assets/svgs/member_balance.svg
new file mode 100644
index 000000000..5395b2366
--- /dev/null
+++ b/src/assets/svgs/member_balance.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1693028338187" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22985" width="128" height="128" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M983.8 312.7C958 251.7 921 197 874 150c-47-47-101.8-83.9-162.7-109.7C648.2 13.5 581.1 0 512 0S375.8 13.5 312.7 40.2C251.7 66 197 102.9 150 150c-47 47-83.9 101.8-109.7 162.7C13.5 375.8 0 442.9 0 512s13.5 136.2 40.2 199.3C66 772.3 102.9 827 150 874c47 47 101.8 83.9 162.7 109.7 63.1 26.7 130.2 40.2 199.3 40.2s136.2-13.5 199.3-40.2C772.3 958 827 921 874 874c47-47 83.9-101.8 109.7-162.7 26.7-63.1 40.2-130.2 40.2-199.3s-13.4-136.2-40.1-199.3z m-55.3 375.2c-22.8 53.8-55.4 102.2-96.9 143.7s-89.9 74.1-143.7 96.9C632.2 952.1 573 964 512 964s-120.2-11.9-175.9-35.5c-53.8-22.8-102.2-55.4-143.7-96.9s-74.1-89.9-96.9-143.7C71.9 632.2 60 573 60 512s11.9-120.2 35.5-175.9c22.8-53.8 55.4-102.2 96.9-143.7s89.9-74.1 143.7-96.9C391.8 71.9 451 60 512 60s120.2 11.9 175.9 35.5c53.8 22.8 102.2 55.4 143.7 96.9s74.1 89.9 96.9 143.7C952.1 391.8 964 451 964 512s-11.9 120.2-35.5 175.9z" fill="#000000" p-id="22986"></path><path d="M706 469.1H574.7l84.2-180.6c7-15 0.4-32.9-14.5-39.9-15-7-32.9-0.4-39.9 14.5L512 461.5l-92.5-198.3c-7-15-24.9-21.5-39.9-14.5s-21.5 24.9-14.5 39.9l84.2 180.6H318c-16.5 0-30 13.5-30 30s13.5 30 30 30h164v64h-92.5c-20.6 0-37.5 13.5-37.5 30s16.9 30 37.5 30H482v95c0 16.5 13.5 30 30 30s30-13.5 30-30v-95h92.5c20.6 0 37.5-13.5 37.5-30s-16.9-30-37.5-30H542v-64h164c16.5 0 30-13.5 30-30 0-16.6-13.5-30.1-30-30.1z" fill="#000000" p-id="22987"></path></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/member_expenditure_balance.svg b/src/assets/svgs/member_expenditure_balance.svg
new file mode 100644
index 000000000..02d498cdf
--- /dev/null
+++ b/src/assets/svgs/member_expenditure_balance.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1693028553383" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="28918" width="128" height="128" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M510.72 962.56C262.4 960 61.44 757.76 64 509.44 66.56 263.68 264.96 65.28 510.72 62.72c17.92 0 34.56 14.08 34.56 32s-14.08 34.56-32 34.56h-2.56C299.52 130.56 128 300.8 128 512s171.52 382.72 382.72 382.72S893.44 723.2 893.44 512c0-17.92 16.64-33.28 34.56-32 17.92 0 32 15.36 32 32 0 248.32-200.96 450.56-449.28 450.56z" fill="#000000" p-id="28919"></path><path d="M645.12 480H375.04c-17.92 0-34.56-14.08-34.56-32s14.08-34.56 32-34.56h272.64c17.92 0 33.28 16.64 32 34.56 0 17.92-14.08 32-32 32z m0 130.56H375.04c-17.92 0-33.28-16.64-32-34.56 0-17.92 15.36-32 32-32h270.08c17.92 0 33.28 16.64 32 34.56 0 16.64-14.08 32-32 32z" fill="#000000" p-id="28920"></path><path d="M510.72 746.24c-17.92 0-33.28-15.36-33.28-33.28V441.6c0-17.92 16.64-33.28 34.56-32 17.92 0 32 15.36 32 32v270.08c0 19.2-15.36 34.56-33.28 34.56z" fill="#000000" p-id="28921"></path><path d="M510.72 458.24c-8.96 0-17.92-3.84-24.32-10.24l-111.36-111.36c-14.08-12.8-15.36-33.28-2.56-47.36s33.28-15.36 47.36-2.56l2.56 2.56 111.36 111.36c12.8 12.8 12.8 34.56 0 47.36-6.4 6.4-15.36 10.24-23.04 10.24z" fill="#000000" p-id="28922"></path><path d="M510.72 458.24c-8.96 0-17.92-3.84-24.32-10.24-12.8-12.8-12.8-34.56 0-47.36l111.36-111.36c14.08-12.8 35.84-10.24 47.36 2.56 11.52 12.8 11.52 32 0 44.8L533.76 448c-6.4 6.4-15.36 10.24-23.04 10.24zM925.44 241.92c17.92 0 33.28-15.36 33.28-33.28 0-8.96-3.84-17.92-10.24-24.32l-111.36-111.36c-12.8-14.08-33.28-14.08-47.36-1.28s-14.08 33.28-1.28 47.36l1.28 1.28 111.36 111.36c7.68 6.4 15.36 10.24 24.32 10.24z" fill="#000000" p-id="28923"></path><path d="M815.36 353.28c8.96 0 17.92-3.84 24.32-10.24l111.36-111.36c12.8-14.08 10.24-35.84-2.56-47.36-12.8-11.52-32-11.52-44.8 0l-111.36 111.36c-12.8 12.8-12.8 34.56 0 47.36 5.12 6.4 14.08 10.24 23.04 10.24z" fill="#000000" p-id="28924"></path><path d="M920.32 241.92c17.92 0 34.56-14.08 34.56-32s-14.08-34.56-32-34.56H695.04c-17.92 0-33.28 16.64-32 34.56 0 17.92 15.36 32 32 32h225.28z" fill="#000000" p-id="28925"></path></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/member_level.svg b/src/assets/svgs/member_level.svg
new file mode 100644
index 000000000..cbcc686d2
--- /dev/null
+++ b/src/assets/svgs/member_level.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1693027700643" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8876" width="128" height="128" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M936.96 385.877333l-203.434667-204.8-18.090667-7.68L308.565333 173.397333l-18.090667 7.68L87.04 385.877333c-9.728 9.898667-9.898667 25.941333-0.170667 35.84l406.869333 421.034667c4.778667 4.949333 11.434667 7.850667 18.432 7.850667 6.997333 0 13.653333-2.901333 18.432-7.850667l406.869333-421.034667C946.858667 411.648 946.688 395.776 936.96 385.877333zM868.522667 389.632l-141.994667 0-163.84-165.034667 141.994667 0L868.522667 389.632zM319.317333 224.768l143.018667 0-163.84 165.034667L155.477333 389.802667 319.317333 224.768zM176.469333 440.832l132.608 0 18.090667-7.509333 185.173333-186.538667 185.173333 186.538667 18.090667 7.509333 131.584 0L512 787.968 176.469333 440.832z" p-id="8877" fill="#000000"></path></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/member_point.svg b/src/assets/svgs/member_point.svg
new file mode 100644
index 000000000..b849ddb4a
--- /dev/null
+++ b/src/assets/svgs/member_point.svg
@@ -0,0 +1 @@
+<svg t="1693027780777" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10083" width="128" height="128"><path d="M509.091764 501.653351c241.775532 0 424.086741-78.085426 424.086741-181.63992 0-103.543238-182.311209-181.628664-424.086741-181.628664S84.993766 216.471217 84.993766 320.014454C84.993766 423.568948 267.316232 501.653351 509.091764 501.653351zM509.091764 184.220698c222.908836 0 378.251833 71.561849 378.251833 135.793756S732.001623 455.818443 509.091764 455.818443c-222.920092 0-378.26309-71.573105-378.26309-135.803989S286.171672 184.220698 509.091764 184.220698z" fill="#000000" p-id="10084"></path><path d="M509.083577 694.061522c241.1155 0 422.937568-77.598332 422.937568-180.482561 0-27.169803-13.127995-52.453652-36.241412-75.131141-0.148379-0.153496-0.26606-0.320295-0.418532-0.468674-0.170892-0.166799-0.285502-0.345877-0.456395-0.51063l-0.11461 0.125867c-3.717671-3.40761-8.576329-5.608741-14.017248-5.608741-11.542894 0-20.898982 9.356089-20.898982 20.898982 0 6.110161 2.721994 11.481496 6.901177 15.302521l-0.082888 0.091074c13.948687 14.024411 21.809725 31.154557 21.809725 45.300742 0 64.785515-155.813718 136.966465-379.419426 136.966465-223.595474 0-379.410216-72.180949-379.410216-136.966465 0-16.139585 4.53734-29.952172 22.323425-45.670156 0.213871-0.204661 0.429789-0.381693 0.635473-0.594541 0.137123-0.118704 0.240477-0.233314 0.378623-0.354064l-0.084934-0.080841c3.416819-3.719718 5.623068-8.588609 5.623068-14.037714 0-11.542894-9.356089-20.898982-20.898982-20.898982-5.770424 0-10.993378 2.340301-14.773472 6.119371l-0.122797-0.118704c-23.408129 22.797215-36.594453 48.27754-36.594453 75.635631C86.158289 616.462167 267.979334 694.061522 509.083577 694.061522z" fill="#000000" p-id="10085"></path><path d="M895.577119 629.529787c-0.168846-0.164752-0.282433-0.342808-0.453325-0.50756l-0.11461 0.124843c-3.717671-3.40761-8.577353-5.608741-14.018272-5.608741-11.540847 0-20.897959 9.356089-20.897959 20.898982 0 6.110161 2.720971 11.482519 6.901177 15.302521l-0.083911 0.091074c13.94971 14.024411 21.810748 31.154557 21.810748 45.300742 0 64.787562-155.813718 136.966465-379.419426 136.966465-223.595474 0-379.410216-72.179926-379.410216-136.966465 0-16.139585 4.53734-29.952172 22.321378-45.670156 0.213871-0.202615 0.429789-0.381693 0.635473-0.594541 0.137123-0.118704 0.240477-0.233314 0.378623-0.354064l-0.084934-0.080841c3.416819-3.719718 5.623068-8.588609 5.623068-14.037714 0-11.542894-9.356089-20.898982-20.897959-20.898982-5.770424 0-10.993378 2.340301-14.773472 6.119371l-0.122797-0.118704c-23.410176 22.797215-36.594453 48.278563-36.594453 75.635631 0 102.884228 181.821045 180.482561 422.926312 180.482561 241.114476 0 422.935522-77.598332 422.935522-180.482561 0-27.166733-13.125949-52.452629-36.235272-75.127048C895.851365 629.847012 895.730615 629.681236 895.577119 629.529787z" fill="#000000" p-id="10086"></path></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/member_recharge_balance.svg b/src/assets/svgs/member_recharge_balance.svg
new file mode 100644
index 000000000..7519bb23d
--- /dev/null
+++ b/src/assets/svgs/member_recharge_balance.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1693028440322" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="25843" width="128" height="128" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 750.509317c-19.080745 0-31.801242-12.720497-31.801242-31.801242L480.198758 432.496894c0-19.080745 12.720497-31.801242 31.801242-31.801242s31.801242 12.720497 31.801242 31.801242l0 286.21118C537.440994 737.78882 524.720497 750.509317 512 750.509317z" fill="#000000" p-id="25844"></path><path d="M651.925466 534.26087 365.714286 534.26087c-19.080745 0-31.801242-12.720497-31.801242-31.801242 0-19.080745 12.720497-31.801242 31.801242-31.801242l286.21118 0c19.080745 0 31.801242 12.720497 31.801242 31.801242C683.726708 521.540373 671.006211 534.26087 651.925466 534.26087z" fill="#000000" p-id="25845"></path><path d="M651.925466 648.745342 365.714286 648.745342c-19.080745 0-31.801242-12.720497-31.801242-31.801242 0-19.080745 12.720497-31.801242 31.801242-31.801242l286.21118 0c19.080745 0 31.801242 12.720497 31.801242 31.801242C683.726708 636.024845 671.006211 648.745342 651.925466 648.745342z" fill="#000000" p-id="25846"></path><path d="M512 464.298137c-6.360248 0-19.080745 0-25.440994-6.360248L352.993789 324.372671c-12.720497-12.720497-12.720497-31.801242 0-44.521739 12.720497-12.720497 31.801242-12.720497 44.521739 0l133.565217 133.565217c12.720497 12.720497 12.720497 31.801242 0 44.521739C524.720497 464.298137 518.360248 464.298137 512 464.298137z" fill="#000000" p-id="25847"></path><path d="M512 464.298137c-6.360248 0-19.080745 0-25.440994-6.360248-12.720497-12.720497-12.720497-31.801242 0-44.521739l133.565217-133.565217c12.720497-12.720497 31.801242-12.720497 44.521739 0 12.720497 12.720497 12.720497 31.801242 0 44.521739L531.080745 457.937888C524.720497 464.298137 518.360248 464.298137 512 464.298137z" fill="#000000" p-id="25848"></path><path d="M512 1017.639752c-279.850932 0-508.819876-228.968944-508.819876-508.819876s228.968944-508.819876 508.819876-508.819876 508.819876 228.968944 508.819876 508.819876c0 25.440994 0 50.881988-6.360248 82.68323 0 19.080745-19.080745 31.801242-38.161491 25.440994-19.080745 0-31.801242-19.080745-25.440994-38.161491 6.360248-25.440994 6.360248-44.521739 6.360248-69.962733 0-248.049689-197.167702-445.217391-445.217391-445.217391S66.782609 267.130435 66.782609 515.180124s197.167702 445.217391 445.217391 445.217391c25.440994 0 57.242236 0 82.68323-6.360248 19.080745-6.360248 31.801242 6.360248 38.161491 25.440994 6.360248 19.080745-6.360248 31.801242-25.440994 38.161491C575.602484 1017.639752 543.801242 1017.639752 512 1017.639752z" fill="#000000" p-id="25849"></path><path d="M989.018634 864.993789l-318.012422 0c-19.080745 0-31.801242-12.720497-31.801242-31.801242s12.720497-31.801242 31.801242-31.801242l318.012422 0c19.080745 0 31.801242 12.720497 31.801242 31.801242S1001.73913 864.993789 989.018634 864.993789z" fill="#000000" p-id="25850"></path><path d="M830.012422 1024c-19.080745 0-31.801242-12.720497-31.801242-31.801242l0-318.012422c0-19.080745 12.720497-31.801242 31.801242-31.801242s31.801242 12.720497 31.801242 31.801242l0 318.012422C861.813665 1004.919255 842.732919 1024 830.012422 1024z" fill="#000000" p-id="25851"></path></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/message.svg b/src/assets/svgs/message.svg
new file mode 100644
index 000000000..14ca81728
--- /dev/null
+++ b/src/assets/svgs/message.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 20.967v59.59c0 11.59 8.537 20.966 19.075 20.966h28.613l1 26.477L76.8 101.523h32.125c10.538 0 19.075-9.377 19.075-20.966v-59.59C128 9.377 119.463 0 108.925 0h-89.85C8.538 0 0 9.377 0 20.967zm82.325 33.1c0-5.524 4.013-9.935 9.037-9.935 5.026 0 9.038 4.41 9.038 9.934 0 5.524-4.025 9.934-9.038 9.934-5.024 0-9.037-4.41-9.037-9.934zm-27.613 0c0-5.524 4.013-9.935 9.038-9.935s9.037 4.41 9.037 9.934c0 5.524-4.025 9.934-9.037 9.934-5.025 0-9.038-4.41-9.038-9.934zm-27.1 0c0-5.524 4.013-9.935 9.038-9.935s9.038 4.41 9.038 9.934c0 5.524-4.026 9.934-9.05 9.934-5.013 0-9.025-4.41-9.025-9.934z"/></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/money.svg b/src/assets/svgs/money.svg
new file mode 100644
index 000000000..c1580de10
--- /dev/null
+++ b/src/assets/svgs/money.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M54.122 127.892v-28.68H7.513V87.274h46.609v-12.4H7.513v-12.86h38.003L.099 0h22.6l32.556 45.07c3.617 5.144 6.44 9.611 8.487 13.385 1.788-3.05 4.89-7.779 9.301-14.186L103.93 0h24.01L82.385 62.013h38.34v12.862h-46.41v12.4h46.41v11.937h-46.41v28.68H54.123z"/></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/pay/icon/alipay_app.svg b/src/assets/svgs/pay/icon/alipay_app.svg
new file mode 100644
index 000000000..ebf11883e
--- /dev/null
+++ b/src/assets/svgs/pay/icon/alipay_app.svg
@@ -0,0 +1 @@
+<svg t="1627279997305" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11904" width="40" height="40"><path d="M938.7008 669.525333L938.7008 249.412267c0-90.555733-73.5232-164.078933-164.1472-164.078933L249.378133 85.333333c-90.555733 0-164.078933 73.48906699-164.078933 164.078933l0 525.2096c0 90.555733 73.454933 164.078933 164.07893301 164.078933l525.20959999 0c80.725333 0 147.8656-58.368 161.553067-135.099733-43.52-18.8416-232.106667-100.283733-330.376533-147.182933-74.786133 90.589867-153.088 144.930133-271.121067 144.930133s-196.81279999-72.704-187.357867-161.655467c6.2464-58.402133 46.2848-153.9072 220.296533-137.5232 91.682133 8.6016 133.666133 25.736533 208.418133 50.414933 19.3536-35.4304 35.4304-74.513067 47.616-116.0192L292.0448 436.565333l0-32.8704 164.0448 0 0-58.9824L256 344.712533l1e-8-36.181333 200.12373299 0L456.123733 223.3344c0 0 1.809067-13.312 16.520533-13.31200001l82.056533 1e-8 0 98.474667 213.333333 0 0 36.181333-213.333333 1e-8 0 58.98239999 174.045867 0c-16.00853301 65.1264-40.277333 124.962133-70.690133 177.220267C708.608 599.176533 938.7008 669.525333 938.7008 669.525333L938.7008 669.525333 938.7008 669.525333 938.7008 669.525333zM321.57013299 744.994133c-124.7232 0-144.452267-78.7456-137.83039999-111.65013299 6.5536-32.733867 42.666667-75.502933 112.0256-75.50293301 79.6672 0 151.04 20.445867 236.714667 62.088533C472.302933 698.333867 398.370133 744.994133 321.57013299 744.994133L321.57013299 744.994133 321.57013299 744.994133zM321.57013299 744.994133" fill="#1296db" p-id="11905"></path></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/pay/icon/alipay_bar.svg b/src/assets/svgs/pay/icon/alipay_bar.svg
new file mode 100644
index 000000000..eb1e1e848
--- /dev/null
+++ b/src/assets/svgs/pay/icon/alipay_bar.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1627279586085" class="icon" viewBox="0 0 1036 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6737" xmlns:xlink="http://www.w3.org/1999/xlink" width="40.46875" height="40"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.eot?#iefix") format("embedded-opentype"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.woff2") format("woff2"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.woff") format("woff"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.ttf") format("truetype"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.svg#iconfont") format("svg"); }
+</style></defs><path d="M27.587124 336.619083h69.148134a13.978733 13.978733 0 0 0 13.79235-13.978733V13.989916A13.978733 13.978733 0 0 0 96.735258 0.011183H27.587124a13.978733 13.978733 0 0 0-13.792351 13.978733v308.650434a13.978733 13.978733 0 0 0 13.792351 13.978733z m165.880969 0h27.584701a13.978733 13.978733 0 0 0 13.79235-13.978733V13.989916a13.978733 13.978733 0 0 0-13.79235-13.978733h-27.584701a13.978733 13.978733 0 0 0-13.79235 13.978733v308.650434a13.978733 13.978733 0 0 0 13.79235 13.978733z m138.109886 322.629167h-110.525185a27.771084 27.771084 0 0 0-27.584701 28.14385v111.829867a27.771084 27.771084 0 0 0 27.584701 28.14385h110.525185a27.957467 27.957467 0 0 0 27.584701-28.14385v-111.829867a27.957467 27.957467 0 0 0-27.584701-28.14385z m484.596091-322.629167h27.584701a13.978733 13.978733 0 0 0 13.79235-13.978733V13.989916a13.978733 13.978733 0 0 0-14.537883-13.978733h-27.5847a13.978733 13.978733 0 0 0-13.978734 13.978733v308.650434a13.978733 13.978733 0 0 0 13.978734 13.978733z m-469.871825 0H428.68358a13.978733 13.978733 0 0 0 13.792351-13.978733V13.989916A13.978733 13.978733 0 0 0 428.68358 0.011183h-83.126867a13.978733 13.978733 0 0 0-13.792351 13.978733v308.650434a13.978733 13.978733 0 0 0 13.792351 13.978733z m594.189361 0h69.148134a13.978733 13.978733 0 0 0 13.792351-13.978733V13.989916a13.978733 13.978733 0 0 0-14.537883-13.978733h-69.148135a13.978733 13.978733 0 0 0-13.79235 13.978733v308.650434a13.978733 13.978733 0 0 0 13.79235 13.978733z m-412.279444 126.181367H66.91396A67.470687 67.470687 0 0 0 0.002423 530.830286v425.139878a67.470687 67.470687 0 0 0 66.911537 68.029836h418.802853a67.470687 67.470687 0 0 0 66.911537-68.029836V487.775787a24.788954 24.788954 0 0 0-24.416188-24.975337z m-58.337914 433.899885a42.681733 42.681733 0 0 1-42.495349 43.054498H125.438257a42.681733 42.681733 0 0 1-42.495349-43.054498V590.100115a42.681733 42.681733 0 0 1 42.495349-43.054498h301.940642a42.681733 42.681733 0 0 1 42.495349 43.054498z m525.22761-433.899885a41.749817 41.749817 0 0 0-41.377051 42.122583v55.914934a41.377051 41.377051 0 1 0 82.940485 0v-55.914934a41.749817 41.749817 0 0 0-41.563434-42.122583z m0 223.659734a41.749817 41.749817 0 0 0-41.377051 42.122584V894.65012a45.477479 45.477479 0 0 1-45.291096 45.850246h-159.730327a43.240882 43.240882 0 0 0-43.613649 37.276622A41.9362 41.9362 0 0 0 745.534871 1024h233.538039a57.778765 57.778765 0 0 0 57.405999-58.337914V729.3283a41.749817 41.749817 0 0 0-41.377051-41.9362zM732.488053 322.64035V13.989916a13.978733 13.978733 0 0 0-13.79235-13.978733h-82.940485a13.978733 13.978733 0 0 0-13.79235 13.978733v308.650434a13.978733 13.978733 0 0 0 13.79235 13.978733h82.940485a13.978733 13.978733 0 0 0 13.79235-13.978733zM532.126208 0.011183c-11.36937 0-20.688525 6.337026-20.688526 13.978733v308.650434c0 7.828091 9.319156 13.978733 20.688526 13.978733s20.688525-6.337026 20.688525-13.978733V13.989916c0-7.641708-9.319156-13.978733-20.688525-13.978733z" p-id="6738" fill="#1977FD"></path><path d="M745.534871 462.80045a41.749817 41.749817 0 0 0-41.377051 42.122583v252.549117a41.377051 41.377051 0 1 0 82.940485 0V504.923033A41.749817 41.749817 0 0 0 745.534871 462.80045" p-id="6739" fill="#1977FD"></path></svg>
diff --git a/src/assets/svgs/pay/icon/alipay_pc.svg b/src/assets/svgs/pay/icon/alipay_pc.svg
new file mode 100644
index 000000000..2a7527703
--- /dev/null
+++ b/src/assets/svgs/pay/icon/alipay_pc.svg
@@ -0,0 +1 @@
+<svg t="1627279878333" class="icon" viewBox="0 0 1285 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8535" width="40" height="40"><path d="M1141.76 855.04h-286.72c0 40.96 30.72 71.68 71.68 71.68h107.52c20.48 0 35.84 15.36 35.84 35.84s-15.36 35.84-35.84 35.84h-783.36c-20.48 0-35.84-15.36-35.84-35.84s15.36-35.84 35.84-35.84h107.52c40.96 0 71.68-30.72 71.68-71.68h-286.72c-76.8 0-143.36-61.44-143.36-143.36v-568.32c0-76.8 61.44-143.36 143.36-143.36h993.28c76.8 0 143.36 61.44 143.36 143.36v568.32c5.12 76.8-56.32 143.36-138.24 143.36z m71.68-711.68c0-40.96-30.72-71.68-71.68-71.68h-993.28c-40.96 0-71.68 30.72-71.68 71.68v568.32c0 40.96 30.72 71.68 71.68 71.68h993.28c40.96 0 71.68-30.72 71.68-71.68v-568.32z m-143.36 568.32h-855.04c-40.96 0-71.68-30.72-71.68-71.68v-424.96c0-40.96 30.72-71.68 71.68-71.68h855.04c40.96 0 71.68 30.72 71.68 71.68v424.96c0 40.96-30.72 71.68-71.68 71.68z" p-id="8536" fill="#1977FD"></path></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/pay/icon/alipay_qr.svg b/src/assets/svgs/pay/icon/alipay_qr.svg
new file mode 100644
index 000000000..48337508a
--- /dev/null
+++ b/src/assets/svgs/pay/icon/alipay_qr.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1627279238245" class="icon" viewBox="0 0 1115 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4112" width="43.5546875" height="40" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.eot?#iefix") format("embedded-opentype"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.woff2") format("woff2"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.woff") format("woff"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.ttf") format("truetype"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.svg#iconfont") format("svg"); }
+</style></defs><path d="M751.388 68.267a34.133 34.133 0 0 1 0-68.267h227.556a91.022 91.022 0 0 1 91.022 91.022v227.556a34.133 34.133 0 1 1-68.266 0V91.022a22.756 22.756 0 0 0-22.756-22.755H751.388M1001.7 705.422a34.133 34.133 0 0 1 68.266 0v227.556A91.022 91.022 0 0 1 978.944 1024H748.885a34.133 34.133 0 0 1 0-68.267H978.49a22.756 22.756 0 0 0 22.755-22.755V705.422M364.09 955.733a34.133 34.133 0 1 1 0 68.267H136.533a91.022 91.022 0 0 1-91.022-91.022V705.422a34.133 34.133 0 0 1 68.267 0v227.556a22.756 22.756 0 0 0 22.755 22.755H364.09M113.778 318.578a34.133 34.133 0 1 1-68.267 0V91.022A91.022 91.022 0 0 1 136.533 0H364.09a34.133 34.133 0 0 1 0 68.267H136.533a22.756 22.756 0 0 0-22.755 22.755v227.556M34.133 477.867a34.133 34.133 0 0 0 0 68.266h168.619v-68.266z m1046.756 0H912.27v68.266h168.619a34.133 34.133 0 0 0 0-68.266zM202.752 157.24h709.746v320.627H202.752z m0 388.893h709.746V866.76H202.752z" fill="#1977FD" p-id="4113"></path></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/pay/icon/alipay_wap.svg b/src/assets/svgs/pay/icon/alipay_wap.svg
new file mode 100644
index 000000000..87075dbb7
--- /dev/null
+++ b/src/assets/svgs/pay/icon/alipay_wap.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1645964864184" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8460" xmlns:xlink="http://www.w3.org/1999/xlink" width="40" height="40"><defs><style type="text/css"></style></defs><path d="M768.3 0 255.7 0c-70.8 0-128.1 57.4-128.1 128.1l0 767.8c0 70.8 57.4 128.1 128.1 128.1L512 1024l256.3 0c70.8 0 128.1-57.4 128.1-128.1L896.4 128.1C896.4 57.3 839 0 768.3 0zM383.9 96.1c0-17.7 14.3-32 32-32l192.2 0c17.7 0 32 14.3 32 32l0 0c0 17.7-14.3 32-32 32L415.9 128.1C398.2 128.1 383.9 113.8 383.9 96.1L383.9 96.1zM512 959.9 512 959.9 512 959.9c-35.4 0-64.1-28.8-64.1-64.1 0-35.4 28.7-64.1 64.1-64.1l0 0 0 0c35.4 0 64.1 28.7 64.1 64.1C576.1 931.1 547.4 959.9 512 959.9zM832.3 755.6c0 6.7-5.4 12.2-12.2 12.2L203.9 767.8c-6.7 0-12.2-5.4-12.2-12.2L191.7 204.3c0-6.7 5.4-12.2 12.2-12.2l616.3 0c6.7 0 12.2 5.4 12.2 12.2L832.4 755.6z" p-id="8461" fill="#1977FD"></path></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/pay/icon/mock.svg b/src/assets/svgs/pay/icon/mock.svg
new file mode 100644
index 000000000..27b09ead5
--- /dev/null
+++ b/src/assets/svgs/pay/icon/mock.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1676209854312" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3033" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M173.077333 362.666667l91.114667-214.677334a65.6 65.6 0 0 1 86.016-34.773333c11.584 4.906667 24.96 10.282667 40.896 16.448 8.277333 3.2 16.789333 6.464 27.904 10.666667 28.202667 10.709333 39.296 14.933333 46.144 17.642666l51.477333-51.669333c28.181333-28.16 74.112-27.946667 102.570667 0.533333l195.925333 195.925334c16.426667 16.426667 23.445333 38.634667 21.056 59.904H896a42.666667 42.666667 0 0 1 42.666667 42.666666v490.666667a42.666667 42.666667 0 0 1-42.666667 42.666667H128a42.666667 42.666667 0 0 1-42.666667-42.666667V405.333333a42.666667 42.666667 0 0 1 42.666667-42.666666h45.077333z m48.96 0h39.104l169.194667-169.770667-27.328-10.389333c-11.2-4.245333-19.818667-7.530667-28.224-10.794667a1459.2 1459.2 0 0 1-42.197333-17.002667 20.522667 20.522667 0 0 0-26.901334 10.88L222.037333 362.666667z m108.842667 0h454.954667a23.509333 23.509333 0 0 0-5.290667-25.322667l-195.925333-195.925333a23.36 23.36 0 0 0-33.024-0.213334L330.88 362.666667zM128 405.333333v490.666667h768V405.333333H128z m597.333333 320a85.333333 85.333333 0 1 1 0-170.666666 85.333333 85.333333 0 0 1 0 170.666666z m0-42.666666a42.666667 42.666667 0 1 0 0-85.333334 42.666667 42.666667 0 0 0 0 85.333334z" fill="#4296d5" p-id="3034"></path></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/pay/icon/wx_app.svg b/src/assets/svgs/pay/icon/wx_app.svg
new file mode 100644
index 000000000..ad40b2a2c
--- /dev/null
+++ b/src/assets/svgs/pay/icon/wx_app.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1627279375144" class="icon" viewBox="0 0 1115 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4399" width="43.5546875" height="40" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.eot?#iefix") format("embedded-opentype"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.woff2") format("woff2"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.woff") format("woff"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.ttf") format("truetype"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.svg#iconfont") format("svg"); }
+</style></defs><path d="M751.388 68.267a34.133 34.133 0 0 1 0-68.267h227.556a91.022 91.022 0 0 1 91.022 91.022v227.556a34.133 34.133 0 1 1-68.266 0V91.022a22.756 22.756 0 0 0-22.756-22.755H751.388M1001.7 705.422a34.133 34.133 0 0 1 68.266 0v227.556A91.022 91.022 0 0 1 978.944 1024H748.885a34.133 34.133 0 0 1 0-68.267H978.49a22.756 22.756 0 0 0 22.755-22.755V705.422M364.09 955.733a34.133 34.133 0 1 1 0 68.267H136.533a91.022 91.022 0 0 1-91.022-91.022V705.422a34.133 34.133 0 0 1 68.267 0v227.556a22.756 22.756 0 0 0 22.755 22.755H364.09M113.778 318.578a34.133 34.133 0 1 1-68.267 0V91.022A91.022 91.022 0 0 1 136.533 0H364.09a34.133 34.133 0 0 1 0 68.267H136.533a22.756 22.756 0 0 0-22.755 22.755v227.556M34.133 477.867a34.133 34.133 0 0 0 0 68.266h168.619v-68.266z m1046.756 0H912.27v68.266h168.619a34.133 34.133 0 0 0 0-68.266zM202.752 157.24h709.746v320.627H202.752z m0 388.893h709.746V866.76H202.752z" fill="#04C361" p-id="4400"></path></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/pay/icon/wx_bar.svg b/src/assets/svgs/pay/icon/wx_bar.svg
new file mode 100644
index 000000000..11292e6e7
--- /dev/null
+++ b/src/assets/svgs/pay/icon/wx_bar.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1627279586085" class="icon" viewBox="0 0 1036 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6737" xmlns:xlink="http://www.w3.org/1999/xlink" width="40.46875" height="40"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url(&quot;//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.eot?#iefix&quot;) format(&quot;embedded-opentype&quot;), url(&quot;//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.woff2&quot;) format(&quot;woff2&quot;), url(&quot;//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.woff&quot;) format(&quot;woff&quot;), url(&quot;//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.ttf&quot;) format(&quot;truetype&quot;), url(&quot;//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.svg#iconfont&quot;) format(&quot;svg&quot;); }</style></defs><path d="M27.587124 336.619083h69.148134a13.978733 13.978733 0 0 0 13.79235-13.978733V13.989916A13.978733 13.978733 0 0 0 96.735258 0.011183H27.587124a13.978733 13.978733 0 0 0-13.792351 13.978733v308.650434a13.978733 13.978733 0 0 0 13.792351 13.978733z m165.880969 0h27.584701a13.978733 13.978733 0 0 0 13.79235-13.978733V13.989916a13.978733 13.978733 0 0 0-13.79235-13.978733h-27.584701a13.978733 13.978733 0 0 0-13.79235 13.978733v308.650434a13.978733 13.978733 0 0 0 13.79235 13.978733z m138.109886 322.629167h-110.525185a27.771084 27.771084 0 0 0-27.584701 28.14385v111.829867a27.771084 27.771084 0 0 0 27.584701 28.14385h110.525185a27.957467 27.957467 0 0 0 27.584701-28.14385v-111.829867a27.957467 27.957467 0 0 0-27.584701-28.14385z m484.596091-322.629167h27.584701a13.978733 13.978733 0 0 0 13.79235-13.978733V13.989916a13.978733 13.978733 0 0 0-14.537883-13.978733h-27.5847a13.978733 13.978733 0 0 0-13.978734 13.978733v308.650434a13.978733 13.978733 0 0 0 13.978734 13.978733z m-469.871825 0H428.68358a13.978733 13.978733 0 0 0 13.792351-13.978733V13.989916A13.978733 13.978733 0 0 0 428.68358 0.011183h-83.126867a13.978733 13.978733 0 0 0-13.792351 13.978733v308.650434a13.978733 13.978733 0 0 0 13.792351 13.978733z m594.189361 0h69.148134a13.978733 13.978733 0 0 0 13.792351-13.978733V13.989916a13.978733 13.978733 0 0 0-14.537883-13.978733h-69.148135a13.978733 13.978733 0 0 0-13.79235 13.978733v308.650434a13.978733 13.978733 0 0 0 13.79235 13.978733z m-412.279444 126.181367H66.91396A67.470687 67.470687 0 0 0 0.002423 530.830286v425.139878a67.470687 67.470687 0 0 0 66.911537 68.029836h418.802853a67.470687 67.470687 0 0 0 66.911537-68.029836V487.775787a24.788954 24.788954 0 0 0-24.416188-24.975337z m-58.337914 433.899885a42.681733 42.681733 0 0 1-42.495349 43.054498H125.438257a42.681733 42.681733 0 0 1-42.495349-43.054498V590.100115a42.681733 42.681733 0 0 1 42.495349-43.054498h301.940642a42.681733 42.681733 0 0 1 42.495349 43.054498z m525.22761-433.899885a41.749817 41.749817 0 0 0-41.377051 42.122583v55.914934a41.377051 41.377051 0 1 0 82.940485 0v-55.914934a41.749817 41.749817 0 0 0-41.563434-42.122583z m0 223.659734a41.749817 41.749817 0 0 0-41.377051 42.122584V894.65012a45.477479 45.477479 0 0 1-45.291096 45.850246h-159.730327a43.240882 43.240882 0 0 0-43.613649 37.276622A41.9362 41.9362 0 0 0 745.534871 1024h233.538039a57.778765 57.778765 0 0 0 57.405999-58.337914V729.3283a41.749817 41.749817 0 0 0-41.377051-41.9362zM732.488053 322.64035V13.989916a13.978733 13.978733 0 0 0-13.79235-13.978733h-82.940485a13.978733 13.978733 0 0 0-13.79235 13.978733v308.650434a13.978733 13.978733 0 0 0 13.79235 13.978733h82.940485a13.978733 13.978733 0 0 0 13.79235-13.978733zM532.126208 0.011183c-11.36937 0-20.688525 6.337026-20.688526 13.978733v308.650434c0 7.828091 9.319156 13.978733 20.688526 13.978733s20.688525-6.337026 20.688525-13.978733V13.989916c0-7.641708-9.319156-13.978733-20.688525-13.978733z" p-id="6738" fill="#04C361"/><path d="M745.534871 462.80045a41.749817 41.749817 0 0 0-41.377051 42.122583v252.549117a41.377051 41.377051 0 1 0 82.940485 0V504.923033A41.749817 41.749817 0 0 0 745.534871 462.80045" p-id="6739" fill="#04C361"/></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/pay/icon/wx_lite.svg b/src/assets/svgs/pay/icon/wx_lite.svg
new file mode 100644
index 000000000..0c925cf39
--- /dev/null
+++ b/src/assets/svgs/pay/icon/wx_lite.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1676209433089" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2990" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M608.6 290.3c67.1 0 121.7 50.5 121.7 112.9 0 19.4-5.6 38.4-15.7 55.5-15.3 25-39.8 43.5-69.4 52.3-7.9 2.3-13.9 3.2-19.4 3.2-13 0-23.1-10.2-23.1-23.1 0-13 10.2-23.1 23.1-23.1 0.9 0 2.8 0 5.1-0.9 19.9-5.6 35.6-17.1 44.4-32.4 6-9.7 8.8-20.4 8.8-31.5 0-36.6-33.8-66.6-75-66.6-14.4 0-28.2 3.7-40.7 10.6-21.8 12.5-34.7 33.3-34.7 56v193.9c0 39.3-21.8 75.4-57.9 95.8-19.4 11.1-41.2 16.7-63.4 16.7-67.1 0-121.7-50.5-121.7-112.9 0-19.4 5.6-38.4 15.7-55.5 15.3-25 39.8-43.5 69.4-52.3 8.3-2.3 13.9-3.2 19.4-3.2 13 0 23.1 10.2 23.1 23.1 0 13-10.2 23.1-23.1 23.1-0.9 0-2.8 0-5.1 0.9-19.9 6-35.6 17.6-44.4 32.4-6 9.7-8.8 20.4-8.8 31.5 0 36.6 33.8 66.6 75.4 66.6 14.4 0 28.2-3.7 40.7-10.6 21.8-12.5 34.7-33.3 34.7-56V403.3c0-39.3 21.8-75.4 57.9-95.8 19-11.6 40.7-17.2 63-17.2zM510.8 929c231.1 0 418.4-187.3 418.4-418.4S741.9 92.1 510.8 92.1 92.4 279.5 92.4 510.6 279.7 929 510.8 929z m0 22C267.5 951 70.3 753.8 70.3 510.6S267.5 70.1 510.8 70.1s440.5 197.2 440.5 440.5S754.1 951 510.8 951z" p-id="2991" fill="#58bf6b"></path></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/pay/icon/wx_native.svg b/src/assets/svgs/pay/icon/wx_native.svg
new file mode 100644
index 000000000..bf3ba2b61
--- /dev/null
+++ b/src/assets/svgs/pay/icon/wx_native.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1627279375144" class="icon" viewBox="0 0 1115 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4399" width="43.5546875" height="40" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url(&quot;//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.eot?#iefix&quot;) format(&quot;embedded-opentype&quot;), url(&quot;//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.woff2&quot;) format(&quot;woff2&quot;), url(&quot;//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.woff&quot;) format(&quot;woff&quot;), url(&quot;//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.ttf&quot;) format(&quot;truetype&quot;), url(&quot;//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.svg#iconfont&quot;) format(&quot;svg&quot;); }</style></defs><path d="M751.388 68.267a34.133 34.133 0 0 1 0-68.267h227.556a91.022 91.022 0 0 1 91.022 91.022v227.556a34.133 34.133 0 1 1-68.266 0V91.022a22.756 22.756 0 0 0-22.756-22.755H751.388M1001.7 705.422a34.133 34.133 0 0 1 68.266 0v227.556A91.022 91.022 0 0 1 978.944 1024H748.885a34.133 34.133 0 0 1 0-68.267H978.49a22.756 22.756 0 0 0 22.755-22.755V705.422M364.09 955.733a34.133 34.133 0 1 1 0 68.267H136.533a91.022 91.022 0 0 1-91.022-91.022V705.422a34.133 34.133 0 0 1 68.267 0v227.556a22.756 22.756 0 0 0 22.755 22.755H364.09M113.778 318.578a34.133 34.133 0 1 1-68.267 0V91.022A91.022 91.022 0 0 1 136.533 0H364.09a34.133 34.133 0 0 1 0 68.267H136.533a22.756 22.756 0 0 0-22.755 22.755v227.556M34.133 477.867a34.133 34.133 0 0 0 0 68.266h168.619v-68.266z m1046.756 0H912.27v68.266h168.619a34.133 34.133 0 0 0 0-68.266zM202.752 157.24h709.746v320.627H202.752z m0 388.893h709.746V866.76H202.752z" fill="#04C361" p-id="4400"/></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/pay/icon/wx_pub.svg b/src/assets/svgs/pay/icon/wx_pub.svg
new file mode 100644
index 000000000..3a6d15b70
--- /dev/null
+++ b/src/assets/svgs/pay/icon/wx_pub.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1627279797174" class="icon" viewBox="0 0 1260 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7665" xmlns:xlink="http://www.w3.org/1999/xlink" width="49.21875" height="40"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.eot?#iefix") format("embedded-opentype"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.woff2") format("woff2"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.woff") format("woff"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.ttf") format("truetype"), url("//at.alicdn.com/t/font_1031158_1uhr8ri0pk5.svg#iconfont") format("svg"); }
+</style></defs><path d="M797.14798 481.753a269.194 269.194 0 0 0 102.892-211.929C900.03998 120.99 779.02998 0 630.15698 0 481.28298 0 360.27398 120.99 360.27398 269.824c0 85.878 40.33 162.462 102.912 211.929A450.974 450.974 0 0 0 309.84198 582.774c-85.543 85.524-132.608 199.208-132.608 320.236 0 25.01 0 51.712 0.197 76.367a44.898 44.898 0 0 0 44.82 44.623h816.01a44.8 44.8 0 0 0 44.82-44.623V903.01c0-121.009-47.066-234.732-132.609-320.236a451.072 451.072 0 0 0-153.344-101.021z" p-id="7666" fill="#04C361"></path><path d="M1186.18898 580.391A378.644 378.644 0 0 0 1061.81198 473.03a223.783 223.783 0 0 0 64.237-157.657c0-49.742-15.872-96.67-45.746-136.074A225.34 225.34 0 0 0 964.70998 99.9a37.297 37.297 0 0 0-46.14 25.718c-5.592 19.89 5.79 40.724 25.6 46.356 63.114 18.196 107.363 77.135 107.363 143.4a148.913 148.913 0 0 1-81.23 133.06 38.065 38.065 0 0 0-20.363 36.608c1.32 15.203 11.58 28.16 25.975 32.65 125.479 39.601 209.703 155.038 209.703 287.173v63.074c0 20.638 16.62 37.534 37.16 37.711h0.196a37.396 37.396 0 0 0 37.337-37.336V805.06c-0.197-81.644-25.777-159.35-74.142-224.69z m-901.77-62.503a36.982 36.982 0 0 0 25.955-32.65 37.455 37.455 0 0 0-20.362-36.628 148.913 148.913 0 0 1-81.231-133.06c0-66.245 44.071-125.184 107.382-143.4a37.612 37.612 0 0 0 25.58-46.356 37.376 37.376 0 0 0-46.139-25.718 225.32 225.32 0 0 0-115.593 79.4 223.252 223.252 0 0 0-45.746 136.074c0 60.258 23.533 116.381 64.237 157.676A380.475 380.475 0 0 0 74.14498 580.569 373.839 373.839 0 0 0 0.00198 805.258v63.232c0 20.657 16.798 37.356 37.356 37.356h0.197a37.317 37.317 0 0 0 37.14-37.73V805.06c0-132.332 84.401-247.769 209.723-287.173z" p-id="7667" fill="#04C361"></path></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/peoples.svg b/src/assets/svgs/peoples.svg
new file mode 100644
index 000000000..aab852e52
--- /dev/null
+++ b/src/assets/svgs/peoples.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M95.648 118.762c0 5.035-3.563 9.121-7.979 9.121H7.98c-4.416 0-7.979-4.086-7.979-9.121C0 100.519 15.408 83.47 31.152 76.75c-9.099-6.43-15.216-17.863-15.216-30.987v-9.128c0-20.16 14.293-36.518 31.893-36.518s31.894 16.358 31.894 36.518v9.122c0 13.137-6.123 24.556-15.216 30.993 15.738 6.726 31.141 23.769 31.141 42.012z"/><path d="M106.032 118.252h15.867c3.376 0 6.101-3.125 6.101-6.972 0-13.957-11.787-26.984-23.819-32.123 6.955-4.919 11.638-13.66 11.638-23.704v-6.985c0-15.416-10.928-27.926-24.39-27.926-1.674 0-3.306.193-4.89.561 1.936 4.713 3.018 9.974 3.018 15.526v9.121c0 13.137-3.056 23.111-11.066 30.993 14.842 4.41 27.312 23.42 27.541 41.509z"/></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/shopping.svg b/src/assets/svgs/shopping.svg
new file mode 100644
index 000000000..f395bc7f6
--- /dev/null
+++ b/src/assets/svgs/shopping.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M42.913 101.36c1.642 0 3.198.332 4.667.996a12.28 12.28 0 013.89 2.772c1.123 1.184 1.987 2.582 2.592 4.193.605 1.612.908 3.318.908 5.118 0 1.8-.303 3.507-.908 5.118-.605 1.611-1.469 3.01-2.593 4.194a13.3 13.3 0 01-3.889 2.843 10.582 10.582 0 01-4.667 1.066c-1.729 0-3.306-.355-4.732-1.066a13.604 13.604 0 01-3.825-2.843c-1.123-1.185-1.988-2.583-2.593-4.194a14.437 14.437 0 01-.907-5.118c0-1.8.302-3.506.907-5.118.605-1.61 1.47-3.009 2.593-4.193a12.515 12.515 0 013.825-2.772c1.426-.664 3.003-.996 4.732-.996zm53.932.285c1.643 0 3.22.331 4.733.995a11.386 11.386 0 013.889 2.772c1.08 1.185 1.945 2.583 2.593 4.194.648 1.61.972 3.317.972 5.118 0 1.8-.324 3.506-.972 5.117-.648 1.611-1.513 3.01-2.593 4.194a12.253 12.253 0 01-3.89 2.843 11 11 0 01-4.732 1.066 10.58 10.58 0 01-4.667-1.066 12.478 12.478 0 01-3.824-2.843c-1.08-1.185-1.945-2.583-2.593-4.194a13.581 13.581 0 01-.973-5.117c0-1.801.325-3.507.973-5.118.648-1.611 1.512-3.01 2.593-4.194a11.559 11.559 0 013.824-2.772 11.212 11.212 0 014.667-.995zm21.781-80.747c2.42 0 4.3.355 5.64 1.066 1.34.71 2.29 1.587 2.852 2.63a6.427 6.427 0 01.778 3.34c-.044 1.185-.195 2.204-.454 3.057-.26.853-.8 2.606-1.62 5.26a589.268 589.268 0 01-2.788 8.743 1236.373 1236.373 0 00-3.047 9.453c-.994 3.128-1.75 5.592-2.269 7.393-1.123 3.79-2.55 6.42-4.278 7.89-1.728 1.469-3.846 2.203-6.352 2.203H39.023l1.945 12.795h65.342c4.148 0 6.223 1.943 6.223 5.828 0 1.896-.41 3.53-1.232 4.905-.821 1.374-2.442 2.061-4.862 2.061H38.505c-1.729 0-3.176-.426-4.343-1.28-1.167-.852-2.14-1.966-2.917-3.34a21.277 21.277 0 01-1.88-4.478 44.128 44.128 0 01-1.102-4.55c-.087-.568-.324-1.942-.713-4.122-.39-2.18-.865-4.904-1.426-8.174l-1.88-10.947c-.692-4.027-1.383-8.079-2.075-12.154-1.642-9.572-3.5-20.234-5.574-31.986H6.87c-1.296 0-2.377-.356-3.24-1.067a9.024 9.024 0 01-2.14-2.558 10.416 10.416 0 01-1.167-3.2C.108 8.53 0 7.488 0 6.54c0-1.896.583-3.46 1.75-4.69C2.917.615 4.494 0 6.482 0h13.095c1.728 0 3.111.284 4.148.853 1.037.569 1.858 1.28 2.463 2.132a8.548 8.548 0 011.297 2.701c.26.948.475 1.754.648 2.417.173.758.346 1.825.519 3.199.173 1.374.345 2.772.518 4.193.26 1.706.519 3.507.778 5.403h88.678z"/></svg>
\ No newline at end of file
diff --git a/src/components/Annex/index.ts b/src/components/Annex/index.ts
new file mode 100644
index 000000000..d0456f911
--- /dev/null
+++ b/src/components/Annex/index.ts
@@ -0,0 +1,3 @@
+import Annex from './src/Annex.vue'
+
+export { Annex }
diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
new file mode 100644
index 000000000..4cae5c2e1
--- /dev/null
+++ b/src/components/Annex/src/Annex.vue
@@ -0,0 +1,127 @@
+<!-- 附件组件 -->
+<template>
+  <div class="annex">
+    <div class="title flex items-center">
+      <div class="title-txt">附件</div>
+      <UploadFile :isShowFile="false" :isShowTip="false" title="添加附件" :upData="upData"
+        @update:modelValue="handleAnnexSuccess" />
+    </div>
+    <div class="list">
+      <div class="item flex items-start" v-for="(item, index) in annexData.annexList" :key="index">
+        <Icon icon="fa:file-text-o" color="#409eff" size="30" class="mt-4px" />
+        <div class="item-center" >
+          <div class="item-title" @click="downFile(item)">{{ item.name }}</div>
+          <div class="info mt-6px">
+            <div class="info-txt">
+              <div>{{ item.size }}KB</div>
+              <div>来自 {{ item.nickname }}</div>
+            </div>
+            <Icon icon="ep:delete" class="cursor-pointer" size="18" @click="deleteAnnex(item.id)" />
+          </div>
+          <div class="time mt-6px ">{{ formatDate(item.createTime) }}</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import UploadFile from '@/components/UploadFile/src/UploadFile.vue'
+import { formatDate } from '@/utils/formatTime'
+import * as FileApi from '@/api/wms/file'
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+defineComponent({
+  name: 'Annex'
+})
+// 接受父组件参数
+const props = defineProps({
+  annexData: {
+    type: Object,
+    required: true
+  },
+  upData: {
+    type: Object,
+    required: true
+  },
+})
+// 子传父的时候需要先定义好emit这个方法
+const emit = defineEmits(['handleAnnexSuccess', 'deleteAnnexSuccess'])
+// 添加附件
+const handleAnnexSuccess = () => {
+  emit('handleAnnexSuccess')
+}
+
+// 删除附件
+const deleteAnnex = async (id) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await FileApi.deleteFile(id)
+    message.success(t('common.delSuccess'))
+  } catch { }
+  emit('deleteAnnexSuccess')
+}
+const downFile = (item)=>{
+   window.open(import.meta.env.VITE_BASE_URL + '/admin-api/infra/file/0/get/' + item.path)
+}
+</script>
+
+
+<style scoped lang="scss">
+.title {
+  border-bottom: 1px solid #dedede;
+  justify-content: space-between;
+
+  .title-txt {
+    width: 80px;
+    text-align: center;
+    color: rgb(63, 158, 255);
+    border-bottom: 2px solid rgb(63, 158, 255);
+    height: 30px;
+  }
+}
+
+.item {
+  border-bottom: 1px dashed #dedede;
+  padding: 20px 0px 10px;
+
+  .item-center {
+    flex: 1;
+    margin-left: 16px;
+    overflow: hidden;
+
+    .item-title {
+      font-size: 16px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      cursor: pointer;
+    }
+
+    .info {
+      display: flex;
+      align-items: center;
+
+      .info-txt {
+        flex: 1;
+        display: flex;
+        align-items: center;
+
+        div {
+          color: #b6b6b6;
+          margin-right: 20px;
+          font-size: 14px;
+        }
+      }
+
+    }
+
+    .time {
+      color: #b6b6b6;
+      font-size: 14px;
+    }
+  }
+}
+</style>
diff --git a/src/components/Backtop/index.ts b/src/components/Backtop/index.ts
new file mode 100644
index 000000000..96de88d69
--- /dev/null
+++ b/src/components/Backtop/index.ts
@@ -0,0 +1,3 @@
+import Backtop from './src/Backtop.vue'
+
+export { Backtop }
diff --git a/src/components/Backtop/src/Backtop.vue b/src/components/Backtop/src/Backtop.vue
new file mode 100644
index 000000000..5d79f51a9
--- /dev/null
+++ b/src/components/Backtop/src/Backtop.vue
@@ -0,0 +1,17 @@
+<script lang="ts" setup>
+import { ElBacktop } from 'element-plus'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'BackTop' })
+
+const { getPrefixCls, variables } = useDesign()
+
+const prefixCls = getPrefixCls('backtop')
+</script>
+
+<template>
+  <ElBacktop
+    :class="`${prefixCls}-backtop`"
+    :target="`.${variables.namespace}-layout-content-scrollbar .${variables.elNamespace}-scrollbar__wrap`"
+  />
+</template>
diff --git a/src/components/BasicForm/index.ts b/src/components/BasicForm/index.ts
new file mode 100644
index 000000000..131ef9dc5
--- /dev/null
+++ b/src/components/BasicForm/index.ts
@@ -0,0 +1,3 @@
+import BasicForm from './src/BasicForm.vue'
+
+export { BasicForm }
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
new file mode 100644
index 000000000..2566aaf6c
--- /dev/null
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -0,0 +1,668 @@
+<template>
+  <Dialog
+    :title="dialogTitle"
+    v-model="dialogVisible"
+    :width="dialogWidth"
+    :close-on-click-modal="false"
+    :vLoading="formLoading"
+  >
+  
+  <div 
+    style="max-height: 60vh;overflow-y: auto;">
+    <Form
+      ref="formRef"
+      :rules="rules"
+      :schema="formSchema"
+      :is-col="true"
+      @opensearchTable="opensearchTable"
+      @onChange="onChange"
+      @onBlur="onBlur"
+    >
+      <template #crontab="formSchema" v-if="fromeWhere == 'countPlan'">
+        <crontab v-model="formSchema.crontab" />
+      </template>
+      <template #type="formSchema" v-if="fromeWhere == 'countPlan'">
+        <el-select
+          v-model="formSchema.type"
+          placeholder="选择盘点类型"
+          @change="selectChange('type', $event)"
+          v-if="!isDetail"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+        <el-select
+          v-model="formSchema.type"
+          placeholder="选择盘点范围类型"
+          @change="selectChangeDetail('type', $event,formSchema)"
+          v-if="isDetail"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </template>
+      <template #value="formSchema" v-if="fromeWhere == 'countPlan'">
+        <el-select
+          v-model="formSchema.value"
+          placeholder="选择盘点范围值"
+          v-if="isDetail&& formTypeDetail =='Select'"
+        >
+          <el-option
+            v-for="dict in countPlanAllList"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+        <el-input v-model="formSchema.value" v-if="isDetail && formTypeDetail =='InputString'"/>
+      </template>
+    </Form>
+    <div class="table" v-if="isBusiness && formType == 'create' && fromeWhere != 'countPlan'">
+      <TableForm
+        ref="tableFormRef"
+        class="w-[100%]"
+        :tableFields="tableAllSchemas.tableFormColumns"
+        :tableData="tableData"
+        :tableFormRules="tableFormRules"
+        :isShowButton="isShowButton"
+        :isShowReduceButton="isShowReduceButton"
+        @handleAddTable="handleAddTable"
+        @handleDeleteTable="handleDeleteTable"
+        @tableSelectionChange="tableSelectionChange"
+        @extendedButtonsClick="extendedButtonsClick"
+        @formSelectChange="formSelectChange"
+        @formSelectvVisibleChange="formSelectvVisibleChange"
+        @tableSortChange="tableSortChange"
+        @selectCallback="selectCallback"
+        @handleTableSelect="handleTableSelect"
+        @inpuFocus="inpuFocus"
+        @buttonOperationClick="buttonOperationClick"
+        @inputStringBlur="inputStringBlur"
+        @inputNumberChange="inputNumberChange"
+        @tableFormSelectOnBlur="tableFormSelectOnBlur"
+        @formFormDateChange="formFormDateChange"
+      />
+    </div>
+    <div v-if="isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
+      <TableFormCountPlan 
+        :tableFields="tableAllSchemas.tableFormColumns"
+        :tableData="tableData"
+        :countScopeType="countScopeType"
+        :tableFormRules="tableFormRules"
+        ref="tableFormRef"
+        @tableFormChange="tableFormChange"
+        @handleAddTable="handleAddTable"
+        @handleDeleteTable="handleDeleteTable"
+      />
+    </div>
+  </div>
+    <template #footer>
+      <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
+    </template>
+  
+  </Dialog>
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
+</template>
+<script setup lang="ts">
+import { SearchTable } from '@/components/SearchTable'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
+import TableForm from '@/components/TableForm/src/TableForm.vue'
+import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
+const props = defineProps({
+  // 显示窗口宽度设置
+  basicFormWidth: {
+    type: String,
+    default: ''
+  },
+  // 是否显示TableForm 新增/删除按钮
+  isShowButton: {
+    type: Boolean,
+    default: true
+  },
+  // 是否显示tableForm 删除按钮
+  isShowReduceButton: {
+    type: Boolean,
+    default: true
+  },
+  // 校验rules
+  rules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 表单，列表 相关信息
+  formAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 列表 相关信息
+  tableAllSchemas: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  // 列表数据
+  tableData: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  tableFormRules: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  // 查询参数
+  // searchTableParams: {
+  //   type: Array,
+  //   required: false,
+  //   default: null
+  // },
+  // API——Vo
+  apiVo: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  API——创建
+  apiCreate: {
+    type: Function,
+    required: true,
+    default: null
+  },
+  //  API——编辑
+  apiUpdate: {
+    type: Function,
+    required: true,
+    default: null
+  },
+  // 是否是业务表单（区分是不显示tableForm）
+  isBusiness: {
+    type: Boolean,
+    required: true,
+    default: true
+  },
+  // 表单form
+  form: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 详情数据
+  detailData: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // // 主表参数
+  // masterParmas: {
+  //   type: Object,
+  //   required: false,
+  //   default: null
+  // },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 盘点范围类型
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 是否从详情进入
+  isDetail: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
+  formTypeDetail: {
+    type: String,
+    required: false,
+    default: 'InputString'
+  },
+  //盘点详情子表新增的时候判断盘点范围值的下拉列表
+  countPlanAllList: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 窗体底部按钮 显示or隐藏：保存，关闭
+  isShowFooterButtton: {
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 明细数据长度校验
+  tableFormDataLength: {
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 底部按钮集合
+  footButttondata: {
+    type: Array,
+    required: false,
+    default: null
+  }
+})
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const dialogWidth = ref()
+if (props.basicFormWidth) {
+  dialogWidth.value = props.basicFormWidth + '%'
+} else {
+  dialogWidth.value = props.isBusiness ? '60%' : '40%'
+}
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+
+const formRef = ref() // 表单 Ref
+const formSchema = ref(props.formAllSchemas?.formSchema)
+const tableAllSchemas = ref(props.tableAllSchemas)
+const tableFormRules = ref(props.tableFormRules)
+
+// 列表-按钮
+// const buttondata = [
+//   defaultButtons.mainListEditBtn(null), // 编辑
+//   defaultButtons.mainListDeleteBtn(null)
+// ]
+// // 列表-操作按钮事件
+// const buttonTableClick = async (val, row) => {
+//   if (val == 'edit') {
+    
+//   } else if (val == 'delete') {
+   
+//   } else {
+//   }
+// }
+
+/** 弹层操作 */
+// formField form表单中的字段
+// searchField 查询列表中的字段
+// type 发起事件位置 type=tableForm 是明细中发起的 否则 为主表发起的
+// searchCondition 查询条件
+const searchTableRef = ref()
+const opensearchTable = (
+  formField,
+  searchField,
+  searchTitle,
+  searchAllSchemas,
+  searchPage,
+  searchCondition,
+  multiple,
+  type,
+  row
+) => {
+  const _searchCondition = {}
+  // 判断查询条件中，是否存在指向主表的数据
+  if (searchCondition && searchCondition.length > 0) {
+    // 转换筛选条件所需
+    let filters: any[] = []
+    for (var i=0; i< searchCondition.length; i++ ) {
+    // searchCondition.forEach((item) => {
+      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
+      if (searchCondition[i].isMainValue) {
+        _searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value]
+          ? formRef.value.formModel[searchCondition[i].value]
+          : props.detailData
+          ? props.detailData[searchCondition[i].value]
+          : row
+          ? row[searchCondition[i].value]
+          : ''
+        // 是否含有空参数情况
+        let isNull = false
+        if (_searchCondition[searchCondition[i].key] == '' || _searchCondition[searchCondition[i].key] == undefined) {
+          isNull = true
+        }
+        if (isNull) {
+          message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
+          return
+        }
+      } else {
+        // 扩展 转换为筛选条件进行查询
+        if (searchCondition[i].isSearch) {
+          filters.push({
+            action: searchCondition[i].action,
+            column: searchCondition[i].key,
+            value: searchCondition[i].value
+          })
+        } else {
+          _searchCondition[searchCondition[i].key] = searchCondition[i].value
+        }
+      }
+    }
+    if (filters.length > 0) {
+      _searchCondition.isSearch = true
+      _searchCondition.filters = filters
+    }
+  }
+  const _searchTableTitle = searchTitle
+  const _searchTableAllSchemas = searchAllSchemas
+  const _searchTablePage = searchPage
+  searchTableRef.value.open(
+    _searchTableTitle,
+    _searchTableAllSchemas,
+    _searchTablePage,
+    formField,
+    searchField,
+    multiple,
+    type,
+    row,
+    _searchCondition
+  )
+}
+// 弹层确定返回所选数据
+// val ： 弹层列表row 数据
+const searchTableSuccess = (formField, searchField, val, type, row) => {
+  emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+}
+
+/** 打开弹窗 */
+const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
+  dialogVisible.value = true
+  if (titleName) {
+    dialogTitle.value = t('action.' + titleName)
+  } else {
+    dialogTitle.value = t('action.' + type)
+  }
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  // 如果是从主表的详情页面进图添加子表，需要添加masterId，number参数
+  if (masterParmas) {
+    if (!row) {
+      row = {
+        masterId: masterParmas.masterId,
+        number: masterParmas.number
+      }
+    }
+  }
+  if (row?.id || row?.masterId) {
+    formLoading.value = true
+    try {
+      nextTick(() => {
+        formRef.value.setValues(row)
+      })
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
+
+/** 弹窗按钮 */
+let Butttondata:any = []
+if (props.isShowFooterButtton) {
+  Butttondata = [
+    defaultButtons.formSaveBtn(null), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+}
+if (props.footButttondata) {
+  Butttondata = props.footButttondata
+}
+
+/** 按钮事件 */
+const buttonBaseClick = (val) => {
+  // 扩展 按钮事件回调
+  if (props.footButttondata) {
+    emit('footButtonClick',val)
+  } 
+   // 保存
+  else if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
+/** 提交表单 */
+// const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+
+const tableFormRef = ref()
+const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  // 校验表单
+  if (!elForm) return
+  const valid = await elForm.validate()
+  if (!valid) return
+  // 针对主子表 明细校验
+  if (props.isBusiness) {
+    formLoading.value = true
+    if (formType.value == 'create') {
+      const validateForm = await tableFormRef.value.validateForm()
+      if (!validateForm && props.tableFormDataLength) {
+        if (props.tableData.length == 0) {
+          message.warning('请填写明细信息！')
+          formLoading.value = false
+          return
+        }
+        formLoading.value = false
+        return
+      }
+      // 主子表——提交请求
+      try {
+        const data = unref(formRef)?.formModel
+        emit('submitForm', formType.value, data)
+      } finally {
+      }
+    } else {
+      // 编辑
+      try {
+        const data = unref(formRef)?.formModel
+        emit('submitForm', formType.value, data)
+      } finally {
+      }
+    }
+  } else {
+    // 基础数据单表——提交请求
+    formLoading.value = true
+    try {
+      const data = unref(formRef)?.formModel
+      emit('success', formType.value, data)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  unref(formRef)?.resetFields()
+}
+
+// 传递给父类
+const emit = defineEmits([
+  'success',
+  'tableSelectionChange',
+  'tableFormSelectOnBlur',
+  'extendedButtonsClick',
+  'formSelectChange',
+  'formSelectvVisibleChange',
+  'tableSortChange',
+  'selectCallback',
+  'handleTableSelect',
+  'handleDeleteTable',
+  'handleAddTable',
+  'inpuFocus',
+  'searchTableSuccess',
+  'opensearchTable',
+  'submitForm',
+  'selectChange',
+  'selectChangeDetail',
+  'tableFormChange',
+  'buttonOperationClick',
+  'inputStringBlur',
+  'onChange',
+  'onBlur',
+  'inputNumberChange',
+  'formFormDateChange',
+  'footButtonClick'
+])
+//普通下拉改变事件
+const formSelectChange = (field, val, row) => {
+  emit('formSelectChange', field, val, row)
+}
+// 日期改变事件
+const formFormDateChange = (field, val,row, index) => {
+  emit('formFormDateChange', field, val,row, index)
+}
+const formSelectvVisibleChange = (field, val, row) => {
+  emit('formSelectvVisibleChange', field, val, row)
+}
+// 点击selection框
+const tableSelectionChange = (val) => {
+  emit('tableSelectionChange', val)
+}
+// tableform select bulr
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  emit('tableFormSelectOnBlur', field, val, row, index)
+}
+// 列表排序
+const tableSortChange = (column, prop, order) => {
+  emit('tableSortChange', column, prop, order)
+}
+
+// 数字输入-改变事件
+const inputNumberChange = (field, index, row, val) => {
+  emit('inputNumberChange', field, index, row, val)
+}
+//下拉框回显方法
+// const showSelect = (val, statusID) => {
+//   return getDictForStatusID(val, statusID)
+// }
+
+// 行点击
+const handleTableSelect = (row, column, event) => {
+  emit('handleTableSelect', row, column, event)
+}
+
+// 删除数据
+const handleDeleteTable = (row, index) => {
+  emit('handleDeleteTable', row, index,formRef.value)
+}
+// 添加数据
+const handleAddTable = () => {
+  emit('handleAddTable')
+}
+// 输入框聚焦
+const inpuFocus = (headerItem, row, index) => {
+  opensearchTable(
+    headerItem.field,
+    headerItem.tableForm.searchField,
+    headerItem.tableForm.searchTitle,
+    headerItem.tableForm.searchAllSchemas,
+    headerItem.tableForm.searchPage,
+    headerItem.tableForm.searchCondition,
+    headerItem.tableForm.multiple,
+    'tableForm',
+    row
+  )
+}
+/**
+ * 监听改变事件
+ * @param field 当前操作字段
+ * @param cur 改变后值
+ */
+const onChange = (field, cur) => {
+  emit('onChange', field, cur)
+}
+
+/**
+ * 监听失焦事件
+ * @param field 当前操作字段
+ * @param e 
+ */
+const onBlur = (field, e) => {
+  emit('onBlur', field, e)
+}
+
+// 修改盘点类型
+const selectChange = (field, val) => {
+  emit('selectChange', field, val)
+}
+// 修改盘点范围类型
+const selectChangeDetail = (field, val,formSchema) => {
+  formSchema.value = ''
+  emit('selectChangeDetail', field, val)
+}
+
+
+const tableFormChange = (field, val, row) => {
+  emit('tableFormChange', field, val, row)
+}
+
+const buttonOperationClick = (row, label, index)=> {
+  emit("buttonOperationClick", row, label, index);
+}
+
+const inputStringBlur = (headerItem, row, index)=> {
+  emit("inputStringBlur", headerItem, row, index);
+}
+
+</script>
+<style lang="scss" scoped>
+.table {
+  border: 1px solid #dedede;
+  border-radius: 8px;
+  padding: 10px;
+  width: calc(100% - 32px);
+  display: flex;
+}
+::v-deep(.el-table__body) {
+  padding: 10px 0px;
+}
+::v-deep(.el-table--default .el-table__cell) {
+  padding: 2px 0px;
+  border: none;
+}
+
+::v-deep(.el-table td.el-table__cell .el-form-item__content) {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+}
+::v-deep(.el-table td.el-table__cell div) {
+  overflow: visible;
+}
+
+::v-deep(.el-icon) {
+  display: block;
+}button
+.button {
+  > div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+
+    > div {
+      margin-left: 6px;
+      text-decoration: underline;
+      color: #409eff;
+    }
+  }
+}
+</style>
diff --git a/src/components/Card/index.ts b/src/components/Card/index.ts
new file mode 100644
index 000000000..f4c0d86ce
--- /dev/null
+++ b/src/components/Card/index.ts
@@ -0,0 +1,3 @@
+import CardTitle from './src/CardTitle.vue'
+
+export { CardTitle }
diff --git a/src/components/Card/src/CardTitle.vue b/src/components/Card/src/CardTitle.vue
new file mode 100644
index 000000000..5b122f495
--- /dev/null
+++ b/src/components/Card/src/CardTitle.vue
@@ -0,0 +1,37 @@
+<script lang="ts" setup>
+defineComponent({
+  name: 'CardTitle'
+})
+
+const { title } = defineProps({
+  title: {
+    type: String,
+    required: true
+  }
+})
+</script>
+
+<template>
+  <span class="card-title">{{ title }}</span>
+</template>
+
+<style scoped lang="scss">
+.card-title {
+  font-size: 14px;
+  font-weight: 600;
+
+  &::before {
+    position: relative;
+    top: 8px;
+    left: -5px;
+    display: inline-block;
+    width: 3px;
+    height: 14px;
+    //background-color: #105cfb;
+    background: var(--el-color-primary);
+    border-radius: 5px;
+    content: '';
+    transform: translateY(-50%);
+  }
+}
+</style>
diff --git a/src/components/ChangeRecord/index.ts b/src/components/ChangeRecord/index.ts
new file mode 100644
index 000000000..f0a35099d
--- /dev/null
+++ b/src/components/ChangeRecord/index.ts
@@ -0,0 +1,3 @@
+import ChangeRecord from './src/ChangeRecord.vue'
+
+export { ChangeRecord }
diff --git a/src/components/ChangeRecord/src/ChangeRecord.vue b/src/components/ChangeRecord/src/ChangeRecord.vue
new file mode 100644
index 000000000..a7de4f902
--- /dev/null
+++ b/src/components/ChangeRecord/src/ChangeRecord.vue
@@ -0,0 +1,128 @@
+<!-- 变更记录组件 -->
+<template>
+  <div class="annex">
+    <div class="title flex items-center">
+      <div class="title-txt">变更记录</div>
+    </div>
+    <div class="list">
+      <el-steps direction="vertical" class="mt-16px" :space="90">
+        <el-step v-for="(item, index) in changeRecordData.changeRecordList" :key="index">
+          <template #icon>
+            <slot>
+              <Icon color="#9e9e9e"
+                :icon="item.type == 1 ? 'ep:document-add' : item.type == 2 ? 'ep:edit' : item.type == 3 ? 'ep:delete' : item.type == 4 ? 'fa:edit' : item.type == 5 ? 'ep:upload' : item.type == 6 ? 'ep:document-delete' : item.type == 7 ? 'ep:chat-line-square' : item.type == 8 ? 'ep:delete' : ''"
+                class="cursor-pointer" size="20" />
+            </slot>
+          </template>
+          <template #title>
+            <slot>
+              <span class="color-#9e9e9e font-size-16px time">{{ formatDate(item.createTime) }}</span>
+            </slot>
+          </template>
+          <template #description>
+            <slot>
+              <div class="dic color-#303133" v-if="item.type == 1">
+                {{ item.nickname }} {{ item.content }}
+              </div>
+              <div class="dic color-#303133" v-else-if="item.type == 2">
+                {{ item.nickname }} {{ item.content }}
+              </div>
+              <div class="dic color-#303133" v-else-if="item.type == 3">
+                {{ item.nickname }} {{ item.content }}
+              </div>
+              <div class="dic color-#303133" v-else-if="item.type == 4">
+                {{ item.nickname }} {{ item.content }}
+              </div>
+              <div class="dic color-#303133" v-else-if="item.type == 5">
+                {{ item.nickname }} {{ item.content }}
+              </div>
+              <div class="dic color-#303133" v-else-if="item.type == 6">
+                {{ item.nickname }} {{ item.content }}
+              </div>
+              <div class="dic color-#303133" v-else-if="item.type == 7">
+                {{ item.nickname }} {{ item.content }}
+              </div>
+              <div class="dic color-#303133" v-else-if="item.type == 8">
+                {{ item.nickname }} {{ item.content }}
+              </div>
+
+              <!-- <div class="tips" v-if="item.type == 2">
+                <span class="color-#f56c6c" style="text-decoration:line-through">原值</span>><span
+                  class="color-#67c23a">新值</span>
+              </div>
+              <div  class="file" v-if="item.type == 3">
+                <div class="flex mt-8px items-center" v-for="(cur, key) in item.file" :key="key" @click="downFile(cur)">
+                  <Icon color="#70b6ff" icon="ep:document" size="20" style="display:bloc"/>
+                  <div class="file-text" type="primary">{{cur.name}}</div>
+                </div>
+              </div> -->
+
+            </slot>
+          </template>
+        </el-step>
+      </el-steps>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import download from '@/utils/download'
+import { formatDate } from '@/utils/formatTime'
+defineComponent({
+  name: 'ChangeRecord'
+})
+// 接收父组件数据
+const props = defineProps({
+  changeRecordData: {
+    type: Object,
+    required: true
+  }
+})
+// 下载文件
+const downFile = (cur) => {
+  download.excel(cur.url, cur.name)
+}
+</script>
+
+
+<style scoped lang="scss">
+.title {
+  border-bottom: 1px solid #dedede;
+  justify-content: space-between;
+
+  .title-txt {
+    width: 80px;
+    text-align: center;
+    color: rgb(63, 158, 255);
+    border-bottom: 2px solid rgb(63, 158, 255);
+    height: 30px;
+  }
+}
+
+.time {
+  font-weight: normal !important;
+}
+
+.dic {
+  font-size: 16px;
+
+  span {
+    color: #9e9e9e;
+  }
+}
+
+.tips {
+  font-size: 14px;
+  margin-top: 6px;
+}
+
+.file {
+  .file-text {
+    margin-left: 6px;
+    color: #70b6ff;
+    text-decoration: underline;
+    cursor: pointer;
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/components/ConfigGlobal/index.ts b/src/components/ConfigGlobal/index.ts
new file mode 100644
index 000000000..dda2462cb
--- /dev/null
+++ b/src/components/ConfigGlobal/index.ts
@@ -0,0 +1,3 @@
+import ConfigGlobal from './src/ConfigGlobal.vue'
+
+export { ConfigGlobal }
diff --git a/src/components/ConfigGlobal/src/ConfigGlobal.vue b/src/components/ConfigGlobal/src/ConfigGlobal.vue
new file mode 100644
index 000000000..a08739674
--- /dev/null
+++ b/src/components/ConfigGlobal/src/ConfigGlobal.vue
@@ -0,0 +1,63 @@
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import { useLocaleStore } from '@/store/modules/locale'
+import { useAppStore } from '@/store/modules/app'
+import { setCssVar } from '@/utils'
+import { useDesign } from '@/hooks/web/useDesign'
+import { ElementPlusSize } from '@/types/elementPlus'
+import { useWindowSize } from '@vueuse/core'
+
+defineOptions({ name: 'ConfigGlobal' })
+
+const { variables } = useDesign()
+
+const appStore = useAppStore()
+
+const props = defineProps({
+  size: propTypes.oneOf<ElementPlusSize>(['default', 'small', 'large']).def('default')
+})
+
+provide('configGlobal', props)
+
+// 初始化所有主题色
+onMounted(() => {
+  appStore.setCssVarTheme()
+})
+
+const { width } = useWindowSize()
+
+// 监听窗口变化
+watch(
+  () => width.value,
+  (width: number) => {
+    if (width < 768) {
+      !appStore.getMobile ? appStore.setMobile(true) : undefined
+      setCssVar('--left-menu-min-width', '0')
+      appStore.setCollapse(true)
+      appStore.getLayout !== 'classic' ? appStore.setLayout('classic') : undefined
+    } else {
+      appStore.getMobile ? appStore.setMobile(false) : undefined
+      setCssVar('--left-menu-min-width', '64px')
+    }
+  },
+  {
+    immediate: true
+  }
+)
+
+// 多语言相关
+const localeStore = useLocaleStore()
+
+const currentLocale = computed(() => localeStore.currentLocale)
+</script>
+
+<template>
+  <ElConfigProvider
+    :locale="currentLocale.elLocale"
+    :message="{ max: 1 }"
+    :namespace="variables.elNamespace"
+    :size="size"
+  >
+    <slot></slot>
+  </ElConfigProvider>
+</template>
diff --git a/src/components/ContentDetailWrap/index.ts b/src/components/ContentDetailWrap/index.ts
new file mode 100644
index 000000000..1871cac72
--- /dev/null
+++ b/src/components/ContentDetailWrap/index.ts
@@ -0,0 +1,3 @@
+import ContentDetailWrap from './src/ContentDetailWrap.vue'
+
+export { ContentDetailWrap }
diff --git a/src/components/ContentDetailWrap/src/ContentDetailWrap.vue b/src/components/ContentDetailWrap/src/ContentDetailWrap.vue
new file mode 100644
index 000000000..a9eacc011
--- /dev/null
+++ b/src/components/ContentDetailWrap/src/ContentDetailWrap.vue
@@ -0,0 +1,58 @@
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'ContentDetailWrap' })
+
+const { t } = useI18n()
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('content-detail-wrap')
+
+defineProps({
+  title: propTypes.string.def(''),
+  message: propTypes.string.def('')
+})
+const emit = defineEmits(['back'])
+const offset = ref(85)
+const contentDetailWrap = ref()
+onMounted(() => {
+  offset.value = contentDetailWrap.value.getBoundingClientRect().top
+})
+</script>
+
+<template>
+  <div ref="contentDetailWrap" :class="[`${prefixCls}-container`]">
+    <Sticky :offset="offset">
+      <div
+        :class="[
+          `${prefixCls}-header`,
+          'flex b-b-1 h-50px items-center text-center bg-white pr-10px'
+        ]"
+      >
+        <div :class="[`${prefixCls}-header__back`, 'flex pl-10px pr-10px ']">
+          <ElButton @click="emit('back')">
+            <Icon class="mr-5px" icon="ep:arrow-left" />
+            {{ t('common.back') }}
+          </ElButton>
+        </div>
+        <div :class="[`${prefixCls}-header__title`, 'flex flex-1  justify-center']">
+          <slot name="title">
+            <label class="text-16px font-700">{{ title }}</label>
+          </slot>
+        </div>
+        <div :class="[`${prefixCls}-header__right`, 'flex  pl-10px pr-10px']">
+          <slot name="right"></slot>
+        </div>
+      </div>
+    </Sticky>
+    <div style="padding: var(--app-content-padding)">
+      <ElCard :class="[`${prefixCls}-body`, 'mb-20px']" shadow="never">
+        <div>
+          <slot></slot>
+        </div>
+      </ElCard>
+    </div>
+  </div>
+</template>
diff --git a/src/components/ContentWrap/index.ts b/src/components/ContentWrap/index.ts
new file mode 100644
index 000000000..8c22cc833
--- /dev/null
+++ b/src/components/ContentWrap/index.ts
@@ -0,0 +1,3 @@
+import ContentWrap from './src/ContentWrap.vue'
+
+export { ContentWrap }
diff --git a/src/components/ContentWrap/src/ContentWrap.vue b/src/components/ContentWrap/src/ContentWrap.vue
new file mode 100644
index 000000000..e3bd59725
--- /dev/null
+++ b/src/components/ContentWrap/src/ContentWrap.vue
@@ -0,0 +1,34 @@
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'ContentWrap' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('content-wrap')
+
+defineProps({
+  title: propTypes.string.def(''),
+  message: propTypes.string.def('')
+})
+</script>
+
+<template>
+  <ElCard :class="[prefixCls, 'mb-15px']" shadow="never">
+    <template v-if="title" #header>
+      <div class="flex items-center">
+        <span class="text-16px font-700">{{ title }}</span>
+        <ElTooltip v-if="message" effect="dark" placement="right">
+          <template #content>
+            <div class="max-w-200px">{{ message }}</div>
+          </template>
+          <Icon :size="14" class="ml-5px" icon="ep:question-filled" />
+        </ElTooltip>
+      </div>
+    </template>
+    <div>
+      <slot></slot>
+    </div>
+  </ElCard>
+</template>
diff --git a/src/components/CountTo/index.ts b/src/components/CountTo/index.ts
new file mode 100644
index 000000000..2119f0235
--- /dev/null
+++ b/src/components/CountTo/index.ts
@@ -0,0 +1,3 @@
+import CountTo from './src/CountTo.vue'
+
+export { CountTo }
diff --git a/src/components/CountTo/src/CountTo.vue b/src/components/CountTo/src/CountTo.vue
new file mode 100644
index 000000000..1b1131a09
--- /dev/null
+++ b/src/components/CountTo/src/CountTo.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup>
+import { PropType } from 'vue'
+import { isNumber } from '@/utils/is'
+import { propTypes } from '@/utils/propTypes'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'CountTo' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('count-to')
+
+const props = defineProps({
+  startVal: propTypes.number.def(0),
+  endVal: propTypes.number.def(2021),
+  duration: propTypes.number.def(3000),
+  autoplay: propTypes.bool.def(true),
+  decimals: propTypes.number.validate((value: number) => value >= 0).def(0),
+  decimal: propTypes.string.def('.'),
+  separator: propTypes.string.def(','),
+  prefix: propTypes.string.def(''),
+  suffix: propTypes.string.def(''),
+  useEasing: propTypes.bool.def(true),
+  easingFn: {
+    type: Function as PropType<(t: number, b: number, c: number, d: number) => number>,
+    default(t: number, b: number, c: number, d: number) {
+      return (c * (-Math.pow(2, (-10 * t) / d) + 1) * 1024) / 1023 + b
+    }
+  }
+})
+
+const emit = defineEmits(['mounted', 'callback'])
+
+const formatNumber = (num: number | string) => {
+  const { decimals, decimal, separator, suffix, prefix } = props
+  num = Number(num).toFixed(decimals)
+  num += ''
+  const x = num.split('.')
+  let x1 = x[0]
+  const x2 = x.length > 1 ? decimal + x[1] : ''
+  const rgx = /(\d+)(\d{3})/
+  if (separator && !isNumber(separator)) {
+    while (rgx.test(x1)) {
+      x1 = x1.replace(rgx, '$1' + separator + '$2')
+    }
+  }
+  return prefix + x1 + x2 + suffix
+}
+
+const state = reactive<{
+  localStartVal: number
+  printVal: number | null
+  displayValue: string
+  paused: boolean
+  localDuration: number | null
+  startTime: number | null
+  timestamp: number | null
+  rAF: any
+  remaining: number | null
+}>({
+  localStartVal: props.startVal,
+  displayValue: formatNumber(props.startVal),
+  printVal: null,
+  paused: false,
+  localDuration: props.duration,
+  startTime: null,
+  timestamp: null,
+  remaining: null,
+  rAF: null
+})
+
+const displayValue = toRef(state, 'displayValue')
+
+onMounted(() => {
+  if (props.autoplay) {
+    start()
+  }
+  emit('mounted')
+})
+
+const getCountDown = computed(() => {
+  return props.startVal > props.endVal
+})
+
+watch([() => props.startVal, () => props.endVal], () => {
+  if (props.autoplay) {
+    start()
+  }
+})
+
+const start = () => {
+  const { startVal, duration } = props
+  state.localStartVal = startVal
+  state.startTime = null
+  state.localDuration = duration
+  state.paused = false
+  state.rAF = requestAnimationFrame(count)
+}
+
+const pauseResume = () => {
+  if (state.paused) {
+    resume()
+    state.paused = false
+  } else {
+    pause()
+    state.paused = true
+  }
+}
+
+const pause = () => {
+  cancelAnimationFrame(state.rAF)
+}
+
+const resume = () => {
+  state.startTime = null
+  state.localDuration = +(state.remaining as number)
+  state.localStartVal = +(state.printVal as number)
+  requestAnimationFrame(count)
+}
+
+const reset = () => {
+  state.startTime = null
+  cancelAnimationFrame(state.rAF)
+  state.displayValue = formatNumber(props.startVal)
+}
+
+const count = (timestamp: number) => {
+  const { useEasing, easingFn, endVal } = props
+  if (!state.startTime) state.startTime = timestamp
+  state.timestamp = timestamp
+  const progress = timestamp - state.startTime
+  state.remaining = (state.localDuration as number) - progress
+  if (useEasing) {
+    if (unref(getCountDown)) {
+      state.printVal =
+        state.localStartVal -
+        easingFn(progress, 0, state.localStartVal - endVal, state.localDuration as number)
+    } else {
+      state.printVal = easingFn(
+        progress,
+        state.localStartVal,
+        endVal - state.localStartVal,
+        state.localDuration as number
+      )
+    }
+  } else {
+    if (unref(getCountDown)) {
+      state.printVal =
+        state.localStartVal -
+        (state.localStartVal - endVal) * (progress / (state.localDuration as number))
+    } else {
+      state.printVal =
+        state.localStartVal +
+        (endVal - state.localStartVal) * (progress / (state.localDuration as number))
+    }
+  }
+  if (unref(getCountDown)) {
+    state.printVal = state.printVal < endVal ? endVal : state.printVal
+  } else {
+    state.printVal = state.printVal > endVal ? endVal : state.printVal
+  }
+  state.displayValue = formatNumber(state.printVal!)
+  if (progress < (state.localDuration as number)) {
+    state.rAF = requestAnimationFrame(count)
+  } else {
+    emit('callback')
+  }
+}
+
+defineExpose({
+  pauseResume,
+  reset,
+  start,
+  pause
+})
+</script>
+
+<template>
+  <span :class="prefixCls">
+    {{ displayValue }}
+  </span>
+</template>
diff --git a/src/components/Crontab/index.ts b/src/components/Crontab/index.ts
new file mode 100644
index 000000000..6beeef864
--- /dev/null
+++ b/src/components/Crontab/index.ts
@@ -0,0 +1,2 @@
+import Crontab from './src/Crontab.vue'
+export { Crontab }
diff --git a/src/components/Crontab/src/Crontab.vue b/src/components/Crontab/src/Crontab.vue
new file mode 100644
index 000000000..90b40b2fb
--- /dev/null
+++ b/src/components/Crontab/src/Crontab.vue
@@ -0,0 +1,1011 @@
+<script lang="ts" setup>
+import { ElMessage } from 'element-plus'
+import { PropType } from 'vue'
+
+defineOptions({ name: 'Crontab' })
+
+interface shortcutsType {
+  text: string
+  value: string
+}
+
+const props = defineProps({
+  modelValue: {
+    type: String,
+    default: '* * * * * ?'
+  },
+  shortcuts: { type: Array as PropType<shortcutsType[]>, default: () => [] }
+})
+const defaultValue = ref('')
+const dialogVisible = ref(false)
+const getYear = () => {
+  let v: number[] = []
+  let y = new Date().getFullYear()
+  for (let i = 0; i < 11; i++) {
+    v.push(y + i)
+  }
+  return v
+}
+const cronValue = reactive({
+  second: {
+    type: '0',
+    range: {
+      start: 1,
+      end: 2
+    },
+    loop: {
+      start: 0,
+      end: 1
+    },
+    appoint: [] as string[]
+  },
+  minute: {
+    type: '0',
+    range: {
+      start: 1,
+      end: 2
+    },
+    loop: {
+      start: 0,
+      end: 1
+    },
+    appoint: [] as string[]
+  },
+  hour: {
+    type: '0',
+    range: {
+      start: 1,
+      end: 2
+    },
+    loop: {
+      start: 0,
+      end: 1
+    },
+    appoint: [] as string[]
+  },
+  day: {
+    type: '0',
+    range: {
+      start: 1,
+      end: 2
+    },
+    loop: {
+      start: 1,
+      end: 1
+    },
+    appoint: [] as string[]
+  },
+  month: {
+    type: '0',
+    range: {
+      start: 1,
+      end: 2
+    },
+    loop: {
+      start: 1,
+      end: 1
+    },
+    appoint: [] as string[]
+  },
+  week: {
+    type: '5',
+    range: {
+      start: '2',
+      end: '3'
+    },
+    loop: {
+      start: 0,
+      end: '2'
+    },
+    last: '2',
+    appoint: [] as string[]
+  },
+  year: {
+    type: '-1',
+    range: {
+      start: getYear()[0],
+      end: getYear()[1]
+    },
+    loop: {
+      start: getYear()[0],
+      end: 1
+    },
+    appoint: [] as string[]
+  }
+})
+const data = reactive({
+  second: ['0', '5', '15', '20', '25', '30', '35', '40', '45', '50', '55', '59'],
+  minute: ['0', '5', '15', '20', '25', '30', '35', '40', '45', '50', '55', '59'],
+  hour: [
+    '0',
+    '1',
+    '2',
+    '3',
+    '4',
+    '5',
+    '6',
+    '7',
+    '8',
+    '9',
+    '10',
+    '11',
+    '12',
+    '13',
+    '14',
+    '15',
+    '16',
+    '17',
+    '18',
+    '19',
+    '20',
+    '21',
+    '22',
+    '23'
+  ],
+  day: [
+    '1',
+    '2',
+    '3',
+    '4',
+    '5',
+    '6',
+    '7',
+    '8',
+    '9',
+    '10',
+    '11',
+    '12',
+    '13',
+    '14',
+    '15',
+    '16',
+    '17',
+    '18',
+    '19',
+    '20',
+    '21',
+    '22',
+    '23',
+    '24',
+    '25',
+    '26',
+    '27',
+    '28',
+    '29',
+    '30',
+    '31'
+  ],
+  month: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+  week: [
+    {
+      value: '1',
+      label: '周日'
+    },
+    {
+      value: '2',
+      label: '周一'
+    },
+    {
+      value: '3',
+      label: '周二'
+    },
+    {
+      value: '4',
+      label: '周三'
+    },
+    {
+      value: '5',
+      label: '周四'
+    },
+    {
+      value: '6',
+      label: '周五'
+    },
+    {
+      value: '7',
+      label: '周六'
+    }
+  ],
+  year: getYear()
+})
+
+const value_second = computed(() => {
+  let v = cronValue.second
+  if (v.type == '0') {
+    return '*'
+  } else if (v.type == '1') {
+    return v.range.start + '-' + v.range.end
+  } else if (v.type == '2') {
+    return v.loop.start + '/' + v.loop.end
+  } else if (v.type == '3') {
+    return v.appoint.length > 0 ? v.appoint.join(',') : '*'
+  } else {
+    return '*'
+  }
+})
+const value_minute = computed(() => {
+  let v = cronValue.minute
+  if (v.type == '0') {
+    return '*'
+  } else if (v.type == '1') {
+    return v.range.start + '-' + v.range.end
+  } else if (v.type == '2') {
+    return v.loop.start + '/' + v.loop.end
+  } else if (v.type == '3') {
+    return v.appoint.length > 0 ? v.appoint.join(',') : '*'
+  } else {
+    return '*'
+  }
+})
+const value_hour = computed(() => {
+  let v = cronValue.hour
+  if (v.type == '0') {
+    return '*'
+  } else if (v.type == '1') {
+    return v.range.start + '-' + v.range.end
+  } else if (v.type == '2') {
+    return v.loop.start + '/' + v.loop.end
+  } else if (v.type == '3') {
+    return v.appoint.length > 0 ? v.appoint.join(',') : '*'
+  } else {
+    return '*'
+  }
+})
+const value_day = computed(() => {
+  let v = cronValue.day
+  if (v.type == '0') {
+    return '*'
+  } else if (v.type == '1') {
+    return v.range.start + '-' + v.range.end
+  } else if (v.type == '2') {
+    return v.loop.start + '/' + v.loop.end
+  } else if (v.type == '3') {
+    return v.appoint.length > 0 ? v.appoint.join(',') : '*'
+  } else if (v.type == '4') {
+    return 'L'
+  } else if (v.type == '5') {
+    return '?'
+  } else {
+    return '*'
+  }
+})
+const value_month = computed(() => {
+  let v = cronValue.month
+  if (v.type == '0') {
+    return '*'
+  } else if (v.type == '1') {
+    return v.range.start + '-' + v.range.end
+  } else if (v.type == '2') {
+    return v.loop.start + '/' + v.loop.end
+  } else if (v.type == '3') {
+    return v.appoint.length > 0 ? v.appoint.join(',') : '*'
+  } else {
+    return '*'
+  }
+})
+const value_week = computed(() => {
+  let v = cronValue.week
+  if (v.type == '0') {
+    return '*'
+  } else if (v.type == '1') {
+    return v.range.start + '-' + v.range.end
+  } else if (v.type == '2') {
+    return v.loop.end + '#' + v.loop.start
+  } else if (v.type == '3') {
+    return v.appoint.length > 0 ? v.appoint.join(',') : '*'
+  } else if (v.type == '4') {
+    return v.last + 'L'
+  } else if (v.type == '5') {
+    return '?'
+  } else {
+    return '*'
+  }
+})
+const value_year = computed(() => {
+  let v = cronValue.year
+  if (v.type == '-1') {
+    return ''
+  } else if (v.type == '0') {
+    return '*'
+  } else if (v.type == '1') {
+    return v.range.start + '-' + v.range.end
+  } else if (v.type == '2') {
+    return v.loop.start + '/' + v.loop.end
+  } else if (v.type == '3') {
+    return v.appoint.length > 0 ? v.appoint.join(',') : ''
+  } else {
+    return ''
+  }
+})
+watch(
+  () => cronValue.week.type,
+  (val) => {
+    if (val != '5') {
+      cronValue.day.type = '5'
+    }
+  }
+)
+watch(
+  () => cronValue.day.type,
+  (val) => {
+    if (val != '5') {
+      cronValue.week.type = '5'
+    }
+  }
+)
+watch(
+  () => props.modelValue,
+  () => {
+    defaultValue.value = props.modelValue
+  }
+)
+onMounted(() => {
+  defaultValue.value = props.modelValue
+})
+const emit = defineEmits(['update:modelValue'])
+const select = ref()
+watch(
+  () => select.value,
+  () => {
+    if (select.value == 'custom') {
+      open()
+    } else {
+      defaultValue.value = select.value
+      emit('update:modelValue', defaultValue.value)
+    }
+  }
+)
+const open = () => {
+  set()
+  dialogVisible.value = true
+}
+const set = () => {
+  defaultValue.value = props.modelValue
+  let arr = (props.modelValue || '* * * * * ?').split(' ')
+  //简单检查
+  if (arr.length < 6) {
+    ElMessage.warning('cron表达式错误，已转换为默认表达式')
+    arr = '* * * * * ?'.split(' ')
+  }
+
+  //秒
+  if (arr[0] == '*') {
+    cronValue.second.type = '0'
+  } else if (arr[0].includes('-')) {
+    cronValue.second.type = '1'
+    cronValue.second.range.start = Number(arr[0].split('-')[0])
+    cronValue.second.range.end = Number(arr[0].split('-')[1])
+  } else if (arr[0].includes('/')) {
+    cronValue.second.type = '2'
+    cronValue.second.loop.start = Number(arr[0].split('/')[0])
+    cronValue.second.loop.end = Number(arr[0].split('/')[1])
+  } else {
+    cronValue.second.type = '3'
+    cronValue.second.appoint = arr[0].split(',')
+  }
+  //分
+  if (arr[1] == '*') {
+    cronValue.minute.type = '0'
+  } else if (arr[1].includes('-')) {
+    cronValue.minute.type = '1'
+    cronValue.minute.range.start = Number(arr[1].split('-')[0])
+    cronValue.minute.range.end = Number(arr[1].split('-')[1])
+  } else if (arr[1].includes('/')) {
+    cronValue.minute.type = '2'
+    cronValue.minute.loop.start = Number(arr[1].split('/')[0])
+    cronValue.minute.loop.end = Number(arr[1].split('/')[1])
+  } else {
+    cronValue.minute.type = '3'
+    cronValue.minute.appoint = arr[1].split(',')
+  }
+  //小时
+  if (arr[2] == '*') {
+    cronValue.hour.type = '0'
+  } else if (arr[2].includes('-')) {
+    cronValue.hour.type = '1'
+    cronValue.hour.range.start = Number(arr[2].split('-')[0])
+    cronValue.hour.range.end = Number(arr[2].split('-')[1])
+  } else if (arr[2].includes('/')) {
+    cronValue.hour.type = '2'
+    cronValue.hour.loop.start = Number(arr[2].split('/')[0])
+    cronValue.hour.loop.end = Number(arr[2].split('/')[1])
+  } else {
+    cronValue.hour.type = '3'
+    cronValue.hour.appoint = arr[2].split(',')
+  }
+  //日
+  if (arr[3] == '*') {
+    cronValue.day.type = '0'
+  } else if (arr[3] == 'L') {
+    cronValue.day.type = '4'
+  } else if (arr[3] == '?') {
+    cronValue.day.type = '5'
+  } else if (arr[3].includes('-')) {
+    cronValue.day.type = '1'
+    cronValue.day.range.start = Number(arr[3].split('-')[0])
+    cronValue.day.range.end = Number(arr[3].split('-')[1])
+  } else if (arr[3].includes('/')) {
+    cronValue.day.type = '2'
+    cronValue.day.loop.start = Number(arr[3].split('/')[0])
+    cronValue.day.loop.end = Number(arr[3].split('/')[1])
+  } else {
+    cronValue.day.type = '3'
+    cronValue.day.appoint = arr[3].split(',')
+  }
+  //月
+  if (arr[4] == '*') {
+    cronValue.month.type = '0'
+  } else if (arr[4].includes('-')) {
+    cronValue.month.type = '1'
+    cronValue.month.range.start = Number(arr[4].split('-')[0])
+    cronValue.month.range.end = Number(arr[4].split('-')[1])
+  } else if (arr[4].includes('/')) {
+    cronValue.month.type = '2'
+    cronValue.month.loop.start = Number(arr[4].split('/')[0])
+    cronValue.month.loop.end = Number(arr[4].split('/')[1])
+  } else {
+    cronValue.month.type = '3'
+    cronValue.month.appoint = arr[4].split(',')
+  }
+  //周
+  if (arr[5] == '*') {
+    cronValue.week.type = '0'
+  } else if (arr[5] == '?') {
+    cronValue.week.type = '5'
+  } else if (arr[5].includes('-')) {
+    cronValue.week.type = '1'
+    cronValue.week.range.start = arr[5].split('-')[0]
+    cronValue.week.range.end = arr[5].split('-')[1]
+  } else if (arr[5].includes('#')) {
+    cronValue.week.type = '2'
+    cronValue.week.loop.start = Number(arr[5].split('#')[1])
+    cronValue.week.loop.end = arr[5].split('#')[0]
+  } else if (arr[5].includes('L')) {
+    cronValue.week.type = '4'
+    cronValue.week.last = arr[5].split('L')[0]
+  } else {
+    cronValue.week.type = '3'
+    cronValue.week.appoint = arr[5].split(',')
+  }
+  //年
+  if (!arr[6]) {
+    cronValue.year.type = '-1'
+  } else if (arr[6] == '*') {
+    cronValue.year.type = '0'
+  } else if (arr[6].includes('-')) {
+    cronValue.year.type = '1'
+    cronValue.year.range.start = Number(arr[6].split('-')[0])
+    cronValue.year.range.end = Number(arr[6].split('-')[1])
+  } else if (arr[6].includes('/')) {
+    cronValue.year.type = '2'
+    cronValue.year.loop.start = Number(arr[6].split('/')[1])
+    cronValue.year.loop.end = Number(arr[6].split('/')[0])
+  } else {
+    cronValue.year.type = '3'
+    cronValue.year.appoint = arr[6].split(',')
+  }
+}
+const submit = () => {
+  let year = value_year.value ? ' ' + value_year.value : ''
+  defaultValue.value =
+    value_second.value +
+    ' ' +
+    value_minute.value +
+    ' ' +
+    value_hour.value +
+    ' ' +
+    value_day.value +
+    ' ' +
+    value_month.value +
+    ' ' +
+    value_week.value +
+    year
+  emit('update:modelValue', defaultValue.value)
+  dialogVisible.value = false
+}
+</script>
+<template>
+  <el-input v-model="defaultValue" class="input-with-select" v-bind="$attrs">
+    <template #append>
+      <el-select v-model="select" placeholder="生成器" style="width: 115px">
+        <el-option label="每分钟" value="0 * * * * ?" />
+        <el-option label="每小时" value="0 0 * * * ?" />
+        <el-option label="每天零点" value="0 0 0 * * ?" />
+        <el-option label="每月一号零点" value="0 0 0 1 * ?" />
+        <el-option label="每月最后一天零点" value="0 0 0 L * ?" />
+        <el-option label="每周星期日零点" value="0 0 0 ? * 1" />
+        <el-option
+          v-for="(item, index) in shortcuts"
+          :key="index"
+          :label="item.text"
+          :value="item.value"
+        />
+        <el-option label="自定义" value="custom" />
+      </el-select>
+    </template>
+  </el-input>
+
+  <el-dialog
+    v-model="dialogVisible"
+    :width="580"
+    append-to-body
+    destroy-on-close
+    title="cron规则生成器"
+  >
+    <div class="sc-cron">
+      <el-tabs>
+        <el-tab-pane>
+          <template #label>
+            <div class="sc-cron-num">
+              <h2>秒</h2>
+              <h4>{{ value_second }}</h4>
+            </div>
+          </template>
+          <el-form>
+            <el-form-item label="类型">
+              <el-radio-group v-model="cronValue.second.type">
+                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button label="3">指定</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item v-if="cronValue.second.type == '1'" label="范围">
+              <el-input-number
+                v-model="cronValue.second.range.start"
+                :max="59"
+                :min="0"
+                controls-position="right"
+              />
+              <span style="padding: 0 15px">-</span>
+              <el-input-number
+                v-model="cronValue.second.range.end"
+                :max="59"
+                :min="0"
+                controls-position="right"
+              />
+            </el-form-item>
+            <el-form-item v-if="cronValue.second.type == '2'" label="间隔">
+              <el-input-number
+                v-model="cronValue.second.loop.start"
+                :max="59"
+                :min="0"
+                controls-position="right"
+              />
+              秒开始，每
+              <el-input-number
+                v-model="cronValue.second.loop.end"
+                :max="59"
+                :min="0"
+                controls-position="right"
+              />
+              秒执行一次
+            </el-form-item>
+            <el-form-item v-if="cronValue.second.type == '3'" label="指定">
+              <el-select v-model="cronValue.second.appoint" multiple style="width: 100%">
+                <el-option
+                  v-for="(item, index) in data.second"
+                  :key="index"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane>
+          <template #label>
+            <div class="sc-cron-num">
+              <h2>分钟</h2>
+              <h4>{{ value_minute }}</h4>
+            </div>
+          </template>
+          <el-form>
+            <el-form-item label="类型">
+              <el-radio-group v-model="cronValue.minute.type">
+                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button label="3">指定</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item v-if="cronValue.minute.type == '1'" label="范围">
+              <el-input-number
+                v-model="cronValue.minute.range.start"
+                :max="59"
+                :min="0"
+                controls-position="right"
+              />
+              <span style="padding: 0 15px">-</span>
+              <el-input-number
+                v-model="cronValue.minute.range.end"
+                :max="59"
+                :min="0"
+                controls-position="right"
+              />
+            </el-form-item>
+            <el-form-item v-if="cronValue.minute.type == '2'" label="间隔">
+              <el-input-number
+                v-model="cronValue.minute.loop.start"
+                :max="59"
+                :min="0"
+                controls-position="right"
+              />
+              分钟开始，每
+              <el-input-number
+                v-model="cronValue.minute.loop.end"
+                :max="59"
+                :min="0"
+                controls-position="right"
+              />
+              分钟执行一次
+            </el-form-item>
+            <el-form-item v-if="cronValue.minute.type == '3'" label="指定">
+              <el-select v-model="cronValue.minute.appoint" multiple style="width: 100%">
+                <el-option
+                  v-for="(item, index) in data.minute"
+                  :key="index"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane>
+          <template #label>
+            <div class="sc-cron-num">
+              <h2>小时</h2>
+              <h4>{{ value_hour }}</h4>
+            </div>
+          </template>
+          <el-form>
+            <el-form-item label="类型">
+              <el-radio-group v-model="cronValue.hour.type">
+                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button label="3">指定</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item v-if="cronValue.hour.type == '1'" label="范围">
+              <el-input-number
+                v-model="cronValue.hour.range.start"
+                :max="23"
+                :min="0"
+                controls-position="right"
+              />
+              <span style="padding: 0 15px">-</span>
+              <el-input-number
+                v-model="cronValue.hour.range.end"
+                :max="23"
+                :min="0"
+                controls-position="right"
+              />
+            </el-form-item>
+            <el-form-item v-if="cronValue.hour.type == '2'" label="间隔">
+              <el-input-number
+                v-model="cronValue.hour.loop.start"
+                :max="23"
+                :min="0"
+                controls-position="right"
+              />
+              小时开始，每
+              <el-input-number
+                v-model="cronValue.hour.loop.end"
+                :max="23"
+                :min="0"
+                controls-position="right"
+              />
+              小时执行一次
+            </el-form-item>
+            <el-form-item v-if="cronValue.hour.type == '3'" label="指定">
+              <el-select v-model="cronValue.hour.appoint" multiple style="width: 100%">
+                <el-option
+                  v-for="(item, index) in data.hour"
+                  :key="index"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane>
+          <template #label>
+            <div class="sc-cron-num">
+              <h2>日</h2>
+              <h4>{{ value_day }}</h4>
+            </div>
+          </template>
+          <el-form>
+            <el-form-item label="类型">
+              <el-radio-group v-model="cronValue.day.type">
+                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button label="4">本月最后一天</el-radio-button>
+                <el-radio-button label="5">不指定</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item v-if="cronValue.day.type == '1'" label="范围">
+              <el-input-number
+                v-model="cronValue.day.range.start"
+                :max="31"
+                :min="1"
+                controls-position="right"
+              />
+              <span style="padding: 0 15px">-</span>
+              <el-input-number
+                v-model="cronValue.day.range.end"
+                :max="31"
+                :min="1"
+                controls-position="right"
+              />
+            </el-form-item>
+            <el-form-item v-if="cronValue.day.type == '2'" label="间隔">
+              <el-input-number
+                v-model="cronValue.day.loop.start"
+                :max="31"
+                :min="1"
+                controls-position="right"
+              />
+              号开始，每
+              <el-input-number
+                v-model="cronValue.day.loop.end"
+                :max="31"
+                :min="1"
+                controls-position="right"
+              />
+              天执行一次
+            </el-form-item>
+            <el-form-item v-if="cronValue.day.type == '3'" label="指定">
+              <el-select v-model="cronValue.day.appoint" multiple style="width: 100%">
+                <el-option
+                  v-for="(item, index) in data.day"
+                  :key="index"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane>
+          <template #label>
+            <div class="sc-cron-num">
+              <h2>月</h2>
+              <h4>{{ value_month }}</h4>
+            </div>
+          </template>
+          <el-form>
+            <el-form-item label="类型">
+              <el-radio-group v-model="cronValue.month.type">
+                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button label="3">指定</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item v-if="cronValue.month.type == '1'" label="范围">
+              <el-input-number
+                v-model="cronValue.month.range.start"
+                :max="12"
+                :min="1"
+                controls-position="right"
+              />
+              <span style="padding: 0 15px">-</span>
+              <el-input-number
+                v-model="cronValue.month.range.end"
+                :max="12"
+                :min="1"
+                controls-position="right"
+              />
+            </el-form-item>
+            <el-form-item v-if="cronValue.month.type == '2'" label="间隔">
+              <el-input-number
+                v-model="cronValue.month.loop.start"
+                :max="12"
+                :min="1"
+                controls-position="right"
+              />
+              月开始，每
+              <el-input-number
+                v-model="cronValue.month.loop.end"
+                :max="12"
+                :min="1"
+                controls-position="right"
+              />
+              月执行一次
+            </el-form-item>
+            <el-form-item v-if="cronValue.month.type == '3'" label="指定">
+              <el-select v-model="cronValue.month.appoint" multiple style="width: 100%">
+                <el-option
+                  v-for="(item, index) in data.month"
+                  :key="index"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane>
+          <template #label>
+            <div class="sc-cron-num">
+              <h2>周</h2>
+              <h4>{{ value_week }}</h4>
+            </div>
+          </template>
+          <el-form>
+            <el-form>
+              <el-form-item label="类型">
+                <el-radio-group v-model="cronValue.week.type">
+                  <el-radio-button label="0">任意值</el-radio-button>
+                  <el-radio-button label="1">范围</el-radio-button>
+                  <el-radio-button label="2">间隔</el-radio-button>
+                  <el-radio-button label="3">指定</el-radio-button>
+                  <el-radio-button label="4">本月最后一周</el-radio-button>
+                  <el-radio-button label="5">不指定</el-radio-button>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item v-if="cronValue.week.type == '1'" label="范围">
+                <el-select v-model="cronValue.week.range.start">
+                  <el-option
+                    v-for="(item, index) in data.week"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span style="padding: 0 15px">-</span>
+                <el-select v-model="cronValue.week.range.end">
+                  <el-option
+                    v-for="(item, index) in data.week"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="cronValue.week.type == '2'" label="间隔">
+                第
+                <el-input-number
+                  v-model="cronValue.week.loop.start"
+                  :max="4"
+                  :min="1"
+                  controls-position="right"
+                />
+                周的星期
+                <el-select v-model="cronValue.week.loop.end">
+                  <el-option
+                    v-for="(item, index) in data.week"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+                执行一次
+              </el-form-item>
+              <el-form-item v-if="cronValue.week.type == '3'" label="指定">
+                <el-select v-model="cronValue.week.appoint" multiple style="width: 100%">
+                  <el-option
+                    v-for="(item, index) in data.week"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="cronValue.week.type == '4'" label="最后一周">
+                <el-select v-model="cronValue.week.last">
+                  <el-option
+                    v-for="(item, index) in data.week"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane>
+          <template #label>
+            <div class="sc-cron-num">
+              <h2>年</h2>
+              <h4>{{ value_year }}</h4>
+            </div>
+          </template>
+          <el-form>
+            <el-form-item label="类型">
+              <el-radio-group v-model="cronValue.year.type">
+                <el-radio-button label="-1">忽略</el-radio-button>
+                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button label="3">指定</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item v-if="cronValue.year.type == '1'" label="范围">
+              <el-input-number v-model="cronValue.year.range.start" controls-position="right" />
+              <span style="padding: 0 15px">-</span>
+              <el-input-number v-model="cronValue.year.range.end" controls-position="right" />
+            </el-form-item>
+            <el-form-item v-if="cronValue.year.type == '2'" label="间隔">
+              <el-input-number v-model="cronValue.year.loop.start" controls-position="right" />
+              年开始，每
+              <el-input-number
+                v-model="cronValue.year.loop.end"
+                :min="1"
+                controls-position="right"
+              />
+              年执行一次
+            </el-form-item>
+            <el-form-item v-if="cronValue.year.type == '3'" label="指定">
+              <el-select v-model="cronValue.year.appoint" multiple style="width: 100%">
+                <el-option
+                  v-for="(item, index) in data.year"
+                  :key="index"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+    <template #footer>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit()">确 认</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style scoped>
+.sc-cron:deep(.el-tabs__item) {
+  height: auto;
+  padding: 0 7px;
+  line-height: 1;
+  vertical-align: bottom;
+}
+
+.sc-cron-num {
+  width: 100%;
+  margin-bottom: 15px;
+  text-align: center;
+}
+
+.sc-cron-num h2 {
+  margin-bottom: 15px;
+  font-size: 12px;
+  font-weight: normal;
+}
+
+.sc-cron-num h4 {
+  display: block;
+  width: 100%;
+  height: 32px;
+  padding: 0 15px;
+  font-size: 12px;
+  line-height: 30px;
+  background: var(--el-color-primary-light-9);
+  border-radius: 4px;
+}
+
+.sc-cron:deep(.el-tabs__item.is-active) .sc-cron-num h4 {
+  color: #fff;
+  background: var(--el-color-primary);
+}
+
+[data-theme='dark'] .sc-cron-num h4 {
+  background: var(--el-color-white);
+}
+
+.input-with-select .el-input-group__prepend {
+  background-color: var(--el-fill-color-blank);
+}
+</style>
diff --git a/src/components/Cropper/index.ts b/src/components/Cropper/index.ts
new file mode 100644
index 000000000..8fcc61830
--- /dev/null
+++ b/src/components/Cropper/index.ts
@@ -0,0 +1,4 @@
+import CropperImage from './src/Cropper.vue'
+import CropperAvatar from './src/CropperAvatar.vue'
+
+export { CropperImage, CropperAvatar }
diff --git a/src/components/Cropper/src/CopperModal.vue b/src/components/Cropper/src/CopperModal.vue
new file mode 100644
index 000000000..27052b8a9
--- /dev/null
+++ b/src/components/Cropper/src/CopperModal.vue
@@ -0,0 +1,261 @@
+<template>
+  <div>
+    <Dialog
+      v-model="dialogVisible"
+      :canFullscreen="false"
+      :title="t('cropper.modalTitle')"
+      maxHeight="380px"
+      width="800px"
+    >
+      <div :class="prefixCls">
+        <div :class="`${prefixCls}-left`">
+          <div :class="`${prefixCls}-cropper`">
+            <CropperImage
+              v-if="src"
+              :circled="circled"
+              :src="src"
+              height="300px"
+              @cropend="handleCropend"
+              @ready="handleReady"
+            />
+          </div>
+
+          <div :class="`${prefixCls}-toolbar`">
+            <el-upload :beforeUpload="handleBeforeUpload" :fileList="[]" accept="image/*">
+              <el-tooltip :content="t('cropper.selectImage')" placement="bottom">
+                <XButton preIcon="ant-design:upload-outlined" type="primary" />
+              </el-tooltip>
+            </el-upload>
+            <el-space>
+              <el-tooltip :content="t('cropper.btn_reset')" placement="bottom">
+                <XButton
+                  :disabled="!src"
+                  preIcon="ant-design:reload-outlined"
+                  size="small"
+                  type="primary"
+                  @click="handlerToolbar('reset')"
+                />
+              </el-tooltip>
+              <el-tooltip :content="t('cropper.btn_rotate_left')" placement="bottom">
+                <XButton
+                  :disabled="!src"
+                  preIcon="ant-design:rotate-left-outlined"
+                  size="small"
+                  type="primary"
+                  @click="handlerToolbar('rotate', -45)"
+                />
+              </el-tooltip>
+              <el-tooltip :content="t('cropper.btn_rotate_right')" placement="bottom">
+                <XButton
+                  :disabled="!src"
+                  preIcon="ant-design:rotate-right-outlined"
+                  size="small"
+                  type="primary"
+                  @click="handlerToolbar('rotate', 45)"
+                />
+              </el-tooltip>
+              <el-tooltip :content="t('cropper.btn_scale_x')" placement="bottom">
+                <XButton
+                  :disabled="!src"
+                  preIcon="vaadin:arrows-long-h"
+                  size="small"
+                  type="primary"
+                  @click="handlerToolbar('scaleX')"
+                />
+              </el-tooltip>
+              <el-tooltip :content="t('cropper.btn_scale_y')" placement="bottom">
+                <XButton
+                  :disabled="!src"
+                  preIcon="vaadin:arrows-long-v"
+                  size="small"
+                  type="primary"
+                  @click="handlerToolbar('scaleY')"
+                />
+              </el-tooltip>
+              <el-tooltip :content="t('cropper.btn_zoom_in')" placement="bottom">
+                <XButton
+                  :disabled="!src"
+                  preIcon="ant-design:zoom-in-outlined"
+                  size="small"
+                  type="primary"
+                  @click="handlerToolbar('zoom', 0.1)"
+                />
+              </el-tooltip>
+              <el-tooltip :content="t('cropper.btn_zoom_out')" placement="bottom">
+                <XButton
+                  :disabled="!src"
+                  preIcon="ant-design:zoom-out-outlined"
+                  size="small"
+                  type="primary"
+                  @click="handlerToolbar('zoom', -0.1)"
+                />
+              </el-tooltip>
+            </el-space>
+          </div>
+        </div>
+        <div :class="`${prefixCls}-right`">
+          <div :class="`${prefixCls}-preview`">
+            <img v-if="previewSource" :alt="t('cropper.preview')" :src="previewSource" />
+          </div>
+          <template v-if="previewSource">
+            <div :class="`${prefixCls}-group`">
+              <el-avatar :src="previewSource" size="large" />
+              <el-avatar :size="48" :src="previewSource" />
+              <el-avatar :size="64" :src="previewSource" />
+              <el-avatar :size="80" :src="previewSource" />
+            </div>
+          </template>
+        </div>
+      </div>
+      <template #footer>
+        <el-button type="primary" @click="handleOk">{{ t('cropper.okText') }}</el-button>
+      </template>
+    </Dialog>
+  </div>
+</template>
+<script lang="ts" setup>
+import { useDesign } from '@/hooks/web/useDesign'
+import { dataURLtoBlob } from '@/utils/filt'
+import { useI18n } from 'vue-i18n'
+import type { CropendResult, Cropper } from './types'
+import { propTypes } from '@/utils/propTypes'
+import { CropperImage } from '@/components/Cropper'
+
+defineOptions({ name: 'CopperModal' })
+
+const props = defineProps({
+  srcValue: propTypes.string.def(''),
+  circled: propTypes.bool.def(true)
+})
+const emit = defineEmits(['uploadSuccess'])
+const { t } = useI18n()
+const { getPrefixCls } = useDesign()
+const prefixCls = getPrefixCls('cropper-am')
+
+const src = ref(props.srcValue)
+const previewSource = ref('')
+const cropper = ref<Cropper>()
+const dialogVisible = ref(false)
+let filename = ''
+let scaleX = 1
+let scaleY = 1
+
+// Block upload
+function handleBeforeUpload(file: File) {
+  const reader = new FileReader()
+  reader.readAsDataURL(file)
+  src.value = ''
+  previewSource.value = ''
+  reader.onload = function (e) {
+    src.value = (e.target?.result as string) ?? ''
+    filename = file.name
+  }
+  return false
+}
+
+function handleCropend({ imgBase64 }: CropendResult) {
+  previewSource.value = imgBase64
+}
+
+function handleReady(cropperInstance: Cropper) {
+  cropper.value = cropperInstance
+}
+
+function handlerToolbar(event: string, arg?: number) {
+  if (event === 'scaleX') {
+    scaleX = arg = scaleX === -1 ? 1 : -1
+  }
+  if (event === 'scaleY') {
+    scaleY = arg = scaleY === -1 ? 1 : -1
+  }
+  cropper?.value?.[event]?.(arg)
+}
+
+async function handleOk() {
+  const blob = dataURLtoBlob(previewSource.value)
+  emit('uploadSuccess', { source: previewSource.value, data: blob, filename: filename })
+}
+
+function openModal() {
+  dialogVisible.value = true
+}
+
+function closeModal() {
+  dialogVisible.value = false
+}
+
+defineExpose({ openModal, closeModal })
+</script>
+<style lang="scss">
+$prefix-cls: #{$namespace}-cropper-am;
+
+.#{$prefix-cls} {
+  display: flex;
+
+  &-left,
+  &-right {
+    height: 340px;
+  }
+
+  &-left {
+    width: 55%;
+  }
+
+  &-right {
+    width: 45%;
+  }
+
+  &-cropper {
+    height: 300px;
+    background: #eee;
+    background-image: linear-gradient(
+        45deg,
+        rgb(0 0 0 / 25%) 25%,
+        transparent 0,
+        transparent 75%,
+        rgb(0 0 0 / 25%) 0
+      ),
+      linear-gradient(
+        45deg,
+        rgb(0 0 0 / 25%) 25%,
+        transparent 0,
+        transparent 75%,
+        rgb(0 0 0 / 25%) 0
+      );
+    background-position:
+      0 0,
+      12px 12px;
+    background-size: 24px 24px;
+  }
+
+  &-toolbar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 10px;
+  }
+
+  &-preview {
+    width: 220px;
+    height: 220px;
+    margin: 0 auto;
+    overflow: hidden;
+    border: 1px solid;
+    border-radius: 50%;
+
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  &-group {
+    display: flex;
+    padding-top: 8px;
+    margin-top: 8px;
+    border-top: 1px solid;
+    justify-content: space-around;
+    align-items: center;
+  }
+}
+</style>
diff --git a/src/components/Cropper/src/Cropper.vue b/src/components/Cropper/src/Cropper.vue
new file mode 100644
index 000000000..871aed8f6
--- /dev/null
+++ b/src/components/Cropper/src/Cropper.vue
@@ -0,0 +1,183 @@
+<template>
+  <div :class="getClass" :style="getWrapperStyle">
+    <img
+      v-show="isReady"
+      ref="imgElRef"
+      :alt="alt"
+      :crossorigin="crossorigin"
+      :src="src"
+      :style="getImageStyle"
+    />
+  </div>
+</template>
+<script lang="ts" setup>
+import { CSSProperties, PropType } from 'vue'
+import Cropper from 'cropperjs'
+import 'cropperjs/dist/cropper.css'
+import { useDesign } from '@/hooks/web/useDesign'
+import { propTypes } from '@/utils/propTypes'
+import { useDebounceFn } from '@vueuse/core'
+
+defineOptions({ name: 'Cropper' })
+
+type Options = Cropper.Options
+
+const defaultOptions: Options = {
+  aspectRatio: 1,
+  zoomable: true,
+  zoomOnTouch: true,
+  zoomOnWheel: true,
+  cropBoxMovable: true,
+  cropBoxResizable: true,
+  toggleDragModeOnDblclick: true,
+  autoCrop: true,
+  background: true,
+  highlight: true,
+  center: true,
+  responsive: true,
+  restore: true,
+  checkCrossOrigin: true,
+  checkOrientation: true,
+  scalable: true,
+  modal: true,
+  guides: true,
+  movable: true,
+  rotatable: true
+}
+
+const props = defineProps({
+  src: propTypes.string.def(''),
+  alt: propTypes.string.def(''),
+  circled: propTypes.bool.def(false),
+  realTimePreview: propTypes.bool.def(true),
+  height: propTypes.string.def('360px'),
+  crossorigin: {
+    type: String as PropType<'' | 'anonymous' | 'use-credentials' | undefined>,
+    default: undefined
+  },
+  imageStyle: { type: Object as PropType<CSSProperties>, default: () => ({}) },
+  options: { type: Object as PropType<Options>, default: () => ({}) }
+})
+
+const emit = defineEmits(['cropend', 'ready', 'cropendError'])
+const attrs = useAttrs()
+const imgElRef = ref<ElRef<HTMLImageElement>>()
+const cropper = ref<Nullable<Cropper>>()
+const isReady = ref(false)
+
+const { getPrefixCls } = useDesign()
+const prefixCls = getPrefixCls('cropper-image')
+const debounceRealTimeCroppered = useDebounceFn(realTimeCroppered, 80)
+
+const getImageStyle = computed((): CSSProperties => {
+  return {
+    height: props.height,
+    maxWidth: '100%',
+    ...props.imageStyle
+  }
+})
+
+const getClass = computed(() => {
+  return [
+    prefixCls,
+    attrs.class,
+    {
+      [`${prefixCls}--circled`]: props.circled
+    }
+  ]
+})
+const getWrapperStyle = computed((): CSSProperties => {
+  return { height: `${props.height}`.replace(/px/, '') + 'px' }
+})
+
+onMounted(init)
+
+onUnmounted(() => {
+  cropper.value?.destroy()
+})
+
+async function init() {
+  const imgEl = unref(imgElRef)
+  if (!imgEl) {
+    return
+  }
+  cropper.value = new Cropper(imgEl, {
+    ...defaultOptions,
+    ready: () => {
+      isReady.value = true
+      realTimeCroppered()
+      emit('ready', cropper.value)
+    },
+    crop() {
+      debounceRealTimeCroppered()
+    },
+    zoom() {
+      debounceRealTimeCroppered()
+    },
+    cropmove() {
+      debounceRealTimeCroppered()
+    },
+    ...props.options
+  })
+}
+
+// Real-time display preview
+function realTimeCroppered() {
+  props.realTimePreview && croppered()
+}
+
+// event: return base64 and width and height information after cropping
+function croppered() {
+  if (!cropper.value) {
+    return
+  }
+  let imgInfo = cropper.value.getData()
+  const canvas = props.circled ? getRoundedCanvas() : cropper.value.getCroppedCanvas()
+  canvas.toBlob((blob) => {
+    if (!blob) {
+      return
+    }
+    let fileReader: FileReader = new FileReader()
+    fileReader.readAsDataURL(blob)
+    fileReader.onloadend = (e) => {
+      emit('cropend', {
+        imgBase64: e.target?.result ?? '',
+        imgInfo
+      })
+    }
+    fileReader.onerror = () => {
+      emit('cropendError')
+    }
+  }, 'image/png')
+}
+
+// Get a circular picture canvas
+function getRoundedCanvas() {
+  const sourceCanvas = cropper.value!.getCroppedCanvas()
+  const canvas = document.createElement('canvas')
+  const context = canvas.getContext('2d')!
+  const width = sourceCanvas.width
+  const height = sourceCanvas.height
+  canvas.width = width
+  canvas.height = height
+  context.imageSmoothingEnabled = true
+  context.drawImage(sourceCanvas, 0, 0, width, height)
+  context.globalCompositeOperation = 'destination-in'
+  context.beginPath()
+  context.arc(width / 2, height / 2, Math.min(width, height) / 2, 0, 2 * Math.PI, true)
+  context.fill()
+  return canvas
+}
+</script>
+<style lang="scss">
+$prefix-cls: #{$namespace}-cropper-image;
+
+.#{$prefix-cls} {
+  &--circled {
+    .cropper-view-box,
+    .cropper-face {
+      border-radius: 50%;
+    }
+  }
+}
+</style>
diff --git a/src/components/Cropper/src/CropperAvatar.vue b/src/components/Cropper/src/CropperAvatar.vue
new file mode 100644
index 000000000..55a7d34b0
--- /dev/null
+++ b/src/components/Cropper/src/CropperAvatar.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="user-info-head" @click="open()">
+    <el-avatar v-if="sourceValue" :src="sourceValue" alt="avatar" class="img-circle img-lg" />
+    <el-avatar v-if="!sourceValue" :src="avatar" alt="avatar" class="img-circle img-lg" />
+    <el-button v-if="showBtn" :class="`${prefixCls}-upload-btn`" @click="open()">
+      {{ btnText ? btnText : t('cropper.selectImage') }}
+    </el-button>
+    <CopperModal
+      ref="cropperModelRef"
+      :srcValue="sourceValue"
+      @upload-success="handleUploadSuccess"
+    />
+  </div>
+</template>
+<script lang="ts" setup>
+import { useDesign } from '@/hooks/web/useDesign'
+
+import { propTypes } from '@/utils/propTypes'
+import { useI18n } from 'vue-i18n'
+import CopperModal from './CopperModal.vue'
+import avatar from '@/assets/imgs/avatar.jpg'
+
+defineOptions({ name: 'CropperAvatar' })
+
+const props = defineProps({
+  width: propTypes.string.def('200px'),
+  value: propTypes.string.def(''),
+  showBtn: propTypes.bool.def(true),
+  btnText: propTypes.string.def('')
+})
+
+const emit = defineEmits(['update:value', 'change'])
+const sourceValue = ref(props.value)
+const { getPrefixCls } = useDesign()
+const prefixCls = getPrefixCls('cropper-avatar')
+const message = useMessage()
+const { t } = useI18n()
+
+const cropperModelRef = ref()
+
+watchEffect(() => {
+  sourceValue.value = props.value
+})
+
+watch(
+  () => sourceValue.value,
+  (v: string) => {
+    emit('update:value', v)
+  }
+)
+
+function handleUploadSuccess({ source, data, filename }) {
+  sourceValue.value = source
+  emit('change', { source, data, filename })
+  message.success(t('cropper.uploadSuccess'))
+}
+
+function open() {
+  cropperModelRef.value.openModal()
+}
+
+function close() {
+  cropperModelRef.value.closeModal()
+}
+
+defineExpose({
+  open,
+  close
+})
+</script>
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}--cropper-avatar;
+
+.#{$prefix-cls} {
+  display: inline-block;
+  text-align: center;
+
+  &-image-wrapper {
+    overflow: hidden;
+    cursor: pointer;
+    border: 1px solid;
+    border-radius: 50%;
+
+    img {
+      width: 100%;
+    }
+  }
+
+  &-image-mask {
+    position: absolute;
+    width: inherit;
+    height: inherit;
+    cursor: pointer;
+    background: rgb(0 0 0 / 40%);
+    border: inherit;
+    border-radius: inherit;
+    opacity: 0;
+    transition: opacity 0.4s;
+
+    ::v-deep(svg) {
+      margin: auto;
+    }
+  }
+
+  &-image-mask:hover {
+    opacity: 40;
+  }
+
+  &-upload-btn {
+    margin: 10px auto;
+  }
+}
+
+.user-info-head {
+  position: relative;
+  display: inline-block;
+}
+
+.img-circle {
+  border-radius: 50%;
+}
+
+.img-lg {
+  width: 120px;
+  height: 120px;
+}
+
+.user-info-head:hover::after {
+  position: absolute;
+  inset: 0;
+  font-size: 24px;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  font-style: normal;
+  line-height: 110px;
+  color: #eee;
+  cursor: pointer;
+  background: rgb(0 0 0 / 50%);
+  border-radius: 50%;
+  content: '+';
+}
+</style>
diff --git a/src/components/Cropper/src/types.ts b/src/components/Cropper/src/types.ts
new file mode 100644
index 000000000..bcad3b450
--- /dev/null
+++ b/src/components/Cropper/src/types.ts
@@ -0,0 +1,8 @@
+import type Cropper from 'cropperjs'
+
+export interface CropendResult {
+  imgBase64: string
+  imgInfo: Cropper.Data
+}
+
+export type { Cropper }
diff --git a/src/components/Descriptions/index.ts b/src/components/Descriptions/index.ts
new file mode 100644
index 000000000..243bc397b
--- /dev/null
+++ b/src/components/Descriptions/index.ts
@@ -0,0 +1,4 @@
+import Descriptions from './src/Descriptions.vue'
+import DescriptionsItemLabel from './src/DescriptionsItemLabel.vue'
+
+export { Descriptions, DescriptionsItemLabel }
diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
new file mode 100644
index 000000000..56540d68b
--- /dev/null
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -0,0 +1,186 @@
+<script lang="ts" setup>
+import { PropType } from 'vue'
+import dayjs from 'dayjs'
+import { useDesign } from '@/hooks/web/useDesign'
+import { propTypes } from '@/utils/propTypes'
+import { useAppStore } from '@/store/modules/app'
+import { DescriptionsSchema } from '@/types/descriptions'
+
+defineOptions({ name: 'Descriptions' })
+
+const appStore = useAppStore()
+
+const mobile = computed(() => appStore.getMobile)
+
+const attrs = useAttrs()
+
+const slots = useSlots()
+const height = ref('200px')
+const isShow = ref(false)
+
+
+const props = defineProps({
+  title: propTypes.string.def(''),
+  message: propTypes.string.def(''),
+  collapse: propTypes.bool.def(true),
+  columns: propTypes.number.def(1),
+  width: propTypes.string.def('50px'),
+  labelAlign: propTypes.string.def('right'),
+  labelClassName: propTypes.string.def(''),
+  schema: {
+    type: Array as PropType<DescriptionsSchema[]>,
+    default: () => []
+  },
+  data: {
+    type: Object as PropType<any>,
+    default: () => ({})
+  }
+})
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('descriptions')
+
+const getBindValue = computed(() => {
+  const delArr: string[] = ['title', 'message', 'collapse', 'schema', 'data', 'class']
+  const obj = { ...attrs, ...props }
+  for (const key in obj) {
+    if (delArr.indexOf(key) !== -1) {
+      delete obj[key]
+    }
+  }
+  return obj
+})
+
+const getBindItemValue = (item: DescriptionsSchema) => {
+  const delArr: string[] = ['field']
+  const obj = { ...item }
+  for (const key in obj) {
+    if (delArr.indexOf(key) !== -1) {
+      delete obj[key]
+    }
+  }
+  return obj
+}
+
+// 折叠
+const show = ref(true)
+
+const toggleClick = () => {
+  if (props.collapse) {
+    show.value = !unref(show)
+  }
+}
+const showAll = () =>{
+  if(isShow.value){
+    height.value ='200px'
+  }else{
+    height.value ='auto'
+  }
+  isShow.value = !isShow.value
+ 
+}
+</script>
+
+<template>
+  <div
+    :class="[
+      prefixCls,
+      'bg-[var(--el-color-white)] dark:bg-[var(--el-bg-color)] dark:border-[var(--el-border-color)] dark:border-1px'
+    ]"
+  >
+    <div
+      v-if="title"
+      :class="[
+        `${prefixCls}-header`,
+        'h-50px flex justify-between items-center b-b-1 border-solid border-[var(--el-border-color)] px-10px cursor-pointer dark:border-[var(--el-border-color)]'
+      ]"
+      @click="toggleClick"
+    >
+      <div :class="[`${prefixCls}-header__title`, 'relative font-18px font-bold ml-10px']">
+        <div class="flex items-center">
+          {{ title }}
+          <ElTooltip v-if="message" :content="message" placement="right">
+            <Icon class="ml-5px" icon="ep:warning" />
+          </ElTooltip>
+        </div>
+      </div>
+      <Icon v-if="collapse" :icon="show ? 'ep:arrow-down' : 'ep:arrow-up'" />
+    </div>
+
+    <ElCollapseTransition  :style="{height: height,overflow: 'hidden'}">
+      <div v-show="show" :class="[`${prefixCls}-content`]">
+        <ElDescriptions
+          :column="props.columns"
+          :direction="mobile ? 'vertical' : 'horizontal'"
+          border
+          v-bind="getBindValue"
+        >
+          <template v-if="slots['extra']" #extra>
+            <slot name="extra"></slot>
+          </template>
+          <ElDescriptionsItem
+            v-for="item in schema"
+            :key="item.field"
+            v-bind="getBindItemValue(item)"
+            :label-align="labelAlign"
+            :label-class-name="labelClassName"
+            :width="width"
+          >
+            <template #label>
+              <slot
+                :name="`${item.field}-label`"
+                :row="{
+                  label: item.label
+                }"
+                >{{ item.label }}
+              </slot>
+            </template>
+
+            <template #default>
+              <slot v-if="item.dateFormat">
+                {{
+                  data[item.field] !== null ? dayjs(data[item.field]).format(item.dateFormat) : ''
+                }}
+              </slot>
+              <slot v-else-if="item.dictType">
+                <div v-if="data[item.field]&&Array.isArray(data[item.field])" >
+                  <DictTag :type="item.dictType" :value="cur" v-for="(cur,key) in data[item.field]" :key="key" style="margin-right: 6px;margin-bottom: 6px;"/>
+                </div>
+                <DictTag :type="item.dictType" :value="data[item.field] + ''" v-if="data[item.field]&&!Array.isArray(data[item.field])"/>
+              </slot>
+              <slot v-else :name="item.field" :row="data">{{ data[item.field] }}</slot>
+            </template>
+          </ElDescriptionsItem>
+        </ElDescriptions>
+      </div>
+    </ElCollapseTransition>
+    <div class="flex align-center  justify-center">
+      <el-button type="primary" class="mt-20px" @click="showAll">{{!isShow?'展开':'收起'}}</el-button>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-descriptions;
+
+.#{$prefix-cls}-header {
+  &__title {
+    &::after {
+      position: absolute;
+      top: 3px;
+      left: -10px;
+      width: 4px;
+      height: 70%;
+      background: var(--el-color-primary);
+      content: '';
+    }
+  }
+}
+
+.#{$prefix-cls}-content {
+  :deep(.#{$elNamespace}-descriptions__cell) {
+    width: 0;
+  }
+}
+</style>
diff --git a/src/components/Descriptions/src/DescriptionsItemLabel.vue b/src/components/Descriptions/src/DescriptionsItemLabel.vue
new file mode 100644
index 000000000..4efb2fb77
--- /dev/null
+++ b/src/components/Descriptions/src/DescriptionsItemLabel.vue
@@ -0,0 +1,29 @@
+<script setup lang="ts">
+const { label } = defineProps({
+  label: {
+    type: String,
+    required: true
+  },
+  icon: {
+    type: String,
+    required: false
+  }
+})
+</script>
+
+<template>
+  <div class="cell-item">
+    <Icon :icon="icon" v-if="icon" style="vertical-align: middle" :size="18" />
+    {{ label }}
+  </div>
+</template>
+
+<style scoped lang="scss">
+.cell-item {
+  display: inline;
+}
+
+.cell-item::after {
+  content: ':';
+}
+</style>
diff --git a/src/components/Detail/index.ts b/src/components/Detail/index.ts
new file mode 100644
index 000000000..d3fcb5cad
--- /dev/null
+++ b/src/components/Detail/index.ts
@@ -0,0 +1,3 @@
+import Detail from './src/Detail.vue'
+
+export { Detail }
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
new file mode 100644
index 000000000..899d5fc31
--- /dev/null
+++ b/src/components/Detail/src/Detail.vue
@@ -0,0 +1,693 @@
+<template>
+  <div>
+    <el-drawer
+      v-model="isShowDrawer"
+      title="详情"
+      direction="rtl"
+      size="80%"
+      v-loading="detailLoading"
+    >
+      <template #header>
+        <div class="font-size-18px">
+          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
+        </div>
+      </template>
+      <ContentWrap v-if="!isBasic">
+        <Descriptions
+          :data="detailData"
+          labelClassName="label-class-name"
+          label-align="left"
+          direction="vertical"
+          :column="8"
+          :schema="allSchemas.detailSchema"
+          :columns="2"
+          width="200px"
+        />
+      </ContentWrap>
+
+      <Tabs :tabsList="tabsList" :current="current" @change="change" />
+      <div class="flex">
+        <!-- 详情 -->
+        <ContentWrap class="w-[73%]">
+          <!-- 列表头部 -->
+          <TableHead
+            v-if="!isBasic"
+            :HeadButttondata="HeadButttondata"
+            :masterId="masterParmas.masterId"
+            @button-base-click="buttonBaseClick"
+            :routeName="routeName"
+            @searchFormClick="searchFormClick"
+            :allSchemas="detailAllSchemas"
+          />
+          <!-- 默认单表展现 -->
+          <Descriptions
+            v-if="isBasic && !tabsExtend"
+            :data="detailData"
+            :schema="allSchemas.detailSchema"
+            :columns="2"
+          />
+          <!-- 单表切换tabs 展现table -->
+          <Table
+            v-if="isBasic && tabsExtend"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          >
+            <!-- <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template> -->
+          </Table>
+          <Table
+            v-if="!isBasic && fromeWhere != 'countPlan'"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          >
+          <template #photos="{ row }">
+             <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>
+            </template>
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template>
+          </Table>
+          <DetailTable
+            v-if="!isBasic && fromeWhere == 'countPlan' && isShowDrawer"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :allList="allList"
+            :countScopeType="countScopeType"
+            :key="updateKey"
+          >
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template>
+          </DetailTable>
+        </ContentWrap>
+        <ContentWrap class="w-[27%] ml-16px">
+          <!-- 附件组件 -->
+          <Annex
+            :annexData="annexData"
+            @handleAnnexSuccess="handleAnnexSuccess"
+            @deleteAnnexSuccess="deleteAnnexSuccess"
+            :upData="remarksData.data"
+          />
+          <!-- 备注组件 -->
+          <Remarks
+            :remarksData="remarksData"
+            class="mt-20px"
+            @remarksSubmitScuess="remarksSubmitScuess"
+          />
+          <!-- 变更记录组件 -->
+          <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
+        </ContentWrap>
+      </div>
+    </el-drawer>
+    <!-- 表单弹窗：添加/修改 -->
+    <BasicForm
+      ref="formRef"
+      @success="submitForm"
+      :rules="detailAllSchemasRules"
+      :formAllSchemas="detailAllSchemas"
+      :isBusiness="false"
+      :apiUpdate="apiUpdate"
+      :apiCreate="apiCreate"
+      :fromeWhere="fromeWhere"
+      :isDetail="true"
+      @searchTableSuccess="searchTableSuccess"
+      :detailData="detailData"
+      @submitForm="submitForm"
+      @selectChangeDetail="selectChangeDetail"
+      :formTypeDetail="formTypeDetail"
+      :countPlanAllList="countPlanAllList"
+      @onChange="detailBasicFormOnChange"
+      @onBlur="onBlur"
+      @formFormDateChange="formFormDateChange"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import Annex from '@/components/Annex/src/Annex.vue'
+import Remarks from '@/components/Remarks/src/Remarks.vue'
+import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
+import Tabs from '@/components/Tabs/src/Tabs.vue'
+import * as RemarkApi from '@/api/wms/remark'
+import * as FileApi from '@/api/wms/file'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
+
+defineOptions({ name: 'Detail' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
+const updateKey = ref(0)
+
+const props = defineProps({
+  // 标签参数
+  tabs: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 是否是基础数据 展现详情顶部表单
+  isBasic: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 表单，列表 相关信息
+  allSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 明细列表相关信息
+  detailAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  明细验证
+  detailAllSchemasRules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 子表新增API
+  apiCreate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表编辑API
+  apiUpdate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表分页列表API
+  apiPage: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表删除API
+  apiDelete: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表新增修改校验
+  detailValidate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 获取接口列表集合
+  allList: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 盘点范围类型
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
+  formTypeDetail: {
+    type: String,
+    required: false,
+    default: 'InputString'
+  },
+  //盘点详情子表新增的时候判断盘点范围值的下拉列表
+  countPlanAllList: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 详情列表扩展操作按钮
+  buttondataTable: {
+    type: Array,
+    required: false,
+    default: ()=>{
+      return []
+    }
+  },
+  // 针对基础数据tabs扩展 显示table列表 默认false
+  tabsExtend: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // tableObject 数据过滤条件 针对 详情扩展标签页 传入不同条件
+  tableObjectExtend: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 子列表 筛选 展示与隐藏 ，默认展示
+  detailButtonIsShowFilter:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 新增 展示与隐藏 ，默认展示
+  detailButtonIsShowAdd:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 编辑 展示与隐藏 ，默认展示
+  detailButtonIsShowEdit:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 删除 展示与隐藏 ，默认展示
+  detailButtonIsShowDelete:{
+    type: Boolean,
+    required: false,
+    default: true
+  }
+})
+const isShowDrawer = ref(false)
+const detailLoading = ref(false)
+const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
+
+if (props.isBasic == true) {
+  if (tabsList.value && tabsList.value.length > 0) {
+    tabsList.value.unshift({
+      label: '详情',
+      prop: 'Detail'
+    })
+  }
+} else {
+  if (tabsList.value && tabsList.value.length > 0) {
+  } else {
+    tabsList.value = [
+      {
+        label: '明细',
+        prop: 'Detail'
+      }
+    ]
+  }
+}
+if (tabsList.value) {
+}
+
+// 附件默认数据
+const annexData = reactive({
+  annexList: []
+})
+
+// 备注数据
+const remarksData = reactive({
+  remarksList: [],
+  data: {}
+})
+
+// 变更记录默认数据
+const changeRecordData = reactive({
+  changeRecordList: []
+})
+const detailData = ref({}) //详情数据
+// 获取附件列表篇
+const getFileList = async () => {
+  detailLoading.value = true
+  try {
+    annexData.annexList = await FileApi.getFileList(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+/** 添加附件 */
+const handleAnnexSuccess = () => {
+  getFileList()
+  getChangeRecordList()
+}
+// 删除附件成功之后所走的方法
+const deleteAnnexSuccess = async () => {
+  getFileList()
+  getChangeRecordList()
+}
+
+// Tabs当前选择
+const current = ref(0)
+const change = (item, index) => {
+  current.value = index
+  emit('changeTabs', item)
+}
+
+//主表所需的参数
+const masterParmas = ref({
+  masterId: '', //主表id
+  number: '', //主表单据号
+  status: '' //主表状态 用于控制子表新增编辑按钮显示情况
+})
+
+// 列表头部按钮
+const HeadButttondata = ref()
+// 列表-操作按钮
+const buttondata = ref()
+
+/** 打开弹窗 */
+const formRef = ref()
+const titleNameRef = ref()
+const titleValueRef = ref()
+const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
+  titleNameRef.value = titleName
+  titleValueRef.value = titleValue
+  remarksData.data = {
+    tableId: row.id,
+    tableName: tableName
+  }
+  // 加载明细列表
+  if (!props.isBasic) {
+    // 设置主表id
+    masterParmas.value.masterId = row.id
+    masterParmas.value.number = row.number
+    masterParmas.value.status = row.status
+    tableObjectRef.value.params = {
+      masterId: row.id
+    }
+    await getList()
+  }
+  isShowDrawer.value = true
+  if (row) {
+    detailLoading.value = true
+    try {
+      detailData.value = row
+      getRemarkList()
+      getFileList()
+      getChangeRecordList()
+      // 判断详情按钮是否显示
+      let detailButtonFilter: any = []
+      let detailButtonAdd: any = []
+      if (props.detailButtonIsShowFilter) {
+        // 筛选
+        detailButtonFilter = [
+          defaultButtons.defaultFilterBtn(null)
+        ]
+      }
+      if (props.detailButtonIsShowAdd) {
+        // 新增
+        detailButtonAdd = [
+          defaultButtons.defaultAddBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      HeadButttondata.value = [...detailButtonFilter,...detailButtonAdd]
+
+      // 针对特殊处理 当业务是任务的 只显示筛选 正常情况下应在业务页面设置 后期再作优化
+      if (routeName.value.indexOf('Job') > -1) {
+        HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+        ]
+      }
+
+      let detailButtonEdit: any = []
+      let detailButtonDelete: any = []
+      if (props.detailButtonIsShowEdit) {
+        // 编辑
+        detailButtonEdit = [
+          defaultButtons.mainListEditBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      if (props.detailButtonIsShowDelete) {
+        // 删除
+        detailButtonDelete = [
+          defaultButtons.mainListDeleteBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      buttondata.value = [...detailButtonEdit,...detailButtonDelete,...props.buttondataTable]
+
+    } finally {
+      detailLoading.value = false
+    }
+  }
+}
+defineExpose({ openDetail, formRef }) // 提供 open 方法，用于打开弹窗
+
+// 获取备注列表
+const getRemarkList = async () => {
+  detailLoading.value = true
+  try {
+    remarksData.remarksList = await RemarkApi.getRemarkPage(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+// 备注提交成功之后
+const remarksSubmitScuess = async (remark) => {
+  detailLoading.value = false
+  getRemarkList()
+  getChangeRecordList()
+}
+// 获取变更记录
+const getChangeRecordList = async () => {
+  changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
+}
+
+const tableObjectRef = ref()
+const tableMethodsRef = ref()
+const detailAllSchemasRef = ref()
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: props.apiPage // 分页接口
+})
+
+tableObjectRef.value = tableObject
+tableMethodsRef.value = tableMethods
+detailAllSchemasRef.value = props.detailAllSchemas
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 获得表格的各种操作
+const { getList } = tableMethodsRef.value
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 字段设置 更新主列表字段
+// const updataTableColumns = (val) => {
+//   detailAllSchemas.tableColumns.value = val
+// }
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  } else {
+    emit('tableFormButton',val, row)
+  }
+}
+/** 添加/修改操作 */
+const openForm = async (type: string, row?: number) => {
+  formRef.value.open(type, row, masterParmas.value)
+  emit('detailOpenForm', type, row)
+}
+// form 提交
+const submitForm = async (formType, data) => {
+  try {
+    // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
+    const rs = (await props.detailValidate) ? await props.detailValidate(data) : true
+    if (!rs) return
+    if (formType === 'create') {
+      await props.apiCreate(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await props.apiUpdate(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    await getList()
+    updateKey.value += 1
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
+}
+// 传递给父类
+const emit = defineEmits([
+  'searchTableSuccessDetail',
+  'changeTabs',
+  'selectChangeDetail',
+  'detailOpenForm',
+  'tableFormButton',
+  'openImage',
+  'onBlur',
+  'detailBasicFormOnChange',
+  'formFormDateChange'
+])
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await props.apiDelete(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+    updateKey.value += 1
+  } catch {}
+}
+// 筛选提交
+const searchFormClick = async (searchData) => {
+  const { tableObject, tableMethods } = useTable({
+    getListApi: props.apiPage // 分页接口
+  })
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+      ? searchData.filters
+      : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  }
+  detailAllSchemasRef.value = props.detailAllSchemas
+  tableObjectRef.value = tableObject
+  tableMethodsRef.value = tableMethods
+  tableObjectRef.value.tableList = []
+  const { getList } = tableMethods
+  await getList()
+  updateKey.value += 1
+  // tableObjectRef.value.params = {
+  //   isSearch: true,
+  //   filters: searchData.filters
+  //     ? searchData.filters
+  //     : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  // }
+  // getList() // 刷新当前列表
+}
+// 选择盘点类型的时候针对限值的操作
+const selectChangeDetail = (field, val) => {
+  emit('selectChangeDetail', field, val)
+}
+// 打开图片
+const openImage=(item)=>{
+  emit('openImage', item)
+}
+/**
+ * 监听改变事件
+ * @param field 当前操作字段
+ * @param cur 改变后值
+ */
+ const detailBasicFormOnChange = (field, cur) => {
+  emit('detailBasicFormOnChange', field, cur)
+}
+
+/**
+ * 监听失焦事件
+ * @param field 当前操作字段
+ * @param e 
+ */
+ const onBlur = (field, e) => {
+  emit('onBlur', field, e)
+}
+
+// 日期改变事件
+const formFormDateChange = (field, val,row, index) => {
+  emit('formFormDateChange', field, val,row, index)
+}
+//监视属性
+watch(
+  () => props.apiPage,
+  () => {
+    const { tableObject, tableMethods } = useTable({
+      getListApi: props.apiPage // 分页接口
+    })
+    tableObject.params.masterId = masterParmas.value.masterId
+    detailAllSchemasRef.value = props.detailAllSchemas
+    if (props.tableObjectExtend) {
+      props.tableObjectExtend.forEach(item => {
+        tableObject.params[item.key] = item.value
+      })
+    }
+    tableObjectRef.value = tableObject
+    tableMethodsRef.value = tableMethods
+    const { getList } = tableMethods
+    getList()
+  }
+)
+</script>
+<style lang="scss">
+.el-drawer__body {
+  background: #f5f5f5 !important;
+}
+
+::v-deep(.label-class-name) {
+  color: #dedede;
+}
+</style>
+<style scoped lang="scss"></style>
diff --git a/src/components/DetailTable/index.ts b/src/components/DetailTable/index.ts
new file mode 100644
index 000000000..2acd32a21
--- /dev/null
+++ b/src/components/DetailTable/index.ts
@@ -0,0 +1,3 @@
+import DetailCountPlan from './src/DetailCountPlan.vue'
+
+export { DetailCountPlan }
diff --git a/src/components/DetailTable/src/DetailTable.vue b/src/components/DetailTable/src/DetailTable.vue
new file mode 100644
index 000000000..b09facbf3
--- /dev/null
+++ b/src/components/DetailTable/src/DetailTable.vue
@@ -0,0 +1,104 @@
+<template>
+  <div>
+    <el-table :data="data" style="width: 100%">
+      <el-table-column :prop="columns[0].field" :label="columns[0].label" align="center">
+        <template #default="scope">
+          {{ forrmatter(scope.row.type) }}
+        </template>
+        <!-- <slot name="action" v-if="item.field == 'action'"></slot> -->
+      </el-table-column>
+      <el-table-column :prop="columns[1].field" :label="columns[1].label" align="center">
+        <template #default="scope">
+         <div v-if=" scope.row.type == 'PROJECT'"> {{ scope.row.value }}</div>
+         <div v-else> {{ forrmatter1(scope.row) }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="" label="操作" align="center">
+        <template #default="scope">
+         
+        <slot name="action" :row="scope.row" v-if="columns[2].field == 'action'"></slot> 
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script lang="ts" setup>
+defineOptions({ name: 'DetailTable' })
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  columns: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  data: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  // 获取盘点计划接口列表集合
+  allList: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  }
+})
+const data = ref(props.data)
+const countScopeType = ref(props.countScopeType)
+const allList = ref(props.allList)
+const forrmatter = (val) => {
+  if(val){
+    return  countScopeType.value.find((cur) => cur.value == val).label
+  }else{
+    return ''
+  }
+  
+}
+const forrmatter1 = (item) => {
+  if(item?.type == 'OWNER'){
+    return  allList.value.ownerAllList.find((cur) => cur.value == item.value).label
+  }else if(item?.type == 'SUPPLIER'){
+    return  allList.value.supplierAllList.find((cur) => cur.value == item.value).label
+  }else if(item?.type == 'CUSTOMER'){
+    return  allList.value.customerAllList.find((cur) => cur.value == item.value).label
+  }else if(item?.type == 'ABC'){
+    return  allList.value.abcList.find((cur) => cur.value == item.value).label
+  }else if(item?.type == 'ITEMS_TYPE'){
+    return  allList.value.itemTypeList.find((cur) => cur.value == item.value).label
+  }else if(item?.type == 'ITEMS_GROUP'){
+    return  allList.value.itemGroupList.find((cur) => cur.value == item.value).label
+  }else if(item?.type == 'ITEMS_CODE'){
+    return  allList.value.itembasicAllList.find((cur) => cur.value == item.value).label
+  }else if(item?.type == 'WAREHOUSE_CODE'){
+    return  allList.value.warehouseAllList.find((cur) => cur.value == item.value).label
+  }else if(item?.type == 'AREABASIC_CODE'){
+    return  allList.value.areaAllList.find((cur) => cur.value == item.value).label
+  }else if(item?.type == 'LOCATIONGROUP_CODE'){
+    return  allList.value.locationgroupAllList.find((cur) => cur.value == item.value).label
+  }else if(item?.type == 'LOCATION_CODE'){
+    return  allList.value.locationAllList.find((cur) => cur.value == item.value).label
+  }else{
+    return ''
+  }
+}
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+</script>
+<style lang="scss">
+</style>
diff --git a/src/components/Dialog/index.ts b/src/components/Dialog/index.ts
new file mode 100644
index 000000000..1655dadce
--- /dev/null
+++ b/src/components/Dialog/index.ts
@@ -0,0 +1,3 @@
+import Dialog from './src/Dialog.vue'
+
+export { Dialog }
diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
new file mode 100644
index 000000000..a7d75553a
--- /dev/null
+++ b/src/components/Dialog/src/Dialog.vue
@@ -0,0 +1,165 @@
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import { isNumber } from '@/utils/is'
+defineOptions({ name: 'Dialog' })
+
+const slots = useSlots()
+
+const props = defineProps({
+  modelValue: propTypes.bool.def(false),
+  title: propTypes.string.def('Dialog'),
+  fullscreen: propTypes.bool.def(true),
+  width: propTypes.oneOfType([String, Number]).def('40%'),
+  scroll: propTypes.bool.def(false), // 是否开启滚动条。如果是的话，按照 maxHeight 设置最大高度
+  maxHeight: propTypes.oneOfType([String, Number]).def('400px'),
+  vLoading:propTypes.bool.def(false)
+})
+
+const getBindValue = computed(() => {
+  const delArr: string[] = ['fullscreen', 'title', 'maxHeight', 'appendToBody']
+  const attrs = useAttrs()
+  const obj = { ...attrs, ...props }
+  for (const key in obj) {
+    if (delArr.indexOf(key) !== -1) {
+      delete obj[key]
+    }
+  }
+  return obj
+})
+
+const isFullscreen = ref(false)
+
+const toggleFull = () => {
+  isFullscreen.value = !unref(isFullscreen)
+}
+
+const dialogHeight = ref(isNumber(props.maxHeight) ? `${props.maxHeight}px` : props.maxHeight)
+
+watch(
+  () => isFullscreen.value,
+  async (val: boolean) => {
+    await nextTick()
+    if (val) {
+      const windowHeight = document.documentElement.offsetHeight
+      dialogHeight.value = `${windowHeight - 55 - 60 - (slots.footer ? 63 : 0)}px`
+    } else {
+      dialogHeight.value = isNumber(props.maxHeight) ? `${props.maxHeight}px` : props.maxHeight
+    }
+  },
+  {
+    immediate: true
+  }
+)
+
+let demo = null
+watch(
+  () => props.vLoading,
+  async (val: boolean) => {
+    await nextTick()
+    if (val) {
+      initDialog()
+    } else {
+      if (demo !== null) demo.close()
+    }
+  },
+  {
+    immediate: true
+  }
+)
+
+const dialogStyle = computed(() => {
+  return {
+    height: unref(dialogHeight)
+  }
+})
+
+
+const initDialog = () => {
+  // 用服务生成一个el-loading实例，包括了自定义svg的指令如何在服务中使用
+  demo = ElLoading.service({ target: '.loading', text: '加载中...', background: 'rgba(246, 246, 246, 0.8)' })
+}
+
+</script>
+
+<template>
+  <ElDialog
+    v-bind="getBindValue"
+    :close-on-click-modal="true"
+    :fullscreen="isFullscreen"
+    :width="width"
+    destroy-on-close
+    lock-scroll
+    draggable
+    class="com-dialog"
+    :show-close="false"
+    custom-class="loading"
+  >
+    <template #header="{ close }">
+      <div class="relative h-54px flex items-center justify-between pl-15px pr-15px">
+        <slot name="title">
+          {{ title }}
+        </slot>
+        <div
+          class="absolute right-15px top-[50%] h-54px flex translate-y-[-50%] items-center justify-between"
+        >
+          <Icon
+            v-if="fullscreen"
+            class="is-hover mr-10px cursor-pointer"
+            :icon="isFullscreen ? 'radix-icons:exit-full-screen' : 'radix-icons:enter-full-screen'"
+            color="var(--el-color-info)"
+            hover-color="var(--el-color-primary)"
+            @click="toggleFull"
+          />
+          <Icon
+            class="is-hover cursor-pointer"
+            icon="ep:close"
+            hover-color="var(--el-color-primary)"
+            color="var(--el-color-info)"
+            @click="close"
+          />
+        </div>
+      </div>
+    </template>
+
+    <ElScrollbar v-if="scroll" :style="dialogStyle">
+      <slot></slot>
+    </ElScrollbar>
+    <slot v-else></slot>
+    <template v-if="slots.footer" #footer>
+      <slot name="footer"></slot>
+    </template>
+  </ElDialog>
+</template>
+
+<style lang="scss">
+.com-dialog {
+  .#{$elNamespace}-overlay-dialog {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .#{$elNamespace}-dialog {
+    margin: 0 !important;
+
+    &__header {
+      height: 54px;
+      padding: 0;
+      margin-right: 0 !important;
+      border-bottom: 1px solid var(--el-border-color);
+    }
+
+    &__body {
+      padding: 15px !important;
+    }
+
+    &__footer {
+      border-top: 1px solid var(--el-border-color);
+    }
+
+    &__headerbtn {
+      top: 0;
+    }
+  }
+}
+</style>
diff --git a/src/components/DictTag/index.ts b/src/components/DictTag/index.ts
new file mode 100644
index 000000000..4db274209
--- /dev/null
+++ b/src/components/DictTag/index.ts
@@ -0,0 +1,3 @@
+import DictTag from './src/DictTag.vue'
+
+export { DictTag }
diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue
new file mode 100644
index 000000000..b72b2b9ec
--- /dev/null
+++ b/src/components/DictTag/src/DictTag.vue
@@ -0,0 +1,84 @@
+<script lang="tsx">
+import { defineComponent, PropType, ref } from 'vue'
+import { isHexColor } from '@/utils/color'
+import { ElTag } from 'element-plus'
+import { DictDataType, getDictOptions } from '@/utils/dict'
+
+export default defineComponent({
+  name: 'DictTag',
+  props: {
+    type: {
+      type: String as PropType<string>,
+      required: true
+    },
+    value: {
+      type: [String, Number, Boolean] as PropType<string | number | boolean>,
+      required: true
+    }
+  },
+  setup(props) {
+    const dictData = ref<DictDataType>()
+    let dictDataList:any[] = []
+    const getDictObj = (dictType: string, value: string) => {
+      dictDataList = []
+      // 判断 是否多个回显标签
+      if (value.indexOf(',') == -1) {
+        const dictOptions = getDictOptions(dictType)
+        dictData.value = dictOptions.find(dictOptionsItem => (dictOptionsItem.value == value))
+      } else {
+        value.split(',').forEach(item => {
+          const dictOptions = getDictOptions(dictType)
+          dictDataList.push(dictOptions.find(dictOptionsItem => (dictOptionsItem.value == item)))
+        })
+      }
+    }
+    const rederDictTag = () => {
+      if (!props.type) {
+        return null
+      }
+      // 解决自定义字典标签值为零时标签不渲染的问题
+      if (props.value === undefined || props.value === null) {
+        return null
+      }
+      getDictObj(props.type, props.value.toString())
+      // 添加标签的文字颜色为白色，解决自定义背景颜色时标签文字看不清的问题
+      // 根据 dictDataList 进行区分 是否多个
+      if (dictDataList.length == 0) {
+        return (
+            <ElTag
+              style={dictData.value?.cssClass ? 'color: #fff' : ''}
+              type={dictData.value?.colorType}
+              color={
+                dictData.value?.cssClass && isHexColor(dictData.value?.cssClass)
+                  ? dictData.value?.cssClass
+                  : ''
+              }
+              disableTransitions={true}
+            >
+              {dictData.value?.label}
+          </ElTag>
+        )
+      } else {
+        return (
+          dictDataList.map(item => {
+            return <ElTag
+                    style={item?.cssClass ? 'color: #fff' : ''}
+                    type={item?.colorType}
+                    color={
+                      item?.cssClass && isHexColor(item?.cssClass)
+                        ? item?.cssClass
+                        : ''
+                    }
+                    disableTransitions={true}
+                  >
+                    {item?.label}
+                  </ElTag>
+          })
+        )
+      }
+      
+    }
+    return () => rederDictTag()
+  }
+})
+</script>
diff --git a/src/components/DocAlert/index.vue b/src/components/DocAlert/index.vue
new file mode 100644
index 000000000..3a3feab7c
--- /dev/null
+++ b/src/components/DocAlert/index.vue
@@ -0,0 +1,34 @@
+<template>
+  <el-alert v-if="getEnable()" type="success" show-icon>
+    <template #title>
+      <div @click="goToUrl">{{ '【' + title + '】文档地址：' + url }}</div>
+    </template>
+  </el-alert>
+</template>
+<script setup lang="tsx">
+import { propTypes } from '@/utils/propTypes'
+
+defineOptions({ name: 'DocAlert' })
+
+const props = defineProps({
+  title: propTypes.string,
+  url: propTypes.string
+})
+
+/** 跳转 URL 链接 */
+const goToUrl = () => {
+  window.open(props.url)
+}
+
+/** 是否开启 */
+const getEnable = () => {
+  return import.meta.env.VITE_APP_TENANT_ENABLE === 'true'
+}
+</script>
+<style scoped>
+.el-alert--success.is-light {
+  margin-bottom: 10px;
+  cursor: pointer;
+  border: 1px solid green;
+}
+</style>
diff --git a/src/components/Echart/index.ts b/src/components/Echart/index.ts
new file mode 100644
index 000000000..482209210
--- /dev/null
+++ b/src/components/Echart/index.ts
@@ -0,0 +1,3 @@
+import Echart from './src/Echart.vue'
+
+export { Echart }
diff --git a/src/components/Echart/src/Echart.vue b/src/components/Echart/src/Echart.vue
new file mode 100644
index 000000000..fd3342dd0
--- /dev/null
+++ b/src/components/Echart/src/Echart.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup>
+import type { EChartsOption } from 'echarts'
+import echarts from '@/plugins/echarts'
+import { debounce } from 'lodash-es'
+import 'echarts-wordcloud'
+import { propTypes } from '@/utils/propTypes'
+import { PropType } from 'vue'
+import { useAppStore } from '@/store/modules/app'
+import { isString } from '@/utils/is'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'EChart' })
+
+const { getPrefixCls, variables } = useDesign()
+
+const prefixCls = getPrefixCls('echart')
+
+const appStore = useAppStore()
+
+const props = defineProps({
+  options: {
+    type: Object as PropType<EChartsOption>,
+    required: true
+  },
+  width: propTypes.oneOfType([Number, String]).def(''),
+  height: propTypes.oneOfType([Number, String]).def('500px')
+})
+
+const isDark = computed(() => appStore.getIsDark)
+
+const theme = computed(() => {
+  const echartTheme: boolean | string = unref(isDark) ? true : 'auto'
+
+  return echartTheme
+})
+
+const options = computed(() => {
+  return Object.assign(props.options, {
+    darkMode: unref(theme)
+  })
+})
+
+const elRef = ref<ElRef>()
+
+let echartRef: Nullable<echarts.ECharts> = null
+
+const contentEl = ref<Element>()
+
+const styles = computed(() => {
+  const width = isString(props.width) ? props.width : `${props.width}px`
+  const height = isString(props.height) ? props.height : `${props.height}px`
+
+  return {
+    width,
+    height
+  }
+})
+
+const initChart = () => {
+  if (unref(elRef) && props.options) {
+    echartRef = echarts.init(unref(elRef) as HTMLElement)
+    echartRef?.setOption(unref(options))
+  }
+}
+
+watch(
+  () => options.value,
+  (options) => {
+    if (echartRef) {
+      echartRef?.setOption(options)
+    }
+  },
+  {
+    deep: true
+  }
+)
+
+const resizeHandler = debounce(() => {
+  if (echartRef) {
+    echartRef.resize()
+  }
+}, 100)
+
+const contentResizeHandler = async (e: TransitionEvent) => {
+  if (e.propertyName === 'width') {
+    resizeHandler()
+  }
+}
+
+onMounted(() => {
+  initChart()
+
+  window.addEventListener('resize', resizeHandler)
+
+  contentEl.value = document.getElementsByClassName(`${variables.namespace}-layout-content`)[0]
+  unref(contentEl) &&
+    (unref(contentEl) as Element).addEventListener('transitionend', contentResizeHandler)
+})
+
+onBeforeUnmount(() => {
+  window.removeEventListener('resize', resizeHandler)
+  unref(contentEl) &&
+    (unref(contentEl) as Element).removeEventListener('transitionend', contentResizeHandler)
+})
+
+onActivated(() => {
+  if (echartRef) {
+    echartRef.resize()
+  }
+})
+</script>
+
+<template>
+  <div ref="elRef" :class="[$attrs.class, prefixCls]" :style="styles"></div>
+</template>
diff --git a/src/components/Editor/index.ts b/src/components/Editor/index.ts
new file mode 100644
index 000000000..3fbf0a9c9
--- /dev/null
+++ b/src/components/Editor/index.ts
@@ -0,0 +1,8 @@
+import Editor from './src/Editor.vue'
+import { IDomEditor } from '@wangeditor/editor'
+
+export interface EditorExpose {
+  getEditorRef: () => Promise<IDomEditor>
+}
+
+export { Editor }
diff --git a/src/components/Editor/src/Editor.vue b/src/components/Editor/src/Editor.vue
new file mode 100644
index 000000000..ec40bca27
--- /dev/null
+++ b/src/components/Editor/src/Editor.vue
@@ -0,0 +1,202 @@
+<script lang="ts" setup>
+import { PropType } from 'vue'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
+import { i18nChangeLanguage, IDomEditor, IEditorConfig } from '@wangeditor/editor'
+import { propTypes } from '@/utils/propTypes'
+import { isNumber } from '@/utils/is'
+import { ElMessage } from 'element-plus'
+import { useLocaleStore } from '@/store/modules/locale'
+import { getAccessToken, getTenantId } from '@/utils/auth'
+
+defineOptions({ name: 'Editor' })
+
+type InsertFnType = (url: string, alt: string, href: string) => void
+
+const localeStore = useLocaleStore()
+
+const currentLocale = computed(() => localeStore.getCurrentLocale)
+
+i18nChangeLanguage(unref(currentLocale).lang)
+
+const props = defineProps({
+  editorId: propTypes.string.def('wangeEditor-1'),
+  height: propTypes.oneOfType([Number, String]).def('500px'),
+  editorConfig: {
+    type: Object as PropType<Partial<IEditorConfig>>,
+    default: () => undefined
+  },
+  readonly: propTypes.bool.def(false),
+  modelValue: propTypes.string.def('')
+})
+
+const emit = defineEmits(['change', 'update:modelValue'])
+
+// 编辑器实例，必须用 shallowRef
+const editorRef = shallowRef<IDomEditor>()
+
+const valueHtml = ref('')
+
+watch(
+  () => props.modelValue,
+  (val: string) => {
+    if (val === unref(valueHtml)) return
+    valueHtml.value = val
+  },
+  {
+    immediate: true
+  }
+)
+
+// 监听
+watch(
+  () => valueHtml.value,
+  (val: string) => {
+    emit('update:modelValue', val)
+  }
+)
+
+const handleCreated = (editor: IDomEditor) => {
+  editorRef.value = editor
+}
+
+// 编辑器配置
+const editorConfig = computed((): IEditorConfig => {
+  return Object.assign(
+    {
+      placeholder: '请输入内容...',
+      readOnly: props.readonly,
+      customAlert: (s: string, t: string) => {
+        switch (t) {
+          case 'success':
+            ElMessage.success(s)
+            break
+          case 'info':
+            ElMessage.info(s)
+            break
+          case 'warning':
+            ElMessage.warning(s)
+            break
+          case 'error':
+            ElMessage.error(s)
+            break
+          default:
+            ElMessage.info(s)
+            break
+        }
+      },
+      autoFocus: false,
+      scroll: true,
+      MENU_CONF: {
+        ['uploadImage']: {
+          server: import.meta.env.VITE_UPLOAD_URL,
+          // 单个文件的最大体积限制，默认为 2M
+          maxFileSize: 5 * 1024 * 1024,
+          // 最多可上传几个文件，默认为 100
+          maxNumberOfFiles: 10,
+          // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+          allowedFileTypes: ['image/*'],
+
+          // 自定义上传参数，例如传递验证的 token 等。参数会被添加到 formData 中，一起上传到服务端。
+          meta: { updateSupport: 0 },
+          // 将 meta 拼接到 url 参数中，默认 false
+          metaWithUrl: true,
+
+          // 自定义增加 http  header
+          headers: {
+            Accept: '*',
+            Authorization: 'Bearer ' + getAccessToken(),
+            'tenant-id': getTenantId()
+          },
+
+          // 跨域是否传递 cookie ，默认为 false
+          withCredentials: true,
+
+          // 超时时间，默认为 10 秒
+          timeout: 5 * 1000, // 5 秒
+
+          // form-data fieldName，后端接口参数名称，默认值wangeditor-uploaded-image
+          fieldName: 'file',
+
+          // 上传之前触发
+          onBeforeUpload(file: File) {
+            console.log(file)
+            return file
+          },
+          // 上传进度的回调函数
+          onProgress(progress: number) {
+            // progress 是 0-100 的数字
+            console.log('progress', progress)
+          },
+          onSuccess(file: File, res: any) {
+            console.log('onSuccess', file, res)
+          },
+          onFailed(file: File, res: any) {
+            alert(res.message)
+            console.log('onFailed', file, res)
+          },
+          onError(file: File, err: any, res: any) {
+            alert(err.message)
+            console.error('onError', file, err, res)
+          },
+          // 自定义插入图片
+          customInsert(res: any, insertFn: InsertFnType) {
+            insertFn(res.data, 'image', res.data)
+          }
+        }
+      },
+      uploadImgShowBase64: true
+    },
+    props.editorConfig || {}
+  )
+})
+
+const editorStyle = computed(() => {
+  return {
+    height: isNumber(props.height) ? `${props.height}px` : props.height
+  }
+})
+
+// 回调函数
+const handleChange = (editor: IDomEditor) => {
+  emit('change', editor)
+}
+
+// 组件销毁时，及时销毁编辑器
+onBeforeUnmount(() => {
+  const editor = unref(editorRef.value)
+
+  // 销毁，并移除 editor
+  editor?.destroy()
+})
+
+const getEditorRef = async (): Promise<IDomEditor> => {
+  await nextTick()
+  return unref(editorRef.value) as IDomEditor
+}
+
+defineExpose({
+  getEditorRef
+})
+</script>
+
+<template>
+  <div class="z-99 border-1 border-[var(--el-border-color)] border-solid">
+    <!-- 工具栏 -->
+    <Toolbar
+      :editor="editorRef"
+      :editorId="editorId"
+      class="border-0 b-b-1 border-[var(--el-border-color)] border-solid"
+    />
+    <!-- 编辑器 -->
+    <Editor
+      v-model="valueHtml"
+      :defaultConfig="editorConfig"
+      :editorId="editorId"
+      :style="editorStyle"
+      @on-change="handleChange"
+      @on-created="handleCreated"
+    />
+  </div>
+</template>
+
+<style src="@wangeditor/editor/dist/css/style.css"></style>
diff --git a/src/components/Error/index.ts b/src/components/Error/index.ts
new file mode 100644
index 000000000..a52c6f97d
--- /dev/null
+++ b/src/components/Error/index.ts
@@ -0,0 +1,3 @@
+import Error from './src/Error.vue'
+
+export { Error }
diff --git a/src/components/Error/src/Error.vue b/src/components/Error/src/Error.vue
new file mode 100644
index 000000000..3fd7a1767
--- /dev/null
+++ b/src/components/Error/src/Error.vue
@@ -0,0 +1,58 @@
+<script lang="ts" setup>
+import pageError from '@/assets/svgs/404.svg'
+import networkError from '@/assets/svgs/500.svg'
+import noPermission from '@/assets/svgs/403.svg'
+import { propTypes } from '@/utils/propTypes'
+
+defineOptions({ name: 'Error' })
+
+interface ErrorMap {
+  url: string
+  message: string
+  buttonText: string
+}
+
+const { t } = useI18n()
+
+const errorMap: {
+  [key: string]: ErrorMap
+} = {
+  '404': {
+    url: pageError,
+    message: t('error.pageError'),
+    buttonText: t('error.returnToHome')
+  },
+  '500': {
+    url: networkError,
+    message: t('error.networkError'),
+    buttonText: t('error.returnToHome')
+  },
+  '403': {
+    url: noPermission,
+    message: t('error.noPermission'),
+    buttonText: t('error.returnToHome')
+  }
+}
+
+const props = defineProps({
+  type: propTypes.string.validate((v: string) => ['404', '500', '403'].includes(v)).def('404')
+})
+
+const emit = defineEmits(['errorClick'])
+
+const btnClick = () => {
+  emit('errorClick', props.type)
+}
+</script>
+
+<template>
+  <div class="flex justify-center">
+    <div class="text-center">
+      <img :src="errorMap[type].url" alt="" width="350" />
+      <div class="text-14px text-[var(--el-color-info)]">{{ errorMap[type].message }}</div>
+      <div class="mt-20px">
+        <ElButton type="primary" @click="btnClick">{{ errorMap[type].buttonText }}</ElButton>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/src/components/Form/index.ts b/src/components/Form/index.ts
new file mode 100644
index 000000000..484c7a22d
--- /dev/null
+++ b/src/components/Form/index.ts
@@ -0,0 +1,15 @@
+import Form from './src/Form.vue'
+import { ElForm } from 'element-plus'
+import { FormSchema, FormSetPropsType } from '@/types/form'
+
+export interface FormExpose {
+  setValues: (data: Recordable) => void
+  setProps: (props: Recordable) => void
+  delSchema: (field: string) => void
+  addSchema: (formSchema: FormSchema, index?: number) => void
+  setSchema: (schemaProps: FormSetPropsType[]) => void
+  formModel: Recordable
+  getElFormRef: () => ComponentRef<typeof ElForm>
+}
+
+export { Form }
diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
new file mode 100644
index 000000000..f11599fc8
--- /dev/null
+++ b/src/components/Form/src/Form.vue
@@ -0,0 +1,381 @@
+<script lang="tsx">
+import { computed, defineComponent, onMounted, PropType, ref, unref, watch } from 'vue'
+import { ElButton, ElCol, ElForm, ElFormItem, ElInput, ElRow, ElTooltip } from 'element-plus'
+import { componentMap } from './componentMap'
+import { propTypes } from '@/utils/propTypes'
+import { getSlot } from '@/utils/tsxHelper'
+import {
+  initModel,
+  setComponentProps,
+  setFormItemSlots,
+  setGridProp,
+  setItemComponentSlots,
+  setTextPlaceholder
+} from './helper'
+import { useRenderSelect } from './components/useRenderSelect'
+import { useRenderRadio } from './components/useRenderRadio'
+import { useRenderCheckbox } from './components/useRenderCheckbox'
+import { useDesign } from '@/hooks/web/useDesign'
+import { findIndex } from '@/utils'
+import { set } from 'lodash-es'
+import { FormProps } from './types'
+import { Icon } from '@/components/Icon'
+import { FormSchema, FormSetPropsType } from '@/types/form'
+import { Search } from '@element-plus/icons-vue'
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('form')
+
+export default defineComponent({
+  // eslint-disable-next-line vue/no-reserved-component-names
+  name: 'Form',
+  props: {
+    // 生成Form的布局结构数组
+    schema: {
+      type: Array as PropType<FormSchema[]>,
+      default: () => []
+    },
+    // 是否需要栅格布局
+    // update by 芋艿：将 true 改成 false，因为项目更常用这种方式
+    isCol: propTypes.bool.def(false),
+    // 表单数据对象
+    model: {
+      type: Object as PropType<Recordable>,
+      default: () => ({})
+    },
+    // 是否自动设置placeholder
+    autoSetPlaceholder: propTypes.bool.def(true),
+    // 是否自定义内容
+    isCustom: propTypes.bool.def(false),
+    // 表单label宽度
+    labelWidth: propTypes.oneOfType([String, Number]).def('auto'),
+    // 是否 loading 数据中 add by 芋艿
+    vLoading: propTypes.bool.def(false),
+    labelPosition: propTypes.string.def('left'),
+  },
+  emits: ['register','opensearchTable', 'onChange', 'onBlur'],
+  setup(props, { slots, expose, emit }) {
+    // element form 实例
+    const elFormRef = ref<ComponentRef<typeof ElForm>>()
+
+    // useForm传入的props
+    const outsideProps = ref<FormProps>({})
+
+    const mergeProps = ref<FormProps>({})
+
+    const getProps = computed(() => {
+      const propsObj = { ...props }
+      Object.assign(propsObj, unref(mergeProps))
+      return propsObj
+    })
+
+    // 表单数据
+    const formModel = ref<Recordable>({})
+
+    onMounted(() => {
+      emit('register', unref(elFormRef)?.$parent, unref(elFormRef))
+    })
+
+    // 对表单赋值
+    const setValues = (data: Recordable = {}) => {
+      formModel.value = Object.assign(unref(formModel), data)
+    }
+
+    const setProps = (props: FormProps = {}) => {
+      mergeProps.value = Object.assign(unref(mergeProps), props)
+      outsideProps.value = props
+    }
+
+    const delSchema = (field: string) => {
+      const { schema } = unref(getProps)
+
+      const index = findIndex(schema, (v: FormSchema) => v.field === field)
+      if (index > -1) {
+        schema.splice(index, 1)
+      }
+    }
+
+    const addSchema = (formSchema: FormSchema, index?: number) => {
+      const { schema } = unref(getProps)
+      if (index !== void 0) {
+        schema.splice(index, 0, formSchema)
+        return
+      }
+      schema.push(formSchema)
+    }
+
+    const setSchema = (schemaProps: FormSetPropsType[]) => {
+      const { schema } = unref(getProps)
+      for (const v of schema) {
+        for (const item of schemaProps) {
+          if (v.field === item.field) {
+            set(v, item.path, item.value)
+          }
+        }
+      }
+    }
+
+    const getElFormRef = (): ComponentRef<typeof ElForm> => {
+      return unref(elFormRef) as ComponentRef<typeof ElForm>
+    }
+
+    const opensearchTable = (field, searchField,searchTitle,searchAllSchemas, searchPage, searchCondition,multiple) => {
+      emit('opensearchTable',field, searchField, searchTitle, searchAllSchemas, searchPage, searchCondition,multiple)
+    }
+
+    expose({
+      setValues,
+      formModel,
+      setProps,
+      delSchema,
+      addSchema,
+      setSchema,
+      getElFormRef,
+      opensearchTable
+    })
+
+    // 监听表单结构化数组，重新生成formModel
+    watch(
+      () => unref(getProps).schema,
+      (schema = []) => {
+        formModel.value = initModel(schema, unref(formModel))
+      },
+      {
+        immediate: true,
+        deep: true
+      }
+    )
+
+    // 渲染包裹标签，是否使用栅格布局
+    const renderWrap = () => {
+      const { isCol } = unref(getProps)
+      const content = isCol ? (
+        <ElRow gutter={20}>{renderFormItemWrap()}</ElRow>
+      ) : (
+        renderFormItemWrap()
+      )
+      return content
+    }
+
+    // 是否要渲染el-col
+    const renderFormItemWrap = () => {
+      // hidden属性表示隐藏，不做渲染
+      const { schema = [], isCol } = unref(getProps)
+
+      return schema
+        .filter((v) => !v.hidden)
+        .map((item) => {
+          // 如果是 Divider 组件，需要自己占用一行
+          const isDivider = item.component === 'Divider'
+          const Com = componentMap['Divider'] as ReturnType<typeof defineComponent>
+          return isDivider ? (
+            <Com {...{ contentPosition: 'left', ...item.componentProps }}>{item?.label}</Com>
+          ) : isCol ? (
+            // 如果需要栅格，需要包裹 ElCol
+            <ElCol  {...setGridProp(item.colProps)}>{renderFormItem(item)}</ElCol>
+          ) : (
+            renderFormItem(item)
+          )
+        })
+    }
+
+    /**
+     * 监听改变事件
+     * @param field 当前操作字段
+     * @param cur 改变后值
+     */
+    const onChange = (field, cur) => {
+      emit('onChange', field, cur)
+    }
+    /**
+     * 监听失去焦点
+     * @param field 当前操作字段
+     * @param e 改变后值
+     */
+    const onBlur = (field, e) => {
+      emit('onBlur', field, e)
+    }
+    // 渲染formItem
+    const renderFormItem = (item: FormSchema) => {
+      // 单独给只有options属性的组件做判断
+      const notRenderOptions = ['SelectV2', 'Cascader', 'Transfer']
+      const slotsMap: Recordable = {
+        ...setItemComponentSlots(slots, item?.componentProps?.slots, item.field)
+      }
+      if (
+        item?.component !== 'SelectV2' &&
+        item?.component !== 'Cascader' &&
+        item?.componentProps?.options
+      ) {
+        slotsMap.default = () => renderOptions(item)
+      }
+
+      const formItemSlots: Recordable = setFormItemSlots(slots, item.field)
+      // 如果有 labelMessage，自动使用插槽渲染
+      if (item?.labelMessage) {
+        formItemSlots.label = () => {
+          return (
+            <>
+              <span>{item.label}</span>
+              <ElTooltip placement="right" raw-content>
+                {{
+                  content: () => <span v-dompurify-html={item.labelMessage}></span>,
+                  default: () => (
+                    <Icon
+                      icon="ep:warning"
+                      size={16}
+                      color="var(--el-color-primary)"
+                      class="relative top-1px ml-2px"
+                    ></Icon>
+                  )
+                }}
+              </ElTooltip>
+            </>
+          )
+        }
+      }
+      
+      // 如果有 isSearchList: true ，使用查询弹层列表
+      const formItemSlotsSearchList: Recordable = setFormItemSlots(slots, item.field)
+      if (item?.componentProps?.isSearchList) {
+        if(item?.componentProps?.multiple){
+
+          formItemSlotsSearchList[item.field] = () => {
+          return (
+            <>
+              <ElTooltip placement="top"  content={formModel.value[item.field]} >
+                <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} disabled={true}  />
+              </ElTooltip>
+              <ElButton icon={Search} onClick={()=>{
+                opensearchTable(
+                  item.field, item?.componentProps?.searchField,
+                  item?.componentProps?.searchTitle, 
+                  item?.componentProps?.searchAllSchemas, 
+                  item?.componentProps?.searchPage,
+                  item?.componentProps?.searchCondition,
+                  item?.componentProps?.multiple,
+                )}}/>
+              </>
+            )
+          }
+        }else{
+          formItemSlotsSearchList[item.field] = () => {
+          return (
+            <>
+              <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} disabled={true}  />
+              <ElButton icon={Search} onClick={()=>{
+                opensearchTable(
+                  item.field, item?.componentProps?.searchField,
+                  item?.componentProps?.searchTitle, 
+                  item?.componentProps?.searchAllSchemas, 
+                  item?.componentProps?.searchPage,
+                  item?.componentProps?.searchCondition,
+                  item?.componentProps?.multiple,
+                )}}/>
+              </>
+            )
+          }
+        }
+      }
+      return (
+        <ElFormItem {...(item.formItemProps || {})} prop={item.field} label={item.label || ''}>
+          {{
+            ...formItemSlots,
+            default: () => {
+              const Com = componentMap[item.component as string] as ReturnType<
+                typeof defineComponent
+              >
+              const { autoSetPlaceholder } = unref(getProps)
+              // 查询弹层列表定义的插槽
+              return formItemSlotsSearchList[item.field] ? 
+                (getSlot(formItemSlotsSearchList, item.field, formModel.value)) : 
+                slots[item.field] ? (
+                    getSlot(slots, item.field, formModel.value)
+                  ) : (
+                    <Com
+                      vModel={formModel.value[item.field]}
+                      {...(autoSetPlaceholder && setTextPlaceholder(item))}
+                      {...setComponentProps(item)}
+                      style={item.componentProps?.style}
+                      onChange={(e)=>{onChange(item.field, e)}}
+                      onBlur={(e)=>{onBlur(item.field, e)}}
+                      {...(notRenderOptions.includes(item?.component as string) &&
+                      item?.componentProps?.options
+                        ? { options: item?.componentProps?.options || [] }
+                        : {})}
+                    >
+                      {{ ...slotsMap }}
+                    </Com>
+                  )
+            },
+          }}
+        </ElFormItem>
+      )
+    }
+
+    // 渲染options
+    const renderOptions = (item: FormSchema) => {
+      switch (item.component) {
+        case 'Select':
+        case 'SelectV2':
+          const { renderSelectOptions } = useRenderSelect(slots)
+          return renderSelectOptions(item)
+        case 'Radio':
+        case 'RadioButton':
+          const { renderRadioOptions } = useRenderRadio()
+          return renderRadioOptions(item)
+        case 'Checkbox':
+        case 'CheckboxButton':
+          const { renderCheckboxOptions } = useRenderCheckbox()
+          return renderCheckboxOptions(item)
+        default:
+          break
+      }
+    }
+
+    // 过滤传入Form组件的属性
+    const getFormBindValue = () => {
+      // 避免在标签上出现多余的属性
+      const delKeys = ['schema', 'isCol', 'autoSetPlaceholder', 'isCustom', 'model']
+      const props = { ...unref(getProps) }
+      for (const key in props) {
+        if (delKeys.indexOf(key) !== -1) {
+          delete props[key]
+        }
+      }
+      return props
+    }
+
+    return () => (
+      <ElForm
+        ref={elFormRef}
+        {...getFormBindValue()}
+        model={props.isCustom ? props.model : formModel}
+        class={prefixCls}
+        v-loading={props.vLoading}
+        label-position={props.labelPosition}
+      >
+        {{
+          // 如果需要自定义，就什么都不渲染，而是提供默认插槽
+          default: () => {
+            const { isCustom } = unref(getProps)
+            return isCustom ? getSlot(slots, 'default') : renderWrap()
+          }
+        }}
+      </ElForm>
+      
+    )
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+.myInput {
+  width: calc(100% - 46px);
+}
+.#{$elNamespace}-form.#{$namespace}-form .#{$elNamespace}-row {
+  margin-right: 0 !important;
+  margin-left: 0 !important;
+}
+</style>
diff --git a/src/components/Form/src/componentMap.ts b/src/components/Form/src/componentMap.ts
new file mode 100644
index 000000000..5af9b40da
--- /dev/null
+++ b/src/components/Form/src/componentMap.ts
@@ -0,0 +1,55 @@
+import type { Component } from 'vue'
+import {
+  ElCascader,
+  ElCheckboxGroup,
+  ElColorPicker,
+  ElDatePicker,
+  ElInput,
+  ElInputNumber,
+  ElRadioGroup,
+  ElRate,
+  ElSelect,
+  ElSelectV2,
+  ElTreeSelect,
+  ElSlider,
+  ElSwitch,
+  ElTimePicker,
+  ElTimeSelect,
+  ElTransfer,
+  ElAutocomplete,
+  ElDivider
+} from 'element-plus'
+import { InputPassword } from '@/components/InputPassword'
+import { Editor } from '@/components/Editor'
+import { UploadImg, UploadImgs, UploadFile } from '@/components/UploadFile'
+import { ComponentName } from '@/types/components'
+
+const componentMap: Recordable<Component, ComponentName> = {
+  Radio: ElRadioGroup,
+  Checkbox: ElCheckboxGroup,
+  CheckboxButton: ElCheckboxGroup,
+  Input: ElInput,
+  Autocomplete: ElAutocomplete,
+  InputNumber: ElInputNumber,
+  Select: ElSelect,
+  Cascader: ElCascader,
+  Switch: ElSwitch,
+  Slider: ElSlider,
+  TimePicker: ElTimePicker,
+  DatePicker: ElDatePicker,
+  Rate: ElRate,
+  ColorPicker: ElColorPicker,
+  Transfer: ElTransfer,
+  Divider: ElDivider,
+  TimeSelect: ElTimeSelect,
+  SelectV2: ElSelectV2,
+  TreeSelect: ElTreeSelect,
+  RadioButton: ElRadioGroup,
+  InputPassword: InputPassword,
+  Editor: Editor,
+  UploadImg: UploadImg,
+  UploadImgs: UploadImgs,
+  UploadFile: UploadFile
+}
+
+export { componentMap }
diff --git a/src/components/Form/src/components/useRenderCheckbox.tsx b/src/components/Form/src/components/useRenderCheckbox.tsx
new file mode 100644
index 000000000..e15183954
--- /dev/null
+++ b/src/components/Form/src/components/useRenderCheckbox.tsx
@@ -0,0 +1,26 @@
+import { FormSchema } from '@/types/form'
+import { ElCheckbox, ElCheckboxButton } from 'element-plus'
+import { defineComponent } from 'vue'
+
+export const useRenderCheckbox = () => {
+  const renderCheckboxOptions = (item: FormSchema) => {
+    // 如果有别名，就取别名
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField
+    const Com = (item.component === 'Checkbox' ? ElCheckbox : ElCheckboxButton) as ReturnType<
+      typeof defineComponent
+    >
+    return item?.componentProps?.options?.map((option) => {
+      const { ...other } = option
+      return (
+        <Com {...other} label={option[valueAlias || 'value']}>
+          {option[labelAlias || 'label']}
+        </Com>
+      )
+    })
+  }
+
+  return {
+    renderCheckboxOptions
+  }
+}
diff --git a/src/components/Form/src/components/useRenderRadio.tsx b/src/components/Form/src/components/useRenderRadio.tsx
new file mode 100644
index 000000000..d1005ca54
--- /dev/null
+++ b/src/components/Form/src/components/useRenderRadio.tsx
@@ -0,0 +1,26 @@
+import { FormSchema } from '@/types/form'
+import { ElRadio, ElRadioButton } from 'element-plus'
+import { defineComponent } from 'vue'
+
+export const useRenderRadio = () => {
+  const renderRadioOptions = (item: FormSchema) => {
+    // 如果有别名，就取别名
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField
+    const Com = (item.component === 'Radio' ? ElRadio : ElRadioButton) as ReturnType<
+      typeof defineComponent
+    >
+    return item?.componentProps?.options?.map((option) => {
+      const { ...other } = option
+      return (
+        <Com {...other} label={option[valueAlias || 'value']}>
+          {option[labelAlias || 'label']}
+        </Com>
+      )
+    })
+  }
+
+  return {
+    renderRadioOptions
+  }
+}
diff --git a/src/components/Form/src/components/useRenderSelect.tsx b/src/components/Form/src/components/useRenderSelect.tsx
new file mode 100644
index 000000000..59b72e687
--- /dev/null
+++ b/src/components/Form/src/components/useRenderSelect.tsx
@@ -0,0 +1,57 @@
+import { FormSchema } from '@/types/form'
+import { ComponentOptions } from '@/types/components'
+import { ElOption, ElOptionGroup } from 'element-plus'
+import { getSlot } from '@/utils/tsxHelper'
+import { Slots } from 'vue'
+
+export const useRenderSelect = (slots: Slots) => {
+  // 渲染 select options
+  const renderSelectOptions = (item: FormSchema) => {
+    // 如果有别名，就取别名
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField
+    return item?.componentProps?.options?.map((option) => {
+      if (option?.options?.length) {
+        return (
+          <ElOptionGroup label={option[labelAlias || 'label']}>
+            {() => {
+              return option?.options?.map((v) => {
+                return renderSelectOptionItem(item, v)
+              })
+            }}
+          </ElOptionGroup>
+        )
+      } else {
+        return renderSelectOptionItem(item, option)
+      }
+    })
+  }
+
+  // 渲染 select option item
+  const renderSelectOptionItem = (item: FormSchema, option: ComponentOptions) => {
+    // 如果有别名，就取别名
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField
+
+    const { label, value, ...other } = option
+
+    return (
+      <ElOption
+        {...other}
+        label={labelAlias ? option[labelAlias] : label}
+        value={valueAlias ? option[valueAlias] : value}
+      >
+        {{
+          default: () =>
+            // option 插槽名规则，{field}-option
+            item?.componentProps?.optionsSlot
+              ? getSlot(slots, `${item.field}-option`, { item: option })
+              : undefined
+        }}
+      </ElOption>
+    )
+  }
+
+  return {
+    renderSelectOptions
+  }
+}
diff --git a/src/components/Form/src/helper.ts b/src/components/Form/src/helper.ts
new file mode 100644
index 000000000..cdfc8caac
--- /dev/null
+++ b/src/components/Form/src/helper.ts
@@ -0,0 +1,148 @@
+import type { Slots } from 'vue'
+import { getSlot } from '@/utils/tsxHelper'
+import { PlaceholderModel } from './types'
+import { FormSchema } from '@/types/form'
+import { ColProps } from '@/types/components'
+
+/**
+ *
+ * @param schema 对应组件数据
+ * @returns 返回提示信息对象
+ * @description 用于自动设置placeholder
+ */
+export const setTextPlaceholder = (schema: FormSchema): PlaceholderModel => {
+  const { t } = useI18n()
+  const textMap = ['Input', 'Autocomplete', 'InputNumber', 'InputPassword']
+  const selectMap = ['Select', 'SelectV2', 'TimePicker', 'DatePicker', 'TimeSelect', 'TimeSelect']
+  if (textMap.includes(schema?.component as string)) {
+    return {
+      placeholder: t('common.inputText') + schema.label
+    }
+  }
+  if (selectMap.includes(schema?.component as string)) {
+    // 一些范围选择器
+    const twoTextMap = ['datetimerange', 'daterange', 'monthrange', 'datetimerange', 'daterange']
+    if (
+      twoTextMap.includes(
+        (schema?.componentProps?.type || schema?.componentProps?.isRange) as string
+      )
+    ) {
+      return {
+        startPlaceholder: t('common.startTimeText'),
+        endPlaceholder: t('common.endTimeText'),
+        rangeSeparator: '-'
+      }
+    } else {
+      return {
+        placeholder: t('common.selectText') + schema.label
+      }
+    }
+  }
+  return {}
+}
+
+/**
+ *
+ * @param col 内置栅格
+ * @returns 返回栅格属性
+ * @description 合并传入进来的栅格属性
+ */
+export const setGridProp = (col: ColProps = {}): ColProps => {
+  const colProps: ColProps = {
+    // 如果有span，代表用户优先级更高，所以不需要默认栅格
+    ...(col.span
+      ? {}
+      : {
+          xs: 24,
+          sm: 12,
+          md: 12,
+          lg: 12,
+          xl: 12
+        }),
+    ...col
+  }
+  return colProps
+}
+
+/**
+ *
+ * @param item 传入的组件属性
+ * @returns 默认添加 clearable 属性
+ */
+export const setComponentProps = (item: FormSchema): Recordable => {
+  const notNeedClearable = ['ColorPicker']
+  const componentProps: Recordable = notNeedClearable.includes(item.component as string)
+    ? { ...item.componentProps }
+    : {
+        clearable: true,
+        ...item.componentProps
+      }
+  // 需要删除额外的属性
+  delete componentProps?.slots
+  return componentProps
+}
+
+/**
+ *
+ * @param slots 插槽
+ * @param slotsProps 插槽属性
+ * @param field 字段名
+ */
+export const setItemComponentSlots = (
+  slots: Slots,
+  slotsProps: Recordable = {},
+  field: string
+): Recordable => {
+  const slotObj: Recordable = {}
+  for (const key in slotsProps) {
+    if (slotsProps[key]) {
+      // 由于组件有可能重复，需要有一个唯一的前缀
+      slotObj[key] = (data: Recordable) => {
+        return getSlot(slots, `${field}-${key}`, data)
+      }
+    }
+  }
+  return slotObj
+}
+
+/**
+ *
+ * @param schema Form表单结构化数组
+ * @param formModel FormModel
+ * @returns FormModel
+ * @description 生成对应的formModel
+ */
+export const initModel = (schema: FormSchema[], formModel: Recordable) => {
+  const model: Recordable = { ...formModel }
+  schema.map((v) => {
+    // 如果是hidden，就删除对应的值
+    if (v.hidden) {
+      delete model[v.field]
+    } else if (v.component && v.component !== 'Divider') {
+      const hasField = Reflect.has(model, v.field)
+      // 如果先前已经有值存在，则不进行重新赋值，而是采用现有的值
+      model[v.field] = hasField ? model[v.field] : v.value !== void 0 ? v.value : ''
+    }
+  })
+  return model
+}
+
+/**
+ * @param slots 插槽
+ * @param field 字段名
+ * @returns 返回FormIiem插槽
+ */
+export const setFormItemSlots = (slots: Slots, field: string): Recordable => {
+  const slotObj: Recordable = {}
+  if (slots[`${field}-error`]) {
+    slotObj['error'] = (data: Recordable) => {
+      return getSlot(slots, `${field}-error`, data)
+    }
+  }
+  if (slots[`${field}-label`]) {
+    slotObj['label'] = (data: Recordable) => {
+      return getSlot(slots, `${field}-label`, data)
+    }
+  }
+  return slotObj
+}
diff --git a/src/components/Form/src/types.ts b/src/components/Form/src/types.ts
new file mode 100644
index 000000000..dcd01e784
--- /dev/null
+++ b/src/components/Form/src/types.ts
@@ -0,0 +1,17 @@
+import { FormSchema } from '@/types/form'
+
+export interface PlaceholderModel {
+  placeholder?: string
+  startPlaceholder?: string
+  endPlaceholder?: string
+  rangeSeparator?: string
+}
+
+export type FormProps = {
+  schema?: FormSchema[]
+  isCol?: boolean
+  model?: Recordable
+  autoSetPlaceholder?: boolean
+  isCustom?: boolean
+  labelWidth?: string | number
+} & Recordable
diff --git a/src/components/Highlight/index.ts b/src/components/Highlight/index.ts
new file mode 100644
index 000000000..3e2d9ed60
--- /dev/null
+++ b/src/components/Highlight/index.ts
@@ -0,0 +1,3 @@
+import Highlight from './src/Highlight.vue'
+
+export { Highlight }
diff --git a/src/components/Highlight/src/Highlight.vue b/src/components/Highlight/src/Highlight.vue
new file mode 100644
index 000000000..ef923a9a4
--- /dev/null
+++ b/src/components/Highlight/src/Highlight.vue
@@ -0,0 +1,65 @@
+<script lang="tsx">
+import { defineComponent, PropType, computed, h, unref } from 'vue'
+import { propTypes } from '@/utils/propTypes'
+
+export default defineComponent({
+  name: 'Highlight',
+  props: {
+    tag: propTypes.string.def('span'),
+    keys: {
+      type: Array as PropType<string[]>,
+      default: () => []
+    },
+    color: propTypes.string.def('var(--el-color-primary)')
+  },
+  emits: ['click'],
+  setup(props, { emit, slots }) {
+    const keyNodes = computed(() => {
+      return props.keys.map((key) => {
+        return h(
+          'span',
+          {
+            onClick: () => {
+              emit('click', key)
+            },
+            style: {
+              color: props.color,
+              cursor: 'pointer'
+            }
+          },
+          key
+        )
+      })
+    })
+
+    const parseText = (text: string) => {
+      props.keys.forEach((key, index) => {
+        const regexp = new RegExp(key, 'g')
+        text = text.replace(regexp, `{{${index}}}`)
+      })
+      return text.split(/{{|}}/)
+    }
+
+    const renderText = () => {
+      if (!slots?.default) return null
+      const node = slots?.default()[0].children
+
+      if (!node) {
+        return slots?.default()[0]
+      }
+
+      const textArray = parseText(node as string)
+      const regexp = /^[0-9]*$/
+      const nodes = textArray.map((t) => {
+        if (regexp.test(t)) {
+          return unref(keyNodes)[t] || t
+        }
+        return t
+      })
+      return h(props.tag, nodes)
+    }
+
+    return () => renderText()
+  }
+})
+</script>
diff --git a/src/components/Icon/index.ts b/src/components/Icon/index.ts
new file mode 100644
index 000000000..33d1de38a
--- /dev/null
+++ b/src/components/Icon/index.ts
@@ -0,0 +1,4 @@
+import Icon from './src/Icon.vue'
+import IconSelect from './src/IconSelect.vue'
+
+export { Icon, IconSelect }
diff --git a/src/components/Icon/src/Icon.vue b/src/components/Icon/src/Icon.vue
new file mode 100644
index 000000000..00dfa5d77
--- /dev/null
+++ b/src/components/Icon/src/Icon.vue
@@ -0,0 +1,85 @@
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import Iconify from '@purge-icons/generated'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'Icon' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('icon')
+
+const props = defineProps({
+  // icon name
+  icon: propTypes.string,
+  // icon color
+  color: propTypes.string,
+  // icon size
+  size: propTypes.number.def(16),
+  // icon svg class
+  svgClass: propTypes.string.def('')
+})
+
+const elRef = ref<ElRef>(null)
+
+const isLocal = computed(() => props.icon.startsWith('svg-icon:'))
+
+const symbolId = computed(() => {
+  return unref(isLocal) ? `#icon-${props.icon.split('svg-icon:')[1]}` : props.icon
+})
+
+const getIconifyStyle = computed(() => {
+  const { color, size } = props
+  return {
+    fontSize: `${size}px`,
+    color
+  }
+})
+
+const getSvgClass = computed(() => {
+  const { svgClass } = props
+  return `iconify ${svgClass}`
+})
+
+const updateIcon = async (icon: string) => {
+  if (unref(isLocal)) return
+
+  const el = unref(elRef)
+  if (!el) return
+
+  await nextTick()
+
+  if (!icon) return
+
+  const svg = Iconify.renderSVG(icon, {})
+  if (svg) {
+    el.textContent = ''
+    el.appendChild(svg)
+  } else {
+    const span = document.createElement('span')
+    span.className = 'iconify'
+    span.dataset.icon = icon
+    el.textContent = ''
+    el.appendChild(span)
+  }
+}
+
+watch(
+  () => props.icon,
+  (icon: string) => {
+    updateIcon(icon)
+  }
+)
+</script>
+
+<template>
+  <ElIcon :class="prefixCls" :color="color" :size="size">
+    <svg v-if="isLocal" :class="getSvgClass" aria-hidden="true">
+      <use :xlink:href="symbolId" />
+    </svg>
+
+    <span v-else ref="elRef" :class="$attrs.class" :style="getIconifyStyle">
+      <span :class="getSvgClass" :data-icon="symbolId"></span>
+    </span>
+  </ElIcon>
+</template>
diff --git a/src/components/Icon/src/IconSelect.vue b/src/components/Icon/src/IconSelect.vue
new file mode 100644
index 000000000..d4a5b0742
--- /dev/null
+++ b/src/components/Icon/src/IconSelect.vue
@@ -0,0 +1,229 @@
+<script lang="ts" setup>
+import { CSSProperties } from 'vue'
+import { cloneDeep } from 'lodash-es'
+import { IconJson } from '@/components/Icon/src/data'
+
+defineOptions({ name: 'IconSelect' })
+
+type ParameterCSSProperties = (item?: string) => CSSProperties | undefined
+
+const props = defineProps({
+  modelValue: {
+    require: false,
+    type: String
+  }
+})
+const emit = defineEmits<{ (e: 'update:modelValue', v: string) }>()
+
+const visible = ref(false)
+const inputValue = toRef(props, 'modelValue')
+const iconList = ref(IconJson)
+const icon = ref('add-location')
+const currentActiveType = ref('ep:')
+// 深拷贝图标数据，前端做搜索
+const copyIconList = cloneDeep(iconList.value)
+
+const pageSize = ref(96)
+const currentPage = ref(1)
+
+// 搜索条件
+const filterValue = ref('')
+
+const tabsList = [
+  {
+    label: 'Element Plus',
+    name: 'ep:'
+  },
+  {
+    label: 'Font Awesome 4',
+    name: 'fa:'
+  },
+  {
+    label: 'Font Awesome 5 Solid',
+    name: 'fa-solid:'
+  }
+]
+
+const pageList = computed(() => {
+  if (currentPage.value === 1) {
+    return copyIconList[currentActiveType.value]
+      ?.filter((v) => v.includes(filterValue.value))
+      .slice(currentPage.value - 1, pageSize.value)
+  } else {
+    return copyIconList[currentActiveType.value]
+      ?.filter((v) => v.includes(filterValue.value))
+      .slice(
+        pageSize.value * (currentPage.value - 1),
+        pageSize.value * (currentPage.value - 1) + pageSize.value
+      )
+  }
+})
+const iconCount = computed(() => {
+  return copyIconList[currentActiveType.value] == undefined
+    ? 0
+    : copyIconList[currentActiveType.value].length
+})
+
+const iconItemStyle = computed((): ParameterCSSProperties => {
+  return (item) => {
+    if (inputValue.value === currentActiveType.value + item) {
+      return {
+        borderColor: 'var(--el-color-primary)',
+        color: 'var(--el-color-primary)'
+      }
+    }
+  }
+})
+
+function handleClick({ props }) {
+  currentPage.value = 1
+  currentActiveType.value = props.name
+  emit('update:modelValue', currentActiveType.value + iconList.value[currentActiveType.value][0])
+  icon.value = iconList.value[currentActiveType.value][0]
+}
+
+function onChangeIcon(item) {
+  icon.value = item
+  emit('update:modelValue', currentActiveType.value + item)
+  visible.value = false
+}
+
+function onCurrentChange(page) {
+  currentPage.value = page
+}
+
+watch(
+  () => {
+    return props.modelValue
+  },
+  () => {
+    if (props.modelValue && props.modelValue.indexOf(':') >= 0) {
+      currentActiveType.value = props.modelValue.substring(0, props.modelValue.indexOf(':') + 1)
+      icon.value = props.modelValue.substring(props.modelValue.indexOf(':') + 1)
+    }
+  }
+)
+watch(
+  () => {
+    return filterValue.value
+  },
+  () => {
+    currentPage.value = 1
+  }
+)
+</script>
+
+<template>
+  <div class="selector">
+    <ElInput v-model="inputValue" @click="visible = !visible">
+      <template #append>
+        <ElPopover
+          :popper-options="{
+            placement: 'auto'
+          }"
+          :visible="visible"
+          :width="350"
+          popper-class="pure-popper"
+          trigger="click"
+        >
+          <template #reference>
+            <div
+              class="h-32px w-40px flex cursor-pointer items-center justify-center"
+              @click="visible = !visible"
+            >
+              <Icon :icon="currentActiveType + icon" />
+            </div>
+          </template>
+
+          <ElInput v-model="filterValue" class="p-2" clearable placeholder="搜索图标" />
+          <ElDivider border-style="dashed" />
+
+          <ElTabs v-model="currentActiveType" @tab-click="handleClick">
+            <ElTabPane
+              v-for="(pane, index) in tabsList"
+              :key="index"
+              :label="pane.label"
+              :name="pane.name"
+            >
+              <ElDivider border-style="dashed" class="tab-divider" />
+              <ElScrollbar height="220px">
+                <ul class="ml-2 flex flex-wrap px-2">
+                  <li
+                    v-for="(item, key) in pageList"
+                    :key="key"
+                    :style="iconItemStyle(item)"
+                    :title="item"
+                    class="icon-item mr-2 mt-1 w-1/10 flex cursor-pointer items-center justify-center border border-solid p-2"
+                    @click="onChangeIcon(item)"
+                  >
+                    <Icon :icon="currentActiveType + item" />
+                  </li>
+                </ul>
+              </ElScrollbar>
+            </ElTabPane>
+          </ElTabs>
+          <ElDivider border-style="dashed" />
+
+          <ElPagination
+            :current-page="currentPage"
+            :page-size="pageSize"
+            :total="iconCount"
+            background
+            class="h-10 flex items-center justify-center"
+            layout="prev, pager, next"
+            small
+            @current-change="onCurrentChange"
+          />
+        </ElPopover>
+      </template>
+    </ElInput>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.el-divider--horizontal {
+  margin: 1px auto !important;
+}
+
+.tab-divider.el-divider--horizontal {
+  margin: 0 !important;
+}
+
+.icon-item {
+  &:hover {
+    color: var(--el-color-primary);
+    border-color: var(--el-color-primary);
+    transform: scaleX(1.05);
+    transition: all 0.4s;
+  }
+}
+
+:deep(.el-tabs__nav-next) {
+  font-size: 15px;
+  line-height: 32px;
+  box-shadow: -5px 0 5px -6px #ccc;
+}
+
+:deep(.el-tabs__nav-prev) {
+  font-size: 15px;
+  line-height: 32px;
+  box-shadow: 5px 0 5px -6px #ccc;
+}
+
+:deep(.el-input-group__append) {
+  padding: 0;
+}
+
+:deep(.el-tabs__item) {
+  height: 30px;
+  font-size: 12px;
+  font-weight: normal;
+  line-height: 30px;
+}
+
+:deep(.el-tabs__header),
+:deep(.el-tabs__nav-wrap) {
+  position: static;
+  margin: 0;
+}
+</style>
diff --git a/src/components/Icon/src/data.ts b/src/components/Icon/src/data.ts
new file mode 100644
index 000000000..2a4ed5a3c
--- /dev/null
+++ b/src/components/Icon/src/data.ts
@@ -0,0 +1,1961 @@
+export const IconJson = {
+  'ep:': [
+    'add-location',
+    'aim',
+    'alarm-clock',
+    'apple',
+    'arrow-down',
+    'arrow-down-bold',
+    'arrow-left',
+    'arrow-left-bold',
+    'arrow-right',
+    'arrow-right-bold',
+    'arrow-up',
+    'arrow-up-bold',
+    'avatar',
+    'back',
+    'baseball',
+    'basketball',
+    'bell',
+    'bell-filled',
+    'bicycle',
+    'bottom',
+    'bottom-left',
+    'bottom-right',
+    'bowl',
+    'box',
+    'briefcase',
+    'brush',
+    'brush-filled',
+    'burger',
+    'calendar',
+    'camera',
+    'camera-filled',
+    'caret-bottom',
+    'caret-left',
+    'caret-right',
+    'caret-top',
+    'cellphone',
+    'chat-dot-round',
+    'chat-dot-square',
+    'chat-line-round',
+    'chat-line-square',
+    'chat-round',
+    'chat-square',
+    'check',
+    'checked',
+    'cherry',
+    'chicken',
+    'circle-check',
+    'circle-check-filled',
+    'circle-close',
+    'circle-close-filled',
+    'circle-plus',
+    'circle-plus-filled',
+    'clock',
+    'close',
+    'close-bold',
+    'cloudy',
+    'coffee',
+    'coffee-cup',
+    'coin',
+    'cold-drink',
+    'collection',
+    'collection-tag',
+    'comment',
+    'compass',
+    'connection',
+    'coordinate',
+    'copy-document',
+    'cpu',
+    'credit-card',
+    'crop',
+    'd-arrow-left',
+    'd-arrow-right',
+    'd-caret',
+    'data-analysis',
+    'data-board',
+    'data-line',
+    'delete',
+    'delete-filled',
+    'delete-location',
+    'dessert',
+    'discount',
+    'dish',
+    'dish-dot',
+    'document',
+    'document-add',
+    'document-checked',
+    'document-copy',
+    'document-delete',
+    'document-remove',
+    'download',
+    'drizzling',
+    'edit',
+    'edit-pen',
+    'eleme',
+    'eleme-filled',
+    'expand',
+    'failed',
+    'female',
+    'files',
+    'film',
+    'filter',
+    'finished',
+    'first-aid-kit',
+    'flag',
+    'fold',
+    'folder',
+    'folder-add',
+    'folder-checked',
+    'folder-delete',
+    'folder-opened',
+    'folder-remove',
+    'food',
+    'football',
+    'fork-spoon',
+    'fries',
+    'full-screen',
+    'goblet',
+    'goblet-full',
+    'goblet-square',
+    'goblet-square-full',
+    'goods',
+    'goods-filled',
+    'grape',
+    'grid',
+    'guide',
+    'headset',
+    'help',
+    'help-filled',
+    'histogram',
+    'home-filled',
+    'hot-water',
+    'house',
+    'ice-cream',
+    'ice-cream-round',
+    'ice-cream-square',
+    'ice-drink',
+    'ice-tea',
+    'info-filled',
+    'iphone',
+    'key',
+    'knife-fork',
+    'lightning',
+    'link',
+    'list',
+    'loading',
+    'location',
+    'location-filled',
+    'location-information',
+    'lock',
+    'lollipop',
+    'magic-stick',
+    'magnet',
+    'male',
+    'management',
+    'map-location',
+    'medal',
+    'menu',
+    'message',
+    'message-box',
+    'mic',
+    'microphone',
+    'milk-tea',
+    'minus',
+    'money',
+    'monitor',
+    'moon',
+    'moon-night',
+    'more',
+    'more-filled',
+    'mostly-cloudy',
+    'mouse',
+    'mug',
+    'mute',
+    'mute-notification',
+    'no-smoking',
+    'notebook',
+    'notification',
+    'odometer',
+    'office-building',
+    'open',
+    'operation',
+    'opportunity',
+    'orange',
+    'paperclip',
+    'partly-cloudy',
+    'pear',
+    'phone',
+    'phone-filled',
+    'picture',
+    'picture-filled',
+    'picture-rounded',
+    'pie-chart',
+    'place',
+    'platform',
+    'plus',
+    'pointer',
+    'position',
+    'postcard',
+    'pouring',
+    'present',
+    'price-tag',
+    'printer',
+    'promotion',
+    'question-filled',
+    'rank',
+    'reading',
+    'reading-lamp',
+    'refresh',
+    'refresh-left',
+    'refresh-right',
+    'refrigerator',
+    'remove',
+    'remove-filled',
+    'right',
+    'scale-to-original',
+    'school',
+    'scissor',
+    'search',
+    'select',
+    'sell',
+    'semi-select',
+    'service',
+    'set-up',
+    'setting',
+    'share',
+    'ship',
+    'shop',
+    'shopping-bag',
+    'shopping-cart',
+    'shopping-cart-full',
+    'smoking',
+    'soccer',
+    'sold-out',
+    'sort',
+    'sort-down',
+    'sort-up',
+    'stamp',
+    'star',
+    'star-filled',
+    'stopwatch',
+    'success-filled',
+    'sugar',
+    'suitcase',
+    'sunny',
+    'sunrise',
+    'sunset',
+    'switch',
+    'switch-button',
+    'takeaway-box',
+    'ticket',
+    'tickets',
+    'timer',
+    'toilet-paper',
+    'tools',
+    'top',
+    'top-left',
+    'top-right',
+    'trend-charts',
+    'trophy',
+    'turn-off',
+    'umbrella',
+    'unlock',
+    'upload',
+    'upload-filled',
+    'user',
+    'user-filled',
+    'van',
+    'video-camera',
+    'video-camera-filled',
+    'video-pause',
+    'video-play',
+    'view',
+    'wallet',
+    'wallet-filled',
+    'warning',
+    'warning-filled',
+    'watch',
+    'watermelon',
+    'wind-power',
+    'zoom-in',
+    'zoom-out'
+  ],
+  'fa:': [
+    '500px',
+    'address-book',
+    'address-book-o',
+    'address-card',
+    'address-card-o',
+    'adjust',
+    'adn',
+    'align-center',
+    'align-justify',
+    'align-left',
+    'amazon',
+    'ambulance',
+    'american-sign-language-interpreting',
+    'anchor',
+    'android',
+    'angellist',
+    'angle-double-left',
+    'angle-double-up',
+    'angle-down',
+    'angle-left',
+    'angle-up',
+    'apple',
+    'archive',
+    'area-chart',
+    'arrow-circle-left',
+    'arrow-circle-o-left',
+    'arrow-circle-o-up',
+    'arrow-circle-up',
+    'arrow-left',
+    'arrow-up',
+    'arrows',
+    'arrows-alt',
+    'arrows-h',
+    'arrows-v',
+    'assistive-listening-systems',
+    'asterisk',
+    'at',
+    'audio-description',
+    'automobile',
+    'backward',
+    'balance-scale',
+    'ban',
+    'bandcamp',
+    'bank',
+    'bar-chart',
+    'barcode',
+    'bars',
+    'bath',
+    'battery',
+    'battery-0',
+    'battery-1',
+    'battery-2',
+    'battery-3',
+    'bed',
+    'beer',
+    'behance',
+    'behance-square',
+    'bell',
+    'bell-o',
+    'bell-slash',
+    'bell-slash-o',
+    'bicycle',
+    'binoculars',
+    'birthday-cake',
+    'bitbucket',
+    'bitbucket-square',
+    'bitcoin',
+    'black-tie',
+    'blind',
+    'bluetooth',
+    'bluetooth-b',
+    'bold',
+    'bolt',
+    'bomb',
+    'book',
+    'bookmark',
+    'bookmark-o',
+    'braille',
+    'briefcase',
+    'bug',
+    'building',
+    'building-o',
+    'bullhorn',
+    'bullseye',
+    'bus',
+    'buysellads',
+    'cab',
+    'calculator',
+    'calendar',
+    'calendar-check-o',
+    'calendar-minus-o',
+    'calendar-o',
+    'calendar-plus-o',
+    'calendar-times-o',
+    'camera',
+    'camera-retro',
+    'caret-down',
+    'caret-left',
+    'caret-square-o-left',
+    'caret-square-o-up',
+    'caret-up',
+    'cart-arrow-down',
+    'cart-plus',
+    'cc',
+    'cc-amex',
+    'cc-diners-club',
+    'cc-discover',
+    'cc-jcb',
+    'cc-mastercard',
+    'cc-paypal',
+    'cc-stripe',
+    'cc-visa',
+    'certificate',
+    'chain',
+    'chain-broken',
+    'check',
+    'check-circle',
+    'check-circle-o',
+    'check-square',
+    'check-square-o',
+    'chevron-circle-left',
+    'chevron-circle-up',
+    'chevron-down',
+    'chevron-left',
+    'chevron-up',
+    'child',
+    'chrome',
+    'circle',
+    'circle-o',
+    'circle-o-notch',
+    'circle-thin',
+    'clipboard',
+    'clock-o',
+    'clone',
+    'close',
+    'cloud',
+    'cloud-download',
+    'cloud-upload',
+    'cny',
+    'code',
+    'code-fork',
+    'codepen',
+    'codiepie',
+    'coffee',
+    'cog',
+    'cogs',
+    'columns',
+    'comment',
+    'comment-o',
+    'commenting',
+    'commenting-o',
+    'comments',
+    'comments-o',
+    'compass',
+    'compress',
+    'connectdevelop',
+    'contao',
+    'copy',
+    'copyright',
+    'creative-commons',
+    'credit-card',
+    'credit-card-alt',
+    'crop',
+    'crosshairs',
+    'css3',
+    'cube',
+    'cubes',
+    'cut',
+    'cutlery',
+    'dashboard',
+    'dashcube',
+    'database',
+    'deaf',
+    'dedent',
+    'delicious',
+    'desktop',
+    'deviantart',
+    'diamond',
+    'digg',
+    'dollar',
+    'dot-circle-o',
+    'download',
+    'dribbble',
+    'drivers-license',
+    'drivers-license-o',
+    'dropbox',
+    'drupal',
+    'edge',
+    'edit',
+    'eercast',
+    'eject',
+    'ellipsis-h',
+    'ellipsis-v',
+    'empire',
+    'envelope',
+    'envelope-o',
+    'envelope-open',
+    'envelope-open-o',
+    'envelope-square',
+    'envira',
+    'eraser',
+    'etsy',
+    'eur',
+    'exchange',
+    'exclamation',
+    'exclamation-circle',
+    'exclamation-triangle',
+    'expand',
+    'expeditedssl',
+    'external-link',
+    'external-link-square',
+    'eye',
+    'eye-slash',
+    'eyedropper',
+    'fa',
+    'facebook',
+    'facebook-official',
+    'facebook-square',
+    'fast-backward',
+    'fax',
+    'feed',
+    'female',
+    'fighter-jet',
+    'file',
+    'file-archive-o',
+    'file-audio-o',
+    'file-code-o',
+    'file-excel-o',
+    'file-image-o',
+    'file-movie-o',
+    'file-o',
+    'file-pdf-o',
+    'file-powerpoint-o',
+    'file-text',
+    'file-text-o',
+    'file-word-o',
+    'film',
+    'filter',
+    'fire',
+    'fire-extinguisher',
+    'firefox',
+    'first-order',
+    'flag',
+    'flag-checkered',
+    'flag-o',
+    'flask',
+    'flickr',
+    'floppy-o',
+    'folder',
+    'folder-o',
+    'folder-open',
+    'folder-open-o',
+    'font',
+    'fonticons',
+    'fort-awesome',
+    'forumbee',
+    'foursquare',
+    'free-code-camp',
+    'frown-o',
+    'futbol-o',
+    'gamepad',
+    'gavel',
+    'gbp',
+    'genderless',
+    'get-pocket',
+    'gg',
+    'gg-circle',
+    'gift',
+    'git',
+    'git-square',
+    'github',
+    'github-alt',
+    'github-square',
+    'gitlab',
+    'gittip',
+    'glass',
+    'glide',
+    'glide-g',
+    'globe',
+    'google',
+    'google-plus',
+    'google-plus-circle',
+    'google-plus-square',
+    'google-wallet',
+    'graduation-cap',
+    'grav',
+    'group',
+    'h-square',
+    'hacker-news',
+    'hand-grab-o',
+    'hand-lizard-o',
+    'hand-o-left',
+    'hand-o-up',
+    'hand-paper-o',
+    'hand-peace-o',
+    'hand-pointer-o',
+    'hand-scissors-o',
+    'hand-spock-o',
+    'handshake-o',
+    'hashtag',
+    'hdd-o',
+    'header',
+    'headphones',
+    'heart',
+    'heart-o',
+    'heartbeat',
+    'history',
+    'home',
+    'hospital-o',
+    'hourglass',
+    'hourglass-1',
+    'hourglass-2',
+    'hourglass-3',
+    'hourglass-o',
+    'houzz',
+    'html5',
+    'i-cursor',
+    'id-badge',
+    'ils',
+    'image',
+    'imdb',
+    'inbox',
+    'indent',
+    'industry',
+    'info',
+    'info-circle',
+    'inr',
+    'instagram',
+    'internet-explorer',
+    'intersex',
+    'ioxhost',
+    'italic',
+    'joomla',
+    'jsfiddle',
+    'key',
+    'keyboard-o',
+    'krw',
+    'language',
+    'laptop',
+    'lastfm',
+    'lastfm-square',
+    'leaf',
+    'leanpub',
+    'lemon-o',
+    'level-up',
+    'life-bouy',
+    'lightbulb-o',
+    'line-chart',
+    'linkedin',
+    'linkedin-square',
+    'linode',
+    'linux',
+    'list',
+    'list-alt',
+    'list-ol',
+    'list-ul',
+    'location-arrow',
+    'lock',
+    'long-arrow-left',
+    'long-arrow-up',
+    'low-vision',
+    'magic',
+    'magnet',
+    'mail-forward',
+    'mail-reply',
+    'mail-reply-all',
+    'male',
+    'map',
+    'map-marker',
+    'map-o',
+    'map-pin',
+    'map-signs',
+    'mars',
+    'mars-double',
+    'mars-stroke',
+    'mars-stroke-h',
+    'mars-stroke-v',
+    'maxcdn',
+    'meanpath',
+    'medium',
+    'medkit',
+    'meetup',
+    'meh-o',
+    'mercury',
+    'microchip',
+    'microphone',
+    'microphone-slash',
+    'minus',
+    'minus-circle',
+    'minus-square',
+    'minus-square-o',
+    'mixcloud',
+    'mobile',
+    'modx',
+    'money',
+    'moon-o',
+    'motorcycle',
+    'mouse-pointer',
+    'music',
+    'neuter',
+    'newspaper-o',
+    'object-group',
+    'object-ungroup',
+    'odnoklassniki',
+    'odnoklassniki-square',
+    'opencart',
+    'openid',
+    'opera',
+    'optin-monster',
+    'pagelines',
+    'paint-brush',
+    'paper-plane',
+    'paper-plane-o',
+    'paperclip',
+    'paragraph',
+    'pause',
+    'pause-circle',
+    'pause-circle-o',
+    'paw',
+    'paypal',
+    'pencil',
+    'pencil-square',
+    'percent',
+    'phone',
+    'phone-square',
+    'pie-chart',
+    'pied-piper',
+    'pied-piper-alt',
+    'pied-piper-pp',
+    'pinterest',
+    'pinterest-p',
+    'pinterest-square',
+    'plane',
+    'play',
+    'play-circle',
+    'play-circle-o',
+    'plug',
+    'plus',
+    'plus-circle',
+    'plus-square',
+    'plus-square-o',
+    'podcast',
+    'power-off',
+    'print',
+    'product-hunt',
+    'puzzle-piece',
+    'qq',
+    'qrcode',
+    'question',
+    'question-circle',
+    'question-circle-o',
+    'quora',
+    'quote-left',
+    'quote-right',
+    'ra',
+    'random',
+    'ravelry',
+    'recycle',
+    'reddit',
+    'reddit-alien',
+    'reddit-square',
+    'refresh',
+    'registered',
+    'renren',
+    'repeat',
+    'retweet',
+    'road',
+    'rocket',
+    'rotate-left',
+    'rouble',
+    'rss-square',
+    'safari',
+    'scribd',
+    'search',
+    'search-minus',
+    'search-plus',
+    'sellsy',
+    'server',
+    'share-alt',
+    'share-alt-square',
+    'share-square',
+    'share-square-o',
+    'shield',
+    'ship',
+    'shirtsinbulk',
+    'shopping-bag',
+    'shopping-basket',
+    'shopping-cart',
+    'shower',
+    'sign-in',
+    'sign-language',
+    'sign-out',
+    'signal',
+    'simplybuilt',
+    'sitemap',
+    'skyatlas',
+    'skype',
+    'slack',
+    'sliders',
+    'slideshare',
+    'smile-o',
+    'snapchat',
+    'snapchat-ghost',
+    'snapchat-square',
+    'snowflake-o',
+    'sort',
+    'sort-alpha-asc',
+    'sort-alpha-desc',
+    'sort-amount-asc',
+    'sort-amount-desc',
+    'sort-asc',
+    'sort-numeric-asc',
+    'sort-numeric-desc',
+    'soundcloud',
+    'space-shuttle',
+    'spinner',
+    'spoon',
+    'spotify',
+    'square',
+    'square-o',
+    'stack-exchange',
+    'stack-overflow',
+    'star',
+    'star-half',
+    'star-half-empty',
+    'star-o',
+    'steam',
+    'steam-square',
+    'step-backward',
+    'stethoscope',
+    'sticky-note',
+    'sticky-note-o',
+    'stop',
+    'stop-circle',
+    'stop-circle-o',
+    'street-view',
+    'strikethrough',
+    'stumbleupon',
+    'stumbleupon-circle',
+    'subscript',
+    'subway',
+    'suitcase',
+    'sun-o',
+    'superpowers',
+    'superscript',
+    'table',
+    'tablet',
+    'tag',
+    'tags',
+    'tasks',
+    'telegram',
+    'television',
+    'tencent-weibo',
+    'terminal',
+    'text-height',
+    'text-width',
+    'th',
+    'th-large',
+    'th-list',
+    'themeisle',
+    'thermometer',
+    'thermometer-0',
+    'thermometer-1',
+    'thermometer-2',
+    'thermometer-3',
+    'thumb-tack',
+    'thumbs-down',
+    'thumbs-o-up',
+    'thumbs-up',
+    'ticket',
+    'times-circle',
+    'times-circle-o',
+    'times-rectangle',
+    'times-rectangle-o',
+    'tint',
+    'toggle-off',
+    'toggle-on',
+    'trademark',
+    'train',
+    'transgender-alt',
+    'trash',
+    'trash-o',
+    'tree',
+    'trello',
+    'tripadvisor',
+    'trophy',
+    'truck',
+    'try',
+    'tty',
+    'tumblr',
+    'tumblr-square',
+    'twitch',
+    'twitter',
+    'twitter-square',
+    'umbrella',
+    'underline',
+    'universal-access',
+    'unlock',
+    'unlock-alt',
+    'upload',
+    'usb',
+    'user',
+    'user-circle',
+    'user-circle-o',
+    'user-md',
+    'user-o',
+    'user-plus',
+    'user-secret',
+    'user-times',
+    'venus',
+    'venus-double',
+    'venus-mars',
+    'viacoin',
+    'viadeo',
+    'viadeo-square',
+    'video-camera',
+    'vimeo',
+    'vimeo-square',
+    'vine',
+    'vk',
+    'volume-control-phone',
+    'volume-down',
+    'volume-off',
+    'volume-up',
+    'wechat',
+    'weibo',
+    'whatsapp',
+    'wheelchair',
+    'wheelchair-alt',
+    'wifi',
+    'wikipedia-w',
+    'window-maximize',
+    'window-minimize',
+    'window-restore',
+    'windows',
+    'wordpress',
+    'wpbeginner',
+    'wpexplorer',
+    'wpforms',
+    'wrench',
+    'xing',
+    'xing-square',
+    'y-combinator',
+    'yahoo',
+    'yelp',
+    'yoast',
+    'youtube',
+    'youtube-play',
+    'youtube-square'
+  ],
+  'fa-solid:': [
+    'abacus',
+    'ad',
+    'address-book',
+    'address-card',
+    'adjust',
+    'air-freshener',
+    'align-center',
+    'align-justify',
+    'align-left',
+    'align-right',
+    'allergies',
+    'ambulance',
+    'american-sign-language-interpreting',
+    'anchor',
+    'angle-double-down',
+    'angle-double-left',
+    'angle-double-right',
+    'angle-double-up',
+    'angle-down',
+    'angle-left',
+    'angle-right',
+    'angle-up',
+    'angry',
+    'ankh',
+    'apple-alt',
+    'archive',
+    'archway',
+    'arrow-alt-circle-down',
+    'arrow-alt-circle-left',
+    'arrow-alt-circle-right',
+    'arrow-alt-circle-up',
+    'arrow-circle-down',
+    'arrow-circle-left',
+    'arrow-circle-right',
+    'arrow-circle-up',
+    'arrow-down',
+    'arrow-left',
+    'arrow-right',
+    'arrow-up',
+    'arrows-alt',
+    'arrows-alt-h',
+    'arrows-alt-v',
+    'assistive-listening-systems',
+    'asterisk',
+    'at',
+    'atlas',
+    'atom',
+    'audio-description',
+    'award',
+    'baby',
+    'baby-carriage',
+    'backspace',
+    'backward',
+    'bacon',
+    'bacteria',
+    'bacterium',
+    'bahai',
+    'balance-scale',
+    'balance-scale-left',
+    'balance-scale-right',
+    'ban',
+    'band-aid',
+    'barcode',
+    'bars',
+    'baseball-ball',
+    'basketball-ball',
+    'bath',
+    'battery-empty',
+    'battery-full',
+    'battery-half',
+    'battery-quarter',
+    'battery-three-quarters',
+    'bed',
+    'beer',
+    'bell',
+    'bell-slash',
+    'bezier-curve',
+    'bible',
+    'bicycle',
+    'biking',
+    'binoculars',
+    'biohazard',
+    'birthday-cake',
+    'blender',
+    'blender-phone',
+    'blind',
+    'blog',
+    'bold',
+    'bolt',
+    'bomb',
+    'bone',
+    'bong',
+    'book',
+    'book-dead',
+    'book-medical',
+    'book-open',
+    'book-reader',
+    'bookmark',
+    'border-all',
+    'border-none',
+    'border-style',
+    'bowling-ball',
+    'box',
+    'box-open',
+    'box-tissue',
+    'boxes',
+    'braille',
+    'brain',
+    'bread-slice',
+    'briefcase',
+    'briefcase-medical',
+    'broadcast-tower',
+    'broom',
+    'brush',
+    'bug',
+    'building',
+    'bullhorn',
+    'bullseye',
+    'burn',
+    'bus',
+    'bus-alt',
+    'business-time',
+    'calculator',
+    'calculator-alt',
+    'calendar',
+    'calendar-alt',
+    'calendar-check',
+    'calendar-day',
+    'calendar-minus',
+    'calendar-plus',
+    'calendar-times',
+    'calendar-week',
+    'camera',
+    'camera-retro',
+    'campground',
+    'candy-cane',
+    'cannabis',
+    'capsules',
+    'car',
+    'car-alt',
+    'car-battery',
+    'car-crash',
+    'car-side',
+    'caravan',
+    'caret-down',
+    'caret-left',
+    'caret-right',
+    'caret-square-down',
+    'caret-square-left',
+    'caret-square-right',
+    'caret-square-up',
+    'caret-up',
+    'carrot',
+    'cart-arrow-down',
+    'cart-plus',
+    'cash-register',
+    'cat',
+    'certificate',
+    'chair',
+    'chalkboard',
+    'chalkboard-teacher',
+    'charging-station',
+    'chart-area',
+    'chart-bar',
+    'chart-line',
+    'chart-pie',
+    'check',
+    'check-circle',
+    'check-double',
+    'check-square',
+    'cheese',
+    'chess',
+    'chess-bishop',
+    'chess-board',
+    'chess-king',
+    'chess-knight',
+    'chess-pawn',
+    'chess-queen',
+    'chess-rook',
+    'chevron-circle-down',
+    'chevron-circle-left',
+    'chevron-circle-right',
+    'chevron-circle-up',
+    'chevron-down',
+    'chevron-left',
+    'chevron-right',
+    'chevron-up',
+    'child',
+    'church',
+    'circle',
+    'circle-notch',
+    'city',
+    'clinic-medical',
+    'clipboard',
+    'clipboard-check',
+    'clipboard-list',
+    'clock',
+    'clone',
+    'closed-captioning',
+    'cloud',
+    'cloud-download-alt',
+    'cloud-meatball',
+    'cloud-moon',
+    'cloud-moon-rain',
+    'cloud-rain',
+    'cloud-showers-heavy',
+    'cloud-sun',
+    'cloud-sun-rain',
+    'cloud-upload-alt',
+    'cocktail',
+    'code',
+    'code-branch',
+    'coffee',
+    'cog',
+    'cogs',
+    'coins',
+    'columns',
+    'comment',
+    'comment-alt',
+    'comment-dollar',
+    'comment-dots',
+    'comment-medical',
+    'comment-slash',
+    'comments',
+    'comments-dollar',
+    'compact-disc',
+    'compass',
+    'compress',
+    'compress-alt',
+    'compress-arrows-alt',
+    'concierge-bell',
+    'cookie',
+    'cookie-bite',
+    'copy',
+    'copyright',
+    'couch',
+    'credit-card',
+    'crop',
+    'crop-alt',
+    'cross',
+    'crosshairs',
+    'crow',
+    'crown',
+    'crutch',
+    'cube',
+    'cubes',
+    'cut',
+    'database',
+    'deaf',
+    'democrat',
+    'desktop',
+    'dharmachakra',
+    'diagnoses',
+    'dice',
+    'dice-d20',
+    'dice-d6',
+    'dice-five',
+    'dice-four',
+    'dice-one',
+    'dice-six',
+    'dice-three',
+    'dice-two',
+    'digital-tachograph',
+    'directions',
+    'disease',
+    'divide',
+    'dizzy',
+    'dna',
+    'dog',
+    'dollar-sign',
+    'dolly',
+    'dolly-flatbed',
+    'donate',
+    'door-closed',
+    'door-open',
+    'dot-circle',
+    'dove',
+    'download',
+    'drafting-compass',
+    'dragon',
+    'draw-polygon',
+    'drum',
+    'drum-steelpan',
+    'drumstick-bite',
+    'dumbbell',
+    'dumpster',
+    'dumpster-fire',
+    'dungeon',
+    'edit',
+    'egg',
+    'eject',
+    'ellipsis-h',
+    'ellipsis-v',
+    'empty-set',
+    'envelope',
+    'envelope-open',
+    'envelope-open-text',
+    'envelope-square',
+    'equals',
+    'eraser',
+    'ethernet',
+    'euro-sign',
+    'exchange-alt',
+    'exclamation',
+    'exclamation-circle',
+    'exclamation-triangle',
+    'expand',
+    'expand-alt',
+    'expand-arrows-alt',
+    'external-link-alt',
+    'external-link-square-alt',
+    'eye',
+    'eye-dropper',
+    'eye-slash',
+    'fan',
+    'fast-backward',
+    'fast-forward',
+    'faucet',
+    'fax',
+    'feather',
+    'feather-alt',
+    'female',
+    'fighter-jet',
+    'file',
+    'file-alt',
+    'file-archive',
+    'file-audio',
+    'file-code',
+    'file-contract',
+    'file-csv',
+    'file-download',
+    'file-excel',
+    'file-export',
+    'file-image',
+    'file-import',
+    'file-invoice',
+    'file-invoice-dollar',
+    'file-medical',
+    'file-medical-alt',
+    'file-pdf',
+    'file-powerpoint',
+    'file-prescription',
+    'file-signature',
+    'file-upload',
+    'file-video',
+    'file-word',
+    'fill',
+    'fill-drip',
+    'film',
+    'filter',
+    'fingerprint',
+    'fire',
+    'fire-alt',
+    'fire-extinguisher',
+    'first-aid',
+    'fish',
+    'fist-raised',
+    'flag',
+    'flag-checkered',
+    'flag-usa',
+    'flask',
+    'flushed',
+    'folder',
+    'folder-minus',
+    'folder-open',
+    'folder-plus',
+    'font',
+    'football-ball',
+    'forward',
+    'frog',
+    'frown',
+    'frown-open',
+    'function',
+    'funnel-dollar',
+    'futbol',
+    'gamepad',
+    'gas-pump',
+    'gavel',
+    'gem',
+    'genderless',
+    'ghost',
+    'gift',
+    'gifts',
+    'glass-cheers',
+    'glass-martini',
+    'glass-martini-alt',
+    'glass-whiskey',
+    'glasses',
+    'globe',
+    'globe-africa',
+    'globe-americas',
+    'globe-asia',
+    'globe-europe',
+    'golf-ball',
+    'gopuram',
+    'graduation-cap',
+    'greater-than',
+    'greater-than-equal',
+    'grimace',
+    'grin',
+    'grin-alt',
+    'grin-beam',
+    'grin-beam-sweat',
+    'grin-hearts',
+    'grin-squint',
+    'grin-squint-tears',
+    'grin-stars',
+    'grin-tears',
+    'grin-tongue',
+    'grin-tongue-squint',
+    'grin-tongue-wink',
+    'grin-wink',
+    'grip-horizontal',
+    'grip-lines',
+    'grip-lines-vertical',
+    'grip-vertical',
+    'guitar',
+    'h-square',
+    'hamburger',
+    'hammer',
+    'hamsa',
+    'hand-holding',
+    'hand-holding-heart',
+    'hand-holding-medical',
+    'hand-holding-usd',
+    'hand-holding-water',
+    'hand-lizard',
+    'hand-middle-finger',
+    'hand-paper',
+    'hand-peace',
+    'hand-point-down',
+    'hand-point-left',
+    'hand-point-right',
+    'hand-point-up',
+    'hand-pointer',
+    'hand-rock',
+    'hand-scissors',
+    'hand-sparkles',
+    'hand-spock',
+    'hands',
+    'hands-helping',
+    'hands-wash',
+    'handshake',
+    'handshake-alt-slash',
+    'handshake-slash',
+    'hanukiah',
+    'hard-hat',
+    'hashtag',
+    'hat-cowboy',
+    'hat-cowboy-side',
+    'hat-wizard',
+    'hdd',
+    'head-side-cough',
+    'head-side-cough-slash',
+    'head-side-mask',
+    'head-side-virus',
+    'heading',
+    'headphones',
+    'headphones-alt',
+    'headset',
+    'heart',
+    'heart-broken',
+    'heartbeat',
+    'helicopter',
+    'highlighter',
+    'hiking',
+    'hippo',
+    'history',
+    'hockey-puck',
+    'holly-berry',
+    'home',
+    'horse',
+    'horse-head',
+    'hospital',
+    'hospital-alt',
+    'hospital-symbol',
+    'hospital-user',
+    'hot-tub',
+    'hotdog',
+    'hotel',
+    'hourglass',
+    'hourglass-end',
+    'hourglass-half',
+    'hourglass-start',
+    'house-damage',
+    'house-user',
+    'hryvnia',
+    'i-cursor',
+    'ice-cream',
+    'icicles',
+    'icons',
+    'id-badge',
+    'id-card',
+    'id-card-alt',
+    'igloo',
+    'image',
+    'images',
+    'inbox',
+    'indent',
+    'industry',
+    'infinity',
+    'info',
+    'info-circle',
+    'integral',
+    'intersection',
+    'italic',
+    'jedi',
+    'joint',
+    'journal-whills',
+    'kaaba',
+    'key',
+    'keyboard',
+    'khanda',
+    'kiss',
+    'kiss-beam',
+    'kiss-wink-heart',
+    'kiwi-bird',
+    'lambda',
+    'landmark',
+    'language',
+    'laptop',
+    'laptop-code',
+    'laptop-house',
+    'laptop-medical',
+    'laugh',
+    'laugh-beam',
+    'laugh-squint',
+    'laugh-wink',
+    'layer-group',
+    'leaf',
+    'lemon',
+    'less-than',
+    'less-than-equal',
+    'level-down-alt',
+    'level-up-alt',
+    'life-ring',
+    'lightbulb',
+    'link',
+    'lira-sign',
+    'list',
+    'list-alt',
+    'list-ol',
+    'list-ul',
+    'location-arrow',
+    'lock',
+    'lock-open',
+    'long-arrow-alt-down',
+    'long-arrow-alt-left',
+    'long-arrow-alt-right',
+    'long-arrow-alt-up',
+    'low-vision',
+    'luggage-cart',
+    'lungs',
+    'lungs-virus',
+    'magic',
+    'magnet',
+    'mail-bulk',
+    'male',
+    'map',
+    'map-marked',
+    'map-marked-alt',
+    'map-marker',
+    'map-marker-alt',
+    'map-pin',
+    'map-signs',
+    'marker',
+    'mars',
+    'mars-double',
+    'mars-stroke',
+    'mars-stroke-h',
+    'mars-stroke-v',
+    'mask',
+    'medal',
+    'medkit',
+    'meh',
+    'meh-blank',
+    'meh-rolling-eyes',
+    'memory',
+    'menorah',
+    'mercury',
+    'meteor',
+    'microchip',
+    'microphone',
+    'microphone-alt',
+    'microphone-alt-slash',
+    'microphone-slash',
+    'microscope',
+    'minus',
+    'minus-circle',
+    'minus-square',
+    'mitten',
+    'mobile',
+    'mobile-alt',
+    'money-bill',
+    'money-bill-alt',
+    'money-bill-wave',
+    'money-bill-wave-alt',
+    'money-check',
+    'money-check-alt',
+    'monument',
+    'moon',
+    'mortar-pestle',
+    'mosque',
+    'motorcycle',
+    'mountain',
+    'mouse',
+    'mouse-pointer',
+    'mug-hot',
+    'music',
+    'network-wired',
+    'neuter',
+    'newspaper',
+    'not-equal',
+    'notes-medical',
+    'object-group',
+    'object-ungroup',
+    'oil-can',
+    'om',
+    'omega',
+    'otter',
+    'outdent',
+    'pager',
+    'paint-brush',
+    'paint-roller',
+    'palette',
+    'pallet',
+    'paper-plane',
+    'paperclip',
+    'parachute-box',
+    'paragraph',
+    'parking',
+    'passport',
+    'pastafarianism',
+    'paste',
+    'pause',
+    'pause-circle',
+    'paw',
+    'peace',
+    'pen',
+    'pen-alt',
+    'pen-fancy',
+    'pen-nib',
+    'pen-square',
+    'pencil-alt',
+    'pencil-ruler',
+    'people-arrows',
+    'people-carry',
+    'pepper-hot',
+    'percent',
+    'percentage',
+    'person-booth',
+    'phone',
+    'phone-alt',
+    'phone-slash',
+    'phone-square',
+    'phone-square-alt',
+    'phone-volume',
+    'photo-video',
+    'pi',
+    'piggy-bank',
+    'pills',
+    'pizza-slice',
+    'place-of-worship',
+    'plane',
+    'plane-arrival',
+    'plane-departure',
+    'plane-slash',
+    'play',
+    'play-circle',
+    'plug',
+    'plus',
+    'plus-circle',
+    'plus-square',
+    'podcast',
+    'poll',
+    'poll-h',
+    'poo',
+    'poo-storm',
+    'poop',
+    'portrait',
+    'pound-sign',
+    'power-off',
+    'pray',
+    'praying-hands',
+    'prescription',
+    'prescription-bottle',
+    'prescription-bottle-alt',
+    'print',
+    'procedures',
+    'project-diagram',
+    'pump-medical',
+    'pump-soap',
+    'puzzle-piece',
+    'qrcode',
+    'question',
+    'question-circle',
+    'quidditch',
+    'quote-left',
+    'quote-right',
+    'quran',
+    'radiation',
+    'radiation-alt',
+    'rainbow',
+    'random',
+    'receipt',
+    'record-vinyl',
+    'recycle',
+    'redo',
+    'redo-alt',
+    'registered',
+    'remove-format',
+    'reply',
+    'reply-all',
+    'republican',
+    'restroom',
+    'retweet',
+    'ribbon',
+    'ring',
+    'road',
+    'robot',
+    'rocket',
+    'route',
+    'rss',
+    'rss-square',
+    'ruble-sign',
+    'ruler',
+    'ruler-combined',
+    'ruler-horizontal',
+    'ruler-vertical',
+    'running',
+    'rupee-sign',
+    'sad-cry',
+    'sad-tear',
+    'satellite',
+    'satellite-dish',
+    'save',
+    'school',
+    'screwdriver',
+    'scroll',
+    'sd-card',
+    'search',
+    'search-dollar',
+    'search-location',
+    'search-minus',
+    'search-plus',
+    'seedling',
+    'server',
+    'shapes',
+    'share',
+    'share-alt',
+    'share-alt-square',
+    'share-square',
+    'shekel-sign',
+    'shield-alt',
+    'shield-virus',
+    'ship',
+    'shipping-fast',
+    'shoe-prints',
+    'shopping-bag',
+    'shopping-basket',
+    'shopping-cart',
+    'shower',
+    'shuttle-van',
+    'sigma',
+    'sign',
+    'sign-in-alt',
+    'sign-language',
+    'sign-out-alt',
+    'signal',
+    'signal-alt',
+    'signal-alt-slash',
+    'signal-slash',
+    'signature',
+    'sim-card',
+    'sink',
+    'sitemap',
+    'skating',
+    'skiing',
+    'skiing-nordic',
+    'skull',
+    'skull-crossbones',
+    'slash',
+    'sleigh',
+    'sliders-h',
+    'smile',
+    'smile-beam',
+    'smile-wink',
+    'smog',
+    'smoking',
+    'smoking-ban',
+    'sms',
+    'snowboarding',
+    'snowflake',
+    'snowman',
+    'snowplow',
+    'soap',
+    'socks',
+    'solar-panel',
+    'sort',
+    'sort-alpha-down',
+    'sort-alpha-down-alt',
+    'sort-alpha-up',
+    'sort-alpha-up-alt',
+    'sort-amount-down',
+    'sort-amount-down-alt',
+    'sort-amount-up',
+    'sort-amount-up-alt',
+    'sort-down',
+    'sort-numeric-down',
+    'sort-numeric-down-alt',
+    'sort-numeric-up',
+    'sort-numeric-up-alt',
+    'sort-up',
+    'spa',
+    'space-shuttle',
+    'spell-check',
+    'spider',
+    'spinner',
+    'splotch',
+    'spray-can',
+    'square',
+    'square-full',
+    'square-root',
+    'square-root-alt',
+    'stamp',
+    'star',
+    'star-and-crescent',
+    'star-half',
+    'star-half-alt',
+    'star-of-david',
+    'star-of-life',
+    'step-backward',
+    'step-forward',
+    'stethoscope',
+    'sticky-note',
+    'stop',
+    'stop-circle',
+    'stopwatch',
+    'stopwatch-20',
+    'store',
+    'store-alt',
+    'store-alt-slash',
+    'store-slash',
+    'stream',
+    'street-view',
+    'strikethrough',
+    'stroopwafel',
+    'subscript',
+    'subway',
+    'suitcase',
+    'suitcase-rolling',
+    'sun',
+    'superscript',
+    'surprise',
+    'swatchbook',
+    'swimmer',
+    'swimming-pool',
+    'synagogue',
+    'sync',
+    'sync-alt',
+    'syringe',
+    'table',
+    'table-tennis',
+    'tablet',
+    'tablet-alt',
+    'tablets',
+    'tachometer-alt',
+    'tag',
+    'tags',
+    'tally',
+    'tape',
+    'tasks',
+    'taxi',
+    'teeth',
+    'teeth-open',
+    'temperature-high',
+    'temperature-low',
+    'tenge',
+    'terminal',
+    'text-height',
+    'text-width',
+    'th',
+    'th-large',
+    'th-list',
+    'theater-masks',
+    'thermometer',
+    'thermometer-empty',
+    'thermometer-full',
+    'thermometer-half',
+    'thermometer-quarter',
+    'thermometer-three-quarters',
+    'theta',
+    'thumbs-down',
+    'thumbs-up',
+    'thumbtack',
+    'ticket-alt',
+    'tilde',
+    'times',
+    'times-circle',
+    'tint',
+    'tint-slash',
+    'tired',
+    'toggle-off',
+    'toggle-on',
+    'toilet',
+    'toilet-paper',
+    'toilet-paper-slash',
+    'toolbox',
+    'tools',
+    'tooth',
+    'torah',
+    'torii-gate',
+    'tractor',
+    'trademark',
+    'traffic-light',
+    'trailer',
+    'train',
+    'tram',
+    'transgender',
+    'transgender-alt',
+    'trash',
+    'trash-alt',
+    'trash-restore',
+    'trash-restore-alt',
+    'tree',
+    'trophy',
+    'truck',
+    'truck-loading',
+    'truck-monster',
+    'truck-moving',
+    'truck-pickup',
+    'tshirt',
+    'tty',
+    'tv',
+    'umbrella',
+    'umbrella-beach',
+    'underline',
+    'undo',
+    'undo-alt',
+    'union',
+    'universal-access',
+    'university',
+    'unlink',
+    'unlock',
+    'unlock-alt',
+    'upload',
+    'user',
+    'user-alt',
+    'user-alt-slash',
+    'user-astronaut',
+    'user-check',
+    'user-circle',
+    'user-clock',
+    'user-cog',
+    'user-edit',
+    'user-friends',
+    'user-graduate',
+    'user-injured',
+    'user-lock',
+    'user-md',
+    'user-minus',
+    'user-ninja',
+    'user-nurse',
+    'user-plus',
+    'user-secret',
+    'user-shield',
+    'user-slash',
+    'user-tag',
+    'user-tie',
+    'user-times',
+    'users',
+    'users-cog',
+    'users-slash',
+    'utensil-spoon',
+    'utensils',
+    'value-absolute',
+    'vector-square',
+    'venus',
+    'venus-double',
+    'venus-mars',
+    'vest',
+    'vest-patches',
+    'vial',
+    'vials',
+    'video',
+    'video-slash',
+    'vihara',
+    'virus',
+    'virus-slash',
+    'viruses',
+    'voicemail',
+    'volleyball-ball',
+    'volume',
+    'volume-down',
+    'volume-mute',
+    'volume-off',
+    'volume-slash',
+    'volume-up',
+    'vote-yea',
+    'vr-cardboard',
+    'walking',
+    'wallet',
+    'warehouse',
+    'water',
+    'wave-square',
+    'weight',
+    'weight-hanging',
+    'wheelchair',
+    'wifi',
+    'wifi-slash',
+    'wind',
+    'window-close',
+    'window-maximize',
+    'window-minimize',
+    'window-restore',
+    'wine-bottle',
+    'wine-glass',
+    'wine-glass-alt',
+    'won-sign',
+    'wrench',
+    'x-ray',
+    'yen-sign',
+    'yin-yang'
+  ]
+}
diff --git a/src/components/ImageViewer/index.ts b/src/components/ImageViewer/index.ts
new file mode 100644
index 000000000..386813569
--- /dev/null
+++ b/src/components/ImageViewer/index.ts
@@ -0,0 +1,33 @@
+import ImageViewer from './src/ImageViewer.vue'
+import { isClient } from '@/utils/is'
+import { createVNode, render, VNode } from 'vue'
+import { ImageViewerProps } from './src/types'
+
+let instance: Nullable<VNode> = null
+
+export function createImageViewer(options: ImageViewerProps) {
+  if (!isClient) return
+  const {
+    urlList,
+    initialIndex = 0,
+    infinite = true,
+    hideOnClickModal = false,
+    appendToBody = false,
+    zIndex = 2000,
+    show = true
+  } = options
+
+  const propsData: Partial<ImageViewerProps> = {}
+  const container = document.createElement('div')
+  propsData.urlList = urlList
+  propsData.initialIndex = initialIndex
+  propsData.infinite = infinite
+  propsData.hideOnClickModal = hideOnClickModal
+  propsData.appendToBody = appendToBody
+  propsData.zIndex = zIndex
+  propsData.show = show
+
+  document.body.appendChild(container)
+  instance = createVNode(ImageViewer, propsData)
+  render(instance, container)
+}
diff --git a/src/components/ImageViewer/src/ImageViewer.vue b/src/components/ImageViewer/src/ImageViewer.vue
new file mode 100644
index 000000000..5c4921ed6
--- /dev/null
+++ b/src/components/ImageViewer/src/ImageViewer.vue
@@ -0,0 +1,35 @@
+<script lang="ts" setup>
+import { PropType } from 'vue'
+import { propTypes } from '@/utils/propTypes'
+
+defineOptions({ name: 'ImageViewer' })
+
+const props = defineProps({
+  urlList: {
+    type: Array as PropType<string[]>,
+    default: (): string[] => []
+  },
+  zIndex: propTypes.number.def(200),
+  initialIndex: propTypes.number.def(0),
+  infinite: propTypes.bool.def(true),
+  hideOnClickModal: propTypes.bool.def(false),
+  appendToBody: propTypes.bool.def(false),
+  show: propTypes.bool.def(false)
+})
+
+const getBindValue = computed(() => {
+  const propsData: Recordable = { ...props }
+  delete propsData.show
+  return propsData
+})
+
+const show = ref(props.show)
+
+const close = () => {
+  show.value = false
+}
+</script>
+
+<template>
+  <ElImageViewer v-if="show" v-bind="getBindValue" @close="close" />
+</template>
diff --git a/src/components/ImageViewer/src/types.ts b/src/components/ImageViewer/src/types.ts
new file mode 100644
index 000000000..1932d74d0
--- /dev/null
+++ b/src/components/ImageViewer/src/types.ts
@@ -0,0 +1,9 @@
+export interface ImageViewerProps {
+  urlList?: string[]
+  zIndex?: number
+  initialIndex?: number
+  infinite?: boolean
+  hideOnClickModal?: boolean
+  appendToBody?: boolean
+  show?: boolean
+}
diff --git a/src/components/ImportForm/index.ts b/src/components/ImportForm/index.ts
new file mode 100644
index 000000000..9eed68260
--- /dev/null
+++ b/src/components/ImportForm/index.ts
@@ -0,0 +1,3 @@
+import ImportForm from './src/ImportForm.vue'
+
+export { ImportForm }
diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue
new file mode 100644
index 000000000..29ed5d067
--- /dev/null
+++ b/src/components/ImportForm/src/ImportForm.vue
@@ -0,0 +1,338 @@
+<!-- 导入组件 -->
+<template>
+  <Dialog v-model="dialogVisible" title="导入" width="600" :close-on-click-modal="false">
+    <el-upload
+      ref="uploadRef"
+      v-model:file-list="fileList"
+      :action="
+        importUrl +
+        '?mode=' +
+        mode +
+        '&file=' +
+        file +
+        '&updatePart=' +
+        updatePart +
+        '&outFile=' +
+        outFile + 
+        '&extend=' + extend +
+        '&fromInventoryStatus=' + fromInventoryStatus +
+        '&toInventoryStatus=' + toInventoryStatus 
+      "
+      :auto-upload="false"
+      :disabled="formLoading"
+      :headers="uploadHeaders"
+      :limit="1"
+      :on-error="submitFormError"
+      :on-exceed="handleExceed"
+      :on-success="submitFormSuccess"
+      :accept="accept"
+      drag
+      style="width: 300px; margin: 0 auto"
+      v-loading="formLoading"
+    >
+      <Icon icon="ep:upload-filled" color="#c0c4cc" size="60" />
+      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      <template #tip>
+        <div class="el-upload__tip ml--126px mr--80px">
+          <div class="flex">
+            <div
+              class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right"
+              style="line-height: 32px"
+              >导入模式</div
+            >
+            <div class="">
+              <div class="radio">
+                <el-radio-group v-model="mode">
+                  <el-radio :label="1" :disabled="updateIsDisable">更新</el-radio>
+                  <el-radio :label="2" :disabled="appendIsDisable">追加</el-radio>
+                  <el-radio :label="3" :disabled="coverIsDisable">覆盖</el-radio>
+                </el-radio-group>
+              </div>
+
+              <div class="tips color-#acaeb3 font-size-14px">
+                <div class="mt-2">更新：新增并修改</div>
+                <div class="mt-2">追加：只新增，不修改</div>
+                <div class="mt-2">覆盖：只修改不新增</div>
+              </div>
+            </div>
+          </div>
+          <div class="flex mt-16px">
+            <div
+              class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right"
+              style="line-height: 32px"
+              >部分保存</div
+            >
+            <div class="">
+              <div class="switch">
+                <el-switch v-model="updatePart" />
+              </div>
+              <div class="tips color-#acaeb3 font-size-14px">
+                <div class="mt-2">部分保存：如存在错误数据，正确数据正常导入</div>
+                <div class="mt-2">全部保存：全部数据正确，才能导入</div>
+              </div>
+            </div>
+          </div>
+          <div class="flex mt-16px" v-if="isShowOut">
+            <div
+              class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right"
+              style="line-height: 32px"
+              >是否外部资源</div
+            >
+            <div class="">
+              <div class="switch">
+                <el-switch v-model="outFile" />
+              </div>
+            </div>
+          </div>
+        </div>
+      </template>
+    </el-upload>
+    <template #footer>
+      <div class="flex items-center">
+        <div class="flex-1 text-left">
+          <el-button type="primary" plain @click="importTemplate">
+            <Icon icon="ep:download" />
+            下载模板
+          </el-button>
+        </div>
+        <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { getAccessToken, getTenantId } from '@/utils/auth'
+import download from '@/utils/download'
+
+defineOptions({ name: 'ImportForm' })
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const uploadRef = ref()
+const uploadHeaders = ref() // 上传 Header 头
+const fileList = ref([]) // 文件列表
+const file = ref('')
+
+const props = defineProps({
+  importTemplateData: {
+    type: Object,
+    required: true
+  },
+  // 可以导入的文件类型
+  accept: {
+    type: String,
+    required: false,
+    default: '.xlsx,.xls'
+  },
+  // 是否更新已经存在的用户数据.默认值是1
+  mode: {
+    type: Number,
+    required: false,
+    default: 1
+  },
+  // 更新是否禁用,默认值不禁用
+  updateIsDisable: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 追加是否禁用,默认值不禁用
+  appendIsDisable: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 覆盖是否禁用,默认值不禁用
+  coverIsDisable: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 是否部门保存,默认是
+  updatePart: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  url: {
+    type: String,
+    required: false
+  },
+  // 显示是否外部资源
+  isShowOut: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  outFile: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 扩展额外属性
+  extend: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 库存修改 扩展额外属性 TODO: 后续优化 业务限定属性应转为统一的额外扩展属性 此处不应该出现业务相关属性 cxm
+  fromInventoryStatus: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 库存修改 扩展额外属性 TODO: 后续优化 业务限定属性应转为统一的额外扩展属性 此处不应该出现业务相关属性 cxm
+  toInventoryStatus: {
+    type: String,
+    required: false,
+    default: ''
+  }
+})
+const importTemplateData = ref(props.importTemplateData)
+const accept = ref(props.accept)
+const mode = ref(props.mode) //是否更新已经存在的用户数据.默认值是1
+const updateIsDisable = ref(props.updateIsDisable) //更新是否禁用,默认值不禁用
+const appendIsDisable = ref(props.appendIsDisable) //追加是否禁用,默认值不禁用
+const coverIsDisable = ref(props.coverIsDisable) //覆盖是否禁用,默认值不禁用
+const updatePart = ref(props.updatePart) //是否部门保存
+const outFile = ref(props.outFile) //是否引入外部资源
+
+const importUrl = import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + props.url
+
+/** 打开弹窗 */
+const open = () => {
+  dialogVisible.value = true
+  resetForm()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async () => {
+  if (fileList.value.length == 0) {
+    message.error('请上传文件')
+    return
+  }
+  file.value = fileList.value[0].name
+  // 提交请求
+  uploadHeaders.value = {
+    Authorization: 'Bearer ' + getAccessToken(),
+    'tenant-id': getTenantId()
+  }
+  formLoading.value = true
+  uploadRef.value!.submit()
+}
+
+/** 文件上传成功 */
+const emits = defineEmits(['success'])
+const submitFormSuccess = (response: any) => {
+  formLoading.value = true
+  console.log(response)
+  if (response) {
+    if (response.code == 500) {
+      uploadRef.value!.clearFiles()
+      message.error('导入失败')
+      formLoading.value = false
+      return
+    } else if (response.code == 0) {
+      if (response.data.errorCount > 0) {
+        message.confirm('文件中有部分数据导入失败，是否下载失败数据？').then(() => {
+          // download.excel(file, 'file_' + new Date().getTime())
+          // 通过url下载文件
+          // const downloadElement = document.createElement('a')
+          // console.log(172, import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/' + response.data.errorFile)
+          // console.log(172, import.meta.env.VITE_BASE_URL + '/admin-api/opt/profile/' + response.data.errorFile)
+          window.open(
+            import.meta.env.VITE_BASE_URL + '/admin-api' + response.data.errorFile,
+            '222'
+          )
+          // downloadElement.setAttribute('href', import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + response.data.errorFile )
+          // 点击下载
+          // downloadElement.click()
+        })
+      } else {
+        message.success('导入成功')
+      }
+    }else if(response.data == null){
+        message.error(response.msg)
+      }
+  }
+
+  // if (response.code !== 0) {
+  //   message.error(response.msg)
+  //   formLoading.value = false
+  //   return
+  // }
+  // // 拼接提示语
+  // const data = response.data
+  // const create = response.data.importResult[0]
+  // const update = response.data.importResult[1]
+  // const failure = response.data.importResult[2]
+  // let text = '上传成功数量：' + data[create].length + ';'
+  // for (let name of data[create]) {
+  //   text += '< ' + name + ' >'
+  // }
+  // text += '更新成功数量：' + data[update].length + ';'
+  // for (const name of data[update]) {
+  //   text += '< ' + name + ' >'
+  // }
+  // text += '更新失败数量：' + Object.keys(data[failure]).length + ';'
+  // for (const name in data[failure]) {
+  //   text += '< ' + name + ': ' + data[failure][name] + ' >'
+  // }
+  // message.alert(text)
+
+  // 发送操作成功的事件
+
+  formLoading.value = false
+  emits('success')
+  dialogVisible.value = false
+}
+/** 上传错误提示 */
+const submitFormError = (): void => {
+  message.error('上传失败，请您重新上传！')
+  formLoading.value = false
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  // 重置上传状态和文件
+  formLoading.value = false
+  uploadRef.value?.clearFiles()
+  fileList.value = []
+}
+
+/** 文件数超出提示 */
+const handleExceed = (): void => {
+  message.error('最多只能上传一个文件！')
+}
+
+/** 下载模板操作 */
+const importTemplate = () => {
+  const res = importTemplateData.value.templateUrl
+  download.excel(res, importTemplateData.value.templateTitle)
+}
+</script>
+
+<style scoped lang="scss">
+.tips {
+  div {
+    position: relative;
+    padding-left: 22px;
+
+    &::before {
+      width: 4px;
+      height: 4px;
+      border-radius: 50%;
+      content: '';
+      background: #c2c2c2;
+      position: absolute;
+      top: 50%;
+      margin-top: -2px;
+      left: 4px;
+    }
+  }
+}
+</style>
diff --git a/src/components/Infotip/index.ts b/src/components/Infotip/index.ts
new file mode 100644
index 000000000..413fa5f4d
--- /dev/null
+++ b/src/components/Infotip/index.ts
@@ -0,0 +1,3 @@
+import Infotip from './src/Infotip.vue'
+
+export { Infotip }
diff --git a/src/components/Infotip/src/Infotip.vue b/src/components/Infotip/src/Infotip.vue
new file mode 100644
index 000000000..0afd69287
--- /dev/null
+++ b/src/components/Infotip/src/Infotip.vue
@@ -0,0 +1,54 @@
+<script lang="ts" setup>
+import { PropType } from 'vue'
+import { useDesign } from '@/hooks/web/useDesign'
+import { propTypes } from '@/utils/propTypes'
+import { TipSchema } from '@/types/infoTip'
+
+defineOptions({ name: 'InfoTip' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('infotip')
+
+defineProps({
+  title: propTypes.string.def(''),
+  schema: {
+    type: Array as PropType<Array<string | TipSchema>>,
+    required: true,
+    default: () => []
+  },
+  showIndex: propTypes.bool.def(true),
+  highlightColor: propTypes.string.def('var(--el-color-primary)')
+})
+
+const emit = defineEmits(['click'])
+
+const keyClick = (key: string) => {
+  emit('click', key)
+}
+</script>
+
+<template>
+  <div
+    :class="[
+      prefixCls,
+      'p-20px mb-20px border-1px border-solid border-[var(--el-color-primary)] bg-[var(--el-color-primary-light-9)]'
+    ]"
+  >
+    <div v-if="title" :class="[`${prefixCls}__header`, 'flex items-center']">
+      <Icon :size="22" color="var(--el-color-primary)" icon="ep:warning-filled" />
+      <span :class="[`${prefixCls}__title`, 'pl-5px text-16px font-bold']">{{ title }}</span>
+    </div>
+    <div :class="`${prefixCls}__content`">
+      <p v-for="(item, $index) in schema" :key="$index" class="mt-15px text-14px">
+        <Highlight
+          :color="highlightColor"
+          :keys="typeof item === 'string' ? [] : item.keys"
+          @click="keyClick"
+        >
+          {{ showIndex ? `${$index + 1}、` : '' }}{{ typeof item === 'string' ? item : item.label }}
+        </Highlight>
+      </p>
+    </div>
+  </div>
+</template>
diff --git a/src/components/InputPassword/index.ts b/src/components/InputPassword/index.ts
new file mode 100644
index 000000000..1dcc38e9a
--- /dev/null
+++ b/src/components/InputPassword/index.ts
@@ -0,0 +1,3 @@
+import InputPassword from './src/InputPassword.vue'
+
+export { InputPassword }
diff --git a/src/components/InputPassword/src/InputPassword.vue b/src/components/InputPassword/src/InputPassword.vue
new file mode 100644
index 000000000..b8c93e7d0
--- /dev/null
+++ b/src/components/InputPassword/src/InputPassword.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import { useConfigGlobal } from '@/hooks/web/useConfigGlobal'
+import type { ZxcvbnResult } from '@zxcvbn-ts/core'
+import { zxcvbn } from '@zxcvbn-ts/core'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'InputPassword' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('input-password')
+
+const props = defineProps({
+  // 是否显示密码强度
+  strength: propTypes.bool.def(false),
+  modelValue: propTypes.string.def('')
+})
+
+watch(
+  () => props.modelValue,
+  (val: string) => {
+    if (val === unref(valueRef)) return
+    valueRef.value = val
+  }
+)
+
+const { configGlobal } = useConfigGlobal()
+
+const emit = defineEmits(['update:modelValue'])
+
+// 设置input的type属性
+const textType = ref<'password' | 'text'>('password')
+
+const changeTextType = () => {
+  textType.value = unref(textType) === 'text' ? 'password' : 'text'
+}
+
+// 输入框的值
+const valueRef = ref(props.modelValue)
+
+// 监听
+watch(
+  () => valueRef.value,
+  (val: string) => {
+    emit('update:modelValue', val)
+  }
+)
+
+// 获取密码强度
+const getPasswordStrength = computed(() => {
+  const value = unref(valueRef)
+  const zxcvbnRef = zxcvbn(unref(valueRef)) as ZxcvbnResult
+  return value ? zxcvbnRef.score : -1
+})
+
+const getIconName = computed(() => (unref(textType) === 'password' ? 'ep:hide' : 'ep:view'))
+</script>
+
+<template>
+  <div :class="[prefixCls, `${prefixCls}--${configGlobal?.size}`]">
+    <ElInput v-model="valueRef" :type="textType" v-bind="$attrs">
+      <template #suffix>
+        <Icon :icon="getIconName" class="el-input__icon cursor-pointer" @click="changeTextType" />
+      </template>
+    </ElInput>
+    <div
+      v-if="strength"
+      :class="`${prefixCls}__bar`"
+      class="relative mb-6px ml-auto mr-auto mt-10px h-6px"
+    >
+      <div :class="`${prefixCls}__bar--fill`" :data-score="getPasswordStrength"></div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-input-password;
+
+.#{$prefix-cls} {
+  :deep(.#{$elNamespace}-input__clear) {
+    margin-left: 5px;
+  }
+
+  &__bar {
+    background-color: var(--el-text-color-disabled);
+    border-radius: var(--el-border-radius-base);
+
+    &::before,
+    &::after {
+      position: absolute;
+      z-index: 10;
+      display: block;
+      width: 20%;
+      height: inherit;
+      background-color: transparent;
+      border-color: var(--el-color-white);
+      border-style: solid;
+      border-width: 0 5px;
+      content: '';
+    }
+
+    &::before {
+      left: 20%;
+    }
+
+    &::after {
+      right: 20%;
+    }
+
+    &--fill {
+      position: absolute;
+      width: 0;
+      height: inherit;
+      background-color: transparent;
+      border-radius: inherit;
+      transition:
+        width 0.5s ease-in-out,
+        background 0.25s;
+
+      &[data-score='0'] {
+        width: 20%;
+        background-color: var(--el-color-danger);
+      }
+
+      &[data-score='1'] {
+        width: 40%;
+        background-color: var(--el-color-danger);
+      }
+
+      &[data-score='2'] {
+        width: 60%;
+        background-color: var(--el-color-warning);
+      }
+
+      &[data-score='3'] {
+        width: 80%;
+        background-color: var(--el-color-success);
+      }
+
+      &[data-score='4'] {
+        width: 100%;
+        background-color: var(--el-color-success);
+      }
+    }
+  }
+
+  &--mini > &__bar {
+    border-radius: var(--el-border-radius-small);
+  }
+}
+</style>
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
new file mode 100644
index 000000000..b88997b1d
--- /dev/null
+++ b/src/components/Pagination/index.vue
@@ -0,0 +1,87 @@
+<!-- 基于 ruoyi-vue3 的 Pagination 重构，核心是简化无用的属性，并使用 ts 重写 -->
+<template>
+  <el-pagination
+    v-show="total > 0"
+    v-model:current-page="currentPage"
+    v-model:page-size="pageSize"
+    :background="true"
+    :page-sizes="[10, 20, 30, 50, 100]"
+    :pager-count="pagerCount"
+    :total="total"
+    :small="isSmall"
+    class="float-right mb-15px mt-15px"
+    layout="total, sizes, prev, pager, next, jumper"
+    @size-change="handleSizeChange"
+    @current-change="handleCurrentChange"
+  />
+</template>
+<script lang="ts" setup>
+import { computed, watchEffect } from 'vue'
+import { useAppStore } from '@/store/modules/app'
+
+defineOptions({ name: 'Pagination' })
+
+// 此处解决了当全局size为small的时候分页组件样式太大的问题
+const appStore = useAppStore()
+const layoutCurrentSize = computed(() => appStore.currentSize)
+const isSmall = ref<boolean>(layoutCurrentSize.value === 'small')
+watchEffect(() => {
+  isSmall.value = layoutCurrentSize.value === 'small'
+})
+
+const props = defineProps({
+  // 总条目数
+  total: {
+    required: true,
+    type: Number
+  },
+  // 当前页数：pageNo
+  page: {
+    type: Number,
+    default: 1
+  },
+  // 每页显示条目个数：pageSize
+  limit: {
+    type: Number,
+    default: 20
+  },
+  // 设置最大页码按钮数。 页码按钮的数量，当总页数超过该值时会折叠
+  // 移动端页码按钮的数量端默认值 5
+  pagerCount: {
+    type: Number,
+    default: document.body.clientWidth < 992 ? 5 : 7
+  }
+})
+
+const emit = defineEmits(['update:page', 'update:limit', 'pagination', 'pagination'])
+const currentPage = computed({
+  get() {
+    return props.page
+  },
+  set(val) {
+    // 触发 update:page 事件，更新 limit 属性，从而更新 pageNo
+    emit('update:page', val)
+  }
+})
+const pageSize = computed({
+  get() {
+    return props.limit
+  },
+  set(val) {
+    // 触发 update:limit 事件，更新 limit 属性，从而更新 pageSize
+    emit('update:limit', val)
+  }
+})
+const handleSizeChange = (val) => {
+  // 如果修改后超过最大页面，强制跳转到第 1 页
+  if (currentPage.value * val > props.total) {
+    currentPage.value = 1
+  }
+  // 触发 pagination 事件，重新加载列表
+  emit('pagination', { page: currentPage.value, limit: val })
+}
+const handleCurrentChange = (val) => {
+  // 触发 pagination 事件，重新加载列表
+  emit('pagination', { page: val, limit: pageSize.value })
+}
+</script>
diff --git a/src/components/Qrcode/index.ts b/src/components/Qrcode/index.ts
new file mode 100644
index 000000000..ce461612f
--- /dev/null
+++ b/src/components/Qrcode/index.ts
@@ -0,0 +1,3 @@
+import Qrcode from './src/Qrcode.vue'
+
+export { Qrcode }
diff --git a/src/components/Qrcode/src/Qrcode.vue b/src/components/Qrcode/src/Qrcode.vue
new file mode 100644
index 000000000..f0ce7b791
--- /dev/null
+++ b/src/components/Qrcode/src/Qrcode.vue
@@ -0,0 +1,253 @@
+<script lang="ts" setup>
+import { computed, nextTick, PropType, ref, unref, watch } from 'vue'
+import QRCode, { QRCodeRenderersOptions } from 'qrcode'
+import { cloneDeep } from 'lodash-es'
+import { propTypes } from '@/utils/propTypes'
+import { useDesign } from '@/hooks/web/useDesign'
+import { isString } from '@/utils/is'
+import { QrcodeLogo } from '@/types/qrcode'
+
+defineOptions({ name: 'Qrcode' })
+
+const props = defineProps({
+  // img 或者 canvas,img不支持logo嵌套
+  tag: propTypes.string.validate((v: string) => ['canvas', 'img'].includes(v)).def('canvas'),
+  // 二维码内容
+  text: {
+    type: [String, Array] as PropType<string | Recordable[]>,
+    default: null
+  },
+  // qrcode.js配置项
+  options: {
+    type: Object as PropType<QRCodeRenderersOptions>,
+    default: () => ({})
+  },
+  // 宽度
+  width: propTypes.number.def(200),
+  // logo
+  logo: {
+    type: [String, Object] as PropType<Partial<QrcodeLogo> | string>,
+    default: ''
+  },
+  // 是否过期
+  disabled: propTypes.bool.def(false),
+  // 过期提示内容
+  disabledText: propTypes.string.def('')
+})
+
+const emit = defineEmits(['done', 'click', 'disabled-click'])
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('qrcode')
+
+const { toCanvas, toDataURL } = QRCode
+
+const loading = ref(true)
+
+const wrapRef = ref<Nullable<HTMLCanvasElement | HTMLImageElement>>(null)
+
+const renderText = computed(() => String(props.text))
+
+const wrapStyle = computed(() => {
+  return {
+    width: props.width + 'px',
+    height: props.width + 'px'
+  }
+})
+
+const initQrcode = async () => {
+  await nextTick()
+  const options = cloneDeep(props.options || {})
+  if (props.tag === 'canvas') {
+    // 容错率，默认对内容少的二维码采用高容错率，内容多的二维码采用低容错率
+    options.errorCorrectionLevel =
+      options.errorCorrectionLevel || getErrorCorrectionLevel(unref(renderText))
+    const _width: number = await getOriginWidth(unref(renderText), options)
+    options.scale = props.width === 0 ? undefined : (props.width / _width) * 4
+    const canvasRef: HTMLCanvasElement | any = await toCanvas(
+      unref(wrapRef) as HTMLCanvasElement,
+      unref(renderText),
+      options
+    )
+    if (props.logo) {
+      const url = await createLogoCode(canvasRef)
+      emit('done', url)
+      loading.value = false
+    } else {
+      emit('done', canvasRef.toDataURL())
+      loading.value = false
+    }
+  } else {
+    const url = await toDataURL(renderText.value, {
+      errorCorrectionLevel: 'H',
+      width: props.width,
+      ...options
+    })
+    ;(unref(wrapRef) as HTMLImageElement).src = url
+    emit('done', url)
+    loading.value = false
+  }
+}
+
+watch(
+  () => renderText.value,
+  (val) => {
+    if (!val) return
+    initQrcode()
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+
+const createLogoCode = (canvasRef: HTMLCanvasElement) => {
+  const canvasWidth = canvasRef.width
+  const logoOptions: QrcodeLogo = Object.assign(
+    {
+      logoSize: 0.15,
+      bgColor: '#ffffff',
+      borderSize: 0.05,
+      crossOrigin: 'anonymous',
+      borderRadius: 8,
+      logoRadius: 0
+    },
+    isString(props.logo) ? {} : props.logo
+  )
+  const {
+    logoSize = 0.15,
+    bgColor = '#ffffff',
+    borderSize = 0.05,
+    crossOrigin = 'anonymous',
+    borderRadius = 8,
+    logoRadius = 0
+  } = logoOptions
+  const logoSrc = isString(props.logo) ? props.logo : props.logo.src
+  const logoWidth = canvasWidth * logoSize
+  const logoXY = (canvasWidth * (1 - logoSize)) / 2
+  const logoBgWidth = canvasWidth * (logoSize + borderSize)
+  const logoBgXY = (canvasWidth * (1 - logoSize - borderSize)) / 2
+
+  const ctx = canvasRef.getContext('2d')
+  if (!ctx) return
+
+  // logo 底色
+  canvasRoundRect(ctx)(logoBgXY, logoBgXY, logoBgWidth, logoBgWidth, borderRadius)
+  ctx.fillStyle = bgColor
+  ctx.fill()
+
+  // logo
+  const image = new Image()
+  if (crossOrigin || logoRadius) {
+    image.setAttribute('crossOrigin', crossOrigin)
+  }
+  ;(image as any).src = logoSrc
+
+  // 使用image绘制可以避免某些跨域情况
+  const drawLogoWithImage = (image: HTMLImageElement) => {
+    ctx.drawImage(image, logoXY, logoXY, logoWidth, logoWidth)
+  }
+
+  // 使用canvas绘制以获得更多的功能
+  const drawLogoWithCanvas = (image: HTMLImageElement) => {
+    const canvasImage = document.createElement('canvas')
+    canvasImage.width = logoXY + logoWidth
+    canvasImage.height = logoXY + logoWidth
+    const imageCanvas = canvasImage.getContext('2d')
+    if (!imageCanvas || !ctx) return
+    imageCanvas.drawImage(image, logoXY, logoXY, logoWidth, logoWidth)
+
+    canvasRoundRect(ctx)(logoXY, logoXY, logoWidth, logoWidth, logoRadius)
+    if (!ctx) return
+    const fillStyle = ctx.createPattern(canvasImage, 'no-repeat')
+    if (fillStyle) {
+      ctx.fillStyle = fillStyle
+      ctx.fill()
+    }
+  }
+
+  // 将 logo绘制到 canvas上
+  return new Promise((resolve: any) => {
+    image.onload = () => {
+      logoRadius ? drawLogoWithCanvas(image) : drawLogoWithImage(image)
+      resolve(canvasRef.toDataURL())
+    }
+  })
+}
+
+// 得到原QrCode的大小，以便缩放得到正确的QrCode大小
+const getOriginWidth = async (content: string, options: QRCodeRenderersOptions) => {
+  const _canvas = document.createElement('canvas')
+  await toCanvas(_canvas, content, options)
+  return _canvas.width
+}
+
+// 对于内容少的QrCode，增大容错率
+const getErrorCorrectionLevel = (content: string) => {
+  if (content.length > 36) {
+    return 'M'
+  } else if (content.length > 16) {
+    return 'Q'
+  } else {
+    return 'H'
+  }
+}
+
+// copy来的方法，用于绘制圆角
+const canvasRoundRect = (ctx: CanvasRenderingContext2D) => {
+  return (x: number, y: number, w: number, h: number, r: number) => {
+    const minSize = Math.min(w, h)
+    if (r > minSize / 2) {
+      r = minSize / 2
+    }
+    ctx.beginPath()
+    ctx.moveTo(x + r, y)
+    ctx.arcTo(x + w, y, x + w, y + h, r)
+    ctx.arcTo(x + w, y + h, x, y + h, r)
+    ctx.arcTo(x, y + h, x, y, r)
+    ctx.arcTo(x, y, x + w, y, r)
+    ctx.closePath()
+    return ctx
+  }
+}
+
+const clickCode = () => {
+  emit('click')
+}
+
+const disabledClick = () => {
+  emit('disabled-click')
+}
+</script>
+
+<template>
+  <div v-loading="loading" :class="[prefixCls, 'relative inline-block']" :style="wrapStyle">
+    <component :is="tag" ref="wrapRef" @click="clickCode" />
+    <div
+      v-if="disabled"
+      :class="`${prefixCls}--disabled`"
+      class="absolute left-0 top-0 h-full w-full flex items-center justify-center"
+      @click="disabledClick"
+    >
+      <div class="absolute left-[50%] top-[50%] font-bold">
+        <Icon :size="30" color="var(--el-color-primary)" icon="ep:refresh-right" />
+        <div>{{ disabledText }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-qrcode;
+
+.#{$prefix-cls} {
+  &--disabled {
+    background: rgb(255 255 255 / 95%);
+
+    & > div {
+      transform: translate(-50%, -50%);
+    }
+  }
+}
+</style>
diff --git a/src/components/Remarks/index.ts b/src/components/Remarks/index.ts
new file mode 100644
index 000000000..d7154967c
--- /dev/null
+++ b/src/components/Remarks/index.ts
@@ -0,0 +1,3 @@
+import Remarks from './src/Remarks.vue'
+
+export { Remarks }
diff --git a/src/components/Remarks/src/Remarks.vue b/src/components/Remarks/src/Remarks.vue
new file mode 100644
index 000000000..f73c66c8f
--- /dev/null
+++ b/src/components/Remarks/src/Remarks.vue
@@ -0,0 +1,119 @@
+<!-- 备注组件 -->
+<template>
+  <div class="annex">
+    <div class="title flex items-center">
+      <div class="title-txt">备注</div>
+    </div>
+    <div class="list">
+      <div class="item flex items-start" v-for="(item, index) in remarksData.remarksList" :key="index">
+        <div class="user-icon mt-4px">
+          <img :src="item.avatar" v-if="item.avatar" alt="" class="w-[100%] h-[100%]"/>
+          <Icon icon="fa-solid:user" color="#fff" v-else size="16"/>
+        </div>
+        <div class="item-center">
+          <div class="item-title">
+            <div class="item-title-txt">{{ item.nickname }}</div>
+            <div class="time">{{formatDate(item.createTime)}}</div>
+          </div>
+          <div class="mt-8px color-#303133 font-size-14px">{{ item.remark }}</div>
+        </div>
+      </div>
+    </div>
+    <div class="add-remarks flex items-center mt-20px">
+       <el-input v-model="data.remark" placeholder="请输入备注" />
+       <el-button class="ml-16px" type="primary" @click="handleSubmitrRemarks" >
+          确定
+        </el-button>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+const message = useMessage() // 消息弹窗
+import * as RemarkApi from '@/api/wms/remark'
+import { formatDate } from '@/utils/formatTime'
+
+defineComponent({
+  name: 'Annex'
+})
+
+// 接受父级数据
+const props = defineProps({
+  remarksData: {
+    type: Object,
+    required: true
+  }
+})
+const data = ref(props.remarksData.data)
+
+// 子传父的时候需要先定义好emit这个方法
+const emit = defineEmits(['remarksSubmitScuess'])
+// 提交备注
+const handleSubmitrRemarks =async ()=>{
+  if(!data.value.remark){
+    message.error('请填写备注')
+    return;
+  }
+  try {
+    await RemarkApi.createRemark(data.value)
+    message.success('提交成功')
+  } finally {
+    emit('remarksSubmitScuess') //成功之后给父组件的数据
+    data.value.remark = ''
+  }
+  
+}
+</script>
+
+
+<style scoped lang="scss">
+.title {
+  border-bottom: 1px solid #dedede;
+  justify-content: space-between;
+
+  .title-txt {
+    width: 80px;
+    text-align: center;
+    color: rgb(63, 158, 255);
+    border-bottom: 2px solid rgb(63, 158, 255);
+    height: 30px;
+  }
+}
+
+.item {
+  border-bottom: 1px dashed #dedede;
+  padding: 20px 0px 10px;
+
+  .user-icon {
+    width: 34px;
+    height: 34px;
+    background: #dedfe0;
+    border-radius: 4px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+  }
+
+  .item-center {
+    flex: 1;
+    margin-left: 16px;
+    overflow: hidden;
+
+    .item-title {
+      display: flex;
+      align-items: flex-end;
+
+      .item-title-txt {
+        font-size: 16px;
+        color: #333;
+      }
+
+      .time {
+        color: #9e9e9e;
+        margin-left: 10px;
+      }
+    }
+
+  }
+}</style>
diff --git a/src/components/RouterSearch/index.vue b/src/components/RouterSearch/index.vue
new file mode 100644
index 000000000..f33d32e36
--- /dev/null
+++ b/src/components/RouterSearch/index.vue
@@ -0,0 +1,168 @@
+<template>
+  <ElDialog v-if="isModal" v-model="showSearch" :show-close="false" title="菜单搜索">
+    <!-- <el-select
+      filterable
+      :reserve-keyword="false"
+      remote
+      placeholder="请输入菜单内容"
+      :remote-method="remoteMethod"
+      style="width: 100%"
+      @change="handleChange"
+    >
+      <el-option
+        v-for="item in options"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value"
+      />
+    </el-select> -->
+  </ElDialog>
+  <div v-else class="custom-hover" @click.stop="showTopSearch = !showTopSearch">
+    <Icon icon="ep:search" />
+    <el-select
+      filterable
+      :reserve-keyword="false"
+      remote
+      placeholder="请输入菜单内容"
+      :remote-method="remoteMethod"
+      class="overflow-hidden transition-all-600"
+      :class="showTopSearch ? 'w-220px ml2' : 'w-0'"
+      @change="handleChange"
+    >
+      <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+    </el-select>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { usePermissionStore } from '@/store/modules/permission'
+import { filterBreadcrumb } from '@/layout/components/Breadcrumb/src/helper'
+import { filter, treeToList } from '@/utils/tree'
+import type { RouteLocationNormalizedLoaded, RouteMeta } from 'vue-router'
+
+defineProps({
+  isModal: {
+    type: Boolean,
+    default: true
+  }
+})
+
+const permissionStore = usePermissionStore()
+const routersa = permissionStore.getRouters
+// 解析路由 展开菜单路由
+const analyzeRouters = (routers:any) => {
+  return recursion(routers, [])
+}
+// 递归 查询菜单路由
+const recursion = (routers:any, rs) => {
+  routers.forEach((item) => {
+    if (item.children?.length > 0) {
+      recursion(item.children, rs)
+    } else {
+      rs.push(item)
+    }
+  })
+  return rs
+}
+
+// 递归 查询上级目录名称
+const recursionParentName = (routers:any, rs) => {
+    let routerParent = router.getRoutes().find(itemRouter => 
+      itemRouter.path == routers.path.substring(0,routers.path.lastIndexOf('/'))
+    )
+    if (routerParent) {
+      recursionParentName(routerParent, rs)
+    } else {
+      rs.push(routers.meta.title)
+    }
+  return rs
+}
+
+const router = useRouter() // 路由对象
+const showSearch = ref(false) // 是否显示弹框
+const showTopSearch = ref(false) // 是否显示顶部搜索框
+const value: Ref = ref('') // 用户输入的值
+const levelList = ref<AppRouteRecordRaw[]>([])
+const menuRouters = computed(() => {
+  const routers = permissionStore.getRouters
+  return filterBreadcrumb(routers)
+})
+// 20240111 cxm 修改 根据当前登录人获取有效路由 并解析展开所有菜单路由过滤目录路由
+const routers = analyzeRouters(filterBreadcrumb(routersa))
+const options = computed(() => {
+  // 提示选项
+  if (!value.value) {
+    return []
+  }
+ 
+  let list = routers.filter((item: any) => {
+    if (item.meta.title?.indexOf(value.value) > -1 || item.path.indexOf(value.value) > -1) {
+      return true
+    }
+  })
+
+  return list.map((item) => {
+    let menuName = ''
+    levelList.value = filter<AppRouteRecordRaw>(unref(menuRouters), (node: AppRouteRecordRaw) => {
+      return node.path === item.path
+    })
+    const breadcrumbList = treeToList<AppRouteRecordRaw[]>(unref(levelList))
+    breadcrumbList.map((v) => {
+      menuName += v?.meta?.title + ' / '
+    })
+    return {
+      label: `${item.meta.title} ----> ${menuName.substring(0,menuName.length-3)}`,
+      value: item.path
+    }
+  })
+})
+
+const remoteMethod = (data) => {
+  // 这里可以执行相应的操作（例如打开搜索框等）
+  value.value = data
+}
+
+const handleChange = (path) => {
+  console.log(126,path)
+  router.push({ path })
+  console.log(128,11111)
+  hiddenTopSearch();
+  console.log(130,222222)
+}
+
+const hiddenTopSearch = () => {
+  showTopSearch.value = false
+}
+
+onMounted(() => {
+  window.addEventListener('keydown', listenKey)
+  window.addEventListener('click', hiddenTopSearch)
+})
+
+onUnmounted(() => {
+  window.removeEventListener('keydown', listenKey)
+  window.removeEventListener('click', hiddenTopSearch)
+})
+
+// 监听 ctrl + k
+const listenKey = (event) => {
+  if ((event.ctrlKey || event.metaKey) && event.key === 'k') {
+    showSearch.value = !showSearch.value
+    // 这里可以执行相应的操作（例如打开搜索框等）
+  }
+}
+
+defineExpose({
+  openSearch: () => {
+    showSearch.value = true
+  }
+})
+</script>
+<style lang="scss" scoped>
+.w-0 {
+    width: 0 !important;
+}
+.w-220px {
+    width: 220px !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Search/index.ts b/src/components/Search/index.ts
new file mode 100644
index 000000000..fcc6f1630
--- /dev/null
+++ b/src/components/Search/index.ts
@@ -0,0 +1,3 @@
+import Search from './src/Search.vue'
+
+export { Search }
diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
new file mode 100644
index 000000000..78865acf7
--- /dev/null
+++ b/src/components/Search/src/Search.vue
@@ -0,0 +1,186 @@
+<script lang="ts" setup>
+import { PropType } from 'vue'
+import { propTypes } from '@/utils/propTypes'
+
+import { useForm } from '@/hooks/web/useForm'
+import { findIndex } from '@/utils'
+import { cloneDeep } from 'lodash-es'
+import { FormSchema } from '@/types/form'
+
+import { useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache()
+
+defineOptions({ name: 'Search' })
+
+const { t } = useI18n()
+
+const props = defineProps({
+  // 生成Form的布局结构数组
+  schema: {
+    type: Array as PropType<FormSchema[]>,
+    default: () => []
+  },
+  // 是否需要栅格布局
+  isCol: propTypes.bool.def(false),
+  // 表单label宽度
+  labelWidth: propTypes.oneOfType([String, Number]).def('auto'),
+  // 操作按钮风格位置
+  layout: propTypes.string.validate((v: string) => ['inline', 'bottom'].includes(v)).def('inline'),
+  // 底部按钮的对齐方式
+  buttomPosition: propTypes.string
+    .validate((v: string) => ['left', 'center', 'right'].includes(v))
+    .def('center'),
+  showSearch: propTypes.bool.def(true),
+  showReset: propTypes.bool.def(true),
+  // 是否显示伸缩
+  expand: propTypes.bool.def(false),
+  // 伸缩的界限字段
+  expandField: propTypes.string.def(''),
+  inline: propTypes.bool.def(true),
+  model: {
+    type: Object as PropType<Recordable>,
+    default: () => ({})
+  }
+})
+
+const emit = defineEmits(['search', 'reset'])
+
+const visible = ref(true)
+
+const newSchema = computed(() => {
+  let schema: FormSchema[] = cloneDeep(props.schema)
+  if (props.expand && props.expandField && !unref(visible)) {
+    const index = findIndex(schema, (v: FormSchema) => v.field === props.expandField)
+    if (index > -1) {
+      const length = schema.length
+      schema.splice(index + 1, length)
+    }
+  }
+  if (props.layout === 'inline') {
+    schema = schema.concat([
+      {
+        field: 'action',
+        formItemProps: {
+          labelWidth: '0px'
+        }
+      }
+    ])
+  }
+  return schema
+})
+
+const { register, elFormRef, methods } = useForm({
+  model: props.model || {}
+})
+
+const search = async () => {
+  await unref(elFormRef)?.validate(async (isValid) => {
+    if (isValid) {
+      const { getFormData } = methods
+      const model = await getFormData()
+      console.log(model)
+      emit('search', model)
+    }
+  })
+}
+
+const reset = async () => {
+  unref(elFormRef)?.resetFields()
+  const { getFormData } = methods
+  const model = await getFormData()
+  emit('reset', model)
+}
+
+const bottonButtonStyle = computed(() => {
+  return {
+    textAlign: props.buttomPosition as unknown as 'left' | 'center' | 'right'
+  }
+})
+
+const setVisible = () => {
+  unref(elFormRef)?.resetFields()
+  visible.value = !unref(visible)
+}
+const Search = ref()
+onMounted(() => {})
+</script>
+
+<template>
+  <!-- update by 芋艿：class="-mb-15px" 用于降低和 ContentWrap 组件的底部距离，避免空隙过大 -->
+  <div ref="Search">
+    <Form
+      :inline="inline"
+      :is-col="isCol"
+      :is-custom="false"
+      :label-width="labelWidth"
+      :schema="newSchema"
+      class="-mb-15px search"
+      hide-required-asterisk
+      @register="register"
+    >
+      <template #action>
+        <div v-if="layout === 'inline'">
+          <!-- update by 芋艿：去除搜索的 type="primary"，颜色变淡一点 -->
+          <ElButton type="info" plain v-if="showSearch" @click="search">
+            <Icon class="mr-5px" icon="ep:search" />
+            {{ t('common.query') }}
+          </ElButton>
+          <!-- update by 芋艿：将 icon="ep:refresh-right" 修改成 icon="ep:refresh"，和 ruoyi-vue 搜索保持一致  -->
+          <ElButton type="info" plain v-if="showReset" @click="reset">
+            <Icon class="mr-5px" icon="ep:refresh" />
+            {{ t('common.reset') }}
+          </ElButton>
+          <ElButton type="info" plain v-if="expand" text @click="setVisible">
+            {{ t(visible ? 'common.shrink' : 'common.expand') }}
+            <Icon :icon="visible ? 'ep:arrow-up' : 'ep:arrow-down'" />
+          </ElButton>
+          <!-- add by 芋艿：补充在搜索后的按钮 -->
+          <slot name="actionMore"></slot>
+        </div>
+      </template>
+      <template v-for="name in Object.keys($slots)" :key="name" #[name]>
+        <slot :name="name"></slot>
+      </template>
+    </Form>
+  </div>
+
+  <template v-if="layout === 'bottom'">
+    <div :style="bottonButtonStyle">
+      <ElButton v-if="showSearch" type="primary" @click="search">
+        <Icon class="mr-5px" icon="ep:search" />
+        {{ t('common.query') }}
+      </ElButton>
+      <ElButton v-if="showReset" @click="reset">
+        <Icon class="mr-5px" icon="ep:refresh-right" />
+        {{ t('common.reset') }}
+      </ElButton>
+      <ElButton v-if="expand" text @click="setVisible">
+        {{ t(visible ? 'common.shrink' : 'common.expand') }}
+        <Icon :icon="visible ? 'ep:arrow-up' : 'ep:arrow-down'" />
+      </ElButton>
+      <!-- add by 芋艿：补充在搜索后的按钮 -->
+      <slot name="actionMore"></slot>
+    </div>
+  </template>
+</template>
+<style lang="scss" scoped>
+.search ::v-deep(.el-form-item) {
+  margin-right: 1%;
+  width: 20%;
+}
+.search ::v-deep(.el-form-item:nth-last-child(1)) {
+  margin-right: 0px;
+  width: auto;
+  .el-form-item__content {
+    flex: 1;
+    >div{
+      flex: 1;
+        button {
+        width: 46%;
+        max-width: 80px;
+      }
+    }
+    
+  }
+}
+</style>
diff --git a/src/components/SearchHigh/index.ts b/src/components/SearchHigh/index.ts
new file mode 100644
index 000000000..a559d09f8
--- /dev/null
+++ b/src/components/SearchHigh/index.ts
@@ -0,0 +1,3 @@
+import SearchHigh from './src/SearchHigh.vue'
+
+export { SearchHigh }
diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue
new file mode 100644
index 000000000..0c3ab7a0c
--- /dev/null
+++ b/src/components/SearchHigh/src/SearchHigh.vue
@@ -0,0 +1,348 @@
+<template>
+  <!-- 高级筛选界面 -->
+  <Dialog title="筛选" v-model="popoverVisible" :width="'50%'" >
+    <el-form id="moreListElForm" size="default" labelWidth="0" :searchData="moreListData">
+      <el-form-item v-for="(item, index) in moreListData.filters" :key="index" :prop="item.column" >
+        <!-- 第一列 label-->
+        <div class="rowInnerItem">
+          <el-select v-model="item.column" placeholder="请选择筛选对象" :disabled="item.hide" :filterable="true" @change="resetSelect(item)" >
+            <el-option v-for="(item, index) in searchOption_high" :key="index" :label="item.label" :value="item.field" />
+          </el-select>
+        </div>
+        <!-- 第二列 条件-->
+        <div class="rowInnerItem">
+          <el-select v-model="item.action" placeholder="请选择条件" :disabled="item.column == '' || item.hide ? true : false" @change="actionSelect(item)" >
+            <el-option v-for="item in formatMoreListActions(item) " :key="item.value" :label="item.label"
+              :value="item.value" />
+          </el-select>
+        </div>
+        <!-- 第三列 值 -->
+        <div class="rowInnerItem1">
+          <!-- 输入框 -->
+          <el-input v-if="getInputType(item.column) == 'input'" v-model="item.value" placeholder="请输入内容" clearable :disabled="item.disabled"/>
+          <!-- 数字输入框 -->
+          <el-input-number v-else-if="getInputType(item.column) == 'inputNumber'" v-model="item.value" :precision="getInputPrecision(item.column)"  :disabled="item.disabled"/>
+          <!-- 下拉框 -->
+          <el-select v-else-if="getInputType(item.column) == 'select'" v-model="item.value1" placeholder="请选择内容" :filterable="true" clearable :disabled="item.disabled" :multiple="item.action=='in' || item.action=='notIn' ? true : false" collapse-tags collapse-tags-tooltip :key="item.action">
+            <el-option v-for="dict in initSelectOptions(item.column)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+            <!-- <el-option v-for="(op, index) in initSelectOptions(item.column)" :label="op[item.optionsLabel] || op.label"
+              :value="op[item.optionsValue] || op.value" :key="index" /> -->
+          </el-select>
+          <!-- 时间 -->
+          <el-time-picker v-else-if="getInputType(item.column) == 'time'" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" v-model="item.value1"  style="width:  calc(100% - 20px);margin-right: 10px;" :disabled="item.disabled"/>
+          <!-- 日期 -->
+          <el-date-picker v-else-if="getInputType(item.column) == 'date'" v-model="item.value1" type="daterange"
+           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" style="width:  calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item,'daterange')" value-format="YYYY-MM-DD"  format="YYYY/MM/DD" :disabled="item.disabled"/>
+          <!-- 日期时间 -->
+          <el-date-picker v-else-if="getInputType(item.column) == 'datePicker'" v-model="item.value1" type="datetimerange"
+            range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间"  style="width: calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item, 'datetimerange')" value-format="x"  format="YYYY/MM/DD HH:mm:ss" :disabled="item.disabled"/>
+        </div>
+        <!-- 删除条件按钮 -->
+        <el-button type="danger" :icon="Minus" circle size="small"
+          @click="moreListDelete(index, item, $event)" />
+      </el-form-item>
+    </el-form>
+    <!-- 添加筛选条件 -->
+    <div class="moreListPush-btn">
+      <span @click="moreListPush">+ 添加筛选条件</span>
+    </div>
+    <!-- 按钮 -->
+    <div class="moreListBaseBts" >
+      <ButtonBase :Butttondata="butttondata" @button-base-click="buttonBaseClick" />
+    </div>
+  </Dialog>
+</template>
+<script setup >
+import { Minus } from '@element-plus/icons-vue'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
+const props = defineProps({
+  // 主组件name值
+  routeName: {
+    type: String,
+    default: ''
+  },
+  // 从子表进行高级搜索
+  masterId: {
+    type: String,
+    default: ''
+  },
+  allSchemas: {
+    type: Object,
+    default: null
+  }
+})
+
+const message = useMessage() // 消息弹窗
+const route = useRoute() // 路由信息
+const popoverVisible = ref(false)
+const searchOption_high = ref(props.allSchemas?.tableColumns.filter(item => (item.field != "action")))
+const moreListData = ref({
+  filters:[]
+})
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.defaultSearchBtn(null), // 查询
+  defaultButtons.defaultSearchResetBtn(null), // 重置
+]
+// 高级筛选条件列表配置 ==,!=,>,<,>=,<=,like,in,notIn,betweeen,isNull,isNotNull
+const moreListOptions = ref({
+  action: [
+    {
+      value: '==',
+      label: '等于'
+    }, {
+      value: '!=',
+      label: '不等于'
+    }, {
+      value: '>',
+      label: '大于'
+    }, {
+      value: '<',
+      label: '小于'
+    }, {
+      value: '>=',
+      label: '大于等于'
+    }, {
+      value: '<=',
+      label: '小于等于'
+    }, {
+      value: 'like',
+      label: '模糊'
+    }, {
+      value: 'in',
+      label: '包含'
+    }, {
+      value: 'notIn',
+      label: '不包含'
+    }, {
+      value: 'betweeen',
+      label: '区间'
+    }, {
+      value: 'isNull',
+      label: '是空'
+    }, {
+      value: 'isNotNull',
+      label: '不是空'
+    }, {
+      value: 'isStr',
+      label: '是空字符串'
+    }, {
+      value: 'isNotStr',
+      label: '不是空字符串'
+    }
+  ]
+})
+
+ // 判断输入框类型
+ const getInputType = (val) => {
+  
+  const type = searchOption_high.value.find(item => (item.field == val))
+  let data = 'input'
+  if (type?.dictType) {
+    data = 'select'
+  } else if (type?.form?.component == 'InputNumber') {
+    data = 'inputNumber'
+  } else if (type?.form?.component == 'DatePicker') {
+    if(type?.form?.componentProps?.type=='datetimerange'|| type?.form?.componentProps?.type == 'datetime'){
+      data = 'datePicker'
+    }else if(type?.form?.componentProps?.type == 'date'){
+      data = 'date'
+    }
+  }
+  return data
+}
+ // 判断数字输入框小数点位数
+ const getInputPrecision = (val) => {
+  const type = searchOption_high.value.find(item => (item.field == val))
+  let precision = 6
+  if (type?.form?.component == 'InputNumber') {
+    precision = type?.form?.componentProps?.precision || type?.form?.componentProps?.precision == 0  ? type.form.componentProps.precision : 6
+  } 
+  return precision
+}
+// 根据数据内容约束条件选项 ==,!=,>,<,>=,<=,like,in,notIn,betweeen,isNull,isNotNull
+const formatMoreListActions = (val) => {
+  if (val) {
+    if(getInputType(val.column)=='datePicker'|| getInputType(val.column) == 'date'){
+       return moreListOptions.value.action.filter(item => item.value == 'betweeen')
+    }else{
+       return moreListOptions.value.action.filter(item => item.value != 'betweeen')
+    }
+  }
+  return moreListOptions.value.action
+}
+
+// 高级筛选列表-删除筛选条件行
+const moreListDelete = (val,item,$event) => {
+  if (moreListData.value.filters.length == 1) {
+    message.warning('必须保留一条筛选条件!')
+  } else {
+    message.confirm('您确定删除吗, 是否继续?').then(() => {
+      moreListData.value.filters.splice(val, 1)
+    })    
+  }
+}
+
+// 高级筛选列表-添加筛选条件行
+const moreListPush = () => {
+  let data = {
+    column: '',
+    action: "==",
+    value: "",
+    value1 :""
+  }
+  moreListData.value.filters.push(data)
+}
+
+// 筛选条件改变重置其他项
+const resetSelect = (val) => {
+   if (getInputType(val.column) == 'datePicker' || getInputType(val.column) == 'date') {
+    val.action = 'betweeen'
+    val.disabled = false
+  }else{
+    val.action = '=='
+    val.disabled = false
+  }
+  val.value1 = ""
+  val.value = ""
+}
+// 范围改变
+const actionSelect = (val)=>{
+  if(val.action=='isNull'|| val.action == 'isNotNull'|| val.action == 'isStr'|| val.action == 'isNotStr'){
+    val.disabled = true
+  }else{
+    val.disabled = false
+  }
+  val.value1 = undefined
+  nextTick(()=>{
+    val.value1 =[]
+    val.value = ''
+  })
+  
+}
+
+// 查询 重置按钮事件
+const buttonBaseClick = (val) => {
+  if (val == 'search') { // 查询
+    let data = []
+    moreListData.value.filters.forEach(item => {
+      let obj = {}
+      if(item.value1&&item.value1.length>0){
+        obj = {
+          column: item.column,
+          action: item.action,
+          value:Array.isArray(item.value1)?item.value1.join(','):item.value1,
+        }
+      }else{
+        obj = {
+          column: item.column,
+          action: item.action,
+          value:item.value,
+        }
+      }
+      
+      data.push(obj)
+    })
+    if (props.masterId){
+      data.push({ 
+        column: 'masterId',
+        action: "==",
+        value: props.masterId,
+      })
+    }
+    emit('searchFormClick', {
+      filters:data
+    })
+  } else if (val == 'searchReset') { // 重置
+    moreListData.value = {filters:[]}
+    moreListPush()
+    // 重置筛选项及数据列表同时关闭筛选框
+    emit('searchFormClick', {})
+  }
+}
+
+// 初始化下拉option值
+const initSelectOptions = (item) => {
+  return getStrDictOptions(searchOption_high.value.find(searchOptionItem => (searchOptionItem.field == item)).dictType)
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  moreListPush()
+})
+
+// 传递给父类
+const emit = defineEmits([
+  'searchFormClick'
+])
+
+// 改变日期时间
+const changeDateTimePicker = (e, val,from) =>{
+  if(from == 'daterange'){
+   let startTime = new Date(e[0] + ' 00:00:00').getTime()
+    let endTime = new Date(e[1] + ' 23:59:59').getTime()
+    val.value = startTime + ',' + endTime
+  }else if(from == 'datetimerange'){
+    val.value = e.join(',')
+  }
+}
+defineExpose({
+  popoverVisible
+})
+</script>
+<style lang="scss" scoped>
+//  .searchHighComponent {
+   .moreListOuter {
+     margin-top: 10px;
+     position: relative;
+
+     .el-form {
+       max-height: 155px; //3行条件个高度
+       overflow: auto;
+     }
+   }
+
+   .title {
+     padding: 0 0 15px 0;
+     font-weight: bold;
+     color: #333;
+     font-size: 16px;
+   }
+
+   .rowInnerItem {
+     margin-right: 10px;
+     width: 20%;
+
+     .el-input__wrapper {
+       width:100%;
+     }
+   }
+   .rowInnerItem1{
+    margin-right: 10px;
+     width: 50%;
+
+     .el-input__wrapper {
+       width:100%;
+     }
+   }
+   .moreListBaseBts {
+     padding-bottom: 10px;
+   }
+
+   .moreListPush-btn {
+     padding: 0 10px 15px 0;
+     color: rgb(64, 158, 255);
+
+     span {
+       cursor: pointer;
+
+       &:hover {
+         color: blue;
+       }
+     }
+   }
+//  }
+</style>
\ No newline at end of file
diff --git a/src/components/SearchTable/index.ts b/src/components/SearchTable/index.ts
new file mode 100644
index 000000000..28289593f
--- /dev/null
+++ b/src/components/SearchTable/index.ts
@@ -0,0 +1,3 @@
+import SearchTable from './src/SearchTable.vue'
+
+export { SearchTable }
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
new file mode 100644
index 000000000..011ff68f4
--- /dev/null
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -0,0 +1,177 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="'80%'">
+    <!-- 搜索工作栏 -->
+    <!-- <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" /> -->
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      :routeName="routeName"
+      @searchFormClick="searchFormClick"
+      :allSchemas="allSchemasRef"
+    />
+    <ContentWrap>
+      <Table
+        ref="searchTableRef"
+        :columns="tableColumns"
+        :data="tableObjectRef.tableList"
+        :loading="tableObjectRef.loading"
+        :pagination="{
+          total: tableObjectRef.total
+        }"
+        v-model:pageSize="tableObjectRef.pageSize"
+        v-model:currentPage="tableObjectRef.currentPage"
+        v-model:sort="tableObjectRef.sort"
+        :selection="true"
+        :reserveSelection="true"
+        row-key="id"
+      />
+    </ContentWrap>
+    <template #footer>
+      <div class="flex items-center">
+        <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+        <el-button @click="searchDialogVisible = false">取 消</el-button>
+      </div>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+
+const searchDialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultFilterBtn(null), // 筛选
+]
+
+/** 打开弹窗 */
+const getListRef = ref()
+const setSearchParamsRef = ref()
+const tableObjectRef = ref()
+const getPage:any = ref()
+const searchSchema = ref()
+const tableColumns = ref()
+const formFieldRef = ref()
+const searchFieldRef = ref()
+const typeRef = ref()
+const rowRef = ref()
+const allSchemasRef = ref()
+const multipleBol = ref(false)
+const searchConditionRef = ref()
+const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any ) => {
+  searchDialogVisible.value = true
+  formFieldRef.value = formField
+  searchFieldRef.value = searchField
+  allSchemasRef.value = allSchemas
+  searchSchema.value = allSchemas.searchSchema
+  tableColumns.value = allSchemas.tableColumns.filter(item => (item.field !== 'action'))
+  getPage.value = getApiPage
+  typeRef.value = type
+  rowRef.value = row
+  multipleBol.value = multiple
+  // dialogTitle.value = t('action.' + type)
+  dialogTitle.value = titleName
+  const {tableObject, tableMethods } = useTable({
+    getListApi: getPage.value // 分页接口
+  })
+  tableObjectRef.value = tableObject
+  searchConditionRef.value = searchCondition
+  if (searchCondition) tableObjectRef.value.params = searchCondition;
+
+  // 获得表格的各种操作
+  const { getList } = tableMethods
+  // setSearchParamsRef.value = setSearchParams
+  setSearchParamsRef.value = tableObject.params
+  getListRef.value = getList
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  console.log(99, rowRef.value)
+  console.log(100, searchData)
+  console.log(101, searchConditionRef.value)
+  // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters 
+  // 20240321 修改 判断 searchData 是否有条件 如果有 拼接
+  if (searchData.filters) {
+    if (searchConditionRef.value.filters) {
+      Object.keys(searchConditionRef.value.filters).forEach(key => {
+        searchData.filters.push(searchConditionRef.value.filters[key])
+      });
+    } else {
+      Object.keys(searchConditionRef.value).forEach(key => {
+        searchData.filters.push({
+          action: "==",
+          column: key,
+          value: searchConditionRef.value[key]
+        })
+      });
+    }
+  } else {
+    if (searchConditionRef.value.filters) {
+      searchData.filters = searchConditionRef.value.filters
+    } else {
+      Object.keys(searchConditionRef.value).forEach(key => {
+        searchData.filters = [{
+          action: "==",
+          column: key,
+          value: searchConditionRef.value[key]
+        }]
+      });
+    }
+  }
+  tableObjectRef.value.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getListRef.value() // 刷新当前列表
+}
+
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+// Table 组件 ref
+const searchTableRef = ref()
+
+/** 提交表单 */
+const emit = defineEmits(['searchTableSuccess']) // 定义 searchTableSuccess 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  const selections = searchTableRef.value.selections
+  // 如果不是多选的
+  if(!multipleBol.value){
+    if(selections.length > 1 || selections.length == 0) {
+      message.warning('请选择一条数据！')
+      formLoading.value = false
+      return
+    }
+    // 多选
+  }else{
+    if(selections.length == 0) {
+      message.warning('至少选择一条数据！')
+      formLoading.value = false
+      return
+    }
+  }
+ 
+  try {
+    searchDialogVisible.value = false
+    // 发送操作成功的事件
+    emit('searchTableSuccess', formFieldRef.value, searchFieldRef.value, selections, typeRef.value, rowRef.value)
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
+<style scoped lang="scss">
+</style>
\ No newline at end of file
diff --git a/src/components/SearchTableCount/index.ts b/src/components/SearchTableCount/index.ts
new file mode 100644
index 000000000..a43f93a28
--- /dev/null
+++ b/src/components/SearchTableCount/index.ts
@@ -0,0 +1,3 @@
+import SearchTableCount from './src/SearchTableCount.vue'
+
+export { SearchTableCount }
diff --git a/src/components/SearchTableCount/src/SearchTableCount.vue b/src/components/SearchTableCount/src/SearchTableCount.vue
new file mode 100644
index 000000000..d49c81f67
--- /dev/null
+++ b/src/components/SearchTableCount/src/SearchTableCount.vue
@@ -0,0 +1,222 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="'80%'">
+    <ContentWrap>
+      <el-radio-group v-model="radioListType">
+        <el-radio :label="item.label" v-for="(item, index) in radioListRef" :key="index">{{
+          item.title
+        }}</el-radio>
+      </el-radio-group>
+    </ContentWrap>
+    <!-- 搜索工作栏 -->
+    <!-- <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" /> -->
+    <el-form
+      ref="formRef"
+      :model="ruleForm"
+      :rules="rules"
+      label-width="120px"
+      class="demo-ruleForm"
+      status-icon
+      v-if="radioListRef.length == 2 && radioListType == 1"
+    >
+      <el-form-item label="数量" prop="count">
+        <el-input v-model.number="ruleForm.count" />
+      </el-form-item>
+    </el-form>
+    <!-- 列表头部 -->
+    <div
+      v-if="
+        (radioListRef.length == 3 && radioListType == 3) ||
+        (radioListRef.length == 2 && radioListType == 2)
+      "
+    >
+      <TableHead
+        :HeadButttondata="HeadButttondata"
+        :routeName="routeName"
+        @searchFormClick="searchFormClick"
+        :allSchemas="allSchemasRef"
+      />
+    </div>
+    <ContentWrap
+      v-if="
+        (radioListRef.length == 3 && radioListType == 3) ||
+        (radioListRef.length == 2 && radioListType == 2)
+      "
+    >
+      <Table
+        ref="searchTableRef"
+        :columns="tableColumns"
+        :data="tableObjectRef.tableList"
+        :loading="tableObjectRef.loading"
+        :pagination="{
+          total: tableObjectRef.total
+        }"
+        v-model:pageSize="tableObjectRef.pageSize"
+        v-model:currentPage="tableObjectRef.currentPage"
+        v-model:sort="tableObjectRef.sort"
+        :selection="true"
+        :reserveSelection="true"
+        row-key="id"
+      />
+    </ContentWrap>
+
+    <template #footer>
+      <div class="flex items-center">
+        <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+        <el-button @click="searchDialogVisible = false">取 消</el-button>
+      </div>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const radioListType = ref(1)
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+
+const searchDialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultFilterBtn(null) // 筛选
+]
+const formRef = ref()
+const ruleForm = ref({
+  count: ''
+})
+const rules = ref({
+  count: [
+    {required: true, message: '请输入数量' , trigger: 'blur' },
+    { type: 'number', message: '必须是数字', trigger: 'blur' },
+  ]
+ 
+})
+
+/** 打开弹窗 */
+const getListRef = ref()
+const setSearchParamsRef = ref()
+const tableObjectRef = ref()
+const getPage: any = ref()
+const searchSchema = ref()
+const tableColumns = ref()
+const formFieldRef = ref()
+const searchFieldRef = ref()
+const typeRef = ref()
+const rowRef = ref()
+const allSchemasRef = ref()
+const multipleBol = ref(false)
+const radioListRef = ref() //盘点申请的时候所需的单选数据
+const open = (
+  titleName: any,
+  allSchemas: any,
+  getApiPage: any,
+  formField: any,
+  searchField: any,
+  multiple: any,
+  type: any,
+  row: any,
+  searchCondition: any,
+  isCountRequestRe: any,
+  radioList: any
+) => {
+  searchDialogVisible.value = true
+  formFieldRef.value = formField
+  searchFieldRef.value = searchField
+  allSchemasRef.value = allSchemas
+  searchSchema.value = allSchemas.searchSchema
+  tableColumns.value = allSchemas.tableColumns.filter((item) => item.field !== 'action')
+  getPage.value = getApiPage
+  typeRef.value = type
+  rowRef.value = row
+  multipleBol.value = multiple
+  radioListRef.value = radioList
+  radioListType.value = 1
+  ruleForm.value.count = ''
+  // dialogTitle.value = t('action.' + type)
+  dialogTitle.value = titleName
+  const { tableObject, tableMethods } = useTable({
+    getListApi: getPage.value // 分页接口
+  })
+  tableObjectRef.value = tableObject
+  if (searchCondition) tableObjectRef.value.params = searchCondition
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+  setSearchParamsRef.value = setSearchParams
+  getListRef.value = getList
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObjectRef.value.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getListRef.value() // 刷新当前列表
+}
+
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+// Table 组件 ref
+const searchTableRef = ref()
+
+/** 提交表单 */
+const emit = defineEmits(['searchTableSuccess']) // 定义 searchTableSuccess 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 提交请求
+  let selections = ''
+  if(radioListRef.value.length == 2 && radioListType.value == 1){
+    // 校验表单
+    if (!formRef) return
+    const valid = await formRef.value.validate()
+    if (!valid) return
+  }
+  if (
+    (radioListRef.value.length == 3 && radioListType.value == 3) ||
+    (radioListRef.value.length == 2 && radioListType.value == 2)
+  ) {
+    selections = searchTableRef.value.selections
+    // 如果不是多选的
+    if (!multipleBol.value) {
+      if (selections.length > 1 || selections.length == 0) {
+        message.warning('请选择一条数据！')
+        formLoading.value = false
+        return
+      }
+      // 多选
+    } else {
+      if (selections.length == 0) {
+        message.warning('至少选择一条数据！')
+        formLoading.value = false
+        return
+      }
+    }
+  }
+
+  formLoading.value = true
+  try {
+    searchDialogVisible.value = false
+    // 发送操作成功的事件
+    emit(
+      'searchTableSuccess',
+      formFieldRef.value,
+      searchFieldRef.value,
+      selections,
+      radioListType.value,
+      rowRef.value,
+      ruleForm.value.count,
+    )
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
+<style scoped lang="scss">
+</style>
\ No newline at end of file
diff --git a/src/components/Sticky/index.ts b/src/components/Sticky/index.ts
new file mode 100644
index 000000000..5e1de45e8
--- /dev/null
+++ b/src/components/Sticky/index.ts
@@ -0,0 +1,3 @@
+import Sticky from './src/Sticky.vue'
+
+export { Sticky }
diff --git a/src/components/Sticky/src/Sticky.vue b/src/components/Sticky/src/Sticky.vue
new file mode 100644
index 000000000..b958544a5
--- /dev/null
+++ b/src/components/Sticky/src/Sticky.vue
@@ -0,0 +1,143 @@
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import { isClient, useEventListener, useWindowSize } from '@vueuse/core'
+import type { CSSProperties } from 'vue'
+
+defineOptions({ name: 'Sticky' })
+
+const props = defineProps({
+  // 距离顶部或者底部的距离(单位px)
+  offset: propTypes.number.def(0),
+  // 设置元素的堆叠顺序
+  zIndex: propTypes.number.def(999),
+  // 设置指定的class
+  className: propTypes.string.def(''),
+  // 定位方式，默认为(top)，表示距离顶部位置，可以设置为top或者bottom
+  position: {
+    type: String,
+    validator: function (value: string) {
+      return ['top', 'bottom'].indexOf(value) !== -1
+    },
+    default: 'top'
+  }
+})
+const width = ref('auto' as string)
+const height = ref('auto' as string)
+const isSticky = ref(false)
+const refSticky = shallowRef<HTMLElement>()
+const scrollContainer = shallowRef<HTMLElement | Window>()
+const { height: windowHeight } = useWindowSize()
+onMounted(() => {
+  height.value = refSticky.value?.getBoundingClientRect().height + 'px'
+
+  scrollContainer.value = getScrollContainer(refSticky.value!, true)
+  useEventListener(scrollContainer, 'scroll', handleScroll)
+  useEventListener('resize', handleReize)
+  handleScroll()
+})
+onActivated(() => {
+  handleScroll()
+})
+
+const camelize = (str: string): string => {
+  return str.replace(/-(\w)/g, (_, c) => (c ? c.toUpperCase() : ''))
+}
+
+const getStyle = (element: HTMLElement, styleName: keyof CSSProperties): string => {
+  if (!isClient || !element || !styleName) return ''
+
+  let key = camelize(styleName)
+  if (key === 'float') key = 'cssFloat'
+  try {
+    const style = element.style[styleName]
+    if (style) return style
+    const computed = document.defaultView?.getComputedStyle(element, '')
+    return computed ? computed[styleName] : ''
+  } catch {
+    return element.style[styleName]
+  }
+}
+const isScroll = (el: HTMLElement, isVertical?: boolean): boolean => {
+  if (!isClient) return false
+  const key = (
+    {
+      undefined: 'overflow',
+      true: 'overflow-y',
+      false: 'overflow-x'
+    } as const
+  )[String(isVertical)]!
+  const overflow = getStyle(el, key)
+  return ['scroll', 'auto', 'overlay'].some((s) => overflow.includes(s))
+}
+
+const getScrollContainer = (
+  el: HTMLElement,
+  isVertical: boolean
+): Window | HTMLElement | undefined => {
+  if (!isClient) return
+  let parent = el
+  while (parent) {
+    if ([window, document, document.documentElement].includes(parent)) return window
+    if (isScroll(parent, isVertical)) return parent
+    parent = parent.parentNode as HTMLElement
+  }
+  return parent
+}
+
+const handleScroll = () => {
+  width.value = refSticky.value!.getBoundingClientRect().width! + 'px'
+  if (props.position === 'top') {
+    const offsetTop = refSticky.value?.getBoundingClientRect().top
+    if (offsetTop !== undefined && offsetTop < props.offset) {
+      sticky()
+      return
+    }
+    reset()
+  } else {
+    const offsetBottom = refSticky.value?.getBoundingClientRect().bottom
+
+    if (offsetBottom !== undefined && offsetBottom > windowHeight.value - props.offset) {
+      sticky()
+      return
+    }
+    reset()
+  }
+}
+const handleReize = () => {
+  if (isSticky.value && refSticky.value) {
+    width.value = refSticky.value.getBoundingClientRect().width + 'px'
+  }
+}
+const sticky = () => {
+  if (isSticky.value) {
+    return
+  }
+  isSticky.value = true
+}
+const reset = () => {
+  if (!isSticky.value) {
+    return
+  }
+  width.value = 'auto'
+  isSticky.value = false
+}
+</script>
+<template>
+  <div ref="refSticky" :style="{ height: height, zIndex: zIndex }">
+    <div
+      :class="className"
+      :style="{
+        top: position === 'top' ? offset + 'px' : '',
+        bottom: position !== 'top' ? offset + 'px' : '',
+        zIndex: zIndex,
+        position: isSticky ? 'fixed' : 'static',
+        width: width,
+        height: height
+      }"
+    >
+      <slot>
+        <div>sticky</div>
+      </slot>
+    </div>
+  </div>
+</template>
diff --git a/src/components/Table/index.ts b/src/components/Table/index.ts
new file mode 100644
index 000000000..689f64a88
--- /dev/null
+++ b/src/components/Table/index.ts
@@ -0,0 +1,12 @@
+import Table from './src/Table.vue'
+import { ElTable } from 'element-plus'
+import { TableSetPropsType } from '@/types/table'
+
+export interface TableExpose {
+  setProps: (props: Recordable) => void
+  setColumn: (columnProps: TableSetPropsType[]) => void
+  selections: Recordable[]
+  elTableRef: ComponentRef<typeof ElTable>
+}
+
+export { Table }
diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
new file mode 100644
index 000000000..74896e9d8
--- /dev/null
+++ b/src/components/Table/src/Table.vue
@@ -0,0 +1,337 @@
+<script lang="tsx">
+import { ElTable, ElTableColumn, ElPagination } from 'element-plus'
+import { defineComponent, PropType, ref, computed, unref, watch, onMounted } from 'vue'
+import { propTypes } from '@/utils/propTypes'
+import { setIndex } from './helper'
+import { getSlot } from '@/utils/tsxHelper'
+import type { TableProps } from './types'
+import { set } from 'lodash-es'
+import { Pagination, TableColumn, TableSetPropsType, TableSlotDefault } from '@/types/table'
+import { useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache()
+
+    
+
+export default defineComponent({
+  // eslint-disable-next-line vue/no-reserved-component-names
+  name: 'Table',
+  props: {
+    pageSize: propTypes.number.def(10),
+    currentPage: propTypes.number.def(1),
+    // 是否多选
+    selection: propTypes.bool.def(false),
+    // 是否所有的超出隐藏，优先级低于schema中的showOverflowTooltip,
+    showOverflowTooltip: propTypes.bool.def(true),
+    // 表头
+    columns: {
+      type: Array as PropType<TableColumn[]>,
+      default: () => []
+    },
+    // 展开行
+    expand: propTypes.bool.def(false),
+    // 是否展示分页
+    pagination: {
+      type: Object as PropType<Pagination>,
+      default: (): Pagination | undefined => undefined
+    },
+    // 仅对 type=selection 的列有效，类型为 Boolean，为 true 则会在数据更新之后保留之前选中的数据（需指定 row-key）
+    reserveSelection: propTypes.bool.def(false),
+    // 加载状态
+    loading: propTypes.bool.def(false),
+    // 是否叠加索引
+    reserveIndex: propTypes.bool.def(false),
+    // 对齐方式
+    align: propTypes.string
+      .validate((v: string) => ['left', 'center', 'right'].includes(v))
+      .def('center'),
+    border : propTypes.bool.def(true),
+    // 表头对齐方式
+    headerAlign: propTypes.string
+      .validate((v: string) => ['left', 'center', 'right'].includes(v))
+      .def('center'),
+    data: {
+      type: Array as PropType<Recordable[]>,
+      default: () => []
+    }
+  },
+  emits: ['update:pageSize', 'update:currentPage', 'register', 'update:sort'],
+  setup(props, { attrs, slots, emit, expose }) {
+    const elTableRef = ref<ComponentRef<typeof ElTable>>()
+
+    // 注册
+    onMounted(() => {
+      const tableRef = unref(elTableRef)
+      emit('register', tableRef?.$parent, elTableRef)
+    })
+
+    const pageSizeRef = ref(props.pageSize)
+
+    const currentPageRef = ref(props.currentPage)
+
+    // useTable传入的props
+    const outsideProps = ref<TableProps>({})
+
+    const mergeProps = ref<TableProps>({})
+
+    const getProps = computed(() => {
+      const propsObj = { ...props }
+      Object.assign(propsObj, unref(mergeProps))
+      return propsObj
+    })
+
+    const setProps = (props: TableProps = {}) => {
+      mergeProps.value = Object.assign(unref(mergeProps), props)
+      outsideProps.value = props
+    }
+
+    const setColumn = (columnProps: TableSetPropsType[], columnsChildren?: TableColumn[]) => {
+      const { columns } = unref(getProps)
+      for (const v of columnsChildren || columns) {
+        for (const item of columnProps) {
+          if (v.field === item.field) {
+            set(v, item.path, item.value)
+          } else if (v.children?.length) {
+            setColumn(columnProps, v.children)
+          }
+        }
+      }
+    }
+
+    const selections = ref<Recordable[]>([])
+    const sortRef = ref()
+
+    const selectionChange = (selection: Recordable[]) => {
+      selections.value = selection
+    }
+
+    // 排序
+    const sortChange = (sortVal: Recordable) => {
+      sortRef.value = sortVal
+    }
+
+    expose({
+      setProps,
+      setColumn,
+      selections
+    })
+
+    const pagination = computed(() => {
+      // update by 芋艿：保持和 Pagination 组件的逻辑一致
+      return Object.assign(
+        {
+          small: false,
+          background: true,
+          pagerCount: document.body.clientWidth < 992 ? 5 : 7,
+          layout: 'total, sizes, prev, pager, next, jumper',
+          pageSizes: [10, 20, 30, 50, 100],
+          disabled: false,
+          hideOnSinglePage: false,
+          total: 10
+        },
+        unref(getProps).pagination
+      )
+    })
+
+    watch(
+      () => sortRef.value,
+      (val: any) => {
+        emit('update:sort', val)
+      }
+    )
+
+    watch(
+      () => unref(getProps).pageSize,
+      (val: number) => {
+        pageSizeRef.value = val
+      }
+    )
+
+    watch(
+      () => unref(getProps).currentPage,
+      (val: number) => {
+        currentPageRef.value = val
+      }
+    )
+
+    watch(
+      () => pageSizeRef.value,
+      (val: number) => {
+        emit('update:pageSize', val)
+      }
+    )
+
+    watch(
+      () => currentPageRef.value,
+      (val: number) => {
+        emit('update:currentPage', val)
+      }
+    )
+
+    const getBindValue = computed(() => {
+      const bindValue: Recordable = { ...attrs, ...props }
+      delete bindValue.columns
+      delete bindValue.data
+      return bindValue
+    })
+
+    const renderTableSelection = () => {
+      const { selection, reserveSelection, align, headerAlign,border } = unref(getProps)
+      // 渲染多选
+      return selection ? (
+        <ElTableColumn
+          type="selection"
+          reserveSelection={reserveSelection}
+          align={align}
+          headerAlign={headerAlign}
+          border={border}
+          width="50"
+        ></ElTableColumn>
+      ) : undefined
+    }
+
+    const renderTableExpand = () => {
+      const { align, headerAlign, expand,border } = unref(getProps)
+      // 渲染展开行
+      return expand ? (
+        <ElTableColumn type="expand" align={align} headerAlign={headerAlign} border={border}>
+          {{
+            // @ts-ignore
+            default: (data: TableSlotDefault) => getSlot(slots, 'expand', data)
+          }}
+        </ElTableColumn>
+      ) : undefined
+    }
+
+    const rnderTreeTableColumn = (columnsChildren: TableColumn[]) => {
+      const { align, headerAlign, showOverflowTooltip,border } = unref(getProps)
+      return columnsChildren.map((v) => {
+        const props = { ...v }
+        if (props.children) delete props.children
+        return (
+          <ElTableColumn
+            showOverflowTooltip={showOverflowTooltip}
+            align={align}
+            border={border}
+            headerAlign={headerAlign}
+            {...props}
+            prop={v.field}
+          >
+            {{
+              default: (data: TableSlotDefault) =>
+                v.children && v.children.length
+                  ? rnderTableColumn(v.children)
+                  : // @ts-ignore
+                    getSlot(slots, v.field, data) ||
+                    v?.formatter?.(data.row, data.column, data.row[v.field], data.$index) ||
+                    data.row[v.field],
+              // @ts-ignore
+              header: getSlot(slots, `${v.field}-header`)
+            }}
+          </ElTableColumn>
+        )
+      })
+    }
+
+    const rnderTableColumn = (columnsChildren?: TableColumn[]) => {
+      const {
+        columns,
+        reserveIndex,
+        pageSize,
+        currentPage,
+        align,
+        headerAlign,
+        showOverflowTooltip,
+        border
+      } = unref(getProps)
+      return [...[renderTableExpand()], ...[renderTableSelection()]].concat(
+        (columnsChildren || columns).map((v) => {
+          // 自定生成序号
+          if (v.type === 'index') {
+            return (
+              <ElTableColumn
+                type="index"
+                index={
+                  v.index
+                    ? v.index
+                    : (index) => setIndex(reserveIndex, index, pageSize, currentPage)
+                }
+                align={v.align || align}
+                border={v.border || border}
+                headerAlign={v.headerAlign || headerAlign}
+                label={v.label}
+                width="65px"
+              ></ElTableColumn>
+            )
+          } else {
+            const props = { ...v }
+            if (props.children) delete props.children
+            return (
+              <ElTableColumn
+                showOverflowTooltip={showOverflowTooltip}
+                align={align}
+                border={border}
+                headerAlign={headerAlign}
+                {...props}
+                prop={v.field}
+                sortable={v.sort}
+              >
+                {{
+                  default: (data: TableSlotDefault) =>
+                    v.children && v.children.length
+                      ? rnderTreeTableColumn(v.children)
+                      : // @ts-ignore
+                        getSlot(slots, v.field, data) ||
+                        v?.formatter?.(data.row, data.column, data.row[v.field], data.$index) ||
+                        data.row[v.field],
+                  // @ts-ignore
+                  header: () => getSlot(slots, `${v.field}-header`) || v.label
+                }}
+              </ElTableColumn>
+            )
+          }
+        })
+      )
+    }
+
+    return () => (
+      <div v-loading={unref(getProps).loading}>
+        <ElTable
+          // @ts-ignore
+          ref={elTableRef}
+          data={unref(getProps).data}
+          onSelection-change={selectionChange}
+          onSort-change={sortChange}
+          {...unref(getBindValue)}
+          stripe 
+        >
+          {{
+            default: () => rnderTableColumn(),
+            // @ts-ignore
+            append: () => getSlot(slots, 'append')
+          }}
+        </ElTable>
+        {unref(getProps).pagination ? (
+          // update by 芋艿：保持和 Pagination 组件一致
+          <ElPagination
+            v-model:pageSize={pageSizeRef.value}
+            v-model:currentPage={currentPageRef.value}
+            class="float-right mb-15px mt-15px"
+            {...unref(pagination)}
+          ></ElPagination>
+        ) : undefined}
+      </div>
+    )
+  }
+})
+</script>
+<style lang="scss" scoped>
+:deep(.el-button.is-text) {
+  padding: 8px 4px;
+  margin-left: 0;
+}
+
+:deep(.el-button.is-link) {
+  padding: 8px 4px;
+  margin-left: 0;
+}
+</style>
diff --git a/src/components/Table/src/helper.ts b/src/components/Table/src/helper.ts
new file mode 100644
index 000000000..d8b34a8a7
--- /dev/null
+++ b/src/components/Table/src/helper.ts
@@ -0,0 +1,8 @@
+export const setIndex = (reserveIndex: boolean, index: number, size: number, current: number) => {
+  const newIndex = index + 1
+  if (reserveIndex) {
+    return size * (current - 1) + newIndex
+  } else {
+    return newIndex
+  }
+}
diff --git a/src/components/Table/src/types.ts b/src/components/Table/src/types.ts
new file mode 100644
index 000000000..1c7ff7658
--- /dev/null
+++ b/src/components/Table/src/types.ts
@@ -0,0 +1,26 @@
+import { Pagination, TableColumn } from '@/types/table'
+
+export type TableProps = {
+  pageSize?: number
+  currentPage?: number
+  // 是否多选
+  selection?: boolean
+  // 是否所有的超出隐藏，优先级低于schema中的showOverflowTooltip,
+  showOverflowTooltip?: boolean
+  // 表头
+  columns?: TableColumn[]
+  // 是否展示分页
+  pagination?: Pagination | undefined
+  // 仅对 type=selection 的列有效，类型为 Boolean，为 true 则会在数据更新之后保留之前选中的数据（需指定 row-key）
+  reserveSelection?: boolean
+  // 加载状态
+  loading?: boolean
+  // 是否叠加索引
+  reserveIndex?: boolean
+  // 对齐方式
+  align?: 'left' | 'center' | 'right'
+  // 表头对齐方式
+  headerAlign?: 'left' | 'center' | 'right'
+  data?: Recordable
+  expand?: boolean
+} & Recordable
diff --git a/src/components/TableForm/index.ts b/src/components/TableForm/index.ts
new file mode 100644
index 000000000..d0456f911
--- /dev/null
+++ b/src/components/TableForm/index.ts
@@ -0,0 +1,3 @@
+import Annex from './src/Annex.vue'
+
+export { Annex }
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
new file mode 100644
index 000000000..ee1a8b6c2
--- /dev/null
+++ b/src/components/TableForm/src/TableForm.vue
@@ -0,0 +1,492 @@
+<!-- 附件组件 -->
+<template>
+  <div class="table-form">
+    <el-table class="multipleTableComponents"
+      ref="TableBaseComponents_Ref" 
+      v-loading="tableLoading" 
+      :data="tableData"
+      max-height="maxHeight" 
+      row-key="id" 
+      :border="border" 
+      @selection-change="tableSelectionChange"
+      @sort-change="tableSortChange" 
+      @row-click="handleTableSelect"
+    >
+      <!-- 删除按钮 -->
+      <el-table-column
+        fixed="left" 
+        :width="50" 
+        v-if="isShowReduceButton" 
+        v-slot="{ row, $index }"
+      >
+        <Icon icon="ep:remove" color="#757575" size="26" style="cursor: pointer;margin-top: -16px;" @click="handleDeleteTable (row, $index)" />
+      </el-table-column>
+      <!-- 多选 -->
+      <el-table-column 
+        fixed="left" 
+        :reserve-selection="true" 
+        type="selection" 
+        :width="50" 
+        v-if="selectionTable" 
+      />
+      <!-- 序号 -->
+      <el-table-column 
+        type="index" 
+        fixed="left" 
+        label="序号" 
+        width="80" 
+        :align="'center'" 
+        v-if="isShowIndex" 
+      />
+      <el-table-column 
+        v-slot="{ row, $index }" 
+        v-for="(headerItem,index) in tableFields" 
+        :key="headerItem"
+        :fixed="headerItem.tableForm?.fixed" 
+        :label="headerItem.label" :prop="headerItem.field"
+        :align="headerItem?.tableForm?.align || 'center'" 
+        :sortable="headerItem?.tableForm?.sortable || false"
+        :width="headerItem?.tableForm?.width || '200'" 
+        :min-width="headerItem?.tableForm?.minWidth || 'auto'">
+        <el-form 
+          ref="TableBaseForm_Ref" 
+          :model="row" 
+          style="width: 100%;" 
+          :rules="tableFormRules"
+          :class="tableFormRules ? '' : 'noRulesForm'">
+          <!-- 字符串输入框 -->
+          <el-form-item 
+            v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'"
+            :prop="headerItem.field" style="display: flex;align-items: center;">
+            <el-input 
+              v-model="row[headerItem.field]"
+              clearable
+              :type="headerItem?.tableForm?.inputType"
+              :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
+              :disabled="headerItem?.tableForm?.disabled ? true: headerItem?.tableForm?.isInpuFocusShow ? true : false" 
+              style="flex:1" 
+              @blur="inputStringBlur(headerItem.field, $event, row)"
+            />
+            <el-button  v-if="headerItem?.tableForm?.isInpuFocusShow" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button>
+          </el-form-item>
+          <!-- 金额输入框 -->
+            <el-form-item 
+              v-if="headerItem?.tableForm?.type == 'number'"
+              :prop="headerItem.field">
+              <el-input 
+                v-model="row[headerItem.field]"
+                clearable
+                type="number"
+                :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
+                :disabled="itemIsDisabled(headerItem, row)" 
+                style="width: 100%;" 
+                @input="row[headerItem.field] = row[headerItem.field].replace(/[^\d\.-]/g, '')"
+              />
+            </el-form-item>
+          <!-- 数字输入框 -->
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'InputNumber'" 
+            :prop="headerItem.field">
+            <el-input-number 
+              style="width: 100%;" 
+              v-model="row[headerItem.field]" 
+              :max="headerItem?.tableForm?.max"
+              :min="headerItem?.tableForm?.min" 
+              :precision="headerItem?.tableForm?.precision" 
+              :disabled="itemIsDisabled(headerItem, row)" 
+              @change="(e)=>{inputNumberChange(headerItem.field, $index, row, e)}"
+            />
+          </el-form-item>
+          <!-- 下拉框 -->
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'Select'" 
+            :prop="headerItem.field">
+            <el-select 
+              v-model="row[headerItem.field]" 
+              :clearable="headerItem?.tableForm.clearable || true"
+              :multiple="headerItem?.tableForm.multiple" 
+              :size="headerItem?.tableForm.size" 
+              :collapse-tags ="headerItem?.tableForm.collapseTags" 
+              :collapse-tags-tooltip ="headerItem?.tableForm.collapseTagsTooltip" 
+              :multiple-limit ="headerItem?.tableForm.multipleLimit" 
+              :disabled="itemIsDisabled(headerItem, row)"
+              :filterable="headerItem?.tableForm.filterable" 
+              :allow-create="headerItem?.tableForm.allowCreate"
+              style="width: 100%" 
+              :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
+              @change="formSelectChange(headerItem.field, $event,row)"
+              @blur="tableFormSelectOnBlur(headerItem.field, $event,row, $index)">
+              <el-option 
+                v-for="op in initSelectOptions(headerItem)" 
+                :label="op.label" 
+                :value="op.value"
+                :key="op.value" />
+            </el-select>
+          </el-form-item>
+          <!-- 时间选择器 -->
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'FormTime'" 
+            :prop="headerItem.field">
+            <el-time-picker 
+              v-model="row[headerItem.field]" 
+              :clearable="true"
+              :placeholder="headerItem?.tableForm?.placeholder || '选择时间'"
+              style="width: 100%" :disabled="itemIsDisabled(headerItem, row)"
+              :format="headerItem?.tableForm?.format || 'HH:mm:ss'"
+              :value-format="headerItem?.tableForm?.valueFormat || 'HH:mm:ss'" />
+          </el-form-item>
+          <!-- 日期选择器 -->
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'FormDate'" 
+            :prop="headerItem.field">
+            <el-date-picker 
+              v-model="row[headerItem.field]" 
+              :clearable="true"
+              style="width: 100%"
+              :disabled="itemIsDisabled(headerItem, row)" 
+              :placeholder="headerItem?.tableForm?.placeholder || '选择日期'"
+              :format="headerItem?.tableForm?.format || 'YYYY-MM-DD'"
+              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DD'"
+              @change="formFormDateChange(headerItem.field, $event,row, $index)" />
+          </el-form-item>
+          <!-- 日期时间选择器 -->
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'FormDateTime'" 
+            :prop="headerItem.field">
+            <el-date-picker 
+              type="datetime"
+              :clearable="true"
+              v-model="row[headerItem.field]"
+              :placeholder="headerItem?.tableForm?.placeholder || '选择日期时间'" 
+              style="width: 100%"
+              :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
+              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'"
+              :disabled="itemIsDisabled(headerItem, row)" />
+          </el-form-item>
+          <!--开始时间结束时间选择器 (原类型datetimerange已弃用 使用type+timeType结合方式)-->
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'FormTimerange'" 
+            :prop="headerItem.field">
+            <el-date-picker 
+              v-model="row[headerItem.field]"
+              :clearable="true"
+              :disabled="itemIsDisabled(headerItem, row)"
+              :type="headerItem?.tableForm?.timeType || 'datetimerange'"
+              range-separator="至" 
+              start-placeholder="开始日期"
+              end-placeholder="结束日期" 
+              :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
+              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'" />
+          </el-form-item>
+          <!-- Switch 开关 -->
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'Switch'" 
+            :prop="headerItem.field">
+            <el-switch 
+              v-model="row[headerItem.field]" 
+              :disabled="itemIsDisabled(headerItem, row)"
+              :loading="headerItem?.tableForm?.loading" 
+              :size="headerItem?.tableForm?.size"
+              :active-icon="headerItem?.tableForm?.activeIcon" 
+              :inactive-icon="headerItem?.tableForm?.inactiveIcon"
+              :active-text="headerItem?.tableForm?.activeText" 
+              :inactive-text="headerItem?.tableForm?.inactiveText"
+              :active-value="headerItem?.tableForm?.activeValue" 
+              :inactive-value="headerItem?.tableForm?.inactiveValue"
+              :active-color="headerItem?.tableForm?.inactiveColor"
+              :inactive-color="headerItem?.tableForm?.inactiveColor" />
+          </el-form-item>
+          <!-- Radio  单选-->
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'Radio'" 
+            :prop="headerItem.field">
+            <el-radio-group 
+              v-model="row[headerItem.field]" 
+              :size="headerItem?.tableForm?.size"
+              :disabled="itemIsDisabled(headerItem, row)" 
+              :text-color="headerItem?.tableForm?.textColor"
+              :fill="headerItem?.tableForm?.fill" 
+              :name="headerItem?.tableForm?.name" 
+              :id="headerItem?.tableForm?.id">
+              <el-radio 
+                v-for="(item, index) in initSelectOptions(headerItem)" 
+                :key="index" 
+                :label="item.value"
+                :size="headerItem?.tableForm?.size" 
+                :disabled="itemIsDisabled(headerItem, row)"
+                :border="headerItem?.tableForm?.border">
+                {{ item.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <!-- Checkbox  多选-->
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'Checkbox'" 
+            :prop="headerItem.field">
+            <el-checkbox-group 
+              v-model="row[headerItem.field]" 
+              :disabled="itemIsDisabled(headerItem, row)"
+              :size="headerItem?.tableForm?.size" 
+              :min="headerItem?.tableForm?.min" 
+              :max="headerItem?.tableForm?.max"
+              :text-color="headerItem?.tableForm?.textColor" 
+              :fill="headerItem?.tableForm?.fill">
+              <el-checkbox 
+                v-for="(item, index) in initSelectOptions(headerItem)" 
+                :key="index" 
+                :label="item.value"
+                :disabled="itemIsDisabled(headerItem, row)" 
+                :true-label="headerItem?.tableForm?.trueLabel"
+                :false-label="headerItem?.tableForm?.falseLabel" 
+                :border="headerItem?.tableForm?.border"
+                :size="headerItem?.tableForm?.size" 
+                :name="headerItem?.tableForm?.name"
+                :checked="headerItem?.tableForm?.checked">
+                {{ item.label }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+          <!-- table表添加操作列 -->
+          <!-- <el-form-item> -->
+            <div v-if="headerItem?.tableForm?.type == 'action'">
+              <el-button
+                v-for="(itemButton, indexButton) in headerItem?.tableForm?.buttonText.split('|')"
+                :key="indexButton"
+                type="text"
+                style="padding-top: 0px;align-items:unsafe;"
+                @click="buttonOperationClick(row, headerItem?.tableForm?.buttonName.split('|')[indexButton], $index)"
+              >{{itemButton}}</el-button>
+            </div>
+          <!-- </el-form-item> -->
+        </el-form>
+      </el-table-column>
+    </el-table>
+    <div class="button flex" v-if="isShowButton">
+      <div class="p-12px" @click="handleAddTable">
+        <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer;" />
+        <div>添加明细</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+const props = defineProps({
+  // 是否显示添加按钮
+  isShowButton: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否显示选择框 :custom="headerItem.sortable?headerItem.sortable:false"
+  selectionTable: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示序号
+  isShowIndex: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示删除按钮
+  isShowReduceButton:{
+    type: Boolean,
+    default: true,
+  },
+  // 加载状态
+  tableLoading: {
+    type: Boolean,
+    default: false,
+  },
+  // 列表数据
+  tableData: {
+    type: Array,
+    default: () => {
+      return []
+    },
+  },
+  // 列表头定义
+  tableFields: {
+    type: Array,
+    default: () => {
+      return []
+    },
+  },
+  // table高度
+  height: {
+    type: [Number, String],
+    default: () => {
+      return '200'
+    }
+  }, 
+  maxHeight: {
+    type: [Number, String],
+    default: () => {
+      return '650'
+    }
+  },
+  // 是否有边框（可拖拽）
+  border: {
+    type: Boolean,
+    default: false,
+  },
+  // table输入表单的rules
+  tableFormRules: {
+    type: Object,
+    default: null
+  }
+})
+// 传递给父类
+const emit = defineEmits([
+  'tableSelectionChange',
+  'extendedButtonsClick',
+  'formSelectChange',
+  'tableSortChange',
+  'selectCallback',
+  'handleTableSelect',
+  'handleDeleteTable',
+  'handleAddTable',
+  'inpuFocus',
+  'buttonOperationClick',
+  'inputStringBlur',
+  'tableFormSelectOnBlur',
+  'formFormDateChange'
+])
+// 获取下拉列表 | type = radio | type = select
+const initSelectOptions = (item) => {
+  return item.dictType ? getStrDictOptions(item.dictType) : item.tableForm.initOptions
+}
+//普通下拉改变事件
+const formSelectChange = (field, val,row) => {
+  emit('formSelectChange', field, val,row)
+}
+// 日期改变事件
+const formFormDateChange = (field, val,row, index) => {
+  emit('formFormDateChange', field, val,row, index)
+}
+// 普通下拉失焦事件
+const tableFormSelectOnBlur = (field, val,row,index) => {
+  emit('tableFormSelectOnBlur', field, val,row,index)
+}
+// 数字输入-改变事件
+const inputNumberChange = (field, index, row, e) => {
+  emit('inputNumberChange', field, index, row, e)
+}
+
+// 点击selection框
+const tableSelectionChange = (val) => {
+  emit('tableSelectionChange', val)
+}
+// 列表排序
+const tableSortChange = (column, prop, order) => {
+  emit('tableSortChange', column, prop, order)
+}
+//下拉框回显方法
+// const showSelect = (val, statusID) => {
+//   return getDictForStatusID(val, statusID)
+// }
+
+// 行点击
+const handleTableSelect = (row, column, event) => {
+  emit('handleTableSelect', row, column, event)
+}
+
+// 某个item是否禁用
+const itemIsDisabled = (colum, row) => {
+  return Boolean(colum.tableForm?.disabled) || Boolean(row.disabled) || Boolean(row['disabled_' + colum.field])
+}
+
+// const { t } = useI18n() // 国际化
+// const message = useMessage() // 消息弹窗
+
+const TableBaseComponents_Ref = ref()
+const TableBaseForm_Ref = ref()
+
+/**
+   * 验证表单是否符合rules
+   * @param {*} success 如果验证【成功】走的方法
+   * @param {*} error 如果验证【不成功】走的方法
+   */
+
+const validateForm = () => {
+  console.log(TableBaseForm_Ref.value)
+  let _lists = TableBaseForm_Ref.value?.map(v => v.validate())
+  return Promise.all(_lists).then(() => {
+    return true
+  }).catch(() => {
+    return false
+  })
+}
+// 删除数据
+const handleDeleteTable = (row, index) => {
+  emit('handleDeleteTable', row, index)
+}
+// 添加数据
+const handleAddTable = () => {
+  emit('handleAddTable')
+}
+// 输入框聚焦
+const inpuFocus = (headerItem, row, index)=>{
+  if(headerItem?.tableForm?.isInpuFocusShow){
+   emit('inpuFocus', headerItem, row, index)
+  }
+}
+
+// input输入失去焦点事件
+const inputStringBlur = (field, val,row) => {
+  emit('inputStringBlur', field, val,row)
+}
+
+//点击table操作列按钮
+const buttonOperationClick = (row, label, index)=> {
+  emit("buttonOperationClick", row, label, index);
+}
+
+// setup 语法糖 抛出方法
+defineExpose({
+  TableBaseComponents_Ref,
+  validateForm
+})
+
+</script>
+
+
+<style scoped lang="scss">
+::v-deep(.el-table__body){
+  padding:10px 0px
+}
+::v-deep(.el-table--default .el-table__cell) {
+  padding: 2px 0px;
+  border: none;
+}
+
+::v-deep(.el-table td.el-table__cell .el-form-item__content) {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+}
+::v-deep(.el-table td.el-table__cell div) {
+  overflow: visible;
+}
+
+::v-deep(.el-icon) {
+  display: block;
+}
+
+.button {
+  >div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+
+    >div {
+      margin-left: 6px;
+      text-decoration: underline;
+      color: #409eff;
+    }
+  }
+
+
+}
+</style>
diff --git a/src/components/TableFormCountPlan/index.ts b/src/components/TableFormCountPlan/index.ts
new file mode 100644
index 000000000..2f51d1abc
--- /dev/null
+++ b/src/components/TableFormCountPlan/index.ts
@@ -0,0 +1,3 @@
+import TableFormCountPlan from './src/TableFormCountPlan.vue'
+
+export { TableFormCountPlan }
diff --git a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
new file mode 100644
index 000000000..d46d46215
--- /dev/null
+++ b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
@@ -0,0 +1,203 @@
+<!-- 附件组件 -->
+<template>
+  <!-- 盘点计划的子表 -->
+  <div class="table1">
+    <el-table :data="tableData" stripe style="width: 100%"
+      ref="TableBaseComponents_Ref" >
+      <el-table-column fixed="left" :width="50" v-slot="{ row, $index }">
+        <Icon
+          icon="ep:remove"
+          color="#757575"
+          size="26"
+          style="cursor: pointer;margin-top: -16px;"
+          @click="handleDeleteTable(row, $index)"
+        />
+      </el-table-column>
+      <el-table-column  :label="tableFields[0].label" align="center">
+        <template v-slot="{ row }">
+          <el-form 
+          ref="TableBaseForm_Ref" 
+          :model="row" 
+          style="width: 100%;" 
+          :rules="tableFormRules"
+          :class="tableFormRules ? '' : 'noRulesForm'">
+          <el-form-item :prop="tableFields[0].field">
+          <el-select
+            v-model="row.type"
+            :placeholder="tableFields[0].placeholder || '请输入' + tableFields[0].label"
+            @change="tableFormChange(tableFields[0].field, $event, row)"
+          >
+            <el-option
+              v-for="dict in countScopeType"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+          </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :prop="tableFields[1].field"
+        :label="tableFields[1].label"
+        align="center"
+      >
+        <template v-slot="{ row }">
+          <el-form 
+          ref="TableBaseForm_Ref1" 
+          :model="row" 
+          style="width: 100%;" 
+          :rules="tableFormRules"
+          :class="tableFormRules ? '' : 'noRulesForm'">
+          <el-form-item :prop="tableFields[1].field">
+          <el-select
+            v-model="row.value"
+            :placeholder="
+              tableFields[1].placeholder ||
+              '请输入' + tableFields[1].label
+            "
+            v-if="
+              row.type == 'OWNER' ||
+              row.type == 'SUPPLIER' ||
+              row.type == 'CUSTOMER' ||
+              row.type == 'ABC' ||
+              row.type == 'ITEMS_TYPE' ||
+              row.type == 'ITEMS_GROUP' ||
+              row.type == 'ITEMS_CODE' ||
+              row.type == 'WAREHOUSE_CODE' ||
+              row.type == 'AREABASIC_CODE' ||
+              row.type == 'LOCATIONGROUP_CODE' ||
+              row.type == 'LOCATION_CODE'
+            "
+          >
+            <el-option
+              v-for="item in row.initOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+          <el-input
+            v-model="row.value"
+            :placeholder="
+              tableFields[1].placeholder ||
+              '请输入' + tableFields[1].label
+            "
+            v-else
+          />
+          </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="button flex">
+      <div class="p-12px" @click="handleAddTable">
+        <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" />
+        <div>添加明细</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+defineComponent({
+  name: 'TableFormCountPlan'
+})
+const props = defineProps({
+  // 列表头定义
+  tableFields: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  },
+  // 列表数据
+  tableData: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  },
+  tableFormRules: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+})
+const tableData = props.tableData
+const tableFields = props.tableFields
+const TableBaseComponents_Ref = ref()
+const TableBaseForm_Ref = ref()
+const TableBaseForm_Ref1 = ref()
+const tableFormRules = ref(props.tableFormRules)
+console.log('tableFormRules',tableFormRules.value)
+/**
+   * 验证表单是否符合rules
+   * @param {*} success 如果验证【成功】走的方法
+   * @param {*} error 如果验证【不成功】走的方法
+   */
+
+   const validateForm = () => {
+    let TableBaseForm_Arr = []
+    TableBaseForm_Arr.push(TableBaseForm_Ref.value)
+    TableBaseForm_Arr.push(TableBaseForm_Ref1.value)
+  let _lists = TableBaseForm_Arr?.map(v => v.validate())
+  return Promise.all(_lists).then(() => {
+    return true
+  }).catch(() => {
+    return false
+  })
+}
+// 传递给父类
+const emit = defineEmits(['handleAddTable', 'selectChange', 'tableFormChange'])
+// 修改盘点类型
+const selectChange = (field, val) => {
+  emit('selectChange', field, val)
+}
+
+const tableFormChange = (field, val, row) => {
+  emit('tableFormChange', field, val, row)
+}
+// 添加数据
+const handleAddTable = () => {
+  emit('handleAddTable')
+}
+// 删除数据
+const handleDeleteTable = (row, index) => {
+  emit('handleDeleteTable', row, index)
+}
+// setup 语法糖 抛出方法
+defineExpose({
+  TableBaseComponents_Ref,
+  validateForm
+})
+
+</script>
+<style scoped lang="scss">
+.table1 {
+  border: 1px solid #dedede;
+  border-radius: 8px;
+  padding: 10px;
+  width: calc(100% - 20px);
+}
+.button {
+  > div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+
+    > div {
+      margin-left: 6px;
+      text-decoration: underline;
+      color: #409eff;
+    }
+  }
+}
+</style>
diff --git a/src/components/TableHead/index.ts b/src/components/TableHead/index.ts
new file mode 100644
index 000000000..7fc036b5b
--- /dev/null
+++ b/src/components/TableHead/index.ts
@@ -0,0 +1,3 @@
+import TableHead from './src/TableHead.vue'
+
+export { TableHead }
diff --git a/src/components/TableHead/src/TableHead.vue b/src/components/TableHead/src/TableHead.vue
new file mode 100644
index 000000000..e99426886
--- /dev/null
+++ b/src/components/TableHead/src/TableHead.vue
@@ -0,0 +1,160 @@
+<template>
+  <div class="tableNavBtnsContent" ref="tableNavBtnsContent_Ref">
+    <div class="searchBox">
+      <div class="tableNavLeftBtns">
+        <ButtonBase
+          :Butttondata="buttonsLeft"
+          @button-base-click="buttonBaseClick"
+        />
+      </div>
+      <div class="tableNavRightBtns">
+        <!-- 右侧按钮 -->
+        <ButtonBase :Butttondata="buttonsRight" @button-base-click="buttonBaseClick" @updata-table-columns="updataTableColumns"
+    :allSchemas="allSchemas" ref="rowDropRef"/>
+      </div>
+    </div>
+    <slot></slot>
+  </div>
+  <!-- 字段设置弹窗 -->
+  <!-- <rowDrop 
+    ref="rowDropRef"
+    @updata-table-columns="updataTableColumns"
+    :allSchemas="allSchemas"
+  /> -->
+  <!-- 高级筛选 -->
+  <SearchHigh
+    ref="searchHigh_Ref"
+    class="searchHighClass"
+    :routeName="routeName"
+    :masterId="masterId"
+    :showPrimaryBaseButton="false"
+    @search-form-click="searchFormClick"
+    :isHighExcludePrimary="false"
+    :primarySearchCustomButton="[]"
+    :highSearchCustomButton="[]"
+    :allSchemas="allSchemas"
+  />
+</template>
+<script setup>
+import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import rowDrop from "@/components/rowDrop/index.vue"
+
+  const props = defineProps({
+    HeadButttondata: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    // 主组件name值
+    routeName: {
+      type: String,
+      default: ''
+    },
+    // 从子表进行高级搜索
+    masterId: {
+      type: String,
+      default: ''
+    },
+    allSchemas: {
+      type: Object,
+      default: null
+    }
+  })
+  const buttonsLeft = ref([])
+  const buttonsRight = ref([])
+  const tableNavBtnsContent_Ref = ref()
+
+  // 更新主列表字段
+  const updataTableColumns = (val) => {
+    emit('updataTableColumns', val)
+  }
+
+  // const defaultButtons = inject('global').defaultButtons
+  // 创建左右按钮数据
+  const buttonsLeftOrRight = () => {
+    buttonsRight.value = []
+    buttonsLeft.value = []
+    // 判断是否有筛选按钮(判断筛选按钮的逻辑位置，影响筛选按钮的位置)
+    // let _primarySearchOption = primarySearch[props.vueName]
+    // let _highSearchOption = highSearch[props.vueName]
+    // if(_primarySearchOption || _highSearchOption){
+    //   buttonsRight.value.push(defaultButtons.defaultFilterBtn())
+    // }
+    // 父级传参处理左右
+    props.HeadButttondata.forEach(item=>{
+      if(item.float && item.float == 'right'){
+        buttonsRight.value.push(item)
+      }else{
+        buttonsLeft.value.push(item)
+      }
+    })
+  }
+  buttonsLeftOrRight()
+
+watch(
+  () => props.HeadButttondata,
+  () => {
+    buttonsLeftOrRight()
+  }
+)
+
+
+  // 传递给父类
+  const emit = defineEmits([
+    'buttonBaseClick',
+    'updataTableColumns',
+    'searchFormClick'
+  ])
+
+  // 设置显示隐藏变量
+  const rowDropRef = ref()
+
+
+  const buttonBaseClick = (val, item) => {
+    // 设置按钮 
+    if (val == 'set') {
+      rowDropRef.value.popoverVisible = !rowDropRef.value.popoverVisible
+    } else if (val == 'filtrate') {
+      searchHigh_Ref.value.popoverVisible = true
+    } else {
+      emit('buttonBaseClick', val, item)
+    }
+  }
+
+  const quicklySearchDom_Ref = ref()
+
+  // 筛选组件
+  const searchHigh_Ref = ref(false)
+  // 高级筛选所有的按钮事件
+  const searchFormClick = (searchData) => {
+    emit('searchFormClick', searchData)
+    searchHigh_Ref.value.popoverVisible = false
+  }
+
+  defineExpose({
+    tableNavBtnsContent_Ref,
+    quicklySearchDom_Ref
+  })
+
+</script>
+<style lang="scss" scoped>
+.tableNavBtnsContent{
+  padding-bottom: 10px;
+  .searchBox{
+    display: flex;
+    justify-content: space-between;
+  }
+.tableNavLeftBtns{
+  display: flex;
+  
+  margin-left: -5px;
+}
+  .tableNavRightBtns{
+    display: flex;
+    margin-left: 10px;
+    margin-right: -5px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Tabs/index.ts b/src/components/Tabs/index.ts
new file mode 100644
index 000000000..d0456f911
--- /dev/null
+++ b/src/components/Tabs/index.ts
@@ -0,0 +1,3 @@
+import Annex from './src/Annex.vue'
+
+export { Annex }
diff --git a/src/components/Tabs/src/Tabs.vue b/src/components/Tabs/src/Tabs.vue
new file mode 100644
index 000000000..8c66168a9
--- /dev/null
+++ b/src/components/Tabs/src/Tabs.vue
@@ -0,0 +1,59 @@
+<!-- tabs组件 -->
+<template>
+   <div class="tabs flex items-center">
+      <div :class="current == index ? 'active' : ''" v-for="(item, index) in tabsList" :key="index" @click="change(item, index)">{{ item.label }}</div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+// const message = useMessage() // 消息弹窗
+
+import { emit } from "process";
+
+// const { t } = useI18n() // 国际化
+defineComponent({
+  name: 'Tabs'
+})
+// 接受父组件参数
+const props  = defineProps({
+  tabsList: {
+    type: Array,
+    required: true
+  },
+  current: {
+    type: Number,
+    required: false,
+    default: 0
+  },
+})
+const current = ref(props.current);
+const change = (item, index) => {
+  current.value = index
+  emit('change',item,index)
+}
+const emit = defineEmits(['change'])
+</script>
+
+
+<style scoped lang="scss">
+
+.tabs{
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid #d6d6d6;
+  margin-bottom: 16px;
+  margin-top: 20px;
+  div{
+    height: 30px;
+    margin-right: 30px;
+    font-size: 14px;
+    cursor: pointer;
+    
+  }
+  .active{
+    color:#409eff !important;
+    border-bottom: 2px solid #409eff;
+  }
+ 
+}
+</style>
diff --git a/src/components/Tooltip/index.ts b/src/components/Tooltip/index.ts
new file mode 100644
index 000000000..ab66ddff1
--- /dev/null
+++ b/src/components/Tooltip/index.ts
@@ -0,0 +1,3 @@
+import Tooltip from './src/Tooltip.vue'
+
+export { Tooltip }
diff --git a/src/components/Tooltip/src/Tooltip.vue b/src/components/Tooltip/src/Tooltip.vue
new file mode 100644
index 000000000..7490bd702
--- /dev/null
+++ b/src/components/Tooltip/src/Tooltip.vue
@@ -0,0 +1,17 @@
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+
+defineOptions({ name: 'Tooltip' })
+
+defineProps({
+  titel: propTypes.string.def(''),
+  message: propTypes.string.def(''),
+  icon: propTypes.string.def('ep:question-filled')
+})
+</script>
+<template>
+  <span>{{ titel }}</span>
+  <ElTooltip :content="message" placement="top">
+    <Icon :icon="icon" class="relative top-1px ml-1px" />
+  </ElTooltip>
+</template>
diff --git a/src/components/UploadFile/index.ts b/src/components/UploadFile/index.ts
new file mode 100644
index 000000000..97c1d6655
--- /dev/null
+++ b/src/components/UploadFile/index.ts
@@ -0,0 +1,5 @@
+import UploadImg from './src/UploadImg.vue'
+import UploadImgs from './src/UploadImgs.vue'
+import UploadFile from './src/UploadFile.vue'
+
+export { UploadImg, UploadImgs, UploadFile }
diff --git a/src/components/UploadFile/src/Preview.vue b/src/components/UploadFile/src/Preview.vue
new file mode 100644
index 000000000..58f5f1cc4
--- /dev/null
+++ b/src/components/UploadFile/src/Preview.vue
@@ -0,0 +1,66 @@
+<template>
+  <div class="preview">
+    <el-dialog v-model="dialogTableVisible" title="" min-width="80%">
+      <div class="dialog">
+        <Icon
+          icon="ep:close"
+          class="cursor-pointer close"
+          color="white"
+          size="32"
+          @click="dialogTableVisible = false"
+        />
+        <img :src="chooseItem" alt=""/>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts" setup>
+const dialogTableVisible = ref(false)
+const chooseItem = ref()
+const preview = async (item) => {
+  chooseItem.value = item
+  dialogTableVisible.value = true
+}
+defineExpose({ preview }) // 提供 open 方法，用于打开弹窗
+// 传递给父类
+const emit = defineEmits(['deleteFile'])
+</script>
+<style scoped lang="scss">
+.file {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  .name {
+    flex: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    width: 140px;
+  }
+  &:hover{
+    .name {
+    color: #409eff;
+  }
+  }
+}
+img {
+  width: 100%;
+}
+::v-deep(.el-dialog) {
+  background: none;
+}
+::v-deep(.el-dialog__header) {
+  display: none !important;
+}
+.dialog {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.close {
+  position: absolute;
+  right: 10px;
+  top: 10px;
+}
+</style>
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
new file mode 100644
index 000000000..ed92c4c18
--- /dev/null
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -0,0 +1,177 @@
+<template>
+  <div class="upload-file">
+    <el-upload
+      ref="uploadRef"
+      :multiple="props.limit > 1"
+      name="file"
+      v-model="valueRef"
+      v-model:file-list="fileList"
+      :show-file-list="true"
+      :auto-upload="autoUpload"
+      :action="updateUrl+'?tableId='+upData?.tableId+'&tableName='+ upData?.tableName"
+      :headers="uploadHeaders"
+      :limit="props.limit"
+      :drag="drag"
+      :before-upload="beforeUpload"
+      :on-exceed="handleExceed"
+      :on-success="handleFileSuccess"
+      :on-error="excelUploadError"
+      :on-remove="handleRemove"
+      :on-preview="handlePreview"
+      class="upload-file-uploader"
+    >
+      <el-button type="primary"><Icon icon="ep:upload-filled" />{{ title }}</el-button>
+      <template v-if="isShowTip" #tip>
+        <div style="font-size: 8px;margin-top: 10px;line-height: initial;">
+          大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+        </div>
+        <div style="font-size: 8px;line-height: initial;">
+          格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
+        </div>
+      </template>
+      <template  v-if="!isShowFile" #file >
+          <div>
+          </div>
+        </template>
+    </el-upload>
+  </div>
+</template>
+<script lang="ts" setup>
+import { PropType } from 'vue'
+
+import { propTypes } from '@/utils/propTypes'
+import { getAccessToken, getTenantId } from '@/utils/auth'
+import type { UploadInstance, UploadUserFile, UploadProps, UploadRawFile } from 'element-plus'
+
+defineOptions({ name: 'UploadFile' })
+
+const message = useMessage() // 消息弹窗
+const emit = defineEmits(['update:modelValue'])
+
+const props = defineProps({
+  modelValue: {
+    type: Array as PropType<UploadUserFile[]>,
+    required: true
+  },
+  title: propTypes.string.def('文件上传'),
+  updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
+  upData: propTypes.object.def(),
+  fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg']
+  fileSize: propTypes.number.def(5), // 大小限制(MB)
+  limit: propTypes.number.def(5), // 数量限制
+  autoUpload: propTypes.bool.def(true), // 自动上传
+  drag: propTypes.bool.def(false), // 拖拽上传
+  isShowTip: propTypes.bool.def(true), // 是否显示提示
+  isShowFile: propTypes.bool.def(true), // 是否显示上传的文件
+  
+})
+// ========== 上传相关 ==========
+const valueRef = ref(props.modelValue)
+const uploadRef = ref<UploadInstance>()
+const uploadList = ref<UploadUserFile[]>([])
+const fileList = props.modelValue && props.modelValue.length > 0 ? ref<UploadUserFile[]>(props.modelValue) : ref<UploadUserFile[]>([])
+const uploadNumber = ref<number>(0)
+const uploadHeaders = ref({
+  Authorization: 'Bearer ' + getAccessToken(),
+  'tenant-id': getTenantId()
+})
+// 文件上传之前判断
+const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
+  if (fileList.value.length >= props.limit) {
+    message.error(`上传文件数量不能超过${props.limit}个!`)
+    return false
+  }
+  let fileExtension = ''
+  if (file.name.lastIndexOf('.') > -1) {
+    fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1)
+  }
+  const isImg = props.fileType.some((type: string) => {
+    if (file.type.indexOf(type) > -1) return true
+    return !!(fileExtension && fileExtension.indexOf(type) > -1)
+  })
+  const isLimit = file.size < props.fileSize * 1024 * 1024
+  if (!isImg) {
+    message.error(`文件格式不正确, 请上传${props.fileType.join('/')}格式!`)
+    return false
+  }
+  if (!isLimit) {
+    message.error(`上传文件大小不能超过${props.fileSize}MB!`)
+    return false
+  }
+  message.success('正在上传文件，请稍候...')
+  uploadNumber.value++
+}
+// 处理上传的文件发生变化
+// const handleFileChange = (uploadFile: UploadFile): void => {
+//   uploadRef.value.data.path = uploadFile.name
+// }
+// 文件上传成功
+const handleFileSuccess: UploadProps['onSuccess'] = (res: any): void => {
+  message.success('上传成功')
+  const fileListNew = fileList.value
+  fileListNew.pop()
+  fileList.value = fileListNew
+  uploadList.value.push({ name: res.data, url: res.data })
+  if (uploadList.value.length == uploadNumber.value) {
+    fileList.value = fileList.value.concat(uploadList.value)
+    uploadList.value = []
+    uploadNumber.value = 0
+    emit('update:modelValue', listToString(fileList.value))
+  }
+}
+// 文件数超出提示
+const handleExceed: UploadProps['onExceed'] = (): void => {
+  message.error(`上传文件数量不能超过${props.limit}个!`)
+}
+// 上传错误提示
+const excelUploadError: UploadProps['onError'] = (): void => {
+  message.error('导入数据失败，请您重新上传！')
+}
+// 删除上传文件
+const handleRemove = (file) => {
+  const findex = fileList.value.map((f) => f.name).indexOf(file.name)
+  if (findex > -1) {
+    fileList.value.splice(findex, 1)
+    emit('update:modelValue', listToString(fileList.value))
+  }
+}
+const handlePreview: UploadProps['onPreview'] = (uploadFile) => {
+  console.log(uploadFile)
+}
+// 对象转成指定字符串分隔
+const listToString = (list: UploadUserFile[], separator?: string) => {
+  let strs = ''
+  separator = separator || ','
+  for (let i in list) {
+    strs += list[i].url + separator
+  }
+  return strs != '' ? strs.substr(0, strs.length - 1) : ''
+}
+</script>
+<style scoped lang="scss">
+.upload-file-uploader {
+  margin-bottom: 5px;
+}
+
+:deep(.upload-file-list .el-upload-list__item) {
+  position: relative;
+  // margin-bottom: 10px;
+  line-height: 2;
+  border: 1px solid #e4e7ed;
+}
+
+:deep(.el-upload-list__item-file-name) {
+  max-width: 250px;
+}
+
+:deep(.upload-file-list .ele-upload-list__item-content) {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: inherit;
+}
+
+:deep(.ele-upload-list__item-content-action .el-link) {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/components/UploadFile/src/UploadImg.vue b/src/components/UploadFile/src/UploadImg.vue
new file mode 100644
index 000000000..100736b6d
--- /dev/null
+++ b/src/components/UploadFile/src/UploadImg.vue
@@ -0,0 +1,272 @@
+<template>
+  <div class="upload-box">
+    <el-upload
+      :action="updateUrl + '?tableId=' + upData?.tableId + '&tableName=' + upData?.tableName"
+      :id="uuid"
+      :class="['upload', drag ? 'no-border' : '']"
+      :multiple="false"
+      :show-file-list="false"
+      :headers="uploadHeaders"
+      :before-upload="beforeUpload"
+      :on-success="uploadSuccess"
+      :on-error="uploadError"
+      :drag="drag"
+      :accept="fileType.join(',')"
+    >
+      <template v-if="modelValue">
+        <img :src="modelValue" class="upload-image" />
+        <div class="upload-handle" @click.stop>
+          <div class="handle-icon" @click="editImg">
+            <Icon icon="ep:edit" />
+            <span>{{ t('action.edit') }}</span>
+          </div>
+          <div class="handle-icon" @click="imgViewVisible = true">
+            <Icon icon="ep:zoom-in" />
+            <span>{{ t('action.detail') }}</span>
+          </div>
+          <div class="handle-icon" @click="deleteImg">
+            <Icon icon="ep:delete" />
+            <span>{{ t('action.del') }}</span>
+          </div>
+        </div>
+      </template>
+      <template v-else>
+        <div class="upload-empty">
+          <slot name="empty">
+            <Icon icon="ep:plus" />
+            <!-- <span>请上传图片</span> -->
+          </slot>
+        </div>
+      </template>
+    </el-upload>
+    <div class="el-upload__tip">
+      <slot name="tip"></slot>
+    </div>
+    <el-image-viewer
+      v-if="imgViewVisible"
+      @close="imgViewVisible = false"
+      :url-list="[modelValue]"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UploadProps } from 'element-plus'
+
+import { generateUUID } from '@/utils'
+import { propTypes } from '@/utils/propTypes'
+import { getAccessToken, getTenantId } from '@/utils/auth'
+
+defineOptions({ name: 'UploadImg' })
+
+type FileTypes =
+  | 'image/apng'
+  | 'image/bmp'
+  | 'image/gif'
+  | 'image/jpeg'
+  | 'image/pjpeg'
+  | 'image/png'
+  | 'image/svg+xml'
+  | 'image/tiff'
+  | 'image/webp'
+  | 'image/x-icon'
+
+// 接受父组件参数
+const props = defineProps({
+  modelValue: propTypes.string.def(''),
+  updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
+  upData: propTypes.object.def(),
+  drag: propTypes.bool.def(true), // 是否支持拖拽上传 ==> 非必传（默认为 true）
+  disabled: propTypes.bool.def(false), // 是否禁用上传组件 ==> 非必传（默认为 false）
+  fileSize: propTypes.number.def(5), // 图片大小限制 ==> 非必传（默认为 5M）
+  fileType: propTypes.array.def(['image/jpeg', 'image/png', 'image/gif']), // 图片类型限制 ==> 非必传（默认为 ["image/jpeg", "image/png", "image/gif"]）
+  height: propTypes.string.def('150px'), // 组件高度 ==> 非必传（默认为 150px）
+  width: propTypes.string.def('150px'), // 组件宽度 ==> 非必传（默认为 150px）
+  borderradius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传（默认为 8px）
+})
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+// 生成组件唯一id
+const uuid = ref('id-' + generateUUID())
+// 查看图片
+const imgViewVisible = ref(false)
+
+const emit = defineEmits(['update:modelValue'])
+
+const deleteImg = () => {
+  emit('update:modelValue', '')
+}
+
+const uploadHeaders = ref({
+  Authorization: 'Bearer ' + getAccessToken(),
+  'tenant-id': getTenantId()
+})
+
+const editImg = () => {
+  const dom = document.querySelector(`#${uuid.value} .el-upload__input`)
+  dom && dom.dispatchEvent(new MouseEvent('click'))
+}
+
+const beforeUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  const imgSize = rawFile.size / 1024 / 1024 < props.fileSize
+  const imgType = props.fileType
+  if (!imgType.includes(rawFile.type as FileTypes))
+    message.notifyWarning('上传图片不符合所需的格式！')
+  if (!imgSize) message.notifyWarning(`上传图片大小不能超过 ${props.fileSize}M！`)
+  return imgType.includes(rawFile.type as FileTypes) && imgSize
+}
+
+// 图片上传成功提示
+const uploadSuccess: UploadProps['onSuccess'] = (res: any): void => {
+  message.success('上传成功')
+  emit('update:modelValue', res.data)
+}
+
+// 图片上传错误提示
+const uploadError = () => {
+  message.notifyError('图片上传失败，请您重新上传！')
+}
+</script>
+<style scoped lang="scss">
+.is-error {
+  .upload {
+    :deep(.el-upload),
+    :deep(.el-upload-dragger) {
+      border: 1px dashed var(--el-color-danger) !important;
+
+      &:hover {
+        border-color: var(--el-color-primary) !important;
+      }
+    }
+  }
+}
+
+:deep(.disabled) {
+  .el-upload,
+  .el-upload-dragger {
+    cursor: not-allowed !important;
+    background: var(--el-disabled-bg-color);
+    border: 1px dashed var(--el-border-color-darker) !important;
+
+    &:hover {
+      border: 1px dashed var(--el-border-color-darker) !important;
+    }
+  }
+}
+
+.upload-box {
+  .no-border {
+    :deep(.el-upload) {
+      border: none !important;
+    }
+  }
+
+  :deep(.upload) {
+    .el-upload {
+      position: relative;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: v-bind(width);
+      height: v-bind(height);
+      overflow: hidden;
+      border: 1px dashed var(--el-border-color-darker);
+      border-radius: v-bind(borderradius);
+      transition: var(--el-transition-duration-fast);
+
+      &:hover {
+        border-color: var(--el-color-primary);
+
+        .upload-handle {
+          opacity: 1;
+        }
+      }
+
+      .el-upload-dragger {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 100%;
+        padding: 0;
+        overflow: hidden;
+        background-color: transparent;
+        border: 1px dashed var(--el-border-color-darker);
+        border-radius: v-bind(borderradius);
+
+        &:hover {
+          border: 1px dashed var(--el-color-primary);
+        }
+      }
+
+      .el-upload-dragger.is-dragover {
+        background-color: var(--el-color-primary-light-9);
+        border: 2px dashed var(--el-color-primary) !important;
+      }
+
+      .upload-image {
+        width: 100%;
+        height: 100%;
+        object-fit: contain;
+      }
+
+      .upload-empty {
+        position: relative;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        font-size: 12px;
+        line-height: 30px;
+        color: var(--el-color-info);
+
+        .el-icon {
+          font-size: 28px;
+          color: var(--el-text-color-secondary);
+        }
+      }
+
+      .upload-handle {
+        position: absolute;
+        top: 0;
+        right: 0;
+        display: flex;
+        width: 100%;
+        height: 100%;
+        cursor: pointer;
+        background: rgb(0 0 0 / 60%);
+        opacity: 0;
+        box-sizing: border-box;
+        transition: var(--el-transition-duration-fast);
+        align-items: center;
+        justify-content: center;
+
+        .handle-icon {
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          padding: 0 6%;
+          color: aliceblue;
+
+          .el-icon {
+            margin-bottom: 40%;
+            font-size: 130%;
+            line-height: 130%;
+          }
+
+          span {
+            font-size: 85%;
+            line-height: 85%;
+          }
+        }
+      }
+    }
+  }
+
+  .el-upload__tip {
+    line-height: 18px;
+    text-align: center;
+  }
+}
+</style>
diff --git a/src/components/UploadFile/src/UploadImgs.vue b/src/components/UploadFile/src/UploadImgs.vue
new file mode 100644
index 000000000..7470c9ba6
--- /dev/null
+++ b/src/components/UploadFile/src/UploadImgs.vue
@@ -0,0 +1,310 @@
+<template>
+  <div class="upload-box">
+    <el-upload
+      v-model:file-list="fileList"
+      :accept="fileType.join(',')"
+      :action="updateUrl + '?tableId=' + upData?.tableId + '&tableName=' + upData?.tableName"
+      :before-upload="beforeUpload"
+      :class="['upload', drag ? 'no-border' : '']"
+      :drag="drag"
+      :headers="uploadHeaders"
+      :limit="limit"
+      :multiple="true"
+      :on-error="uploadError"
+      :on-exceed="handleExceed"
+      :on-success="uploadSuccess"
+      list-type="picture-card"
+    >
+      <div class="upload-empty">
+        <slot name="empty">
+          <Icon icon="ep:plus" />
+          <!-- <span>请上传图片</span> -->
+        </slot>
+      </div>
+      <template #file="{ file }">
+        <img :src="file.url" class="upload-image" />
+        <div class="upload-handle" @click.stop>
+          <div class="handle-icon" @click="handlePictureCardPreview(file)">
+            <Icon icon="ep:zoom-in" />
+            <span>查看</span>
+          </div>
+          <div class="handle-icon" @click="handleRemove(file)">
+            <Icon icon="ep:delete" />
+            <span>删除</span>
+          </div>
+        </div>
+      </template>
+    </el-upload>
+    <div class="el-upload__tip">
+      <slot name="tip"></slot>
+    </div>
+    <el-image-viewer
+      v-if="imgViewVisible"
+      :url-list="[viewImageUrl]"
+      @close="imgViewVisible = false"
+    />
+  </div>
+</template>
+<script lang="ts" setup>
+import { PropType } from 'vue'
+import type { UploadFile, UploadProps, UploadUserFile } from 'element-plus'
+import { ElNotification } from 'element-plus'
+
+import { propTypes } from '@/utils/propTypes'
+import { getAccessToken, getTenantId } from '@/utils/auth'
+
+defineOptions({ name: 'UploadImgs' })
+
+const message = useMessage() // 消息弹窗
+
+type FileTypes =
+  | 'image/apng'
+  | 'image/bmp'
+  | 'image/gif'
+  | 'image/jpeg'
+  | 'image/pjpeg'
+  | 'image/png'
+  | 'image/svg+xml'
+  | 'image/tiff'
+  | 'image/webp'
+  | 'image/x-icon'
+
+const props = defineProps({
+  modelValue: {
+    type: Array as PropType<UploadUserFile[]>,
+    required: true
+  },
+  updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
+  upData: propTypes.object.def(),
+  drag: propTypes.bool.def(true), // 是否支持拖拽上传 ==> 非必传（默认为 true）
+  disabled: propTypes.bool.def(false), // 是否禁用上传组件 ==> 非必传（默认为 false）
+  limit: propTypes.number.def(5), // 最大图片上传数 ==> 非必传（默认为 5张）
+  fileSize: propTypes.number.def(5), // 图片大小限制 ==> 非必传（默认为 5M）
+  fileType: propTypes.array.def(['image/jpeg', 'image/png', 'image/gif']), // 图片类型限制 ==> 非必传（默认为 ["image/jpeg", "image/png", "image/gif"]）
+  height: propTypes.string.def('150px'), // 组件高度 ==> 非必传（默认为 150px）
+  width: propTypes.string.def('150px'), // 组件宽度 ==> 非必传（默认为 150px）
+  borderradius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传（默认为 8px）
+})
+
+const uploadHeaders = ref({
+  Authorization: 'Bearer ' + getAccessToken(),
+  'tenant-id': getTenantId()
+})
+
+const fileList = ref<UploadUserFile[]>([])
+// fix: 改为动态监听赋值解决图片回显问题
+watch(
+  () => props.modelValue,
+  (data) => {
+    if (!data) return
+    fileList.value = data
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+/**
+ * @description 文件上传之前判断
+ * @param rawFile 上传的文件
+ * */
+const beforeUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  const imgSize = rawFile.size / 1024 / 1024 < props.fileSize
+  const imgType = props.fileType
+  if (!imgType.includes(rawFile.type as FileTypes))
+    ElNotification({
+      title: '温馨提示',
+      message: '上传图片不符合所需的格式！',
+      type: 'warning'
+    })
+  if (!imgSize)
+    ElNotification({
+      title: '温馨提示',
+      message: `上传图片大小不能超过 ${props.fileSize}M！`,
+      type: 'warning'
+    })
+  return imgType.includes(rawFile.type as FileTypes) && imgSize
+}
+
+// 图片上传成功
+interface UploadEmits {
+  (e: 'update:modelValue', value: UploadUserFile[]): void
+}
+
+const emit = defineEmits<UploadEmits>()
+const uploadSuccess = (response, uploadFile: UploadFile) => {
+  if (!response) return
+  // TODO 多图上传组件成功后只是把保存成功后的url替换掉组件选图时的文件路径，所以返回的fileList包含的是一个包含文件信息的对象列表
+  uploadFile.url = response.data
+  emit('update:modelValue', fileList.value)
+  message.success('上传成功')
+}
+
+// 删除图片
+const handleRemove = (uploadFile: UploadFile) => {
+  fileList.value = fileList.value.filter(
+    (item) => item.url !== uploadFile.url || item.name !== uploadFile.name
+  )
+  emit('update:modelValue', fileList.value)
+}
+
+// 图片上传错误提示
+const uploadError = () => {
+  ElNotification({
+    title: '温馨提示',
+    message: '图片上传失败，请您重新上传！',
+    type: 'error'
+  })
+}
+
+// 文件数超出提示
+const handleExceed = () => {
+  ElNotification({
+    title: '温馨提示',
+    message: `当前最多只能上传 ${props.limit} 张图片，请移除后上传！`,
+    type: 'warning'
+  })
+}
+
+// 图片预览
+const viewImageUrl = ref('')
+const imgViewVisible = ref(false)
+const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
+  viewImageUrl.value = uploadFile.url!
+  imgViewVisible.value = true
+}
+</script>
+
+<style lang="scss" scoped>
+.is-error {
+  .upload {
+    :deep(.el-upload--picture-card),
+    :deep(.el-upload-dragger) {
+      border: 1px dashed var(--el-color-danger) !important;
+
+      &:hover {
+        border-color: var(--el-color-primary) !important;
+      }
+    }
+  }
+}
+
+:deep(.disabled) {
+  .el-upload--picture-card,
+  .el-upload-dragger {
+    cursor: not-allowed;
+    background: var(--el-disabled-bg-color) !important;
+    border: 1px dashed var(--el-border-color-darker);
+
+    &:hover {
+      border-color: var(--el-border-color-darker) !important;
+    }
+  }
+}
+
+.upload-box {
+  .no-border {
+    :deep(.el-upload--picture-card) {
+      border: none !important;
+    }
+  }
+
+  :deep(.upload) {
+    .el-upload-dragger {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 100%;
+      height: 100%;
+      padding: 0;
+      overflow: hidden;
+      border: 1px dashed var(--el-border-color-darker);
+      border-radius: v-bind(borderradius);
+
+      &:hover {
+        border: 1px dashed var(--el-color-primary);
+      }
+    }
+
+    .el-upload-dragger.is-dragover {
+      background-color: var(--el-color-primary-light-9);
+      border: 2px dashed var(--el-color-primary) !important;
+    }
+
+    .el-upload-list__item,
+    .el-upload--picture-card {
+      width: v-bind(width);
+      height: v-bind(height);
+      background-color: transparent;
+      border-radius: v-bind(borderradius);
+    }
+
+    .upload-image {
+      width: 100%;
+      height: 100%;
+      object-fit: contain;
+    }
+
+    .upload-handle {
+      position: absolute;
+      top: 0;
+      right: 0;
+      display: flex;
+      width: 100%;
+      height: 100%;
+      cursor: pointer;
+      background: rgb(0 0 0 / 60%);
+      opacity: 0;
+      box-sizing: border-box;
+      transition: var(--el-transition-duration-fast);
+      align-items: center;
+      justify-content: center;
+
+      .handle-icon {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        padding: 0 6%;
+        color: aliceblue;
+
+        .el-icon {
+          margin-bottom: 15%;
+          font-size: 140%;
+        }
+
+        span {
+          font-size: 100%;
+        }
+      }
+    }
+
+    .el-upload-list__item {
+      &:hover {
+        .upload-handle {
+          opacity: 1;
+        }
+      }
+    }
+
+    .upload-empty {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      font-size: 12px;
+      line-height: 30px;
+      color: var(--el-color-info);
+
+      .el-icon {
+        font-size: 28px;
+        color: var(--el-text-color-secondary);
+      }
+    }
+  }
+
+  .el-upload__tip {
+    line-height: 15px;
+    text-align: center;
+  }
+}
+</style>
diff --git a/src/components/Verifition/index.ts b/src/components/Verifition/index.ts
new file mode 100644
index 000000000..bcfe6d940
--- /dev/null
+++ b/src/components/Verifition/index.ts
@@ -0,0 +1,3 @@
+import Verify from './src/Verify.vue'
+
+export { Verify }
diff --git a/src/components/Verifition/src/Verify.vue b/src/components/Verifition/src/Verify.vue
new file mode 100644
index 000000000..b7b504861
--- /dev/null
+++ b/src/components/Verifition/src/Verify.vue
@@ -0,0 +1,441 @@
+<template>
+  <div v-show="showBox" :class="mode == 'pop' ? 'mask' : ''">
+    <div
+      :class="mode == 'pop' ? 'verifybox' : ''"
+      :style="{ 'max-width': parseInt(imgSize.width) + 20 + 'px' }"
+    >
+      <div v-if="mode == 'pop'" class="verifybox-top">
+        {{ t('captcha.verification') }}
+        <span class="verifybox-close" @click="closeBox">
+          <i class="iconfont icon-close"></i>
+        </span>
+      </div>
+      <div :style="{ padding: mode == 'pop' ? '10px' : '0' }" class="verifybox-bottom">
+        <!-- 验证码容器 -->
+        <component
+          :is="componentType"
+          v-if="componentType"
+          ref="instance"
+          :arith="arith"
+          :barSize="barSize"
+          :blockSize="blockSize"
+          :captchaType="captchaType"
+          :explain="explain"
+          :figure="figure"
+          :imgSize="imgSize"
+          :mode="mode"
+          :type="verifyType"
+          :vSpace="vSpace"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+<script type="text/babel">
+/**
+ * Verify 验证码组件
+ * @description 分发验证码使用
+ * */
+import { VerifyPoints, VerifySlide } from './Verify'
+import { computed, ref, toRefs, watchEffect } from 'vue'
+
+export default {
+  name: 'Vue3Verify',
+  components: {
+    VerifySlide,
+    VerifyPoints
+  },
+  props: {
+    captchaType: {
+      type: String,
+      required: true
+    },
+    figure: {
+      type: Number
+    },
+    arith: {
+      type: Number
+    },
+    mode: {
+      type: String,
+      default: 'pop'
+    },
+    vSpace: {
+      type: Number
+    },
+    explain: {
+      type: String
+    },
+    imgSize: {
+      type: Object,
+      default() {
+        return {
+          width: '310px',
+          height: '155px'
+        }
+      }
+    },
+    blockSize: {
+      type: Object
+    },
+    barSize: {
+      type: Object
+    }
+  },
+  setup(props) {
+    const { t } = useI18n()
+    const { captchaType, mode } = toRefs(props)
+    const clickShow = ref(false)
+    const verifyType = ref(undefined)
+    const componentType = ref(undefined)
+
+    const instance = ref({})
+
+    const showBox = computed(() => {
+      if (mode.value == 'pop') {
+        return clickShow.value
+      } else {
+        return true
+      }
+    })
+    /**
+     * refresh
+     * @description 刷新
+     * */
+    const refresh = () => {
+      if (instance.value.refresh) {
+        instance.value.refresh()
+      }
+    }
+    const closeBox = () => {
+      clickShow.value = false
+      refresh()
+    }
+    const show = () => {
+      if (mode.value == 'pop') {
+        clickShow.value = true
+      }
+    }
+    watchEffect(() => {
+      switch (captchaType.value) {
+        case 'blockPuzzle':
+          verifyType.value = '2'
+          componentType.value = 'VerifySlide'
+          break
+        case 'clickWord':
+          verifyType.value = ''
+          componentType.value = 'VerifyPoints'
+          break
+      }
+    })
+
+    return {
+      t,
+      clickShow,
+      verifyType,
+      componentType,
+      instance,
+      showBox,
+      closeBox,
+      show
+    }
+  }
+}
+</script>
+<style>
+.verifybox {
+  position: relative;
+  top: 50%;
+  left: 50%;
+  background-color: #fff;
+  border: 1px solid #e4e7eb;
+  border-radius: 5px;
+  transform: translate(-50%, -50%);
+  box-shadow: 0 0 10px rgb(0 0 0 / 30%);
+  box-sizing: border-box;
+}
+
+.verifybox-top {
+  height: 40px;
+  padding: 0 15px;
+  font-size: 16px;
+  line-height: 40px;
+  color: #45494c;
+  text-align: left;
+  border-bottom: 1px solid #e4e7eb;
+  box-sizing: border-box;
+}
+
+.verifybox-bottom {
+  padding: 10px;
+  box-sizing: border-box;
+}
+
+.verifybox-close {
+  position: absolute;
+  top: 13px;
+  right: 9px;
+  width: 24px;
+  height: 24px;
+  text-align: center;
+  cursor: pointer;
+}
+
+.mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 1001;
+  width: 100%;
+  height: 100vh;
+  background: rgb(0 0 0 / 30%);
+
+  /* display: none; */
+  transition: all 0.5s;
+}
+
+.verify-tips {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 30px;
+  line-height: 30px;
+  color: #fff;
+  text-indent: 10px;
+}
+
+.suc-bg {
+  background-color: rgb(92 184 92 / 50%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C);
+}
+
+.err-bg {
+  background-color: rgb(217 83 79 / 50%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7fD9534F, endcolorstr=#7fD9534F);
+}
+
+.tips-enter,
+.tips-leave-to {
+  bottom: -30px;
+}
+
+.tips-enter-active,
+.tips-leave-active {
+  transition: bottom 0.5s;
+}
+
+/* ---------------------------- */
+
+/* 常规验证码 */
+.verify-code {
+  margin-bottom: 5px;
+  font-size: 20px;
+  text-align: center;
+  cursor: pointer;
+  border: 1px solid #ddd;
+}
+
+.cerify-code-panel {
+  height: 100%;
+  overflow: hidden;
+}
+
+.verify-code-area {
+  float: left;
+}
+
+.verify-input-area {
+  float: left;
+  width: 60%;
+  padding-right: 10px;
+}
+
+.verify-change-area {
+  float: left;
+  line-height: 30px;
+}
+
+.varify-input-code {
+  display: inline-block;
+  width: 100%;
+  height: 25px;
+}
+
+.verify-change-code {
+  color: #337ab7;
+  cursor: pointer;
+}
+
+.verify-btn {
+  width: 200px;
+  height: 30px;
+  margin-top: 10px;
+  color: #fff;
+  background-color: #337ab7;
+  border: none;
+  border-radius: 8px;
+}
+
+/* 滑动验证码 */
+.verify-bar-area {
+  position: relative;
+  text-align: center;
+  background: #fff;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  box-sizing: content-box;
+}
+
+.verify-bar-area .verify-move-block {
+  position: absolute;
+  top: 0;
+  left: 0;
+  cursor: pointer;
+  background: #fff;
+  border-radius: 8px;
+  box-shadow: 0 0 2px #888;
+  box-sizing: content-box;
+}
+
+.verify-bar-area .verify-move-block:hover {
+  color: #fff;
+  background-color: #337ab7;
+}
+
+.verify-bar-area .verify-left-bar {
+  position: absolute;
+  top: -1px;
+  left: -1px;
+  cursor: pointer;
+  background: #f0fff0;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  box-sizing: content-box;
+}
+
+.verify-img-panel {
+  position: relative;
+  margin: 0;
+  border-top: 1px solid #ddd;
+  border-bottom: 1px solid #ddd;
+  border-radius: 3px;
+  box-sizing: content-box;
+}
+
+.verify-img-panel .verify-refresh {
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 2;
+  width: 25px;
+  height: 25px;
+  padding: 5px;
+  text-align: center;
+  cursor: pointer;
+}
+
+.verify-img-panel .icon-refresh {
+  font-size: 20px;
+  color: #fff;
+}
+
+.verify-img-panel .verify-gap {
+  position: relative;
+  z-index: 2;
+  background-color: #fff;
+  border: 1px solid #fff;
+}
+
+.verify-bar-area .verify-move-block .verify-sub-block {
+  position: absolute;
+  z-index: 3;
+  text-align: center;
+
+  /* border: 1px solid #fff; */
+}
+
+.verify-bar-area .verify-move-block .verify-icon {
+  font-size: 18px;
+}
+
+.verify-bar-area .verify-msg {
+  z-index: 3;
+}
+
+/* 字体图标的css */
+
+/* @font-face {font-family: "iconfont"; */
+
+/* src: url('../fonts/iconfont.eot?t=1508229193188'); !* IE9*! */
+
+/* src: url('../fonts/iconfont.eot?t=1508229193188#iefix') format('embedded-opentype'), !* IE6-IE8 *! */
+
+/* url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAaAAAsAAAAACUwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFZW7kiSY21hcAAAAYAAAAB3AAABuM+qBlRnbHlmAAAB+AAAAnQAAALYnrUwT2hlYWQAAARsAAAALwAAADYPNwajaGhlYQAABJwAAAAcAAAAJAfeA4dobXR4AAAEuAAAABMAAAAYF+kAAGxvY2EAAATMAAAADgAAAA4CvAGsbWF4cAAABNwAAAAfAAAAIAEVAF1uYW1lAAAE/AAAAUUAAAJtPlT+fXBvc3QAAAZEAAAAPAAAAE3oPPXPeJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2Bk/sM4gYGVgYOpk+kMAwNDP4RmfM1gxMjBwMDEwMrMgBUEpLmmMDgwVDxbwtzwv4EhhrmBoQEozAiSAwAw1A0UeJzFkcENgCAMRX8RjCGO4gTe9eQcnhzAfXC2rqG/hYsT8MmD9gdS0gJIAAaykAjIBYHppCvuD8juR6zMJ67A89Zdn/f1aNPikUn8RvYo8G20CjKim6Rf6b9m34+WWd/vBr+oW8V6q3vF5qKlYrPRp4L0Ad5nGL8AeJxFUc9rE0EYnTezu8lMsrvtbrqb3TRt0rS7bdOmdI0JbWmCtiItIv5oi14qevCk9SQVLFiQgqAF8Q9QLKIHLx48FkHo3ZNnFUXwD5C2B6dO6sFhmI83w7z3fe8RnZCjb2yX5YlLhskkmScXCIFRxYBFiyjH9Rqtoqes9/g5i8WVuJyqDNTYLPwBI+cljXrkGynDhoU+nCgnjbhGY5yst+gMEq8IBIXwsjPU67CnEPm4b0su0h309Fd67da4XBhr55KSm17POk7gOE/Shq6nKdVsC7d9j+tcGPKVboc9u/0jtB/ZIA7PXTVLBef6o/paccjnwOYm3ELJetPuDrvV3gg91wlSXWY6H5qVwRzWf2TybrYYfSdqoXOwh/Qa8RWIjBTiSI3h614/vKSNRhONOrsnQi6Xf4nQFQDTmJE1NKbhI6crHEJO/+S5QPxhYJRRyvBFBP+5T9EPpEAIVzzRQIrjmJ6jY1WTo+NXTMchuBsKuS8PRZATSMl9oTA4uNLkeIA0V1UeqOoGQh7IAxGo+7T83fn3T+voqCNPPAUazUYUI7LgKSV1Jk2oUeghYGhZ+cKOe2FjVu5ZKEY2VkE13AK1+jI4r1KLbPlZfrKiPhOXKPRj7q9sj9XJ7LFHNmrKJS3VCdhXGSdKrtmoQaWeMjQVt0KD6sGPOx0oH2fgtzoNROxtNq8F3tzYM/n+TjKSX5qf2jx941276TIr9FjXxKr8eX/6bK4yuopwo9py1sw8F9kdw4AmurRpLUM3tYx5ZnKpfHPi8dzz19vJ6MjyxYUrpqeb1uLs3eGV6vr21pSqpeWkqonAN9oUyIiXpv8XvlN5e3icY2BkYGAA4n0vN4fG89t8ZeBmYQCBa9wPPRH0/wcsDMwmQC4HAxNIFABAfAqaAHicY2BkYGBu+N/AEMPCAAJAkpEBFbABAEcMAm94nGNhYGBgfsnAwMKAigESnwEBAAAAAAAAdgCkANoBCAFsAAB4nGNgZGBgYGMIZGBlAAEmIOYCQgaG/2A+AwARSAFzAHicZY9NTsMwEIVf+gekEqqoYIfkBWIBKP0Rq25YVGr3XXTfpk6bKokjx63UA3AejsAJOALcgDvwSCebNpbH37x5Y08A3OAHHo7fLfeRPVwyO3INF7gXrlN/EG6QX4SbaONVuEX9TdjHM6bCbXRheYPXuGL2hHdhDx18CNdwjU/hOvUv4Qb5W7iJO/wKt9Dx6sI+5l5XuI1HL/bHVi+cXqnlQcWhySKTOb+CmV7vkoWt0uqca1vEJlODoF9JU51pW91T7NdD5yIVWZOqCas6SYzKrdnq0AUb5/JRrxeJHoQm5Vhj/rbGAo5xBYUlDowxQhhkiMro6DtVZvSvsUPCXntWPc3ndFsU1P9zhQEC9M9cU7qy0nk6T4E9XxtSdXQrbsuelDSRXs1JErJCXta2VELqATZlV44RelzRiT8oZ0j/AAlabsgAAAB4nGNgYoAALgbsgI2RiZGZkYWRlZGNkZ2BsYI1OSM1OZs1OSe/OJW1KDM9o4S9KDWtKLU4g4EBAJ79CeQ=') format('woff'), */
+
+/* url('../fonts/iconfont.ttf?t=1508229193188') format('truetype'), !* chrome, firefox, opera, Safari, Android, iOS 4.2+*! */
+
+/* url('../fonts/iconfont.svg?t=1508229193188#iconfont') format('svg'); !* iOS 4.1- *! */
+
+/* } */
+
+.iconfont {
+  font-family: iconfont !important;
+  font-size: 16px;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  font-style: normal;
+}
+
+.icon-check::before {
+  position: absolute;
+  z-index: 9999;
+  display: block;
+  width: 16px;
+  height: 16px;
+  margin: auto;
+  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAIlFJREFUeNrt3X1cVNW6B/BnbcS3xJd7fLmSeo+op/Qmyp4BFcQEwpd8Nyc9iZppgUfE49u1tCwlNcMySCM1S81jCoaioiJvKoYgswfUo5wSJ69SZFKCKSAws+4f2/GetFFRYG3g9/2Hz2xj+O2J4Zm19trrIQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgjmOgAAADwOBhz83TzdPNs397qanW1ujJ2s8fNHjd7FBTkhuSG5IbculVdP1kSfeoAAPBwdFzHdXzgQN0S3RLdkpgY2SJbZMvNm9It6ZZ064cfGmQ2yGyQmZfX3KO5R3OPwkJdsi5Zl5yYKIfL4XL4mDHqs7AqGzhgBAIAoFFdI7pGdI1o1KjFlhZbWmxZv149OmXK4z3r4cPEiROfOFExKSbFVFDwqM+EEQgAgMY8y5/lz/LGjZu3bt66eev9+9Wjj1s4bAYNIkaMWHKyx3mP8x7nmzd/1GdyEP1CAQCASifrZJ3s6FjmWuZa5rprF3uLvcXeGjq0en5au3a8nJfz8k6d8lPyU/JTYmIq+wwYgQAAaIIk0WgaTaO/+IJm0SyaNWJEtf/IPMqjvJde0g/QD9APcHOrdGIhrxMAANzGmJwr58q569ZRLMVS7MSJNfajFVJIYYy/wF/gL7z0UmW/vUGNvk4AAHCHTqfT6XQrVtB4Gk/jg4KEBfmBfqAf+vSp7LdhBAIAUMPUwvH66+oj21eBSqmUStu3r+y3oYAAANQQtXDMmKE+WrlSdB4bvpwv58t/+62y34cCAgBQzeSt8lZ568SJFEiBFLh2reg8d2MD2UA28PTpyn4fCggAQDXRh+pD9aEjR1IABVDA5s20ntbTeklzf3eZF/NiXvv2Vfb7NHciAAC1nRwsB8vBvr5Wf6u/1X/nTubO3Jl7A+0tWvImb/LOyemc3zm/c/6ePZX9dmxlAgBQRfTd9N303Tw8rFusW6xbEhPZLDaLzXJyEp3rHjNoBs24dYt/wj/hn3h5mUwmk8mkKJV9GoxAAAAekz5AH6APeOYZ6znrOeu5Awc0WzgCKZACrVZ2hB1hR15++VELhw1GIAAAj0hdVdWli/ooNVX9WvnlsNUflHSk45wbuZEbg4LUwrFhw+M+LUYgAACV1CuoV1CvoCef5Kv4Kr4qIUE9qsHCcRsv4AW8YOHCqiocNtq7qAMAoFHqZoetW9MgGkSDDh+mhbSQFnbuLDrX/YWGmmJMMaaYsLCqfmZMYQEAPIBt23PLp5ZPLZ8mJ9MROkJHdDrRueyKpViKXbdO6aB0UDoEB1fXj8EUFgCAHX0v973c93KTJpbvLd9bvt+3T+uFg0/mk/nkL79UC0dISHX/PIxAAADuYuvLwQ/xQ/zQnj1sKBvKhj7/vOhc9vA4HsfjYmOd2jm1c2o3btxRdpQdZRUV1f1zMQIBALjNYDAYDAYHB9pEm2jTl19qvXBQGIVRWFKSWjgmTKipwmGDi+gAAERExJhZZ9aZdZGRNJ2m0/Tx40UnssuHfMgnPb2koKSgpGD0aIUpTGGlpTUdAwUEAOo9XbguXBf+/vu0lbbS1ldfFZ3HrgE0gAacPu0423G24+xhw5SOSkel440bouKggABAvaXjOq7j77xDetKTfv580Xns8iIv8srNlfKkPClv8OD0jukd0zv++qvoWLiIDgD1jrpnVXAwb86b8+Yffyw6jz18NV/NV+flWQZaBloGenufYqfYKXbxouhcNriIDgD1hi5Zl6xLnjyZL+AL+ILwcNF57OpLfanv1atsPpvP5vv7a61w2GAEAgB1nrpn1ejRPJNn8szoaM1ur05EREVF6ldfX0VRFEUxmUQnskejLyAAwOPT79fv1+9/7jn+E/+J/7Rjh7YLR3ExceLEhw9XTIpJMWm3cNho9IUEAHh08hB5iDykb1/+M/+Z/7x7N0VSJEU2aiQ61z30pCd9WZl1inWKdcoLL2R5ZnlmeR4/LjrWw8I1EACoM+S2clu5rasr+yv7K/vrgQO0jtbRumbNROe6G4/kkTzSYqFMyqTMgAC1cBw6JDpXZaGAAECt1zukd0jvkG7daBftol2HD1MERVBEq1aic93jdl8O9gv7hf0SGKhOVUVHi471qFBAAKDW0hfri/XFHTs6cAfuwBMS2Bw2h81p1050LruepWfp2fnzlaHKUGXopk2i4zwuFBAAqHVcw1zDXMPatrWSlayUkEBplEZp//VfonPZw86ys+zsm28qE5WJysQPPxSdp6qggABAraHuktuiRYOgBkENgg4dYt7Mm3k/9ZToXHZNpIk0MTzcWGosNZYuXy46TlXDfSAAoHnqfRxNm6qP4uPVr/37i85l11gaS2M3b1YWK4uVxa+8oh7kXHSsqoYRCABoVo+oHlE9oho2pME0mAbHxKhHNVw4IimSImNiXLJdsl2yp09XD9a9wmGDAgIAmmPry9G4f+P+jfv/4x8UT/EUP3iw6Fz3d/hwUXpRelH6Sy9FR0dHR0dbLKITVTfcSAgAGsPYhT4X+lzos2EDG8FGsBHjxolOZA9fxBfxRWlpFeYKc4V57NjckNyQ3JBbt0Tnqim4BgIAmiEvkhfJiz78kMWzeBY/Z47oPPbwpXwpX5qdbRlmGWYZ5uOjbnZYWCg6V03DFBYACKdbq1urW7tiheYLRypP5anffluRU5FTkTN4cH0tHDYYgQCAMOqeVX//O7vKrrKra9aIzmMPP86P8+NmM/fjftzP2zsrLSstK+3HH0XnEg0jEACocXJXuavcdepU1ol1Yp00fGNdP+pH/X78UUqSkqQkf38Ujt9DAQGAGqMP0YfoQ154gbbTdtq+cSMppJDCtDcTwokTLyiwvGh50fKiv79xuHG4cbjZLDqW1mjvfxwA1DluZjezm3nECMkgGSTD11+rRx0dRee6G8/gGTzj+nU+gA/gA/z81BGH0Sg6l1ZhBAIA1Ua9g9zHh/3MfmY/R0WpRzVYOE7yk/xkSYmUI+VIOSNHonA8HIxAAKDK6bvpu+m7eXhYt1i3WLckJrJZbBab5eQkOtcfKy9Xv44Zo7aQjYsTnai2cBAdAADqDn2APkAf8Mwz1gRrgjUhIYG9wF5gL7RsKTrXPQIpkAKtVlbMilnxpElKvBKvxO/eLTpWbYMRCAA8NnWqqksXddXSsWN0gk7QCWdn0bnuDao2dOJGbuTGoCCTyWQymTZsEB2rtsI1EAB4ZL2CegX1CnrySb6Kr+KrEhI0Wzhu4wW8gBcsXIjCUTWwFxYAVJral6N1axpEg2jQ4cO0kBbSws6dRee6v9BQU4wpxhQTFiY6SV2BKSwAeGge5z3Oe5xv3tzyreVby7dJSfQ2vU1v6/Wic9kVS7EUu26d0kHpoHQIDhYdp67BFBYAPFDfy30v973cpElFVkVWRdbevZovHJtpM23etk0tHCEhouPUVRiBAIBd6lSVoyMxYsRsq5SGDROdyx4ex+N4XGysUzundk7txo07yo6yo6yiQnSuugojEACwQ5L4dD6dT9+6VX2s3cJBYRRGYUlJauGYMAGFo2bUWAHps73P9j7b27Xr2bNnz549W7USfeIAYA9jslk2y+YNG9gmtoltmjBBdCJ7bA2dypVypVwZNUotHKWlonPVF1U+hfX7PW8CA9UtAnx9mQfzYB5Nmtz5Dz3IgzwKC+k1eo1ei4+naTSNpq1Zo5gUk2LKyBD9wgDUR/I5+Zx87oMP2CQ2iU2aO1d0HnvQ0EkbHruA9OK9eC/esmWD1AapDVK/+orm0ByaM2TIIz9hNEVT9IYNRfuL9hftDwmpby0iAUSQT8on5ZNLlrAZbAabsXSp6Dz28JV8JV/53XcVpypOVZzy9j694PSC0wt+/ll0rvrqkQuI15+8/uT1Jyen0smlk0snHz9Ox+gYHXN1rdp4KSnlE8onlE8YMUL9Rbl5U/QLBlCXqBfJQ0LUi+Th4aLz3N+lS+o2697e6kzFpUuiE9V3j3wNpHR26ezS2ZGR1VM4bHx8HHs59nLsdeBAj6geUT2imjUT9UIB1CVylBwlR738MulJT/qPPhKdxx6+hq/ha65ckWKlWCnW3x+FQ1sqPQJxN7gb3A29e1tbWVtZW5lMNdUQhifxJJ70zTdNujTp0qTL0KHf/PLNL9/88ttvYl42gNrJ7Te339x+GzuW5bAclhMVpU5ZOWhvU9UQCqGQa9es063TrdN9fLLKs8qzyk+dEh0Lfq/SIxBrf2t/a/+JE2u6kxjzY37Mz8ur9OXSl0tfTklRb2z6j/+o2ZcLoHZyi3aLdov285N2Sjulndu3a7ZwEBFRcTFP4Ak8YdQoFA5tq/wU1l/oL/QXLy9hiY/QETqi05U1L2te1vzgQdtFfGF5ADRMX6wv1hd7eqo9vWNjKZIiKbJRI9G57jGDZtCMW7fYUraULR01yrTNtM20LTVVdCy4v0qPINSLbrm56kW3Ll1EnwAtpaW01Ggse6PsjbI3Bg06c+bMmTNnrl0THQtApDtTza2tra2tU1LoJJ2kk9r7oMUzeSbPrKhg7syduRsMakOnPXtE54KHU+kRCF/Gl/FlGrr2cHtPHseVjisdVyYn39klFKAe6h3SO6R3SLduln9Y/mH5x8GDWi0ctr4cLJ7Fs/igIBSO2qnyU1i9qTf1zskRHfxu7G32Nnu7d2+1oCQmopBAfaL+vnfqJIVJYVJYUhLrx/qxfv/5n6Jz2cNSWApLCQlRhipDlaGbNonOA4+m8gWkM3WmzrGxooPbtYyW0bJevdQptuRk1zDXMNewtm1FxwKoDrYtgugNeoPeSExknsyTeXbsKDqXPewsO8vOvvmm8bzxvPH82rWi88DjqXQB6TK6y+guo3ftosW0mBafOyf6BO6vZ0/Hrxy/cvzq6FE3TzdPN0/tdkoDqAx1xNGiRfmI8hHlIw4epPfoPXqvWzfRueyaSBNpYni4sdRYaixdvlx0HKgaj7wMV5ZlWZZ1OsYYY+zYMfVo06aiT8genspTeeq331rmWuZa5vr5nfr01KenPv3hB9G5ACpD7T1ue5/Fx6tf+/cXncuusTSWxm7erCxWFiuLX3lFPci56FhQNR75TnS1p7Ci8Ml8Mp8cEKAeLS8XfUL2MG/mzbyfesphrMNYh7HJybZezqJzATyMrhFdI7pGNGrE5/F5fJ5tClm7hYNP49P4tB071MIxbdrtoygcdUyV3Qioy9Pl6fKef57n8Tye9/XXbCabyWY2biz6BO1aQAtowcWLFeMrxleMt+3mefGi6FgA/85gMBgMBgcH8wXzBfOFr75Sr+0ZDKJz3d/hw0VTiqYUTRk5Epuh1m1Vfie5foN+g37D0KFWV6ur1TUmRvOFxJM8yfN//9fhosNFh4s+Pif3ndx3ct/334uOBfD/fTk2bmQGZmAG2yd57bH15agwV5grzIMGYfPT+qHatiKRF8mL5EWDB1MohVLo7t339APRJNsmbb6+6rr0CxdEJ4L6SX3/fPihep/EnDmi89iDvhz1W7V1JDStMK0wrYiPV+8wHT1abSxVUiL6hO+vUyeextN4WkqKW5pbmlta166iE0H9oivVlepKly/XfOG4vSilIqcipyJn8GAUjvqp2lvaqtsvHz6sbss8ZAjNpJk088YN0Sduj20dPbvFbrFbKSm2O3tF54K6TU6UE+XE2bPJi7zIa9Ei0Xns4cf5cX7cbObP8ef4c76+aOhUv9XYbro2coAcIAd4e9Pf6G/0t7g4NovNYrOcnES/EPbwE/wEP/HTT9Z0a7o13c8ve0D2gOwBWr//BWoLW18OlsgSWeLnn9f0LtcPrR/1o34//siGsCFsiLe3cbhxuHG42Sw6FohV7SOQu9l22WTBLJgFP/88/5h/zD/W0N5ad7FtCSGRRBIlJ7uvdV/rvva//1t0LqjdbH056M/0Z/rzZ59ptnBw4sQLCqSnpaelpwcNQuGAf1fjBcRGndo6flzqLfWWeg8ZwjN4Bs+4fl30C2IPm8PmsDnt2llbWFtYW9g2bezZU3QuqF3U35tBg7Tel8P2frQ2tja2Nh46NDM4Mzgz+OxZ0blAW4QVEBtjU2NTY9O0NPIgD/Lw9eXhPJyH//qr6Fx2fUQf0Udt26pD+qQkua3cVm5bXS19oa6w9eVQf89jYrTal8O22IU5MAfmMGpUVlpWWlaa0Sg6F2iT5obM6lYNsqwWkoQENpvNZrM13HnQ1npzvXW9df2gQXjDwb+rLX05VLadJMaMUZexx8WJTgTaJnwEcjf1F9dkkhZJi6RFzz3H03k6T//lF9G57IqgCIpo1UrqJfWSeiUkuHd27+ze2d1ddCwQSx+qD9WHPvWUdaR1pHVkfLxmC0cgBVKg1cq6s+6s++TJKBxQGZobgdztzie4C9YL1gsJCepWDhru8+FBHuRRWEgZlEEZQ4ao13oyMkTHgpqh36/fr9/v4sIP8UP8UGoqnaATdEKDu0DfbujEjdzIjUFB6t52GzaIjgW1i+YLiI26aqV7d9aINWKNkpO13jBHVVTE2/A2vM2QIaZDpkOmQ+npohNB9bC1C2BJLIklpaay/qw/6+/iIjqXPczMzMy8cKHxmvGa8dr774vOA7WT5qaw7MlyynLKcsrJUQuHj496ND9fdK77a9GCXWVX2dVDh9wC3QLdAvv1E50Iqpat86U0X5ovzU9I0HrhUIWGonBAVag1BcRGnaP917/UR76+thucROe6vxYtJCYxiSUk6LiO6/jAgaITwePxOO9x3uN88+ZqB8yDB2k5LaflPXqIzmVXLMVS7Lp16vtnyRLRcaBuqDVTWPbYLlZyF+7CXZKS6EP6kD7UcJ8Pd3In95s3eQPegDcYOdK01rTWtDY5WXQseDh9L/e93PdykyZlT5Q9UfbEgQPMn/kzfw1/INhMm2nztm1KT6Wn0nPKFPWg1So6FtQNtb6A2Nj2rJLGSGOkMcnJbD6bz+Z36CA61/0VF1tft75ufX3kyCxDliHLkJQkOhH8MXWqytFRXcSxe7d6dNgw0bns4XE8jsfFxjq1c2rn1G7cuKPsKDvKKipE54K6pdZNYdmTHZEdkR1x/rxloGWgZaC3N1/FV/FVWu/r0bSp9J70nvTe3r26Ql2hrtDfX3Qi+COSxKfz6Xz61q3qY+0WDgqjMApLSlILx4QJKBxQnepMAbGxdRbk2TybZ/v42HYPFZ3r/po2pV20i3bt2yevkFfIK4YPF50IiIgY05l1Zp05MpJtYpvYpgkTRCeyy4d8yCc9vaSgpKCkYPRotXCUloqOBXVbnZnCskedeujUSX2UnKxOQXTpIjqXXXrSk76sjHVgHVgHg8H4lvEt41t794qOVd/I8+R58rxVq9gRdoQd+Z//EZ3n/s6ccdzjuMdxz8CB6R3TO6Z31PBWQFCn1LkRyN3UG/kuXWLH2XF23MdH7beQmys6l11GMpKxYUO1t3x0tO5fun/p/jVqlOhY9YW6lc5bb2m+cNz+PZZcJBfJZdAgFA4Qoc4XEBt108bLl6V8KV/K9/amxbSYFmu4r8ftQkJraA2tiYqSw+VwOXzMGNGx6ir5oHxQPvi3v6mPli0Tnccevpqv5qvz8irCK8Irwv39M6MzozOjf/pJdC6on+pNAbGxveEalDYobVDq68vf5e/ydzW8TfXtQsK2sq1s686dd/pIQJVQd1MOCGCX2WV2+eOPReexqy/1pb5Xr6qrC/39bdf6RMeC+q3eFRCbjJcyXsp46coVx2uO1xyv+fnxo/woP/rPf4rOdX+OjiyH5bCcqCh5q7xV3jpxouhEtdWdqcGf6Cf66YsvaD2tp/WSRt8PRUWUTumUPmTI72+kBRBLo2+YmmMrJBWRFZEVkX5+6tEzZ0TnsudOA6Kn6Wl6essW2ydo0blqC7dot2i3aD8/XsgLeeGOHcyduTP3Bg1E5/pjxcW8O+/Ou48YYdulWnQigH9X51dhVVbvY72P9T7Wpo3DbofdDrsTE+kYHaNj2m0YxSN5JI+0WNgNdoPdeOUVxVfxVXxt9yuAjboar08fCqZgCk5MpHW0jtY1ayY61z1ur8KzTrFOsU4ZNSrLM8szy/PQIdGxAP5IvR+B3C17QPaA7AFXr5YlliWWJQ4cSEtpKS3VboMo24iEN+PNeLPPP5ej5Cg56uWXRefSClvrYR7BI3jEgQNaLRy2DwKUSZmUGRCAwgG1AUYgD9CL9+K9eMuWDtcdrjtcj49nvsyX+Xp4iM5l1+0+D6SQQsrMmerUR2Sk6Fg1zS3NLc0trWtXpmd6pk9N1ez2/7b/X2NoDI159VVlqDJUGbppk+hYAA8DI5AHUFe7FBZamluaW5oPHkycOHENN4hSSCGFMfUP07p18gB5gDxg5kzRsWqKuktuhw7SJemSdCkhQbOFw+ZZepaenT8fhQNqI4xAKkmdEmnRgnzJl3wPHaIUSqGUvn1F57If+PYnXH/yJ//ZsxWDYlAMGl6u+ojuXLuKcYhxiDl6lFIplVK7dxedyx52lp1lZ99801hqLDWWLl8uOg/Ao3AQHaC2yc/Pz8/Pv3WrzZg2Y9qM2bFDWiOtkdZ4erIv2Zfsyz//WXS+ewNTPuUzRiVUQiVDhjhzZ+7Mr11Tz0PDI6mHZCvoUrwUL8UnJNAlukSXtLvoQRURoVxWLiuXFy0SnQTgcaCAPKIrCVcSriSUl7dp3aZ1m9a7djn80+GfDv+0dRzs3Fl0vnvYCome9KQfMqR9m/Zt2rcpKsrPzc/Nz619rXbVLUeaNqXn6Dl67sAB+p6+p+81PBIcS2Np7ObNyjZlm7JtxgzRcQCqAq6BPKbTC04vOL3g5k310fDh6lSRhhtE3b5GorbaXbNGDpAD5IDa80m4R1SPqB5RDRvy2Xw2n71rFyVREiV5e4vOZVckRVJkTIxLtku2S/b06epBzkXHAqgKGIFUEXVKqLzcucS5xLlk1y4+j8/j8/r0YSfYCXZCuz2yWQErYAV+fs6hzqHOoRZL/t78vfl7jx0TnetuBoPBYDA4ONzYd2PfjX3bt7MMlsEytL7J5OHDRa2LWhe1Hjfu+AfHPzj+QXm56EQAVQkX0avJndanTcqalDWJjWWD2WA2WPsNo9T7Ed5+2+Rh8jB5aGVTQcZks2yWzRs3MgMzMMO0aaIT2cMX8UV8UVpahbnCXGEeNOj3I1SAugUFpJp1jega0TWiUaMW+hb6FvroaJpFs2jWiBGicz0I/4J/wb9YtcrkanI1ub7+uqgc8jn5nHzugw/YJDaJTZo7V/TrYg9fypfypdnZlmGWYZZhPj625d+icwFUJ1wDqWa5IbkhuSG3bpXkleSV5I0bx2fymXym9htEsalsKpu6cKF8Wj4tn37vvZr++bJJNsmm0FDNF46VfCVf+d13FTkVORU5gwejcEB9ghFIDbNdBG6yqsmqJqt27lSPjh4tOtcDJVESJYWFKS2VlkrL6mu0pC7LDQlRO0eGh4s+7fu7dEm9sdTb29a4THQigJqEEUgNO/fiuRfPvVhWpv7hefFF2yod0bkeyI/8yG/BAvUP/OrVVf306rLcKVPUZcYffST6dO3qR/2o348/sqVsKVvq44PCAfUZVmEJoq7aslr7F/Yv7F/49dfXrl27du1a167qv/bsKTqfXYwYMU/P9lPbT20/tUWL/NT81PzUw4cf9enuNMjqQ32oz7ZtbCPbyDZqsC8HJ068oEDyl/wlfz8/Y4AxwBjw3XeiYwGIpL03aj0THR0dHR1tsbi4uLi4uEyeTJtpM23etk10rgdh8Syexc+ZI+fKuXLuJ5/cPvrQU6K6Ql2hrtDfX9op7ZR2bt9+p8+JxvAMnsEzrl+3NrY2tjYeOjQzODM4M1jDHSwBahCugWiM7X6HC/0v9L/Q/4sv1Fa2kyaJzvVA0RRN0Rs2KC6Ki+Jiu9Paar37P9MX64v1xZ6efC6fy+cePqxuX/7EE6Lj342f5Cf5yZISJjGJSc8/rzCFKezIEdG5ALQEBUSjbIXEbDabzWbbLq1TpojO9UCcOPHPPlOvDQQGqgetVneDu8Hd0Lu3tbW1tbV1SgqdpJN0smVL0XH/mO2GvzFj1O3w4+JEJwLQIs1NGYDq3Llz586d41y9VrJ3r3OKc4pzSqdOFEMxFOPmJjqfXYwYMVluP6/9vPbzOnZ0/sX5F+dfvvvOusS6xLokMZF9zj5nn7duLTrmPQIpkAKtVlbMilnxpElKvBKvxO/eLToWgJZhBFKrSJK6Cmr9evUPtW1vJQ273aKVjGQkY8OGouPc4/Z293wYH8aHBQaaRplGmUZt3Cg6FkBtgAJSKzEmvyO/I78TEcH2sX1sX3Cw6ES1FTMzMzMvXGi8ZrxmvPb++6LzANQmmMKqpfKP5B/JP3LokLOzs7Ozc6tW6tE+fUTnql1CQxWzYlbM774rOglAbYRlvLUa5+pF3r//nQ7SQTqo4RvwtGI8jafxn3yivm5LloiOA1CbYQqrjtGV6kp1pcuXkxd5kVft6fNR7W7fX6P0VHoqPW2r2e5dZgwADw8jkDpGaaw0VhovXsw38o18I6ZmeByP43Gxsc2eafZMs2emTlWPonAAVAUUkDrKJJtkk/zWW/QqvUqvaqWvRw0KozAKS0pyaufUzqndhAlH2VF2lFVUiI4FUJeggNRxSpASpAS9/ba6jHbpUtF5qh0nTjwjo6SgpKCkYPRotXCUloqOBVAXoYDUE+pWHO+8QyEUQiHiGkRVrzNnHGMdYx1jn39e3fX4xg3RiQDqMizjrWfy9+Tvyd/zzTdPlj5Z+mRpSQm1olbUSvutdu3yIi/yys2VHCVHydHX9+T0k9NPTr96VXQsgPoAq7DqOfmYfEw+Nn8+m8PmsDlhYaLzPCy+mq/mq/PyLAMtAy0Dvb3VToAXL4rOBVCfYAqrnjMNMA0wDVi9mubSXJo7b57oPA/Ul/pS36tX2Xw2n83390fhABAHIxD4HV2sLlYXGxREcRRHcZ98QgoppDx8n4/qVVSkfvX1VW8ENJlEJwKoz3ANBH4nf0f+jvwdRmN73p635/n5LIgFsaBhw8QWkuJi3p13592HDTPFm+JN8RkZol8nAMAIBB5AjpVj5dhXX2VX2BV25dNPaT2tp/U10HL29i6+TMd0TDd6tPE142vG1w4eFP16AMD/QwGBh6I7qDuoOzhtGl2my3R5w4bqKiQ8kkfySItFHfn89a9qY6roaNHnDwD3QgGBSpG7yl3lrlOn0nbaTts3bqyqXua2wiEtk5ZJy6ZONe437jfu//JL0ecLAPbhGghUSv6v+b/m/5qd3b5N+zbt22RksLFsLBvbvz+lURqlVb5FLU/lqTz122+l36TfpN8MBuMc4xzjnL17RZ8nADwYlvHCIzGtMK0wrYiPbza+2fhm47t3V48uWcJX8pV85Xff2fu+3//7kiXXP7v+2fXPevUy9jT2NPY8elT0eQHAw8MUFlQL1zDXMNewJ55o2L1h94bd27UryynLKcu5cuX0gtMLTi+4eVN0PgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAO/4PSBxbMqgmA24AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTItMTVUMTU6NTc6MjcrMDg6MDCiEb4vAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE3LTEyLTE1VDE1OjU3OjI3KzA4OjAw00wGkwAAAE10RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vaG9tZS9hZG1pbi9pY29uLWZvbnQvdG1wL2ljb25fY2sxYnphMHpqOWpqZGN4ci9jaGVjay5zdmfbTpDYAAAAAElFTkSuQmCC');
+  background-size: contain;
+  content: ' ';
+  inset: 0;
+}
+
+.icon-close::before {
+  position: absolute;
+  z-index: 9999;
+  display: block;
+  width: 16px;
+  height: 16px;
+  margin: auto;
+  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAADwRJREFUeNrt3V1sU+cZwPHndTAjwZ0mbZPKR/hKm0GqtiJJGZ9CIvMCawJoUksvOpC2XjSi4kMECaa2SO0qFEEhgFCQSqWOVWqJEGJJuyYYWCG9QCIOhQvYlgGCIFmatrVSUhzixO8ujNM1gSZOfPye857/7wYlfPg5xj5/n/fExyIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABATizsWti1sCs/v6y0rLSsdMaMZ/Y8s+eZPZMnm54LQO6kn/fp/UB6v2B6LrdRpgcwZf7e+Xvn7505MxAIBAKBrVt1ja7RNdXVaqlaqpbOmTP0z+u9eq/ee/euFEqhFH7ySeCjwEeBj+rr299of6P9jb//3fT2AMhcWVlZWVnZ3Ln6uD6uj2/eLF3SJV1VVapW1ara6dOH/nn9hf5Cf3HzpupW3aq7qSl5LHkseay+/nLt5drLtbdvm96eXPNZQJQqn1Q+qXzS73+vN+gNesObb0q7tEv7xImZ/kv6kr6kL/X3q0PqkDpUXx/aFNoU2rRz53l1Xp1X/f2mtxTAcMv1cr1cT5jQfb37evf1ujrpkR7p2bxZ1agaVZOXl/E/WCM1UnP/vv5cf64/f+utjg87Puz4cPfu1G9qbXp7neaTgChVeqD0QOmBP/5RHVPH1LHf/CbrN1EplVLZ2iqt0iqtv/51NBqNRqP37pnecgDpI42CgtTz9OTJ1PO0sjLbt6PX6/V6/Z/+1LG5Y3PH5g0bHnzX2pBkXlyPKTtadrTs6Ouvq/fV++r9LVscu6EbckNuPPGEhCUs4UWLpsanxqfGT5yIxWKxWCyRMH0/AH40GI6whCXc3Cyn5bScDoeduj11RV1RV559dkrFlIopFX19sauxq7GrbW2m7wenBEwP4JT0OY7UV6+/nrMbjkhEIitWSIVUSEVLS0ljSWNJYyhk+v4A/GQwHHtkj+xpahp8XuaImqwmq8m7di2oXlC9oHr2bNP3h1OsDUhgfWB9YP2WLdIgDdLwgx/kfICzclbOLluW35Hfkd/x5z8PPqABOGbYEcd22S7bKypyPsiDc6v9df11/XWvvWb6fnGKtQHRj+nH9GOrV5ueY/CVz4MHNCEBsm9YOHJ8xPEo6og6oo64YD/k1PaZHiDbvruD/uYb0/MMUyEVUtHWFi+Pl8fLf/Wray9ee/Haiz09pscCvGjYUpWpI44RBE8FTwVPFRRcLLxYeLEwHjc9T7ZYdwSi2lSbavvxj03P8UgsbQHj5pqlqlFK9iZ7k70u3i+NkXUB6Tvcd7jv8H//a3qOEXGyHciY6ZPjYzXw0sBLAy95YL+UIeuWsNJK75feL71/545arBarxYWFpucZUVjCEj53LvWEqK7mfSTAt9x6jmNEi2WxLL59O3ooeih6aNYs0+Nkm3VHIIO6pEu6Pv3U9Bijxsl2YBjPhiOtUAql0EP7oQxZG5C8SXmT8ibt35++5IjpeUaNpS3As0tVabpBN+iGgQE5Lsfl+KFDpudxirUBuTT90vRL0//xj/S1qkzPkzFOtsOHvHZy/FFUsSpWxfv2pZai//Y30/M4xfpLmRR/VvxZ8Wd//Wvf7b7bfbd//vPBS454xU25KTdnz+YSKbCZ55eq0h5cE2/OB3M+mPPBb3977dq1a9eu2XstLGtPog+Vvp5/X1tfW19bU5N6V72r3v3FL0zPlTHeRwKLeOV9HCPaLbtl94UL8a/jX8e/fv55vzwvfROQNEICmEc47OC7gKQREiD3CIddfBuQNEICOI9w2Mn3AUkjJED2EQ67EZAhCAkwfoTDHwjIIxASIHOEw18IyAgICTAywuFPBGSUCAkwHOHwNwKSIUICEA6kEJAxIiTwI8KB/0dAxomQwA8IBx6GgGQJIYGNCAe+DwHJMkICGxAOjAYBcQghgRcRDmSCgDiMkMALCAfGgoDkCCGBGxEOjAcByTFCAjcgHMgGAmIIIYEJhAPZREAMIyTIBcIBJxAQlyAkcALhgJMIiMsQEmQD4UAuEBCXIiQYC8KBXCIgLkdIMBqEAyYQEI8gJHgYwgGTCIjHEBKIEA64AwHxKELiT4QDbkJAPI6Q+APhgBsREEsQEjsRDrgZAbEMIbED4YAXEBBLERJvIhzwEgJiOULiDYQDXkRAfIKQuBPhgJcREJ8hJO5AOGADAuJThMQMwgGbEBCfIyS5QThgIwICESEkTiEcsBkBwXcQkuwgHPADAoKHIiRjQzjgJwQE34uQjA7hgB8REIwKIXk4wgE/IyDICCFJIRwAAcEY+TUkhAP4FgHBuPglJIQDGI6AICtsDUl+XX5dfl0ySTiA4QgIsmrwlXpYwhJubpaIRCSyYoXpuTIWlrCEz50b/Nrr2xGRiESqq6PRaDQavXfP9FiwAwGBI6w5IvEqjjiQAwQEjiIkOUY4kEMEBDlBSBxGOGAAAUFOEZIsIxwwiIDACEIyToQDLkBAYBQhyRDhgIsQELgCIRkB4YALERC4CiEZgnDAxQgIXMn3ISEc8AACAlfzXUgIBzyEgMATrA8J4YAHERB4inUhIRzwsIDpAYBMJNYm1ibWKqUeV4+rx5X3XwCdkTNyxoLtgC/xwIUnWPN5HI/i8Ge2A04gIHA168MxFCGBhxAQuJLvwjEUIYEHEBC4iu/DMRQhgYsRELgC4RgBIYELERAYRTgyREjgIgQERhCOcSIkcAECgpwiHFlGSGAQAUFOEA6HERIYQEDgKMKRY4QEOURA4AjCYRghQQ7kmR4AdhkMR1jCEm5uliNyRI54MBxhCUv43DkpkiIpunVLbspNuTl7tumxRu2W3JJbM2cGC4IFwYKFC6fGp8anxk+ciMVisVgskTA9HuzAxRSRFcOOOCISkciKFabnylj66ril8dJ46Zo1wY3BjcGNVVV6m96mt505Y3q8jKX/HyqkQipaWkoaSxpLGkMh02PBDixhYVysWaoa4bLq1lxGnqUtZBEBwZj4JRxDERLgWwQEGfFrOIYiJAABwSgRjocjJPAzAoLvRThGh5DAjwgIHopwjA0hgZ8QEHwH4cgOQgI/ICAQEcLhFEICmxEQnyMcuUFIYCMC4lOEwwxCApsQEJ8hHO5ASGADAuIThMOdCAm8jIBYjnB4AyGBFxEQSxEObyIk8BICYhnCYQdCAi8gIJYgHHYiJHAzAuJxhMMfCAnciIB4FOHwJ0ICNyEgHkM4IEJI4A4ExCMIBx6GkMAkAuJyhAOjQUhgAgFxKcKBsSAkyCUC4jKEA9lASJALBMQlCAecQEjgJAJiGOFALhASOIGAGEI4YAIhQTYRkBwjHHADQoJsICA5QjjgRoQE4xEwPYDtbAtH4kriSuIKT1BbXCy8WHixMB6fuGzisonLVq/W2/Q2ve3MGdNzZeysnJWzy5blt+e357f/5S8ljSWNJY2hkOmxbMcRiENsDcfV7Ve3X93+zTemx4IzOCJBJghIlhEO2ICQYDQISJYQDtiIkOD7EJBxIhzwA0KChyEgY0Q44EeEBP+PgGSIcACEBCkEZJQIBzAcIfE3AjICwgGMjJD4EwF5BMIBZI6Q+AsBGYJwAONHSPyBgDxAOIDsIyR2831ACAfgPEJiJ98GhHAAuUdI7OK7gBAOwDxCYgffBIRwAO5DSLzN+oAs18v1cj1hQk95T3lP+aefpr77y1+anitje2SP7Dl7NhW+1auj0Wg0Gr13z/RYQDYMvsALS1jCzc0SkYhEVqwwPVfGKqVSKltbQ++E3gm9U1V1Xp1X51V/v+mxnGL9B0p1X+++3n29ri71FeEA3GjwcR2RiESqq1MhOXfO9FwZa5VWaa2s7DnYc7Dn4O7dpsdxmrUBKX+7/O3yt3/2M5krc2Xupk2m58lYeqkqmogmomvWEA74QfpxHtwY3BjcWFXl1U9I1Iv0Ir1o69b53fO753fPm2d6HqdYG5BkXjIvmbd1q3pOPaeemzDB9Dyjlj7i2Ck7ZeeqVZzjgB+lP2o3dU5kzRqvHZGoGlWjavLyAg2BhkDDa6+Znscp1gZEzVQz1cyqKtNzjBpLVcAwnl/aOi7H5biH9kMZsi4gCzoXdC7o/OEPZZ/sk33TppmeZ0QsVQEj8vbS1owZJY0ljSWNoZDpSbLNuoAMrBtYN7DuRz8yPceIWKoCMubVpa3Q/ND80HwP7JcyZF1ARIkS9e9/mx7jkTjiAMbNa0ckgUmBSYFJ//mP6Tmyzdr3gZTGS+Ol8Rs31FK1VC2dM8f0POkjjuCTwSeDT1ZXp19JmR4LsIFr30eyQ3bIjs7O6AvRF6IvFBebHifb7DsCeUA1qAbV0Nxseg7CATjPrSfb9VP6Kf2UC/ZDDrE2IMlkMplM7t8vNVIjNffv53yAIUtVhANwnluWtvRhfVgf7u1VL6uX1csHDpi+X5xibUAu116uvVx7+3bqqz/8IWc3nD7imBecF5y3ciUnx4HcM36yPSlJSb71VrQj2hHtuHPH9P3hlDzTAzgt1hRrijW1tU3ZMWXHlB1z5qgr6oq68uyzWb+h/bJf9re0BIuCRcGitWs54gDMi8VisVgskZganxqfGj9xInWtqvJyuSE35MYTT2T79vRJfVKfPHas4+mOpzuerq01vf1Osz4gabGWWEus5dSpaV9N+2raV4mE7JJdsmvJEmmXdmnP/J3q+pK+pC/190undErn3r1FkaJIUeR3vzv9yulXTr/S12d6ewF8Kx2S4gvFF4ovfPxxX29fb19vQYE+qo/qowsWqPfUe+q9QMYrMumlKlklq2TVm29+Nxxam95up1n7U1gjKSstKy0rnTFDr9Qr9cotW1SLalEtq1enfgy4qOjhf+vOHVkn62TdJ58M3B24O3C3vv7Lg18e/PJgZ6fp7QGQufQ18/QpfUqf2rw59d3nn0/9OmPGsL+wRJbIkn/+U7+qX9WvNjUFZgVmBWbV17cXtBe0F3R1md6eXPNtQB4l/fkEiTWJNYk1P/1p+n0lvF8D8I/BHwvWokX/5CehaCgaiv7rX6nLs/f2mp4PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtvsf2vlfs7i0WI4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTItMTVUMTU6NTc6MjcrMDg6MDCiEb4vAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE3LTEyLTE1VDE1OjU3OjI3KzA4OjAw00wGkwAAAE10RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vaG9tZS9hZG1pbi9pY29uLWZvbnQvdG1wL2ljb25fY2sxYnphMHpqOWpqZGN4ci9jbG9zZS5zdmdHkn2WAAAAAElFTkSuQmCC');
+  background-size: contain;
+  content: ' ';
+  inset: 0;
+}
+
+.icon-right::before {
+  position: absolute;
+  z-index: 9999;
+  display: block;
+  width: 16px;
+  height: 16px;
+  margin: auto;
+  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAJ4pJREFUeNrt3XtcVXW6P/Dn2VwCBxUzNbnkkXRSGzXW2huQRLyMIqKRJF7Q1CkrDS+VGp3Gy9g5YzI6qVsNfTmlqGmipQiIiJqAcnOvhaKRHidshoatpKaBogL7OX+s6Mz8flO5CfzutXne/+zXWhR8QOXZ3+93Pd8vAHuAEKW10lpp7dix0mXpsnR5/34pX8qX8r/7TpZlWZaJGl//9f6+fY3/X+PnEf2dMMYY/yJqYcbbxtvG2/7+lEM5lLN7NyyCRbBowICmfj56m96mt/PzDZGGSEPkxImWNpY2ljYVFaK/T8ZY6+MiOoCzMn1t+tr09a9/TQfpIB0sLITlsByW9+r1Sz8v5mEe5vn7Q3toD+0nT/Y77Xfa73ROTuWNyhuVNyorRX/fjLHWg0cgzUybcmrThvIoj/JUFcMwDMOeeKLFvmA8xEN8TQ2sh/Ww/rnnFFVRFfXwYdE/B8aY8zOIDuBsqDf1pt6vvdbihaPRBtgAG7y8wAQmMKWlyflyvpw/aZLonwNjzPlxAWlWiOiN3ugdH//Av7QFLGBxd4dzcA7O7dgh75H3yHvmzBH9E2GMOS+ewmomplhTrCn2qads5bZyW3lJieg8jWgADaABf/yjul5dr65fvPj7uyQ6F2NM/3gE0kxsb9vetr3do4foHP8vLMACLPj977W1mS1bwimcwsnVVXQuxpj+cQFpLt/Ct/BtmzaiY/y0adNqltYsrVmakqIVEg8P0YkYY/rFj/E2E5+zPmd9znbpAggI+PzzovP8qItwES727n23w90OdzuEhfl86fOlz5f79lmtVqvVeveu6HiMMf3gEUgzqVfqlXqluFi7qqsTnefnYCImYmJ4OOVSLuWeONF/Zv+Z/Wf6+orOxRjTD15Eb2ZSlVQlVWVkYCRGYuSoUaLz3C86QSfoRHk5lVAJlURElISWhJaE/vWvonMxxhwXj0CaGT1Lz9KzS5eCDDLI+nnaCQfiQBwYEID1WI/1J05oi+6SJDoXY8xx8RpIM7tccbnickVlZdekrkldk4gwAzMwY8gQ0bnuF2ZhFmZ5eWkd7pMn+1T4VPhUKIq2RvLll6LzMcYcB09htShE6YJ0Qbqwdi3GYRzG6bCxbxbMgll372ojqilTlEAlUAncu1d0LMaYeDyF1aKI1CfUJ9Qn5s6FuTAX5r71lt6mtiAJkiDpoYeojuqo7uOP5VQ5VU6dOVN0LMaYeDwCecCkFClFSpk+HcbBOBi3eTOa0IQm/TX20RbaQlsSE9V+aj+131tvic7DGHvwuIAIIp+Xz8vno6OpJ/Wknrt2YRAGYZCnp+hcdpsAE2DC++8rbypvKm82TtHZbKJjMcZaHhcQwYxnjWeNZ8PDaTpNp+mpqdrd9u1F52qa/fu9LF4WL8ukSTmYgzl4547oRIyxlsNrIIJZ+lr6Wvrm5GBv7I29Bw6EN+ANeOMf/xCdq2mefbbGWGOsMR48GHQx6GLQxXbtRCdijLUcfozXQVSWVpZWllZV+df51/nX7dtH8RRP8aNGwQk4ASc6dhSdzz7du9NVukpXR4zoFNMpplPM/v1Xsq9kX8m+dUt0MsZY8+ERiIMpTitOK067dMm1zrXOtS4sTLurqqJz2e04HIfjsuw623W26+yCgsD8wPzAfMfbrZgx1nRcQBxUUVxRXFHclSu1CbUJtQnh4dpd/R1V+0OHuxGNaMzLazw3RXQuxtgvx4voOtEnpU9KnxR3d88yzzLPsu3bIQ3SIG38eNG57BYEQRB04wZVUzVVP/OMukPdoe7IyxMdizFmPx6B6ETZ+LLxZePv3Qv4PODzgM/j4mg37abdGzeKzmW3YiiGYm9vHIyDcXB2tlwil8gl48aJjsUYsx+PQHROTpaT5eSEBDCDGcwrVojOYy9KoiRKamgAK1jBOmuWGq1Gq9GbN4vOxRj7eVxAnISUKWVKma++ihVYgRXr1sEm2ASbDPoZYTZu8bIJNsGmd95RUEEF//AH0bEYYz9OP79g2E9SI9VINfL996mWaql23DjaQBtog44a+RRQQEEEIxjBuHSptgml2ax9UEeFkLFWhEcgTko7z2PIECqiIiravx+DMRiD9drYt3MnEBDQ9OmKqqiK6vgnPjLWGvA7OyelKIqiKJ99pj31NHQovAavwWtVVaJzNU1cHKyCVbAqM/Ppjk93fLpj27aiEzHGeATSahjTjenG9IAAOkyH6XBWFpyEk3BSf419tISW0JJTp2wdbB1sHaKiTg86Pej0oG++EZ2LsdaIC0grozXyPfpow7SGaQ3TMjNxKS7FpTps7CMgoPPntYuICG1q6+9/Fx2LsdaEC0gr1Z/6U3/y9nZNcE1wTThwAI7CUTjauHWK3litVEEVVDFypFqlVqlVpaWiEzHWGvAaSCt1Bs/gGbxx46bfTb+bfsOHUxqlUZpej6rt2hVX4kpcefy4sYOxg7HD00+LTsRYa8AjEAYAALGxsbGxsS4u5XK5XC4nJcEe2AN7XnpJdK6muX1bex0/XnuYICNDdCLGnBEXEPZvIMokk0xLlzb2ZYhOZK/GDne8htfw2iuvKJFKpBL5wQeiczHmTPg8EPZvWZdZl1mXHT/uY/Yx+5ivX4cn4Ul4MiLih4Y/B4cZmIEZBgPchJtwc8wY33Lfct/y2trKO5V3Ku+cPCk6H2POwOF/ETDHoDUmxsVpV1u3aq9ubqJzNY3ZrE1tvf66ds1nuDPWFFxAmF0C9wTuCdwzbBj6oi/67tuHc3AOztFfYx9Npak0dft2TMZkTH7xRe5wZ8x+XEBYk5i6m7qbuptMtlG2UbZRGRlQCIVQ2KmT6Fx2i4RIiExPh0zIhMwJE7SRSeMiPGPsp3ABYb+INrXVq5d2lZWlvT72mOhcdiMgoKIi7WL0aG1EcvWq6FiMOTLuA2G/iPaOvbEjPCQEBsEgGKTDRj4EBAwOhkWwCBbl5BhvG28bb/v7i47FmCPjEQhrVn379u3bt2+HDm55bnlueWlpOAyH4TAdNvaFQiiE/u1v2Bk7Y+eICMtiy2LL4gsXRMdizJHwY7ysWVVVVVVVVd2545Ptk+2T/fHH2t3GvbZ+/WvR+e5bBVRAhbc3zaJZNCsu7lG3R90edcvLu6xcVi4rX38tOh5jjoCnsFiLaFyMDggICAgIiI6mPbSH9uivkQ/n4Tyc9/DDBjSgAbOzA/MD8wPzR44UnYsxR8BTWOwBQpTmS/Ol+StW4HE8jsfffFN0IrsZwQjGe/dgGkyDadOnK6FKqBK6a5foWIyJwFNY7IGyFlgLrAVHjnTd3nV71+03buDj+Dg+PmKEXjrcoRIqodLFBaqgCqpiYnzAB3ygpsZqtVqt1oIC0fEYe5C4gDAhrNus26zbiop8yZd86dIlqIEaqBk9Wvuoi+P/vbSCFayNBW/EiK5ZXbO6Znl6WpOsSdako0dFx2PsQXD8d3ysVZCWS8ul5aNH4yf4CX6ye7d2t00b0bmaJjnZy+Jl8bLMmJGDOZiD9fWiEzHWEriAMIciS7IkS8HB2lV6utaf8cgjonPZi+IpnuIPHHAf7j7cffjEiYX+hf6F/rW1onMx1pz4KSzmULQO8KKihjUNaxrWhIdTPuVTfkWF6Fz2wg24ATc888y9gnsF9woyM7XC2L696FyMNScuIMwhnR50etDpQWVltI7W0bqwMMqjPMrTXyMfJmIiJoaHUy7lUu6JE/1n9p/Zf6avr+hcjDUHnsJiuhBSEVIRUvHww3Xn6s7VnUtP17YcGTBAdC57USIlUuKlS7YDtgO2AxERp82nzafNFy+KzsVYU/AIhOmCtoZw/bpWQIYPh9WwGlYfOiQ6l70wARMwoXt3wzjDOMO4vDxtM0pJEp2LsabgAsJ0pXRh6cLShbdu1V6uvVx7OTqaUimVUvXXyIev4+v4epcuEA/xEJ+To62RjBghOhdj9uApLOYEELVfwCtXak9tzZ8vOpHdvu9wJ5lkkp9/Xn1ZfVl9OSVFdCzGforjN2wxdh+0TvDDh31W+KzwWXHnDtRDPdQPG/avDX8OrLHDfQbMgBkxMT6jfUb7jK6qsn5s/dj6scUiOh5j/47j/8NirAm0tYVp0+gUnaJTf/kLmtCEJldX0bnsRVtoC21JTFT7qf3Ufm+9JToPY/+MCwhzavJ5+bx8PjqaelJP6rlrFwZhEAZ5eorOZbcJMAEmvP++8qbypvLmnDnaTZtNdCzWunEBYa2C8azxrPFseDhNp+k0PTVVu6vDxr4oiIKoffu8lnkt81oWF6dtlXLnjuhYrHXip7BYq2Dpa+lr6ZuTg72xN/YeOBDegDfgjX/8Q3Quu2VABmSMHVtjrDHWGA8eDLoYdDHoYrt2omOx1okX0VmrUllaWVpZWlXlX+df51+3b5+2Z9WoUXACTsCJjh1F57NP9+50la7S1REjOsV0iukUs3//lewr2Veyb90SnYy1DjwCYa1ScVpxWnHapUuuda51rnVhYdpdVRWdy27H4Tgcl2XX2a6zXWcXFGgnJvboIToWax24gLBWrSiuKK4o7sqV2oTahNqE8HDt7uHDonPZCwfiQBwYEIBGNKIxL88Ua4o1xTaeRc9Yy+BFdMb+SZ+UPil9UtzdPcs8yzzLtm+HNEiDtPHjReeyWxAEQdCNG1RN1VT9zDPqDnWHuiMvT3Qs5lx4BMLYPykbXza+bPy9ewGfB3we8HlcHO2m3bR740bRuexWDMVQ7O2Ng3EwDs7OlkvkErlk3DjRsZhz4REIY/dBTpaT5eSEBDCDGcwrVojOYy9KoiRKamjQOvNnzVKj1Wg1evNm0bmYvnEBYcwOUqaUKWW++ipWYAVWrFsHm2ATbDLoZyQvgwwykZb7nXcUVFDBP/xBdCymT/r5i8+YA1Aj1Ug18v33qZZqqXbcONpAG2iDjhr5FFBAQdQ2b1y6VLogXZAumM3aB3VUCJlD4BEIY7+AtufWkCFUREVUtH8/BmMwBuu1sW/nTiAgoOnTtaOF6+pEJ2KOjd9xMPYLKIqiKMpnn2lPPQ0dCq/Ba/BaVZXoXE0TFwerYBWsysx8uuPTHZ/u2Lat6ETMsfEIhLFmZEw3phvTAwLoMB2mw1lZcBJOwkn9NfbRElpCS06dsnWwdbB1iIrSzqj/5hvRuZhj4QLCWAvQGvkefbRhWsO0hmmZmbgUl+JSHTb2ERDQ+fPaRUSENrX197+LjsUcAxcQxlpQf+pP/cnb2zXBNcE14cABOApH4Wjj1il6Y7VSBVVQxciRapVapVaVlopOxMTiNRDGWtAZPINn8MaNm343/W76DR9OaZRGaXv3is7VNF274kpciSuPHzd2MHYwdnj6adGJmFg8AmHsAYqNjY2NjXVxKZfL5XI5KQn2wB7Y89JLonM1ze3b2uv48drDBBkZohOxB4sLCGPCIMokk0xLlzb2ZYhOZK/GDne8htfw2iuvKJFKpBL5wQeic7EHg88DYUwg6zLrMuuy48d9zD5mH/P16/AkPAlPRkT80PDn4DADMzDDYICbcBNujhnjW+5b7lteW1t5p/JO5Z2TJ0XnYy3L4f+CMtaaaI2JcXHa1dat2qubm+hcTWM2a1Nbr7+uXfMZ7s6GCwhjDihwT+CewD3DhqEv+qLvvn04B+fgHP019tFUmkpTt2/HZEzG5Bdf5A5358IFhDEHZupu6m7qbjLZRtlG2UZlZEAhFEJhp06ic9ktEiIhMj0dMiETMidM0EYmjYvwTK+4gDCmA9rUVq9e2lVWlvb62GOic9mNgICKigwHDAcMB6KiTvmd8jvld+2a6FisabgPhDEd0N6xN3aEh4TAIBgEg3TYyIeAgMHBtmJbsa04NzfoYtDFoIt+fqJjsabhEQhjOtS3b9++fft26OCW55bnlpeWhsNwGA7TYWNfKIRC6N/+hp2xM3aOiLAstiy2LL5wQXQsdn/4MV7GdKiqqqqqqurOHZ9sn2yf7I8/1u427rX161+LznffKqACKry9aRbNollxcY+6Per2qFte3mXlsnJZ+fpr0fHYT+MpLMZ0rHExOiAgICAgIDqa9tAe2qO/Rj6ch/Nw3sMPG9CABszODswPzA/MHzlSdC7203gKizGngyjNl+ZL81eswON4HI+/+aboRHYzghGM9+7hLbyFt6ZNs+yw7LDsaBxpMUfBU1iMOSFrgbXAWnDkSNftXbd33X7jBj6Oj+PjI0bopcMdKqESKl1coBt0g27PPecDPuADNTVWq9VqtRYUiI7HNFxAGHNi1m3WbdZtRUW+5Eu+dOkS1EAN1IwerX3UxfH//VvBCtbGgjdiRNesrlldszw9rUnWJGvS0aOi47V2jv9OhDHWbKTl0nJp+ejR+Al+gp/s3q3dbdNGdC67xUAMxGzd6vW219teb7/0Ug7mYA7W14uO1dpwAWGsFZIlWZKl4GDtKj1d68945BHRuexFGZRBGamp7nXude51kyYV+hf6F/rX1orO1VrwU1iMtULanlRFRQ1rGtY0rAkPp3zKp/yKCtG57IVRGIVR0dH3Cu4V3CvIzNQKY/v2onO1FlxAGGvFTg86Pej0oLIyWkfraF1YGOVRHuXpr5EPEzERE8PDKZdyKffEif4z+8/sP9PXV3QuZ8dTWIyxHzyV+1TuU7mdOhm+NXxr+DYjA9/Bd/Adk0l0LnvRCTpBJ8rLaRgNo2FhYSX5Jfkl+ZWVonM5Gx6BMMZ+oI1Ivvnmzt07d+/cHTpUu3v4sOhc9sKBOBAHBgQYFhsWGxbv3dsnpU9KnxR3d9G5nA2PQBhjP6rxF69HqEeoR+jWrRiN0Rg9aZLoXE3z6qta535SkugkzoILCGPsPhkM0gXpgnRhzRqMwziMmzNHdKL7thAWwsKvvlImKhOVid27i47jLLiAMMbsJifLyXJyQgKchJNw8t139dLhjs/is/hsr16862/z4DUQxpjdlGnKNGVaYiJFURRFvfIKJVESJTU0iM71s76Bb+Cb3/xGdAxnwQWEMdZkarQarUZv3ky9qTf1Hj8eXoFX4BWbTXSuH0PP0rP07K9+JTqHs+ACwhhrstjY2NjYWBcX3ISbcFNUFGyCTbDJ4Li/VxbCQljIW540F8f9g2aMOSztjPY2bb7c8OWGLzccOIC7cBfueuEF0bl+ViqkQuqNG6JjOAtX0QEYY/rReJQuHaWjdFRHR+nKIINMVLerblfdLotFdBxnwQWEMfazgi4GXQy66OfXcLbhbMPZrCwYBsNgWJ8+onPdL/oT/Yn+lJ9f6l3qXepdVSU6j7PgAsIY+1HaVFWvXg0TGyY2TMzK0u4+9pjoXPYypBhSDCl//KPoHM6G10AYY/8fU3dTd1N3kwlCIARCcnO1u/orHPQcPUfPbdpkednysuXlzEzReZwNj0AYYz+Q3pbelt6OiLBdt123Xf/kEyiEQijU32OvFE/xFH/gwHc139V8VzNvnug8zsrhO0cZYy1Pm6qKi9Outm7VXt3cROeyF31Kn9Kn27bhWByLY2fM0M49qasTnctZ8RQWY62Ysaexp7Hn7NlaA+D27dpd/RUOjdmsdlO7qd2mT+fC8WC4iA7AGHvwftjL6jSchtPvvaeXvaz+7xvQHssld3In94QE9Zh6TD22eLHoWK0Nj0AYawUaO8blcrlcLt+0CcxgBvOKFaJz2YtO0Sk6VV+P5/E8np8xQ/1U/VT9dOVK0blaK/2842CM2a2HuYe5h/mhh9pvbb+1/dbt2wEBAWNjRedqmtu3tU7y2FjFT/FT/A4eFJ2oteMRCGNOSDsIysurXVy7uHZxaWm6LRxzYS7M/fZbLMdyLB8xgguHY+ERCGNOJHhn8M7gnV261I2pG1M3JjMTB+NgHBwYKDqX3QbAABhQWQn5kA/5I0dqi+Jnz4qOxf4Vj0AYcwJBY4LGBI3p3r3erd6t3i0vT7eFIwzCIOyLL7TCMWAAFw7HxiMQxnTMOMU4xTjlN78hb/Im76wsKIACKPDxEZ3LXrSEltCSU6dwGS7DZaNGaYXj6lXRudhP4050xnRIJplkGjyYjGQk4/792t327UXnshfNp/k0/8gRzxc8X/B8ISbm5LWT105eq64WnYvdH57CYkxH5PPyefl8dDQVUREVNe7tpL/CAdEQDdEffYSrcBWuGjWKC4c+8RQWYzogpUgpUsr06TAOxsG4zZvRhCY0uep0BsFsVhRFUZTXX9euHfcIXPbTuIAw5sB+6BjXaeNfY8e4dtTtO+8oqKCCf/iD6Fiseej0HQxjzgxRKpPKpLJVq+B5eB6ef+MN0YnsRUmUREkNDWAFK1hnzVJRRRU3bxadizUvHoEw5gC0xj93d4+rHlc9riYn4wf4AX4wcaLoXHabBbNg1t27WIqlWDp5ssVsMVvMn3wiOhZrGVxAGBOo38p+K/ut/NWv3ILdgt2C9+6F1+F1eH3kSNG57BYEQRB04wZVUzVVP/OMukPdoe7IyxMdi7UsLiCMCRBSEVIRUvHww3Xn6s7VnUtPh0WwCBYNGCA6V9NYrbZSW6mtNDKypK6krqTuzBnRidiDwY/xMvYABa4KXBW4qlu3ex3vdbzXMT9fr4WDTtAJOlFerl2FhXHhaJ14EZ2xB+Cp3Kdyn8rt0weDMRiDDx3CUAzFUH9/0bnstgyWwTKLpX59/fr69VFRpUqpUqpUVYmOxcTgKSzGWpAsyZIsBQdrV+np2q64jzwiOpfdhsNwGH7smMuLLi+6vDh2bHHP4p7FPb/7TnQsJhZPYTHWAqTl0nJp+ejRWsE4dky3hSMKoiBq3z6vd73e9Xo3KooLB/tnPAJhrBlJnaXOUucpU9Af/dH/ww+1uzo8YzwVUiF1wwbt/I25c7Wb3DHO/hWfic5YM5COSEekI/PmYSAGYuDGjdoZ4/rbaoS20Bbakpio9lR7qj0bGxiJROdijkl3f8EZcxyIUqlUKpW++y7+Dn+Hv0tIEJ3IXo0d42hFK1pnz1b7qf3Ufhs3is7F9IGnsBizQ2xsbGxsrItL+ZflX5Z/uXGjtrYxY4boXHb7vmOcbGQj29Sp6svqy+rLKSmiYzF94QLC2H3oYe5h7mF+6KH2Ie1D2ofs3Kn9Ao6JEZ3LbvEQD/E1NRADMRATE6N4K96Kd3a26FhMn7iAMPYT+lN/6k/e3q5GV6OrMS1NuztwoOhc9qLVtJpWX7liWGRYZFgUGWnJteRacktKROdi+sZrIIz9G7Isy7LctSscgANwoPHgpv79ReeyFyVSIiVeumTba9tr2xsRoeaquWruxYuiczHnwCMQxv6JVjgefxwICCgrS1vjePxx0bnsRTmUQznnzjUsaFjQsGDkyDMbz2w8s/Ef/xCdizkXbiRkDAACQwNDA0ONRgiBEAgpKNBt4UigBErIycFBOAgHDRzIhYO1JB6BsFZNmi3NlmYPHQprYA2s2bdP26uqXTvRuexFGZRBGamp7nXude51kyYV+hf6F/rX1orOxZwbr4GwVklaK62V1o4dC8EQDME7d2qFw8NDdC67xUAMxGzd2rZL2y5tu7z0Ug7mYA7W14uOxVoHHoGwVkUaJA2SBsXH4xScglPMZu2sboPupnJ/6Bjvp/ZT+731lug8rHXiAsJaBTlZTpaTExLADGYwr1ghOo/93wDIIBNBOIRD+IIFymRlsjL5vfdEx2Ktm+7eeTF2Pxo7xqW/Sn+V/pqUpNvCYQQjGO/dw9t4G2/HxXHhYI6ERyDMqfzQMX69/fX217dtgzRIg7Tx40XnspsJTGC6dcs21TbVNnXcuJLQktCS0EOHRMdi7J/xCIQ5hT4pfVL6pHh5tYtrF9cuLi1Nr4WD1tJaWnv9uo1sZKPhw7lwMEfGIxCma8E7g3cG7+zSpf7P9X+u//PBg9pdSRKdy26hEAqhf/sbdsbO2DkiwrLYstiy+MIF0bEY+yn8GC/TpaAxQWOCxnTvXu9W71bvlpWl3e3ZU3Quu/0efg+/Lytz6evS16VvRIR24t/XX4uOxdj94ALCdMU4xTjFOOU3v2mIbIhsiDx0CFbACljh6ys6l90ICKioyBBkCDIERUUV+xX7FftduyY6FmP24CkspgvGs8azxrPh4TSdptP01FTtbvv2onPZbR2sg3VpaW7+bv5u/hMmcMc40zNeRGcOzfhfxv8y/tczz9j62PrY+jTuiqu/wkGf0qf06bZtMBtmw+znnuPCwZwBj0CYQ9J2xZ02jU7RKTr1l7+gCU1o0t8Z4xqzWVEURVFee0275jPGmXPgEQhzKD90jMsgg7xli+4Kx/cd49SNulG3N9/UCse8edoHuXAw58IjEOYAEOW18lp57Z/+BNtgG2xbsEB0IntpI6X6esNgw2DD4Fde0U78+/BD0bkYa0n6eWfHnIrW+Ofu7hHqEeoRunUrREM0RE+aJDpX09y+jZVYiZWxsVrhaOxHYcy58RQWe6D6rey3st/KX/3K447HHY87+/djNEajHgvHXJgLc7/9FsuxHMtHjFD8FD/FjwsHa11cRAdgrUNIRUhFSMXDD9Ntuk23MzNxFa7CVUOHis5ltwEwAAZUVsJe2At7f/tb5ZJySblksYiOxZgIvAbCWpR2VKyPj+Gu4a7hbuOeTn37is5ltzAIg7AvvoBcyIXckSMVVVEV9e9/Fx2LMZF4Cou1iMDqwOrA6t698TP8DD8rLNTu6q9w0BJaQktOndIKx6BBXDgY+z88AmHNytjT2NPYMyiI2lJbapuRAQgI+MgjonPZbSWshJVHj3rEesR6xI4de/LayWsnr1VXi47FmCPhEQhrFsZ0Y7ox/be/tSXbkm3JR47otnBEQzREf/QRLIAFsCAykgsHYz+ORyDsF5E6S52lzlOmoD/6o39j34Obm+hc9qKdtJN2rlunPqE+oT7R2DFus4nOxZgj4xEIaxJZkiVZmjsX/xv/G/87OVm7q6PC0XjGuAUsYFm2TCscc+dqH+TCwdj94BEIswOiTDLJtHSpdlb30qWiE9mLkiiJkhoawApWsM6apUar0Wr05s2iczGmR1xA2E+KjY2NjY11cSmXy+VyOSkJ9sAe2PPSS6Jz2W0WzIJZd+9iKZZi6eTJFrPFbDF/8onoWIzpGRcQ9m/1MPcw9zA/9FA7j3Ye7Tw++gg34Sbc9NxzonPZLQiCIOjGDaqmaqp+5hl1h7pD3ZGXJzoWY86A10DYv+hP/ak/eXu3/7r91+2/zs7Wa+GgAiqggsuXDVcNVw1XhwzhwsFY8+OtTBgAAJhiTbGm2EcfhTbQBtpkZ+OH+CF+GBwsOpe96ASdoBPl5aSSSurQocp8Zb4yv6xMdC7GnBEXkFZO698ICKAqqqKqY8dwG27DbX36iM5lt8EwGAYrSn1ZfVl92dChZyaemXhmYkWF6FiMOTPezr2VkiRJkiRZpm/pW/r24EE4CSfhZOfOonM1zWefucx0meky89lnlZ5KT6Xnd9+JTsRYa8BrIK2MdlTskCFQDMVQfOwYrIE1sEaHhSMKoiBq3z4vi5fFyzJqVHHP4p7FXDgYe6D4KaxWQlorrZXWjh0LwRAMwTt3YjzGY7yHh+hcdkuFVEjdsEE7f4Mb/xgTiUcgTk7KlDKlzFdfRU/0RM+9e/VaOGgLbaEtiYla4Zg9W7vLhYMxkXgNxEnJyXKynJyQAItgESxasUJ0Hns1doyjFa1onT1b7af2U/tt3Cg6F2Ps//BTWE6isWPc44DHAY8D77+PC3EhLnzrLdG57PZ9x7i21ciUKepkdbI6uXGvLcaYI+E1EJ3rk9InpU+Ku7tnmWeZZ9n27ZAGaZA2frzoXHaLh3iIr6mBGIiBmJgYxVvxVryzs0XHYoz9OC4gOqUVDi8vz0TPRM/Exj2dRowQnctetJpW0+orVwyLDIsMiyIjLbmWXEtuSYnoXIyxn8drIDoTvDN4Z/DOLl3qE+sT6xMPHtTuSpLoXPaiREqkxEuXbHtte217IyLUXDVXzb14UXQuxtj946ewdELbo+o//qPukbpH6h7JzdXu6rBw5FAO5Zw717C3YW/D3rCw0+bT5tNmLhyM6RFPYTk403rTetP6J5+0dbB1sHXIyoL34D14z9dXdC57UQIlUEJODq7AFbgiOlpRFVVRb94UnYsx1nRcQByUNFIaKY0MCdEWxdPTMQRDMKRjR9G57EUZlEEZqanude517nWTJhX6F/oX+tfWis7FGPvleA3EwQSWB5YHlo8ZA92gG3TbvRuDMAiDPD1F57JbDMRAzNatbbu07dK2y0sv5WAO5mB9vehYjLHmwyMQByEfk4/Jx6ZOpcE0mAZ/8AGa0IQmV90V+MaOca3xT4d9KIyx+8YFRDDpiHREOjJvHqZgCqasXg0KKKCgfv5cZJBBJoJwCIfwBQuUycpkZfJ774mOxRhrebp7h+scEOUb8g35RmIiDINhMGzhQtGJ7GYEIxjv3cNbeAtvTZtmmWyZbJn88ceiYzHGHhwuIA9IOIVTOLm6Vv+5+s/Vf960SSscL7wgOpfdTGAC061btqm2qbap48aVhJaEloQeOiQ6FmPsweM+kBamnb/Rpk31N9XfVH+Tmoq7cBfu0l/hoLW0ltZev24jG9lo+HAuHIwx/cy168zTHZ/u+HTHtm3v/O7O7+787vBh+Aw+g89CQkTnsttCWAgLv/rKMNAw0DAwIuKU3ym/U37/8z+iYzHGxOMC0iIQ5Xw5X85PTYU5MAfmjBkjOlHTnD1re8j2kO2hkSNL8kvyS/IrK0UnYow5Di4gzcw4xTjFOGXiRPqCvqAvdu0SncduBARUVGQ4YDhgOBAVpY04rl0THYsx5nh4DaSZUSfqRJ3+8z9F57DbOlgH69LS3FLdUt1ShwzhwsEY+zlcQJqJMd2YbkwPCIBcyIXcfv1E57lvH8FH8NGWLV4DvAZ4DYiJ4a1GGGP3ix/jbSbUg3pQj759Reewj9ms9FJ6Kb1ee+3774JEJ2KM6QePQJoJlVIplXboIDrHj/q+Y1w7Y/yNNxRFURRl3rzv03PhYIzZjQtIMyEjGcnoeGsGdIpO0an6ejyP5/H8jBmWSkulpXL1atG5GGP65yI6gLN4rPyx8sfK6+qomqqpuvGdvUDfd4wbrAarwRoTY1lvWW9Zv2eP6FiMMefBI5BmUpxWnFacdukSLIElsOTMGVE5qJAKqfDaNfqKvqKvfvtby8uWly0vZ2aK/vkwxpwPF5BmRlfoCl1ZvlzMV7dawRd8wXfoUPWQekg9VFgo+ufBGHNe3EjYIhCly9Jl6fK+fRiFURgVHd1iXyoMwiDsiy9wOS7H5RERljaWNpY2FRWifwKMMefHI5AWQeT5pOeTnk8+/zy8C+/Cu7m5zf4lvv+8hgWGBYYFYWFcOBhjDxovoreQitqK2orae/d8Pvf53Ofzjz4CBAR0c6NiKqZiWcbNuBk3u7nd7+fT/r/aWqzHeqxftQpWwkpY+cILloWWhZaFNTWiv1/GWOvDU1gPWGBoYGhgqI+Py1cuX7l8NWEC7aW9tHfIELpO1+m6v3/jf4cP48P4cEUFvUPv0DvHjtF39B19l5LCmxoyxhzF/wKeYeMy/zPC/wAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNy0xMi0xNVQxNTo1NzoyNyswODowMKIRvi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTctMTItMTVUMTU6NTc6MjcrMDg6MDDTTAaTAAAATXRFWHRzdmc6YmFzZS11cmkAZmlsZTovLy9ob21lL2FkbWluL2ljb24tZm9udC90bXAvaWNvbl9jazFiemEwemo5ampkY3hyL3JpZ2h0LnN2Z7O3J80AAAAASUVORK5CYII=');
+  background-size: contain;
+  content: ' ';
+  inset: 0;
+}
+
+.icon-refresh::before {
+  position: absolute;
+  z-index: 9999;
+  display: block;
+  width: 16px;
+  height: 16px;
+  margin: auto;
+  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIEAYAAAD9yHLdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAMQpJREFUeNrt3XlcVHX3B/Bz7rCISi6IC+ijkpZpIswMyBLgluVuKm4pqWmEuG/hUpr5uFYoiuaSFrklZvroo+jPFRURZgYVxZ1K3HIXUBSGe35/XC9PWpYL8J2B8/6H1wwGn3sb5sz93u/3fAEYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOM/QUUHYCx59F0ddPVTVdXq5YXkxeTF1O3Ll7H63jdzY3eoDfojTp1UIta1FatCm/D2/C2kxPchttwu0oVyIRMyKxShVpSS2pZuTIkQzIklyuHv+Av+IudHURBFERJkvJbKlQo+IWhEAqhsgz2YA/2d+8WPP/oMXWkjtTx4UMMwAAMuH4d2kE7aHf9OoVQCIX8/jvuxJ2489o1WkJLaMmlS+AHfuB37hwmYAImnDtnNBlNRlNGhvJDiUSfX/ZygiiIgqhMmayJWROzJgYF4Xbcjtv9/akX9aJerq7QE3pCTwcHiIEYiMnMxNpYG2ufOYNTcApOOXDAcNZw1nA2KUn0cTwrLiBMKO+z3me9z9asKa+V18prtVr5tHxaPv3mmzgaR+Nod3cYCANhYMOGyr9+9VXla9myonMXFoqmaIp+8ADDMRzDz56FTtAJOh07RgmUQAkGA17Da3jNYMjrldcrr1dKyrGxx8YeG3vvnujc7I8QdbG6WF3skCFUjapRtYkTcSSOxJHVqr3Yz0tNVb6OH280Go1G43//K/oIn3rkogOwkgzR09bT1tPW3V3jrHHWOLdoIRtkg2zw84PTcBpO+/jgGByDY2rWFJ3U0tEiWkSL8vNxDa7BNSdOkAM5kMOuXTgYB+PgnTvz1uStyVuzbx8XmOKh0+q0Oq2tLW2hLbRl9WrsgB2wQ7duhf17aAWtoBWzZpncTe4m94gI0cf9JC4g7KU0oSbUhCpW1FTTVNNUa98eTGACU9u2uAf34J6WLWEuzIW5VauKzlni6UEP+txcZYju0CGoDtWh+pYt+QH5AfkB69cfxaN4FH/9VXTMkkJ3UXdRd3HBAuWKMTy8yH8hAQENH64MeUZFiT5+FRcQ9kwaN27cuHHjSpVsbW1tbW2DgxEREbt2Vb7bvLny1dZWdE721+gz+ow+S06W+kn9pH7r1+fdyruVd2vdOi4sz0f7rvZd7bs+Pvgv/Bf+KyEBjGAEIxb5+yjNp/k0PytLE6mJ1ES+9lpybHJscuzVq6LPBxcQ9hjlJqCNTbY+W5+tb98eFsEiWNS3LxyDY3CsXTvlsb296JzsJT2aHEBdqAt12bULMzADM5YsgQ/hQ/hw0yblk25enuiYlka7XLtcu3zTJozGaIzu2LG4fz85kzM5jxxpijPFmeLmzhV9PriAlHKefp5+nn4uLtgQG2LDQYOwDJbBMh99BIfgEBxycRGdjxUvOkSH6NDVq7gEl+CSFSvMx83Hzcejo49+c/Sbo99cuiQ6nyjKPY8qVchABjJcuYJe6IVeNjbFHqQNtIE2W7YYpxmnGad16CD6vEiiA7DipfwhNG6sS9Wl6lJ/+EF6KD2UHv76K6ZgCqZMmcKFo3RDX/RF3+rVYQWsgBXjx9uQDdlQero2XZuuTV+2zOui10Wvi6+9JjpncaMP6AP6ICBAWOFQc0RQBEXUqSP6fKj4CqSEKxizvY7X8fqkSaADHejati2usVtWwqhDX+2pPbXfsIFqU22qPW1aSl5KXkre0aOi4xUV3QPdA92Df/8b/MEf/CdMEJvmwgVlem/t2qLPC1+BlDAe8R7xHvENGypXGuvWFdzsAwCAdu24cLCXshgWw2JJUqetSv2l/lL/lBT19abfot+i3+LmJjpmYaMbdINu1K0rOgf4gi/4irsCehIXECvX5OMmHzf52NVVO087TzsvJkZzSnNKcyo1FRAQMDiYCwYrUurr69HrTa4iV5GrnDihu6O7o7sze7Y6e090zJeFC3ABLnjRhYGFiICALGe2IxcQK+OT4ZPhk+HgoNPpdDrdp5/agA3YwOnTGIMxGNO3r/oJUXROVjopK+rLlIGW0BJajh1rF2gXaBd4+rRut263bndIyKN/ZX0faHbADthRrpzoGCCDDDIXEPacPL/0/NLzy8DAXKdcp1ynlBTl2alT1Z5OovMx9pcSIRESnZ1hLIyFsd9/rxunG6cbt2+fOtQqOt4zQ0BAC3jj9gIvEHgT/0lcQCyUcqVRubJypfHdd9IZ6Yx0Zu9epWnf66+LzsfYC9kFu2BXQIDmjOaM5ozJpCMd6WjKFLU1iOh4Fo+vQNjfUWdN5Z7OPZ172mBQnv3gA76XwUoUdUGqHvSgnzwZpsJUmJqQoP9C/4X+C/6A9DTkTu7kzlcg7JHg4ODg4GCNRv0kpvwhHTiAn+An+IkFzPpgrDhMhskwWa+nS3SJLhmNWq1Wq9V+9JHoWJYGwzAMwzQa5ZH4e53CA5RW+vv6+/r7tWqlD0oflD5o9271k9jjLxDGShl1nxZERFy8WHtVe1V7deNGtWmn6HiWol5Uvah6UeKHsizmUqi00J3SndKd6tRJNskm2bR8OY7H8Ti+cmXRuUobSqIkSsrJUVYW37sHw2E4DH+Gwn0QDsLBihV5SLF4YDtsh+06dbLxt/G38U9OVu6VdOmi9OpS980oerSX9tJeRGyGzbCZ6LMCUPZh2YdlH6pDWQ8fisrBfwDFRNtH20fbZ8IELItlsey0afwG9ILCIAzCHj6kntSTep49C6thNaw+fRpDMARDTp/GbtgNu506BTNgBsy4cEFpQXHrltnb7G32vnXLYaLDRIeJt24l1kqslVgrJ+d5f/3jzSadneVj8jH5WNWqmmhNtCbaxYXqUT2q5+xMy2k5La9ZU9mBsHFj/Ba/xW8bNVKuNF9/HQxgAIOdnejTaXW8wAu87t3DbMzG7IEDDSsNKw0r164t6l+rzdJmabNMJqWAeHqKPg1mg9lgNlSqpHRTvnNHVA5+Aysij88qWbhQmQY4cKDoXJaODtABOpCeDtfgGlw7cADfw/fwvf37lfN34ICbm5ubm9vZs7GxsbGxsfn5ovM+L/V1kT83f27+3Pr1bZbYLLFZ4u5OJ+kknQwMpP20n/a3aMGz7Z4RAQF99ZVyRTJunPKkLBf2r9Fu0W7RbklJwck4GSd7eIg+bOW4nZ2V475xQ1QMHsIqZMoWra+8kt8zv2d+z9hY5dnWrUXnshjhEA7h2dlwAS7Aha1boTW0htYbN5pjzDHmmPj4ow5HHY46PL3rq9IDSPRBvLiCNumBEAiBaWnKs+rXtWuhLJSFsn/oknwOz+G5Fi0wHuMxvkUL6A29oXeHDkpBrVJF9PEIh4CAo0frknRJuqS6dW1r2NawrdGnz4teYVoLZYtjSVI2cBOXgwtIIVH/4M3VzdXN1bdsUXo7iL/UFev+faX99O7d0AJaQIvY2JwbOTdybmzYkDYlbUralOxsmAJTYIronJYnJSElISXh8mXl0cqV0AAaQIOVK9VZe+nn08+nn/f1LWhZQ0BAvXuX2sISBmEQ1qVLHuVRHu3Z4z7HfY77nI4dlS1+r1172R+P+ZiP+Tzk/CQuIC9JWejXoIHyyXrnTmgGzaCZq6voXMVN3fEOHdERHRcsKN+8fPPyzdet24f7cB8+eADTYBpME53S+j0+dHfggPpVmZUzblyF7yt8X+H7Nm0gEiIhMjQUVsJKWPnOO6XmnhsCAjZtalvHto5tnQMHlL/PNm2UK9fz50XHKyz2SfZJ9knip/GW/BdUEfFM8EzwTKhXT1otrZZW79tXavbReLT3tjLdctMmnIpTceqSJYb2hvaG9jt3io7HHlfwOh0qDZWGDh2q3IT+8MPS0gKHIimSIn//HbpBN+jWurXpmuma6dqxY8/7c3QjdSN1I48ehXiIh3h3d9HHJblJbpJbjRqit7blAvKcvDt4d/DuULeueb15vXn9vn3oh37oV6uW6FxFpWC6axZmYdaCBTZbbbbabP3qq8O9D/c+3Pv330XnY89H2RDKySn/Qv6F/AsffYRDcAgOGTWqpA99USIlUuLNm+iDPujTurVyRWJ65rsHllZAZHvZXrZ3dX18qLP48RDWM1IX/pkTzAnmhF27SmrhoGRKpmSzGebDfJi/Zk2+lC/lS599drTi0YpHK/76q+h87OUk10yumVzz5k3l0YwZDdc1XNdw3fz5DjkOOQ454eFUn+pT/YkTcSgOxaGOjqLzFhalcDg5KY9271b+ntu2NZQ1lDWUVffL+RvxEA/xljMEKLvL7rI7IiRAAvxz+iIjfAzN0qn7bdBb9Ba9tWdPiWsxogMd6IigA3SADuvWaS5rLmsuN2pkGm4abhoeEqLMM+fCUVKldU/rntY9O9v4gfED4wezZtEYGkNjGjSAYAiG4KVLCz5QlCgVKtBaWktrt29X7pE0b/6P/0kgBEIgkejkKvvR9qPtR4svaMIDWCp1Ixw7WztbO9uEBOUSv0ED0bkKjT/4g/+5c8rK6o8+Ui7p9+wRHYtZFrXtunRdui5dX7oUp+N0nO7nJzpXYVGHaKVvpW+lb7t2NXxk+Mjw0bZtT/47pdCo904aNxadW5l1V7u2Mi38wgVRMfgK5AnqSmPb8bbjbcevW1dSCof6SZKaUTNqNnu27VjbsbZj3d25cLC/cyTwSOCRwLQ0U1dTV1PXgAByJmdyHjlS+e79+6LzvSz0Rm/0dnAgIxnJuHGjsrPne++p31c6SAQEwAgYASMsYEfCR+Tecm+5N1+BWBztae1p7emoKOyNvbH30KGi8xQOkwnLYTksN3CgId4Qb4hXN6Ri7MUon8hffVV5tHSp8vUZhoIsXMGQ3VbYCluPH7eYledPUFqZ1K0reoiZC8gjavtotQuo6DwvTL2nYQADGL7+uryxvLG8MSJCWY9R0saymWVA1LvoXfQuI0bIF+WL8sXZs5UmlZazb0VJo3HRuGhc3NySNidtTtr8yy+icpT6ISx9qj5VnxoUpBSOBQtE53lRdJgO0+HMTPkr+Sv5q27dlLHRMWO4cLCiR2S4bLhsuBwZSV/T1/R1y5Z0iA7RIXHrE1jxKLUFRNlfoE4dpVvr+vXKs+L767+Y1FTNVc1VzVUvrxTHFMcUxw0bRCdipVPKmJQxKWPi45V7bTodTaAJNOEZpsmy55IXlBeUF1T4TSOfV6krIGovIRu9jd5G/8MPVruAahksg2U//qg88PFR5vefOSM6FmMA/+vl9SD/Qf6D/ObN6Uf6kX785hvRuUoKzWDNYM1g8QWk1I1Rnrc/b3/e/pNPlGaHb70lOs9z2wSbYFN0tLGmsaax5rBhypPiX0iM/RVlnUlurvIoLEz3ve573fe//gpREAVRM2eKzmet8lvlt8pvJX47g1JzBaIP1AfqAz09ldlIkyeLzvO8aAWtoBWzZimFY8gQ5VkuHMy6FCxYnEbTaFp4OIRCKITy6/h52bjauNq4ij9vJb6AKF1K7e3pHt2je99/by07wdEiWkSL8vPhM/gMPgsLM7mb3E3uERGiczFWGExtTG1MbRYuhMWwGBb37as8m5cnOpe1eOj90PuhNxeQIlehZ4WeFXqql8oWsIL0n6ifyE7BKTj1wQfGTsZOxk48dsxKJmUh6+rVFEIhFNKjR8EHJ/a3bNfYrrFdwwWkyHh+6fml55eBgbARNsJG9V6B5aOVtJJWDhtmCjGFmEJWrRKdh7HioPRe+/lnyIRMyBw9WnQeS2e7yXaT7SYuIIVOnWUl1ZfqS/WjopRLZPEbr/wT8iRP8pwyxRRvijfFR0eLzsOYCKZWplamVvPm0WbaTJvV6fXsSXmd8jrldRJ/pWbxb6zPKz09PT09/aOPYCpMhalNmojO848ezaoyLTMtMy37/HPRcRizBPI5+Zx8bvBg8AEf8Ll+XXQeS1PmtzK/lfmNr0AKjU+GT4ZPRuXKysYxX3whOs8/WgSLYNGGDY9Px2WMAahNHK9fV3b6DA8XncfSZEVkRWRFcAEpNHmYh3k4derjG8dYHppBM2jGmTOaSppKmkr9+yvPin8hMGaJlJY8sbE8pPW4SmMqjak0hoewXpq+j76Pvs+bb5ILuZBLaKjoPE8VDuEQnp0tl5HLyGXeey+pflL9pPqZmaJjMWYNzKvMq8yrwsOVfTBu3BCdR7RsXbYuWye+gFj9SnQ6SSfp5FdfWXr3TzKTmcwffqjuryA6D2N/5BXsFewVXL268qh6dfm8fF4+b2+PU3EqTnV0pMk0mSaXL6+8gf9Fz7gFsAAW2NjQEBpCQ/6wFe7H8DF8fOcOfoPf4DfPsKMfAgLev4+f4+f4+cOHT36belJP6rluHfwIP8KPgweLPm/F7lG3beMS4xLjEvHrZqy2nbtOq9PqtE2bKi+4xETReZ6G3qF36J3ISNN003TT9FGjROdhpZPSPLRiRRudjc5GFxKi/N107qxcGXt5QTREQ3T58qJzsn+gBz3oc3ONi42LjYvt7UXHsdohLNpKW2nr+PGiczzVRJgIE9PSMqtnVs+sbsE5WYmm3abdpt02eLDmoOag5uD580rhmDdP+W7z5lw4rExTaApN1d5i4lnskM/TFNzz+Iw+o886dhSd508erSSXt8vb5e0DB55bfG7xucV/vhRnrCjpZutm62ZHR8MkmASTSuFQT0mlAQ1oxA9dqazuCoReo9fotYgIMIIRjOL3BP6TztAZOkdFpSxOWZyy+NAh0XFY6aIM7Q4bVmrvEZRwVJfqUl3LuQKxmgKi36Lfot/i5kaTaBJN6tFDdJ4/GQtjYeyvv+bszdmbs/fTT0XHYaWLUjgqVFCGOHhBaollYUNYVlNA5GPyMfnYuHEWO9tqNsyG2aGhyv4H2dmi47DShcpTeSrfpw8kQRIkVawoOg8rIjLIIPMQ1jPzPut91vvsK6/gT/gT/qS2fbY0O3YoC5527BCdhJVO2AybYbOWLUXnYEWMgIC4gDwzcw9zD3OPnj2VR2XLis5T4LGNcHiWFRNMBzrQubmJjsGKFgZgAAbwENYzwxbYAluoLT8syFW4ClfXrFH2MzCZRMdhpRu1ptbU+g8L+FgJxlcg/8gj3iPeI75hQ9gDe2CPj4/oPAXCIAzCHj7UJGuSNcl8s5xZBpyEk3DS7duic7Ai1hyaQ3O+AvlHmhRNiibFAq88FsEiWLR8edLmpM1Jm3/5RXQcxgAAoA/0gT7nzomOwYrYHtgDe65eFR1DZXEFRJmOaGurbLBkQTfNH93zkDZJm6RNc+eKjsPYH+FwHI7DeRJHiXcQDsJBy+mlZ3EFRF4vr5fXv/sujsSROLJaNdF5CiyGxbB427bkmsk1k2ueOSM6DmN/ZH/C/oT9idhYZT+cmzdF52FFQ+or9ZX6xsaKzlGQR3SAPwXqJnWTullgi5JdsAt2qT2EGLMsB28evHnwZlYWtISW0HLyZNF5WFHYuDE5Njk2OfbIEdFJVBZWQBBhNIyG0W3aiE6iomk0jaadOGGsaKxorLhzp+g8jP0dU7wp3hQfHU0hFEIhP/wgOg97Sf7gD/7nzklukpvkFhYmOs6TLKaA6AP1gfpADw/4Gr6Gr11dRedRKbNboqOVR8+wnwFjFsA03DTcNLxfP+XRzJm0iBbRIvEbELFn1BJaQsv9+8255lxzbrNmypWH5dw8V1lMAVFaMLRtKzrG4/LylJWfljPmyNizk2VlndL48VKUFCVFeXjQJtpEm9asocN0mA7zjpjCPdogSpmeq+5r9P77xtnG2cbZzZod/eboN0e/uXRJdMynsZhuttqftD9pfzp4EKfjdJzu5yc6D0RCJETGxRkDjYHGQMsZUmOsMDRc13Bdw3V2duViy8WWi23Y0DzLPMs8q1YtTT9NP00/Z2c5W86Ws//ccw5H42gcXb48mMEM5r/YmTAKoiCqXDlaQStohZ3d8+bCnbgTd5Ypo3S1dnB40eOjZbSMlt27Bz2hJ/QshHUTs2E2zM7MxLfxbXz7+a/kcASOwBFEspPsJDtdvy6Nk8ZJ465exbbYFtsmJSmTc6xv8oPwAuKT4ZPhk1G5cu6V3Cu5V65dwzAMwzCNRnQumANzYM4HHxhbGFsYW8TEiI7DGGOWRnhXW/N483jz+Nat8SSexJPiCwdFUzRFP3hg42TjZOO0caPoPIwxZqmE3wMhLWlJazmtSjAcwzE8Li6pflL9pPo8RswYY08jvIDAG/AGvOHtLTqGSpm2+3//JzoHY4xZOmEFJIiCKIhsbJQuoh4eok+Eit6it+itPXtE52CMMUsn7B7I/e73u9/v/uabmI7pmP7isy0KzQgYASOuXUtxTHFMcTx1SnQcxhizdMKuQPL75PfJ7+PlJfoEqCiLsihr9+5Hj3jBIGOM/QNx90BOwAk4odOJPgEFJ2KptFRaunev6ByMMWYthBUQvIk38aZeL/oEqEgiiaTkZNE5GGPMWggrIDSLZtGs+vVFn4DH9zbnex+MMfasir2AqCvPsSk2xaavvCL6BMBxOA7H09OVnkH374uOwxhj1qLYC4j5ffP75vdr1xZ94AUOwkE4ePy46BiMMWZtir2AyF3lrnLXOnVEH7iKfMmXfE+cEJ2DMcasTfHfA2kEjaDRv/4l+sALTsCv0q/Sr6dPi87BGGPWptgLCLqjO7pb0BXISlpJKy1voxbGGLN0xX8F0gbaQBvLKSDSIGmQNOj6ddE5GGPM2hR/ASEgoBo1RB+4StnA6sYN0TkYY8zaFHsBoZk0k2ZWqiT6wFXZKdkp2SnXronOwRhj1qb4r0DKQBkoU6GC6ANX3L2b1j2te1r3QtjykjHGSpniLyB2YAd2llJAeOEgY4y9qOKfhbUcl+Nye3vRBw6+4Au+3HWXMcZeVLEVkODg4ODgYI0GjGAEI6LoA+cCwhhjL6fYCkhKQEpASoCNsA2sGGOMFa5iKyB21e2q21XnT/yMMVZSFFsBUWY75eWBDnSgs4BCcggOwSELGEpjjDErVcw30YnAG7zBW/y0WepDfahP5cqiczDGmLUq/mm8RjCCMSdH9IFjOIZjeJky/k7+Tv5Ojo6i8zDGmLUp/gISBEEQdOeO6ANXPajzoM6DOlWris7BGGPWpvgLyByYA3Nu3RJ94CpyJmdydnYWnYMxxqxN8ffC2k7bafvNm6IPvOAE+Ev+kj9fgTDG2PMq/pXoC3EhLrSc5oWyXtbL+po1RedgjDFrU/xDWJWhMlS+cEH0gauwMTbGxg0bis7BGGPWpvgLyApYASsyMkQfuIrKUlkq26iR6ByMMWZtir+AAACABV2BfIqf4qdcQBhj7HkVewGR58vz5fmnT4s+8AKJkAiJzs4e8R7xHvE8G4sxxp5VsReQepH1IutF/vILRVM0RT94IPoEFJyIddI6aV3jxqJzMMaYtdAU9y9MS0tLS0sjcnF0cXRx7N4dfoPf4Ldq1USfCGm7tF3afvbsZfNl82Xz/v2i8zDGmKUTdA8EAKpAFahiMok+ASoaQSNoRIsWonMwxpi1EFZA6Cf6iX46dEj0CSjI05k6U2c/P58MnwyfDAcH0XkYY8zSCdvgCQEBwXIKiNpcMdc31zfX19dXeXb3btG5GGPMUgm7AjGajCaj6cQJ5dHdu6JPRIEBMAAGNG8uOgZjjFk6cfdAAABAlpWvhw+LPhEFMiADMt55R3QMxhizdIILCAAYwAAGCxrKmopTcaqXl8cwj2Eew+rXF52HMcYslfgCchfuwt2DB0XHeJLGXeOuce/RQ3QOxhizVMILyN2YuzF3Y+Lj6TAdpsOZmaLzFFgIC2Hh+++LjsEYY5aq2BcSPunWtlvbbm3Lz3eRXCQXydMTzsAZOGMBvakQELBKlZpv1Xyr5lubNl1Ou5x2Oe3qVdGxGGPMUgi/AinQGlpD640bRcd4krxUXiov7d1bdA7GGLM0llNAhsAQGLJ1K+hBD/rcXNFxVHScjtPxDz90n+M+x31OuXKi8zDGmKUQPoSlunLlypUrVx4+dIl0iXSJ9PeH7bAdtterJzoXxmEcxjk4SD2lnlLPS5eurLqy6sqq5GTRuRhjRcfrotdFr4uvvVa9SvUq1av4+ro2c23m2qxBg2oPqz2s9tDRMcAnwCfA5/ff1d5+ovOKImwl+tPgcByOwzduJIkkkt59V3SeglzZmI3ZI0Yoj775RvmqrmNhjFmj4ODg4OBgjSb9fPr59PP9+9NMmkkzx46VO8md5E6vvaZ0zAAgICAAkEACCQDS09PT09Pv3tVO107XTl+7Vr4qX5WvfvXVkagjUUeizp4VfVzFBUUHeJIyVFS1qu0523O25zIylHUidnaic6kohEIopEsX03DTcNPwn38WnYcx9vx0Wp1Wp61ShSIogiLWr8dZOAtnBQW93E/Ny4NBMAgGzZgBS2AJLJk2Tem4kZcn+niLisUVEJUuRZeiS1m7FgbCQBhoOesxaBftol0HD5oqmiqaKr71lug8jLFnpwxNOTnJHeWOcscDB5TZlg0aFPovagNtoM2WLXer3q16t2q3bueGnRt2btjDh6KPv7BZzk30J3mAB3ioQ0WWA1tiS2zp76+7qLuou9i2reg8jLF/pg5VyWlympy2YUORFQ7VNtgG29q3f6XtK21faTt3rujjLyoWW0CMaEQj7tsHARAAASdPis7zJEqlVEqdPVt9YYrOwxh7uvT26e3T248ZA+NhPIwPDCyu34uzcTbODg319PP08/TT60Wfh8Jm8W98NSrWqFijoq0t3sf7eN+Cbqrvxt24u2rVW7du3bp169IlZRaZ0Sg6F2Psf7wWeC3wWtCokTIpZ80a5Z6qTfFNHroCV+AKIprRjGZJUt4nNm8WfV4Ki8VegajyLuVdyrv0/feUREmUlJMjOs+fzIW5MHfqVH8nfyd/J0dH0XEYYwBBFERBZGMj15HryHW++w4WwSJYZG8vNlXJu2dq8QUkNTU1NTX19m2IhEiIXLNGdJ4n4UgciSOrVXtw6cGlB5ciIkTnYYwBZK/OXp29etgwmAyTYbL4oSNKpmRKrl1bdI7CZvEFRCVfkC/IF2bOVP5HmM2i8/yJP/iD/9ix+kB9oD7Q01N0HMZKoybUhJpQnTqwH/bD/qlTRecpkAzJkIwWO+v1RVlNAVEX6OAMnIEzVq4Uneev2dqSjnSk++67husarmu4znLWrzBW8iHa7LfZb7N/0SLlDdtyWg/halyNqy9eFJ2jsFlNASmwATbAhmnTlAcWuEAnHuIh3t29TL0y9crU+/RT0XEYKw309fX19fXDw2EkjISRljPZpkAf6AN9jh0THaOwWV0BMRqNRqPx/HnqRb2o1w8/iM7zVB7gAR4REV51vep61fXyEh2HsZJI30ffR9/nzTflU/Ip+dTs2aLzPA2GYiiG7tghOkdhs7oCorLZZ7PPZp/lXomgF3qhl41N/on8E/knfvjB+6z3We+zr7wiOhdjJYHaHZvSKI3SYmPRG73R28FBdK4/CYMwCHv40DzPPM88b8MG0XEKm9UWkKTNSZuTNv/yC8RCLMSuWCE6z9NgAAZgwOuvmx3NjmbHmJhHz5a4m2mMFSebXja9bHotXVrkK8pfEt2je3Rv3bojgUcCjwRevy46T2Gz2gKiyvsp76e8nz79FIbBMBh2+7boPE+D7bAdtuvUSZukTdIm8b0Rxl6EvpK+kr7SuHHYCTthp169ROd5GlpEi2hRfj4NoAE0YMYM0XmKSon5JKzT6XQ6XViY8mjhQtF5nioUQiFUlukG3aAbnTqZJpgmmCZs2SI6FmOWTDtBO0E74Z13oDN0hs7//S+GYRiGWXALIQICWrZM6cY7aJDoOEWlxBQQhSRpN2k3aTclJuJUnIpTLf3m9d27+Aa+gW+89ZZhpWGlYeXx46ITMWZJ1FYksqPsKDvu3w9REAVRlSqJzvU0lEiJlHjzJjbFpti0QQOlgNy4ITpXUbH6IazHyTJ8Dp/D52Fh6iWk6ER/r0IFeofeoXd27dJ/of9C/8Xrr4tOxJglaPJxk4+bfOzqKq+QV8grtm619MJRYCtsha3jx5f0wqGy3EvAF3TlkRquNVxruDo74xk8g2e8vUXneqpESITEcuWoP/Wn/u3aVS1btWzVsuvX/2743fC7IStLdDzGipNPhk+GT0blyuAADuCwZ4+yolz81tb/hCbQBJqQkGB6z/Se6b2hQx89W+K3ui1xBUTlkumS6ZKZkAB+4Ad+ISFwES7CRcttdog7cSfurFRJ6i/1l/q/+67LWZezLmfXrVPK4f37ovMxVpSUHQIrVJCvydfka9u2QQzEQIzltwRSm7xiCIZgSLt2yt9ryZtt9TQlbAjrf5RLyLt35SA5SA4KCVFvXovO9Y/+Df+GfzdsqExP3L7dI94j3iPe2Vl0LMaKglo4oAW0gBZxcbAH9sAeHx/RuZ7ZQTgIBz/7TFngfOqU6DjFrcQWEFVKcEpwSvCuXeRDPuQzZ47oPM9Hq5UeSA+kBwcOeHfw7uDdoW5d0YkYKwwFhQMAALZvt7bCoW5t/er8V+e/Oj8yUnQeUUrYLKynU/cHyI7LjsuOi4+HSTAJJvn6is71rOgQHaJDV69KraRWUqu2bQ3xhnhDfEqK6FyMPQ9lun2NGsojdfq6Vis61zPzBm/wvnPHvNC80LzQ0/MoHsWj+OuvomOJUuKvQFT7cB/uQ7MZ8zEf8/v0ocN0mA5nZorO9azQF33Rt3p16kf9qF98vO6O7o7uzttvi87F2LPwzPLM8sx64w3lnuShQ8qzVlQ4HsEszMKssLDSXjhUJfYm+tNcXn159eXVt2/XqFejXo16GRl4GA/j4S5dROd6ZsmQDMl2dpAGaZDWo0eNcjXK1Sh3+/aV3678duW35GTR8Rj7Ix3pSEfNmuFaXItrd+yA9bAe1levLjrXi1m0yLjduN24fdYs0UksRakZwnoa5ZJaXbmurmS3VqtX53yS80nOJ6Ghad3Tuqd1z84WnYiVTrpVulW6VaNGKV2zZ81Sm4uKzvW81Om5D/If5D/Ib95c+bvKzRWdy1KUmiGspylvKG8obxg2DN6Bd+Cd7dtF53k5vXs72DjYONgcPlwwZMBYMVA2UCtfXpeiS9GlrF0LX8PX8PVXX1lr4QBf8AXfy5dxOk7H6d26ceH4a6W+gKj3RjT9Nf01/bt3p320j/ZZcUuRR9OApVgpVopNStJqtVqt9qOPlG9yF2BWuLTvat/Vvuvj44AO6IAmEwyEgTCwRw/RuV6Uuq4DEiABErp0UabnXrkiOpel4jeUJ6gtFGwCbAJsAg4fVj5JubqKzlU4DhzAztgZOw8caPjU8Knh09OnRSdi1qVgNmNMdkx2zOjRSouRL75QvmtrKzrfC3u0TkzuJfeSewUHpzimOKY4lrz9OwobF5CnUHcSlCvLleXKe/cqz5YtKzrXyyr4hPVoAZQ6jz02NjY2NtbSe4cxUTxDPUM9Q319sQN2wA4LF+JknIyTPTxE5yoseAWv4JVRowyXDZcNl0vvuo7nxQXkH+hO6U7pTnXqBO/D+/B+bKzyrBV/0noC7aW9tDclheIojuLGjlUXXorOxcTyuuh10euik1N+bn5ufu6sWTgTZ+LMAQPACEYwlqCh0P7QH/rPmGEcYhxiHDJhgug41qbkvBCKmH6Yfph+WNeudJAO0sE1a5RnS04hedyOHVgOy2G5iAhesFg6KLMRy5ZVNmYbOpRepVfp1XHjcDgOx+GVK4vOV9ioA3WgDgsWmKaYppimqM0P2fPiAvKclNlNXbpIzaRmUrO1a5VnS2AhUXuHLYbFsHjtWnm+PF+eP3lyil+KX4rfuXOi47GXUy+qXlS9KHv7ivMrzq84f9Ag+YR8Qj4xcaK6YFV0vqJCsRRLsd9+a3IzuZnc1I2eSn7X3KJS6mdhPa/Hb6699x6EQRiEPXwoOlehWwyLYbH06PXRu7d0XDouHT99Wrtau1q7+v/+zzPdM90zvUMH5fslaEijhFJ7T2l3andqdw4fXsGpglMFp/Pn6RV6hV6ZP7+kFw6IhViIXbJEKRzqrEQuHC+L//BfknLp37kz6EEP+h9/BAMYwGBnJzpXcaHP6XP6/MgRuA/34f68eZlXM69mXl2z5tywc8PODSuBhdVKKAWjaVNl5feAARAMwRDcp4/yXeufDPLMtsE22DZ3rrGqsaqx6qhRypNcOAoLF5BCohSSdu0gHMIhfO1aiIZoiC5fXnSuYjcMhsGw27fpOl2n6z//jANxIA5cu9ZtkNsgt0G7d/Nsr8Klv6+/r79fq5ZskA2yoUcPvIE38Eb//gXbApQ2j4ZeqQE1oAaffGIKNAWaAr/8UnSskooLSCHzCvYK9gr28MgfnD84f/DmzTgGx+CYmjVF5xKNIimSIn//Hd3QDd3WrwdXcAXX9etzYnNic2ITEnil79/TVtVW1VZ1d1dWRnfsCCfhJJzs3BmyIAuytNoSNzvqhdy/L++V98p7+/bldRzFo5S/4IqOp5+nn6efi4s0QZogTdi0CSbDZJis14vOZZnu36fRNJpGJyRIA6QB0oC9e+EW3IJbe/aUcyjnUM4hKUntGCA6aWFTF+Zl2mXaZdo1aiStllZLqwMDyZ/8yT8wEHfhLtwVGAhzYS7MrVpVdF5Lo25zoHld87rm9Y4dk39J/iX5F24qWly4gBQxdXokhVIohcbE4GJcjIu7dhWdy2p4gRd43btHs2gWzTpxQlnwdeKE0uTu5EnpXeld6d3jx/MG5Q3KG3TypNJm+7fflP+4+Me63ee4z3GfU66c3VG7o3ZH69bNn5o/NX9q3bo4GAfj4FdfhVbQClo1boxrcA2u8fBQJmE0agSLYBEssrcXfbqtS2oqEBBQ+/bKDqQXLohOVNpwASlWiLoFugW6Bf/+NxyDY3AsIoKHHgoXJVMyJZvNYAYzmG/cgFzIhdz/fcUojMKoa9cgBEIg5M6dZ/65QECg0WAwBmOwkxO0hJbQ0slJ+blVqkAe5EFelSqQCImQyFsQF5l20A7a/fyzpq+mr6Zvv35J9ZPqJ9W3nn19Shp+4xKkYEOoltASWn7/vfKsulMbYwwAgKIpmqIfPIBsyIbsiAhTK1MrU6t580TnYgouIIJ5xHvEe8Q7O2t2aHZodixfrkw7bN9edC7GRKJpNI2mnTiBE3EiTuzVSxmiSk0VnYs9jguIRUFU2q8PGoSIiKg2dStF8/ZZ6aQDHeiIIAIiIGLpUltbW1tb2xEjEmsl1kqslZMjOh77a1xALJQ6bRPSIR3SV63CIAzCoDffFJ2LsULlB37g99tvShv1jz9WWuXExYmOxZ4NtzKxUKZrpmuma8eOYSAGYqBWq8xCGjGCDtNhOsw3DZk1y8tTvkZF5QTkBOQEvPkmFw7rxFcgVkZdX4I9sAf2mDkTT+AJPNGnD8/mYpZvz578yPzI/MghQ44EHgk8EpiWJjoRezn8hmPl9Kn6VH1qUBD1o37Ub/585dnGjUXnYqXcoz3FoQt0gS7jxxtbGFsYW8TEiI7FChcPYVk5Q2NDY0PjffuUhQo6nTrUBT7gAz7Xr4vOx0oHdUU4jIJRMGr0aDgEh+BQ/fpcOEo2vgIpodQV0TaeNp42ngMHKiu4J0zglhisUIyAETDi2jWQQQb566+VvdHnzzcajUaj8f590fFY8eACUkp4n/U+6332lVfMn5g/MX8SGoou6IIuI0YonxRdXETnYxZuFIyCUZcugR3Ygd2sWeW7le9WvtvSpUqPsgcPRMdjYvAQVimhtnwwbTBtMG2YMycnMCcwJ7BuXWXr2g8/LNjXgzEAUDok7N+PNbAG1ggJuXvz7s27N1991RhsDDYGz5/PhYMB8BUIe4JnqGeoZ6ivLzbEhtgwLAyaQlNoGhyM4RiO4WXKiM7HChfNo3k079YtfA1fw9diYmQH2UF2WLJEaYd+8qTofMyycQFhf6sJNaEmVLGiTZxNnE1c166URVmU1bcv3sE7eCcg4PGtb5lly8tT2ubv26c0m/zuO8e+jn0d+/70E19RsBfBBYS9EHUnPPov/Zf+27mzsg6lc2eaTtNpemAgeqEXetnYiM5ZOt29C8tgGSyLi4McyIGcTZtyQ3NDc0Pj4lJTU1NTU2/fFp2QlQxcQFih8snwyfDJqFw51y3XLdft7bexMTbGxq1awTgYB+NatYI5MAfm1KkjOqfVerRlK1SBKlDl1Ck6Rsfo2O7dOAJH4Ij//CdnR86OnB379vEOj6w4cAFhxUq/Rb9Fv8XNTR4gD5AH+PmhCU1o8vGBTtAJOvn6Kv9KXQhpays6b7FT95RHQsLERGgADaBBYiJshI2w8fBhjMM4jEtMVLrT3r0rOi4r3biAMIui0+q0Oq2tLV2ki3TxjTfgS/gSvmzcGDMxEzMbNYIgCIKgWrXgB/gBfqhdW5k95uqKq3AVrnJ1tZid/fSgB31urrID4W+/QTWoBtXOnwc3cAO38+dhH+yDfenpShfa8+el8lJ5qfzJk8k1k2sm1zx7Vvkhxb+jImPPgwsIK1G8gr2CvYKrVzdfMl8yX6pZU1ouLZeWu7pCb+gNve3sKIIiKKJcOZgJM2GmnZ2UJWVJWXZ2NIkm0aRy5ZQFcYjkS77kW768ci8nK0uZrXT7Ni7ABbggKwuGwlAYmpmpdJHNytL8R/MfzX+ysiAO4iDuxo26H9T9oO4Hly/HxsbGxsbm54s+L4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcYYKzb/D4DEm9oGCaFQAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEyLTE1VDE1OjU3OjI3KzA4OjAwohG+LwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0xMi0xNVQxNTo1NzoyNyswODowMNNMBpMAAABPdEVYdHN2ZzpiYXNlLXVyaQBmaWxlOi8vL2hvbWUvYWRtaW4vaWNvbi1mb250L3RtcC9pY29uX2NrMWJ6YTB6ajlqamRjeHIvcmVmcmVzaC5zdmejF0ikAAAAAElFTkSuQmCC');
+  background-size: contain;
+  content: ' ';
+  inset: 0;
+}
+</style>
diff --git a/src/components/Verifition/src/Verify/VerifyPoints.vue b/src/components/Verifition/src/Verify/VerifyPoints.vue
new file mode 100644
index 000000000..9d04f291e
--- /dev/null
+++ b/src/components/Verifition/src/Verify/VerifyPoints.vue
@@ -0,0 +1,250 @@
+<template>
+  <div style="position: relative">
+    <div class="verify-img-out">
+      <div
+        :style="{
+          width: setSize.imgWidth,
+          height: setSize.imgHeight,
+          'background-size': setSize.imgWidth + ' ' + setSize.imgHeight,
+          'margin-bottom': vSpace + 'px'
+        }"
+        class="verify-img-panel"
+      >
+        <div v-show="showRefresh" class="verify-refresh" style="z-index: 3" @click="refresh">
+          <i class="iconfont icon-refresh"></i>
+        </div>
+        <img
+          ref="canvas"
+          :src="'data:image/png;base64,' + pointBackImgBase"
+          alt=""
+          style="display: block; width: 100%; height: 100%"
+          @click="bindingClick ? canvasClick($event) : undefined"
+        />
+
+        <div
+          v-for="(tempPoint, index) in tempPoints"
+          :key="index"
+          :style="{
+            'background-color': '#1abd6c',
+            color: '#fff',
+            'z-index': 9999,
+            width: '20px',
+            height: '20px',
+            'text-align': 'center',
+            'line-height': '20px',
+            'border-radius': '50%',
+            position: 'absolute',
+            top: parseInt(tempPoint.y - 10) + 'px',
+            left: parseInt(tempPoint.x - 10) + 'px'
+          }"
+          class="point-area"
+        >
+          {{ index + 1 }}
+        </div>
+      </div>
+    </div>
+    <!-- 'height': this.barSize.height, -->
+    <div
+      :style="{
+        width: setSize.imgWidth,
+        color: barAreaColor,
+        'border-color': barAreaBorderColor,
+        'line-height': barSize.height
+      }"
+      class="verify-bar-area"
+    >
+      <span class="verify-msg">{{ text }}</span>
+    </div>
+  </div>
+</template>
+<script setup type="text/babel">
+/**
+ * VerifyPoints
+ * @description 点选
+ * */
+import { resetSize } from './../utils/util'
+import { aesEncrypt } from './../utils/ase'
+import { getCode, reqCheck } from '@/api/login'
+import { getCurrentInstance, nextTick, onMounted, reactive, ref, toRefs } from 'vue'
+
+const props = defineProps({
+  //弹出式pop，固定fixed
+  mode: {
+    type: String,
+    default: 'fixed'
+  },
+  captchaType: {
+    type: String
+  },
+  //间隔
+  vSpace: {
+    type: Number,
+    default: 5
+  },
+  imgSize: {
+    type: Object,
+    default() {
+      return {
+        width: '310px',
+        height: '155px'
+      }
+    }
+  },
+  barSize: {
+    type: Object,
+    default() {
+      return {
+        width: '310px',
+        height: '40px'
+      }
+    }
+  }
+})
+
+const { t } = useI18n()
+const { mode, captchaType } = toRefs(props)
+const { proxy } = getCurrentInstance()
+let secretKey = ref(''), //后端返回的ase加密秘钥
+  checkNum = ref(3), //默认需要点击的字数
+  fontPos = reactive([]), //选中的坐标信息
+  checkPosArr = reactive([]), //用户点击的坐标
+  num = ref(1), //点击的记数
+  pointBackImgBase = ref(''), //后端获取到的背景图片
+  poinTextList = reactive([]), //后端返回的点击字体顺序
+  backToken = ref(''), //后端返回的token值
+  setSize = reactive({
+    imgHeight: 0,
+    imgWidth: 0,
+    barHeight: 0,
+    barWidth: 0
+  }),
+  tempPoints = reactive([]),
+  text = ref(''),
+  barAreaColor = ref(undefined),
+  barAreaBorderColor = ref(undefined),
+  showRefresh = ref(true),
+  bindingClick = ref(true)
+
+const init = () => {
+  //加载页面
+  fontPos.splice(0, fontPos.length)
+  checkPosArr.splice(0, checkPosArr.length)
+  num.value = 1
+  getPictrue()
+  nextTick(() => {
+    let { imgHeight, imgWidth, barHeight, barWidth } = resetSize(proxy)
+    setSize.imgHeight = imgHeight
+    setSize.imgWidth = imgWidth
+    setSize.barHeight = barHeight
+    setSize.barWidth = barWidth
+    proxy.$parent.$emit('ready', proxy)
+  })
+}
+onMounted(() => {
+  // 禁止拖拽
+  init()
+  proxy.$el.onselectstart = function () {
+    return false
+  }
+})
+const canvas = ref(null)
+const canvasClick = (e) => {
+  checkPosArr.push(getMousePos(canvas, e))
+  if (num.value == checkNum.value) {
+    num.value = createPoint(getMousePos(canvas, e))
+    //按比例转换坐标值
+    let arr = pointTransfrom(checkPosArr, setSize)
+    checkPosArr.length = 0
+    checkPosArr.push(...arr)
+    //等创建坐标执行完
+    setTimeout(() => {
+      // var flag = this.comparePos(this.fontPos, this.checkPosArr);
+      //发送后端请求
+      var captchaVerification = secretKey.value
+        ? aesEncrypt(backToken.value + '---' + JSON.stringify(checkPosArr), secretKey.value)
+        : backToken.value + '---' + JSON.stringify(checkPosArr)
+      let data = {
+        captchaType: captchaType.value,
+        pointJson: secretKey.value
+          ? aesEncrypt(JSON.stringify(checkPosArr), secretKey.value)
+          : JSON.stringify(checkPosArr),
+        token: backToken.value
+      }
+      reqCheck(data).then((res) => {
+        if (res.repCode == '0000') {
+          barAreaColor.value = '#4cae4c'
+          barAreaBorderColor.value = '#5cb85c'
+          text.value = t('captcha.success')
+          bindingClick.value = false
+          if (mode.value == 'pop') {
+            setTimeout(() => {
+              proxy.$parent.clickShow = false
+              refresh()
+            }, 1500)
+          }
+          proxy.$parent.$emit('success', { captchaVerification })
+        } else {
+          proxy.$parent.$emit('error', proxy)
+          barAreaColor.value = '#d9534f'
+          barAreaBorderColor.value = '#d9534f'
+          text.value = t('captcha.fail')
+          setTimeout(() => {
+            refresh()
+          }, 700)
+        }
+      })
+    }, 400)
+  }
+  if (num.value < checkNum.value) {
+    num.value = createPoint(getMousePos(canvas, e))
+  }
+}
+//获取坐标
+const getMousePos = function (obj, e) {
+  var x = e.offsetX
+  var y = e.offsetY
+  return { x, y }
+}
+//创建坐标点
+const createPoint = function (pos) {
+  tempPoints.push(Object.assign({}, pos))
+  return num.value + 1
+}
+const refresh = async function () {
+  tempPoints.splice(0, tempPoints.length)
+  barAreaColor.value = '#000'
+  barAreaBorderColor.value = '#ddd'
+  bindingClick.value = true
+  fontPos.splice(0, fontPos.length)
+  checkPosArr.splice(0, checkPosArr.length)
+  num.value = 1
+  await getPictrue()
+  showRefresh.value = true
+}
+
+// 请求背景图片和验证图片
+const getPictrue = async () => {
+  let data = {
+    captchaType: captchaType.value
+  }
+  const res = await getCode(data)
+  if (res.repCode == '0000') {
+    pointBackImgBase.value = res.repData.originalImageBase64
+    backToken.value = res.repData.token
+    secretKey.value = res.repData.secretKey
+    poinTextList.value = res.repData.wordList
+    text.value = t('captcha.point') + '【' + poinTextList.value.join(',') + '】'
+  } else {
+    text.value = res.repMsg
+  }
+}
+//坐标转换函数
+const pointTransfrom = function (pointArr, imgSize) {
+  var newPointArr = pointArr.map((p) => {
+    let x = Math.round((310 * p.x) / parseInt(imgSize.imgWidth))
+    let y = Math.round((155 * p.y) / parseInt(imgSize.imgHeight))
+    return { x, y }
+  })
+  return newPointArr
+}
+</script>
diff --git a/src/components/Verifition/src/Verify/VerifySlide.vue b/src/components/Verifition/src/Verify/VerifySlide.vue
new file mode 100644
index 000000000..8b448b0de
--- /dev/null
+++ b/src/components/Verifition/src/Verify/VerifySlide.vue
@@ -0,0 +1,376 @@
+<template>
+  <div style="position: relative">
+    <div
+      v-if="type === '2'"
+      :style="{ height: parseInt(setSize.imgHeight) + vSpace + 'px' }"
+      class="verify-img-out"
+    >
+      <div :style="{ width: setSize.imgWidth, height: setSize.imgHeight }" class="verify-img-panel">
+        <img
+          :src="'data:image/png;base64,' + backImgBase"
+          alt=""
+          style="display: block; width: 100%; height: 100%"
+        />
+        <div v-show="showRefresh" class="verify-refresh" @click="refresh">
+          <i class="iconfont icon-refresh"></i>
+        </div>
+        <transition name="tips">
+          <span v-if="tipWords" :class="passFlag ? 'suc-bg' : 'err-bg'" class="verify-tips">
+            {{ tipWords }}
+          </span>
+        </transition>
+      </div>
+    </div>
+    <!-- 公共部分 -->
+    <div
+      :style="{ width: setSize.imgWidth, height: barSize.height, 'line-height': barSize.height }"
+      class="verify-bar-area"
+    >
+      <span class="verify-msg" v-text="text"></span>
+      <div
+        :style="{
+          width: leftBarWidth !== undefined ? leftBarWidth : barSize.height,
+          height: barSize.height,
+          'border-color': leftBarBorderColor,
+          transaction: transitionWidth
+        }"
+        class="verify-left-bar"
+      >
+        <span class="verify-msg" v-text="finishText"></span>
+        <div
+          :style="{
+            width: barSize.height,
+            height: barSize.height,
+            'background-color': moveBlockBackgroundColor,
+            left: moveBlockLeft,
+            transition: transitionLeft
+          }"
+          class="verify-move-block"
+          @mousedown="start"
+          @touchstart="start"
+        >
+          <i :class="['verify-icon iconfont', iconClass]" :style="{ color: iconColor }"></i>
+          <div
+            v-if="type === '2'"
+            :style="{
+              width: Math.floor((parseInt(setSize.imgWidth) * 47) / 310) + 'px',
+              height: setSize.imgHeight,
+              top: '-' + (parseInt(setSize.imgHeight) + vSpace) + 'px',
+              'background-size': setSize.imgWidth + ' ' + setSize.imgHeight
+            }"
+            class="verify-sub-block"
+          >
+            <img
+              :src="'data:image/png;base64,' + blockBackImgBase"
+              alt=""
+              style="display: block; width: 100%; height: 100%; -webkit-user-drag: none"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup type="text/babel">
+/**
+ * VerifySlide
+ * @description 滑块
+ * */
+import { aesEncrypt } from './../utils/ase'
+import { resetSize } from './../utils/util'
+import { getCode, reqCheck } from '@/api/login'
+
+const props = defineProps({
+  captchaType: {
+    type: String
+  },
+  type: {
+    type: String,
+    default: '1'
+  },
+  //弹出式pop，固定fixed
+  mode: {
+    type: String,
+    default: 'fixed'
+  },
+  vSpace: {
+    type: Number,
+    default: 5
+  },
+  explain: {
+    type: String,
+    default: ''
+  },
+  imgSize: {
+    type: Object,
+    default() {
+      return {
+        width: '310px',
+        height: '155px'
+      }
+    }
+  },
+  blockSize: {
+    type: Object,
+    default() {
+      return {
+        width: '50px',
+        height: '50px'
+      }
+    }
+  },
+  barSize: {
+    type: Object,
+    default() {
+      return {
+        width: '310px',
+        height: '30px'
+      }
+    }
+  }
+})
+
+const { t } = useI18n()
+const { mode, captchaType, type, blockSize, explain } = toRefs(props)
+const { proxy } = getCurrentInstance()
+let secretKey = ref(''), //后端返回的ase加密秘钥
+  passFlag = ref(''), //是否通过的标识
+  backImgBase = ref(''), //验证码背景图片
+  blockBackImgBase = ref(''), //验证滑块的背景图片
+  backToken = ref(''), //后端返回的唯一token值
+  startMoveTime = ref(''), //移动开始的时间
+  endMovetime = ref(''), //移动结束的时间
+  tipWords = ref(''),
+  text = ref(''),
+  finishText = ref(''),
+  setSize = reactive({
+    imgHeight: 0,
+    imgWidth: 0,
+    barHeight: 0,
+    barWidth: 0
+  }),
+  moveBlockLeft = ref(undefined),
+  leftBarWidth = ref(undefined),
+  // 移动中样式
+  moveBlockBackgroundColor = ref(undefined),
+  leftBarBorderColor = ref('#ddd'),
+  iconColor = ref(undefined),
+  iconClass = ref('icon-right'),
+  status = ref(false), //鼠标状态
+  isEnd = ref(false), //是够验证完成
+  showRefresh = ref(true),
+  transitionLeft = ref(''),
+  transitionWidth = ref(''),
+  startLeft = ref(0)
+
+const barArea = computed(() => {
+  return proxy.$el.querySelector('.verify-bar-area')
+})
+const init = () => {
+  if (explain.value === '') {
+    text.value = t('captcha.slide')
+  } else {
+    text.value = explain.value
+  }
+  getPictrue()
+  nextTick(() => {
+    let { imgHeight, imgWidth, barHeight, barWidth } = resetSize(proxy)
+    setSize.imgHeight = imgHeight
+    setSize.imgWidth = imgWidth
+    setSize.barHeight = barHeight
+    setSize.barWidth = barWidth
+    proxy.$parent.$emit('ready', proxy)
+  })
+
+  window.removeEventListener('touchmove', function (e) {
+    move(e)
+  })
+  window.removeEventListener('mousemove', function (e) {
+    move(e)
+  })
+
+  //鼠标松开
+  window.removeEventListener('touchend', function () {
+    end()
+  })
+  window.removeEventListener('mouseup', function () {
+    end()
+  })
+
+  window.addEventListener('touchmove', function (e) {
+    move(e)
+  })
+  window.addEventListener('mousemove', function (e) {
+    move(e)
+  })
+
+  //鼠标松开
+  window.addEventListener('touchend', function () {
+    end()
+  })
+  window.addEventListener('mouseup', function () {
+    end()
+  })
+}
+watch(type, () => {
+  init()
+})
+onMounted(() => {
+  // 禁止拖拽
+  init()
+  proxy.$el.onselectstart = function () {
+    return false
+  }
+})
+//鼠标按下
+const start = (e) => {
+  e = e || window.event
+  if (!e.touches) {
+    //兼容PC端
+    var x = e.clientX
+  } else {
+    //兼容移动端
+    var x = e.touches[0].pageX
+  }
+  startLeft.value = Math.floor(x - barArea.value.getBoundingClientRect().left)
+  startMoveTime.value = +new Date() //开始滑动的时间
+  if (isEnd.value == false) {
+    text.value = ''
+    moveBlockBackgroundColor.value = '#337ab7'
+    leftBarBorderColor.value = '#337AB7'
+    iconColor.value = '#fff'
+    e.stopPropagation()
+    status.value = true
+  }
+}
+//鼠标移动
+const move = (e) => {
+  e = e || window.event
+  if (status.value && isEnd.value == false) {
+    if (!e.touches) {
+      //兼容PC端
+      var x = e.clientX
+    } else {
+      //兼容移动端
+      var x = e.touches[0].pageX
+    }
+    var bar_area_left = barArea.value.getBoundingClientRect().left
+    var move_block_left = x - bar_area_left //小方块相对于父元素的left值
+    if (
+      move_block_left >=
+      barArea.value.offsetWidth - parseInt(parseInt(blockSize.value.width) / 2) - 2
+    ) {
+      move_block_left =
+        barArea.value.offsetWidth - parseInt(parseInt(blockSize.value.width) / 2) - 2
+    }
+    if (move_block_left <= 0) {
+      move_block_left = parseInt(parseInt(blockSize.value.width) / 2)
+    }
+    //拖动后小方块的left值
+    moveBlockLeft.value = move_block_left - startLeft.value + 'px'
+    leftBarWidth.value = move_block_left - startLeft.value + 'px'
+  }
+}
+
+//鼠标松开
+const end = () => {
+  endMovetime.value = +new Date()
+  //判断是否重合
+  if (status.value && isEnd.value == false) {
+    var moveLeftDistance = parseInt((moveBlockLeft.value || '').replace('px', ''))
+    moveLeftDistance = (moveLeftDistance * 310) / parseInt(setSize.imgWidth)
+    let data = {
+      captchaType: captchaType.value,
+      pointJson: secretKey.value
+        ? aesEncrypt(JSON.stringify({ x: moveLeftDistance, y: 5.0 }), secretKey.value)
+        : JSON.stringify({ x: moveLeftDistance, y: 5.0 }),
+      token: backToken.value
+    }
+    reqCheck(data).then((res) => {
+      if (res.repCode == '0000') {
+        moveBlockBackgroundColor.value = '#5cb85c'
+        leftBarBorderColor.value = '#5cb85c'
+        iconColor.value = '#fff'
+        iconClass.value = 'icon-check'
+        showRefresh.value = false
+        isEnd.value = true
+        if (mode.value == 'pop') {
+          setTimeout(() => {
+            proxy.$parent.clickShow = false
+            refresh()
+          }, 1500)
+        }
+        passFlag.value = true
+        tipWords.value = `${((endMovetime.value - startMoveTime.value) / 1000).toFixed(2)}s
+            ${t('captcha.success')}`
+        var captchaVerification = secretKey.value
+          ? aesEncrypt(
+              backToken.value + '---' + JSON.stringify({ x: moveLeftDistance, y: 5.0 }),
+              secretKey.value
+            )
+          : backToken.value + '---' + JSON.stringify({ x: moveLeftDistance, y: 5.0 })
+        setTimeout(() => {
+          tipWords.value = ''
+          proxy.$parent.closeBox()
+          proxy.$parent.$emit('success', { captchaVerification })
+        }, 1000)
+      } else {
+        moveBlockBackgroundColor.value = '#d9534f'
+        leftBarBorderColor.value = '#d9534f'
+        iconColor.value = '#fff'
+        iconClass.value = 'icon-close'
+        passFlag.value = false
+        setTimeout(function () {
+          refresh()
+        }, 1000)
+        proxy.$parent.$emit('error', proxy)
+        tipWords.value = t('captcha.fail')
+        setTimeout(() => {
+          tipWords.value = ''
+        }, 1000)
+      }
+    })
+    status.value = false
+  }
+}
+
+const refresh = async () => {
+  showRefresh.value = true
+  finishText.value = ''
+
+  transitionLeft.value = 'left .3s'
+  moveBlockLeft.value = 0
+
+  leftBarWidth.value = undefined
+  transitionWidth.value = 'width .3s'
+
+  leftBarBorderColor.value = '#ddd'
+  moveBlockBackgroundColor.value = '#fff'
+  iconColor.value = '#000'
+  iconClass.value = 'icon-right'
+  isEnd.value = false
+
+  await getPictrue()
+  setTimeout(() => {
+    transitionWidth.value = ''
+    transitionLeft.value = ''
+    text.value = explain.value
+  }, 300)
+}
+
+// 请求背景图片和验证图片
+const getPictrue = async () => {
+  let data = {
+    captchaType: captchaType.value
+  }
+  const res = await getCode(data)
+  if (res.repCode == '0000') {
+    backImgBase.value = res.repData.originalImageBase64
+    blockBackImgBase.value = res.repData.jigsawImageBase64
+    backToken.value = res.repData.token
+    secretKey.value = res.repData.secretKey
+  } else {
+    tipWords.value = res.repMsg
+  }
+}
+</script>
diff --git a/src/components/Verifition/src/Verify/index.ts b/src/components/Verifition/src/Verify/index.ts
new file mode 100644
index 000000000..0daa63a56
--- /dev/null
+++ b/src/components/Verifition/src/Verify/index.ts
@@ -0,0 +1,4 @@
+import VerifySlide from './VerifySlide.vue'
+import VerifyPoints from './VerifyPoints.vue'
+
+export { VerifySlide, VerifyPoints }
diff --git a/src/components/Verifition/src/utils/ase.ts b/src/components/Verifition/src/utils/ase.ts
new file mode 100644
index 000000000..d2e6b988f
--- /dev/null
+++ b/src/components/Verifition/src/utils/ase.ts
@@ -0,0 +1,14 @@
+import CryptoJS from 'crypto-js'
+/**
+ * @word 要加密的内容
+ * @keyWord String  服务器随机返回的关键字
+ *  */
+export function aesEncrypt(word, keyWord = 'XwKsGlMcdPMEhR1B') {
+  const key = CryptoJS.enc.Utf8.parse(keyWord)
+  const srcs = CryptoJS.enc.Utf8.parse(word)
+  const encrypted = CryptoJS.AES.encrypt(srcs, key, {
+    mode: CryptoJS.mode.ECB,
+    padding: CryptoJS.pad.Pkcs7
+  })
+  return encrypted.toString()
+}
diff --git a/src/components/Verifition/src/utils/util.ts b/src/components/Verifition/src/utils/util.ts
new file mode 100644
index 000000000..15c16270d
--- /dev/null
+++ b/src/components/Verifition/src/utils/util.ts
@@ -0,0 +1,97 @@
+export function resetSize(vm) {
+  let img_width, img_height, bar_width, bar_height //图片的宽度、高度，移动条的宽度、高度
+  const EmployeeWindow = window as any
+  const parentWidth = vm.$el.parentNode.offsetWidth || EmployeeWindow.offsetWidth
+  const parentHeight = vm.$el.parentNode.offsetHeight || EmployeeWindow.offsetHeight
+  if (vm.imgSize.width.indexOf('%') != -1) {
+    img_width = (parseInt(vm.imgSize.width) / 100) * parentWidth + 'px'
+  } else {
+    img_width = vm.imgSize.width
+  }
+
+  if (vm.imgSize.height.indexOf('%') != -1) {
+    img_height = (parseInt(vm.imgSize.height) / 100) * parentHeight + 'px'
+  } else {
+    img_height = vm.imgSize.height
+  }
+
+  if (vm.barSize.width.indexOf('%') != -1) {
+    bar_width = (parseInt(vm.barSize.width) / 100) * parentWidth + 'px'
+  } else {
+    bar_width = vm.barSize.width
+  }
+
+  if (vm.barSize.height.indexOf('%') != -1) {
+    bar_height = (parseInt(vm.barSize.height) / 100) * parentHeight + 'px'
+  } else {
+    bar_height = vm.barSize.height
+  }
+
+  return { imgWidth: img_width, imgHeight: img_height, barWidth: bar_width, barHeight: bar_height }
+}
+
+export const _code_chars = [
+  1,
+  2,
+  3,
+  4,
+  5,
+  6,
+  7,
+  8,
+  9,
+  'a',
+  'b',
+  'c',
+  'd',
+  'e',
+  'f',
+  'g',
+  'h',
+  'i',
+  'j',
+  'k',
+  'l',
+  'm',
+  'n',
+  'o',
+  'p',
+  'q',
+  'r',
+  's',
+  't',
+  'u',
+  'v',
+  'w',
+  'x',
+  'y',
+  'z',
+  'A',
+  'B',
+  'C',
+  'D',
+  'E',
+  'F',
+  'G',
+  'H',
+  'I',
+  'J',
+  'K',
+  'L',
+  'M',
+  'N',
+  'O',
+  'P',
+  'Q',
+  'R',
+  'S',
+  'T',
+  'U',
+  'V',
+  'W',
+  'X',
+  'Y',
+  'Z'
+]
+export const _code_color1 = ['#fffff0', '#f0ffff', '#f0fff0', '#fff0f0']
+export const _code_color2 = ['#FF0033', '#006699', '#993366', '#FF9900', '#66CC66', '#FF33CC']
diff --git a/src/components/XButton/index.ts b/src/components/XButton/index.ts
new file mode 100644
index 000000000..d573b852b
--- /dev/null
+++ b/src/components/XButton/index.ts
@@ -0,0 +1,5 @@
+import XButton from './src/XButton.vue'
+import XTextButton from './src/XTextButton.vue'
+import ButtonBase from './src/ButtonBase.vue'
+
+export { XButton, XTextButton, ButtonBase }
diff --git a/src/components/XButton/src/ButtonBase.vue b/src/components/XButton/src/ButtonBase.vue
new file mode 100644
index 000000000..15f997966
--- /dev/null
+++ b/src/components/XButton/src/ButtonBase.vue
@@ -0,0 +1,97 @@
+<template>
+  <div v-for="(item, index) in Butttondata" :key="index" class="btn-div">
+    <el-button
+      v-show="!item.hide"
+      :type="item.type"
+      :color="item.color"
+      :link="item.link ? item.link : false"
+      :disabled="item.disabled"
+      v-hasPermi="[item.hasPermi] || []"
+      v-if="item.name != 'set'"
+      @click="buttonBaseClick(item.name, item, $event)"
+    >
+      <Icon v-if="item.icon" :icon="item.icon" class="mr-1px" />
+      {{ item.label }}
+    </el-button>
+    <!-- 设置按钮 -->
+    <el-popover
+      :visible="popoverVisible"
+      placement="bottom"
+      :width="300"
+      trigger="click"
+      v-if="item.name == 'set'&&!item.hide"
+    >
+      <rowDrop
+        ref="rowDropRef"
+        @updata-table-columns="updataTableColumns"
+        :allSchemas="allSchemas"
+        @closeRowDrop="closeRowDrop"
+        @updataTableColumns="updataTableColumns"
+      />
+      <template #reference>
+        <el-button
+          v-show="!item.hide"
+          :type="item.type"
+          :color="item.color"
+          :disabled="item.disabled"
+          :link="item.link ? item.link : false"
+          v-hasPermi="[item.hasPermi] || []"
+          @click="buttonBaseClick(item.name, item, $event)"
+        >
+          <Icon v-if="item.icon" :icon="item.icon" class="mr-1px" />
+          {{ item.label }}
+        </el-button>
+      </template>
+    </el-popover>
+  </div>
+  <slot></slot>
+</template>
+<script setup>
+import { Plus } from '@element-plus/icons-vue'
+import { clearButtonBlurHandle } from '@/utils/index'
+import rowDrop from '@/components/rowDrop/index.vue'
+const props = defineProps({
+  Butttondata: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  },
+  allSchemas: {
+    type: Object,
+    default: null
+  }
+})
+
+// 传递给父类
+const emit = defineEmits(['buttonBaseClick', 'updataTableColumns'])
+
+const buttonBaseClick = (val, item, $event) => {
+  clearButtonBlurHandle($event) //解决el-button点击后颜色不恢复问题
+  emit('buttonBaseClick', val, item, $event)
+}
+const popoverVisible = ref(false)
+// 关闭页面
+const closeRowDrop = () => {
+  popoverVisible.value = false
+}
+defineExpose({
+  popoverVisible
+})
+// 更新主列表字段
+const updataTableColumns = (val) => {
+  emit('updataTableColumns', val)
+}
+</script>
+<style scoped lang="scss">
+.btn-div{
+  display: inline;
+
+  ::v-deep(.el-button){
+    margin: 0px 5px;
+  }
+  ::v-deep(.el-button.is-link){
+    margin: 0px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/XButton/src/XButton.vue b/src/components/XButton/src/XButton.vue
new file mode 100644
index 000000000..40cba1ac4
--- /dev/null
+++ b/src/components/XButton/src/XButton.vue
@@ -0,0 +1,50 @@
+<script lang="ts" setup>
+import { PropType } from 'vue'
+import { propTypes } from '@/utils/propTypes'
+
+defineOptions({ name: 'XButton' })
+
+const props = defineProps({
+  modelValue: propTypes.bool.def(false),
+  loading: propTypes.bool.def(false),
+  preIcon: propTypes.string.def(''),
+  postIcon: propTypes.string.def(''),
+  title: propTypes.string.def(''),
+  type: propTypes.oneOf(['', 'primary', 'success', 'warning', 'danger', 'info']).def(''),
+  link: propTypes.bool.def(false),
+  circle: propTypes.bool.def(false),
+  round: propTypes.bool.def(false),
+  plain: propTypes.bool.def(false),
+  onClick: { type: Function as PropType<(...args) => any>, default: null }
+})
+const getBindValue = computed(() => {
+  const delArr: string[] = ['title', 'preIcon', 'postIcon', 'onClick']
+  const attrs = useAttrs()
+  const obj = { ...attrs, ...props }
+  for (const key in obj) {
+    if (delArr.indexOf(key) !== -1) {
+      delete obj[key]
+    }
+  }
+  return obj
+})
+</script>
+
+<template>
+  <el-button v-bind="getBindValue" @click="onClick">
+    <Icon v-if="preIcon" :icon="preIcon" class="mr-1px" />
+    {{ title ? title : '' }}
+    <Icon v-if="postIcon" :icon="postIcon" class="mr-1px" />
+  </el-button>
+</template>
+<style lang="scss" scoped>
+:deep(.el-button.is-text) {
+  padding: 8px 4px;
+  margin-left: 0;
+}
+
+:deep(.el-button.is-link) {
+  padding: 8px 4px;
+  margin-left: 0;
+}
+</style>
diff --git a/src/components/XButton/src/XTextButton.vue b/src/components/XButton/src/XTextButton.vue
new file mode 100644
index 000000000..b1a922b3d
--- /dev/null
+++ b/src/components/XButton/src/XTextButton.vue
@@ -0,0 +1,49 @@
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import { PropType } from 'vue'
+
+defineOptions({ name: 'XTextButton' })
+
+const props = defineProps({
+  modelValue: propTypes.bool.def(false),
+  loading: propTypes.bool.def(false),
+  preIcon: propTypes.string.def(''),
+  postIcon: propTypes.string.def(''),
+  title: propTypes.string.def(''),
+  type: propTypes.oneOf(['', 'primary', 'success', 'warning', 'danger', 'info']).def('primary'),
+  circle: propTypes.bool.def(false),
+  round: propTypes.bool.def(false),
+  plain: propTypes.bool.def(false),
+  onClick: { type: Function as PropType<(...args) => any>, default: null }
+})
+const getBindValue = computed(() => {
+  const delArr: string[] = ['title', 'preIcon', 'postIcon', 'onClick']
+  const attrs = useAttrs()
+  const obj = { ...attrs, ...props }
+  for (const key in obj) {
+    if (delArr.indexOf(key) !== -1) {
+      delete obj[key]
+    }
+  }
+  return obj
+})
+</script>
+
+<template>
+  <el-button link v-bind="getBindValue" @click="onClick">
+    <Icon v-if="preIcon" :icon="preIcon" class="mr-1px" />
+    {{ title ? title : '' }}
+    <Icon v-if="postIcon" :icon="postIcon" class="mr-1px" />
+  </el-button>
+</template>
+<style lang="scss" scoped>
+:deep(.el-button.is-text) {
+  padding: 8px 4px;
+  margin-left: 0;
+}
+
+:deep(.el-button.is-link) {
+  padding: 8px 4px;
+  margin-left: 0;
+}
+</style>
diff --git a/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue b/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
new file mode 100644
index 000000000..885a7cef6
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
@@ -0,0 +1,704 @@
+<template>
+  <div class="my-process-designer">
+    <div class="my-process-designer__header" style="z-index: 999; display: table-row-group">
+      <slot name="control-header"></slot>
+      <template v-if="!$slots['control-header']">
+        <ElButtonGroup key="file-control">
+          <XButton preIcon="ep:folder-opened" title="打开文件" @click="refFile.click()" />
+          <el-tooltip effect="light" placement="bottom">
+            <template #content>
+              <div style="color: #409eff">
+                <!-- <el-button link @click="downloadProcessAsXml()">下载为XML文件</el-button> -->
+                <XTextButton title="下载为XML文件" @click="downloadProcessAsXml()" />
+                <br />
+
+                <!-- <el-button link @click="downloadProcessAsSvg()">下载为SVG文件</el-button> -->
+                <XTextButton title="下载为SVG文件" @click="downloadProcessAsSvg()" />
+                <br />
+
+                <!-- <el-button link @click="downloadProcessAsBpmn()">下载为BPMN文件</el-button> -->
+                <XTextButton title="下载为BPMN文件" @click="downloadProcessAsBpmn()" />
+              </div>
+            </template>
+            <XButton title="下载文件" preIcon="ep:download" />
+          </el-tooltip>
+          <el-tooltip effect="light">
+            <XButton preIcon="ep:view" title="浏览" />
+            <template #content>
+              <!-- <el-button link @click="previewProcessXML">预览XML</el-button> -->
+              <XTextButton title="预览XML" @click="previewProcessXML" />
+              <br />
+              <!-- <el-button link @click="previewProcessJson">预览JSON</el-button> -->
+              <XTextButton title="预览JSON" @click="previewProcessJson" />
+            </template>
+          </el-tooltip>
+          <el-tooltip
+            v-if="props.simulation"
+            effect="light"
+            :content="simulationStatus ? '退出模拟' : '开启模拟'"
+          >
+            <XButton preIcon="ep:cpu" title="模拟" @click="processSimulation" />
+          </el-tooltip>
+        </ElButtonGroup>
+        <ElButtonGroup key="align-control">
+          <el-tooltip effect="light" content="向左对齐">
+            <!-- <el-button
+              class="align align-left"
+              icon="el-icon-s-data"
+              @click="elementsAlign('left')"
+            /> -->
+            <XButton
+              preIcon="fa:align-left"
+              class="align align-bottom"
+              @click="elementsAlign('left')"
+            />
+          </el-tooltip>
+          <el-tooltip effect="light" content="向右对齐">
+            <!-- <el-button
+              class="align align-right"
+              icon="el-icon-s-data"
+              @click="elementsAlign('right')"
+            /> -->
+            <XButton
+              preIcon="fa:align-left"
+              class="align align-top"
+              @click="elementsAlign('right')"
+            />
+          </el-tooltip>
+          <el-tooltip effect="light" content="向上对齐">
+            <!-- <el-button
+              class="align align-top"
+              icon="el-icon-s-data"
+              @click="elementsAlign('top')"
+            /> -->
+            <XButton
+              preIcon="fa:align-left"
+              class="align align-left"
+              @click="elementsAlign('top')"
+            />
+          </el-tooltip>
+          <el-tooltip effect="light" content="向下对齐">
+            <!-- <el-button
+              class="align align-bottom"
+              icon="el-icon-s-data"
+              @click="elementsAlign('bottom')"
+            /> -->
+            <XButton
+              preIcon="fa:align-left"
+              class="align align-right"
+              @click="elementsAlign('bottom')"
+            />
+          </el-tooltip>
+          <el-tooltip effect="light" content="水平居中">
+            <!-- <el-button
+              class="align align-center"
+              icon="el-icon-s-data"
+              @click="elementsAlign('center')"
+            /> -->
+            <!-- class="align align-center" -->
+            <XButton
+              preIcon="fa:align-left"
+              class="align align-center"
+              @click="elementsAlign('center')"
+            />
+          </el-tooltip>
+          <el-tooltip effect="light" content="垂直居中">
+            <!-- <el-button
+              class="align align-middle"
+              icon="el-icon-s-data"
+              @click="elementsAlign('middle')"
+            /> -->
+            <XButton
+              preIcon="fa:align-left"
+              class="align align-middle"
+              @click="elementsAlign('middle')"
+            />
+          </el-tooltip>
+        </ElButtonGroup>
+        <ElButtonGroup key="scale-control">
+          <el-tooltip effect="light" content="缩小视图">
+            <!-- <el-button
+              :disabled="defaultZoom < 0.2"
+              icon="el-icon-zoom-out"
+              @click="processZoomOut()"
+            /> -->
+            <XButton
+              preIcon="ep:zoom-out"
+              @click="processZoomOut()"
+              :disabled="defaultZoom < 0.2"
+            />
+          </el-tooltip>
+          <el-button>{{ Math.floor(defaultZoom * 10 * 10) + '%' }}</el-button>
+          <el-tooltip effect="light" content="放大视图">
+            <!-- <el-button
+              :disabled="defaultZoom > 4"
+              icon="el-icon-zoom-in"
+              @click="processZoomIn()"
+            /> -->
+            <XButton preIcon="ep:zoom-in" @click="processZoomIn()" :disabled="defaultZoom > 4" />
+          </el-tooltip>
+          <el-tooltip effect="light" content="重置视图并居中">
+            <!-- <el-button icon="el-icon-c-scale-to-original" @click="processReZoom()" /> -->
+            <XButton preIcon="ep:scale-to-original" @click="processReZoom()" />
+          </el-tooltip>
+        </ElButtonGroup>
+        <ElButtonGroup key="stack-control">
+          <el-tooltip effect="light" content="撤销">
+            <!-- <el-button :disabled="!revocable" icon="el-icon-refresh-left" @click="processUndo()" /> -->
+            <XButton preIcon="ep:refresh-left" @click="processUndo()" :disabled="!revocable" />
+          </el-tooltip>
+          <el-tooltip effect="light" content="恢复">
+            <!-- <el-button
+              :disabled="!recoverable"
+              icon="el-icon-refresh-right"
+              @click="processRedo()"
+            /> -->
+            <XButton preIcon="ep:refresh-right" @click="processRedo()" :disabled="!recoverable" />
+          </el-tooltip>
+          <el-tooltip effect="light" content="重新绘制">
+            <!-- <el-button icon="el-icon-refresh" @click="processRestart" /> -->
+            <XButton preIcon="ep:refresh" @click="processRestart()" />
+          </el-tooltip>
+        </ElButtonGroup>
+        <XButton
+          preIcon="ep:plus"
+          title="保存模型"
+          @click="processSave"
+          :type="props.headerButtonType"
+          :disabled="simulationStatus"
+        />
+      </template>
+      <!-- 用于打开本地文件-->
+      <input
+        type="file"
+        id="files"
+        ref="refFile"
+        style="display: none"
+        accept=".xml, .bpmn"
+        @change="importLocalFile"
+      />
+    </div>
+    <div class="my-process-designer__container">
+      <div
+        class="my-process-designer__canvas"
+        ref="bpmnCanvas"
+        id="bpmnCanvas"
+        style="width: 1680px; height: 800px"
+      ></div>
+      <!-- <div id="js-properties-panel" class="panel"></div> -->
+      <!-- <div class="my-process-designer__canvas" ref="bpmn-canvas"></div> -->
+    </div>
+    <Dialog
+      title="预览"
+      v-model="previewModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="600px"
+    >
+      <!-- append-to-body -->
+      <div v-highlight>
+        <code class="hljs">
+          <!-- 高亮代码块 -->
+          {{ previewResult }}
+        </code>
+      </div>
+    </Dialog>
+  </div>
+</template>
+
+<script lang="ts" setup>
+// import 'bpmn-js/dist/assets/diagram-js.css' // 左边工具栏以及编辑节点的样式
+// import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css'
+// import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css'
+// import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'
+// import 'bpmn-js-properties-panel/dist/assets/bpmn-js-properties-panel.css' // 右侧框样式
+import { ElMessage, ElMessageBox } from 'element-plus'
+import BpmnModeler from 'bpmn-js/lib/Modeler'
+import DefaultEmptyXML from './plugins/defaultEmpty'
+// 翻译方法
+import customTranslate from './plugins/translate/customTranslate'
+import translationsCN from './plugins/translate/zh'
+// 模拟流转流程
+import tokenSimulation from 'bpmn-js-token-simulation'
+// 标签解析构建器
+// import bpmnPropertiesProvider from "bpmn-js-properties-panel/lib/provider/bpmn";
+// import propertiesPanelModule from 'bpmn-js-properties-panel'
+// import propertiesProviderModule from 'bpmn-js-properties-panel/lib/provider/camunda'
+// 标签解析 Moddle
+import camundaModdleDescriptor from './plugins/descriptor/camundaDescriptor.json'
+import activitiModdleDescriptor from './plugins/descriptor/activitiDescriptor.json'
+import flowableModdleDescriptor from './plugins/descriptor/flowableDescriptor.json'
+// 标签解析 Extension
+import camundaModdleExtension from './plugins/extension-moddle/camunda'
+import activitiModdleExtension from './plugins/extension-moddle/activiti'
+import flowableModdleExtension from './plugins/extension-moddle/flowable'
+// 引入json转换与高亮
+// import xml2js from 'xml-js'
+// import xml2js from 'fast-xml-parser'
+import { XmlNode, XmlNodeType, parseXmlString } from 'steady-xml'
+// 代码高亮插件
+// import hljs from 'highlight.js/lib/highlight'
+// import 'highlight.js/styles/github-gist.css'
+// hljs.registerLanguage('xml', 'highlight.js/lib/languages/xml')
+// hljs.registerLanguage('json', 'highlight.js/lib/languages/json')
+// const eventName = reactive({
+//   name: ''
+// })
+
+defineOptions({ name: 'MyProcessDesigner' })
+
+const bpmnCanvas = ref()
+const refFile = ref()
+const emit = defineEmits([
+  'destroy',
+  'init-finished',
+  'save',
+  'commandStack-changed',
+  'input',
+  'change',
+  'canvas-viewbox-changed',
+  // eventName.name
+  'element-click'
+])
+
+const props = defineProps({
+  value: String, // xml 字符串
+  // valueWatch: true, // xml 字符串的 watch 状态
+  processId: String, // 流程 key 标识
+  processName: String, // 流程 name 名字
+  formId: Number, // 流程 form 表单编号
+  translations: {
+    // 自定义的翻译文件
+    type: Object,
+    default: () => {}
+  },
+  additionalModel: [Object, Array], // 自定义model
+  moddleExtension: {
+    // 自定义moddle
+    type: Object,
+    default: () => {}
+  },
+  onlyCustomizeAddi: {
+    type: Boolean,
+    default: false
+  },
+  onlyCustomizeModdle: {
+    type: Boolean,
+    default: false
+  },
+  simulation: {
+    type: Boolean,
+    default: true
+  },
+  keyboard: {
+    type: Boolean,
+    default: true
+  },
+  prefix: {
+    type: String,
+    default: 'camunda'
+  },
+  events: {
+    type: Array,
+    default: () => ['element.click']
+  },
+  headerButtonSize: {
+    type: String,
+    default: 'small',
+    validator: (value: string) => ['default', 'medium', 'small', 'mini'].indexOf(value) !== -1
+  },
+  headerButtonType: {
+    type: String,
+    default: 'primary',
+    validator: (value: string) =>
+      ['default', 'primary', 'success', 'warning', 'danger', 'info'].indexOf(value) !== -1
+  }
+})
+
+provide('configGlobal', props)
+let bpmnModeler: any = null
+const defaultZoom = ref(1)
+const previewModelVisible = ref(false)
+const simulationStatus = ref(false)
+const previewResult = ref('')
+const previewType = ref('xml')
+const recoverable = ref(false)
+const revocable = ref(false)
+const additionalModules = computed(() => {
+  console.log(props.additionalModel, 'additionalModel')
+  const Modules: any[] = []
+  // 仅保留用户自定义扩展模块
+  if (props.onlyCustomizeAddi) {
+    if (Object.prototype.toString.call(props.additionalModel) == '[object Array]') {
+      return props.additionalModel || []
+    }
+    return [props.additionalModel]
+  }
+
+  // 插入用户自定义扩展模块
+  if (Object.prototype.toString.call(props.additionalModel) == '[object Array]') {
+    Modules.push(...(props.additionalModel as any[]))
+  } else {
+    props.additionalModel && Modules.push(props.additionalModel)
+  }
+
+  // 翻译模块
+  const TranslateModule = {
+    translate: ['value', customTranslate(props.translations || translationsCN)]
+  }
+  Modules.push(TranslateModule)
+
+  // 模拟流转模块
+  if (props.simulation) {
+    Modules.push(tokenSimulation)
+  }
+
+  // 根据需要的流程类型设置扩展元素构建模块
+  // if (this.prefix === "bpmn") {
+  //   Modules.push(bpmnModdleExtension);
+  // }
+  console.log(props.prefix, 'props.prefix ')
+  if (props.prefix === 'camunda') {
+    Modules.push(camundaModdleExtension)
+  }
+  if (props.prefix === 'flowable') {
+    Modules.push(flowableModdleExtension)
+  }
+  if (props.prefix === 'activiti') {
+    Modules.push(activitiModdleExtension)
+  }
+
+  return Modules
+})
+const moddleExtensions = computed(() => {
+  console.log(props.onlyCustomizeModdle, 'props.onlyCustomizeModdle')
+  console.log(props.moddleExtension, 'props.moddleExtension')
+  console.log(props.prefix, 'props.prefix')
+  const Extensions: any = {}
+  // 仅使用用户自定义模块
+  if (props.onlyCustomizeModdle) {
+    return props.moddleExtension || null
+  }
+
+  // 插入用户自定义模块
+  if (props.moddleExtension) {
+    for (let key in props.moddleExtension) {
+      Extensions[key] = props.moddleExtension[key]
+    }
+  }
+
+  // 根据需要的 "流程类型" 设置 对应的解析文件
+  if (props.prefix === 'activiti') {
+    Extensions.activiti = activitiModdleDescriptor
+  }
+  if (props.prefix === 'flowable') {
+    Extensions.flowable = flowableModdleDescriptor
+  }
+  if (props.prefix === 'camunda') {
+    Extensions.camunda = camundaModdleDescriptor
+  }
+  return Extensions
+})
+console.log(additionalModules, 'additionalModules()')
+console.log(moddleExtensions, 'moddleExtensions()')
+const initBpmnModeler = () => {
+  if (bpmnModeler) return
+  let data = document.getElementById('bpmnCanvas')
+  console.log(data, 'data')
+  console.log(props.keyboard, 'props.keyboard')
+  console.log(additionalModules, 'additionalModules()')
+  console.log(moddleExtensions, 'moddleExtensions()')
+
+  bpmnModeler = new BpmnModeler({
+    // container: this.$refs['bpmn-canvas'],
+    // container: getCurrentInstance(),
+    // container: needClass,
+    // container: bpmnCanvas.value,
+    container: data,
+    // width: '100%',
+    // 添加控制板
+    // propertiesPanel: {
+    // parent: '#js-properties-panel'
+    // },
+    keyboard: props.keyboard ? { bindTo: document } : null,
+    // additionalModules: additionalModules.value,
+    additionalModules: additionalModules.value,
+    moddleExtensions: moddleExtensions.value
+
+    // additionalModules: [
+    // additionalModules.value
+    // propertiesPanelModule,
+    // propertiesProviderModule
+    // propertiesProviderModule
+    // ],
+    // moddleExtensions: { camunda: moddleExtensions.value }
+  })
+
+  // bpmnModeler.createDiagram()
+
+  console.log(bpmnModeler, 'bpmnModeler111111')
+  emit('init-finished', bpmnModeler)
+  initModelListeners()
+}
+
+const initModelListeners = () => {
+  const EventBus = bpmnModeler.get('eventBus')
+  console.log(EventBus, 'EventBus')
+  // 注册需要的监听事件, 将. 替换为 - , 避免解析异常
+  props.events.forEach((event: any) => {
+    EventBus.on(event, function (eventObj) {
+      let eventName = event.replace(/\./g, '-')
+      // eventName.name = eventName
+      let element = eventObj ? eventObj.element : null
+      console.log(eventName, 'eventName')
+      console.log(element, 'element')
+      emit('element-click', element, eventObj)
+      // emit(eventName, element, eventObj)
+    })
+  })
+  // 监听图形改变返回xml
+  EventBus.on('commandStack.changed', async (event) => {
+    try {
+      recoverable.value = bpmnModeler.get('commandStack').canRedo()
+      revocable.value = bpmnModeler.get('commandStack').canUndo()
+      let { xml } = await bpmnModeler.saveXML({ format: true })
+      emit('commandStack-changed', event)
+      emit('input', xml)
+      emit('change', xml)
+    } catch (e: any) {
+      console.error(`[Process Designer Warn]: ${e.message || e}`)
+    }
+  })
+  // 监听视图缩放变化
+  bpmnModeler.on('canvas.viewbox.changed', ({ viewbox }) => {
+    emit('canvas-viewbox-changed', { viewbox })
+    const { scale } = viewbox
+    defaultZoom.value = Math.floor(scale * 100) / 100
+  })
+}
+/* 创建新的流程图 */
+const createNewDiagram = async (xml) => {
+  console.log(xml, 'xml')
+  // 将字符串转换成图显示出来
+  let newId = props.processId || `Process_${new Date().getTime()}`
+  let newName = props.processName || `业务流程_${new Date().getTime()}`
+  let xmlString = xml || DefaultEmptyXML(newId, newName, props.prefix)
+  try {
+    // console.log(xmlString, 'xmlString')
+    // console.log(this.bpmnModeler.importXML);
+    let { warnings } = await bpmnModeler.importXML(xmlString)
+    console.log(warnings, 'warnings')
+    if (warnings && warnings.length) {
+      warnings.forEach((warn) => console.warn(warn))
+    }
+  } catch (e: any) {
+    console.error(`[Process Designer Warn]: ${e.message || e}`)
+  }
+}
+
+// 下载流程图到本地
+const downloadProcess = async (type) => {
+  try {
+    // 按需要类型创建文件并下载
+    if (type === 'xml' || type === 'bpmn') {
+      const { err, xml } = await bpmnModeler.saveXML()
+      // 读取异常时抛出异常
+      if (err) {
+        console.error(`[Process Designer Warn ]: ${err.message || err}`)
+      }
+      let { href, filename } = setEncoded(type.toUpperCase(), xml)
+      downloadFunc(href, filename)
+    } else {
+      const { err, svg } = await bpmnModeler.saveSVG()
+      // 读取异常时抛出异常
+      if (err) {
+        return console.error(err)
+      }
+      let { href, filename } = setEncoded('SVG', svg)
+      downloadFunc(href, filename)
+    }
+  } catch (e: any) {
+    console.error(`[Process Designer Warn ]: ${e.message || e}`)
+  }
+  // 文件下载方法
+  function downloadFunc(href, filename) {
+    if (href && filename) {
+      let a = document.createElement('a')
+      a.download = filename //指定下载的文件名
+      a.href = href //  URL对象
+      a.click() // 模拟点击
+      URL.revokeObjectURL(a.href) // 释放URL 对象
+    }
+  }
+}
+
+// 根据所需类型进行转码并返回下载地址
+const setEncoded = (type, data) => {
+  const filename = 'diagram'
+  const encodedData = encodeURIComponent(data)
+  return {
+    filename: `${filename}.${type}`,
+    href: `data:application/${
+      type === 'svg' ? 'text/xml' : 'bpmn20-xml'
+    };charset=UTF-8,${encodedData}`,
+    data: data
+  }
+}
+
+// 加载本地文件
+const importLocalFile = () => {
+  const file = refFile.value.files[0]
+  const reader = new FileReader()
+  reader.readAsText(file)
+  reader.onload = function () {
+    let xmlStr = this.result
+    createNewDiagram(xmlStr)
+  }
+}
+/* ------------------------------------------------ refs methods ------------------------------------------------------ */
+const downloadProcessAsXml = () => {
+  downloadProcess('xml')
+}
+const downloadProcessAsBpmn = () => {
+  downloadProcess('bpmn')
+}
+const downloadProcessAsSvg = () => {
+  downloadProcess('svg')
+}
+const processSimulation = () => {
+  simulationStatus.value = !simulationStatus.value
+  console.log(bpmnModeler.get('toggleMode', 'strict'), "bpmnModeler.get('toggleMode')")
+  props.simulation && bpmnModeler.get('toggleMode', 'strict').toggleMode()
+}
+const processRedo = () => {
+  bpmnModeler.get('commandStack').redo()
+}
+const processUndo = () => {
+  bpmnModeler.get('commandStack').undo()
+}
+const processZoomIn = (zoomStep = 0.1) => {
+  let newZoom = Math.floor(defaultZoom.value * 100 + zoomStep * 100) / 100
+  if (newZoom > 4) {
+    throw new Error('[Process Designer Warn ]: The zoom ratio cannot be greater than 4')
+  }
+  defaultZoom.value = newZoom
+  bpmnModeler.get('canvas').zoom(defaultZoom.value)
+}
+const processZoomOut = (zoomStep = 0.1) => {
+  let newZoom = Math.floor(defaultZoom.value * 100 - zoomStep * 100) / 100
+  if (newZoom < 0.2) {
+    throw new Error('[Process Designer Warn ]: The zoom ratio cannot be less than 0.2')
+  }
+  defaultZoom.value = newZoom
+  bpmnModeler.get('canvas').zoom(defaultZoom.value)
+}
+// const processZoomTo = (newZoom = 1) => {
+//   if (newZoom < 0.2) {
+//     throw new Error('[Process Designer Warn ]: The zoom ratio cannot be less than 0.2')
+//   }
+//   if (newZoom > 4) {
+//     throw new Error('[Process Designer Warn ]: The zoom ratio cannot be greater than 4')
+//   }
+//   defaultZoom = newZoom
+//   bpmnModeler.get('canvas').zoom(newZoom)
+// }
+const processReZoom = () => {
+  defaultZoom.value = 1
+  bpmnModeler.get('canvas').zoom('fit-viewport', 'auto')
+}
+const processRestart = () => {
+  recoverable.value = false
+  revocable.value = false
+  createNewDiagram(null)
+}
+const elementsAlign = (align) => {
+  const Align = bpmnModeler.get('alignElements')
+  const Selection = bpmnModeler.get('selection')
+  const SelectedElements = Selection.get()
+  if (!SelectedElements || SelectedElements.length <= 1) {
+    ElMessage.warning('请按住 Shift 键选择多个元素对齐')
+    // alert('请按住 Ctrl 键选择多个元素对齐
+    return
+  }
+  ElMessageBox.confirm('自动对齐可能造成图形变形，是否继续？', '警告', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    Align.trigger(SelectedElements, align)
+  })
+}
+/*-----------------------------    方法结束     ---------------------------------*/
+const previewProcessXML = () => {
+  console.log(bpmnModeler.saveXML, 'bpmnModeler')
+  bpmnModeler.saveXML({ format: true }).then(({ xml }) => {
+    // console.log(xml, 'xml111111')
+    previewResult.value = xml
+    previewType.value = 'xml'
+    previewModelVisible.value = true
+  })
+}
+const previewProcessJson = () => {
+  bpmnModeler.saveXML({ format: true }).then(({ xml }) => {
+    // console.log(xml, 'xml')
+
+    // const rootNode = parseXmlString(xml)
+    // console.log(rootNode, 'rootNoderootNode')
+    const rootNodes = new XmlNode(XmlNodeType.Root, parseXmlString(xml))
+    // console.log(rootNodes, 'rootNodesrootNodesrootNodes')
+    // console.log(rootNodes.parent.toJsObject(), 'rootNodes.toJSON()')
+    // console.log(JSON.stringify(rootNodes.parent.toJsObject()), 'rootNodes.toJSON()')
+    // console.log(JSON.stringify(rootNodes.parent.toJSON()), 'rootNodes.toJSON()')
+
+    // const parser = new xml2js.XMLParser()
+    // let jObj = parser.parse(xml)
+    // console.log(jObj, 'jObjjObjjObjjObjjObj')
+    // const builder = new xml2js.XMLBuilder(xml)
+    // const xmlContent = builder
+    // console.log(xmlContent, 'xmlContent')
+    // console.log(xml2js, 'convertconvertconvert')
+    previewResult.value = rootNodes.parent?.toJSON() as unknown as string
+    // previewResult.value = jObj
+    // previewResult.value = convert.xml2json(xml,  {explicitArray : false},{ spaces: 2 })
+    previewType.value = 'json'
+    previewModelVisible.value = true
+  })
+}
+/* ------------------------------------------------ 闻荫源码 methods ------------------------------------------------------ */
+const processSave = async () => {
+  console.log(bpmnModeler, 'bpmnModelerbpmnModelerbpmnModelerbpmnModeler')
+  const { err, xml } = await bpmnModeler.saveXML()
+  console.log(err, 'errerrerrerrerr')
+  console.log(xml, 'xmlxmlxmlxmlxml')
+  // 读取异常时抛出异常
+  if (err) {
+    // this.$modal.msgError('保存模型失败，请重试！')
+    alert('保存模型失败，请重试！')
+    return
+  }
+  // 触发 save 事件
+  emit('save', xml)
+}
+/** 高亮显示 */
+// const highlightedCode = (previewType, previewResult) => {
+//   console.log(previewType, 'previewType, previewResult')
+//   console.log(previewResult, 'previewType, previewResult')
+//   console.log(hljs.highlight, 'hljs.highlight')
+//   const result = hljs.highlight(previewType, previewResult.value || '', true)
+//   return result.value || '&nbsp;'
+// }
+onBeforeMount(() => {
+  console.log(props, 'propspropspropsprops')
+})
+onMounted(() => {
+  initBpmnModeler()
+  createNewDiagram(props.value)
+})
+onBeforeUnmount(() => {
+  // this.$once('hook:beforeDestroy', () => {
+  // })
+  if (bpmnModeler) bpmnModeler.destroy()
+  emit('destroy', bpmnModeler)
+  bpmnModeler = null
+})
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue b/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue
new file mode 100644
index 000000000..e2cd46791
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue
@@ -0,0 +1,635 @@
+<template>
+  <div class="my-process-designer">
+    <div class="my-process-designer__container">
+      <div class="my-process-designer__canvas" style="height: 760px" ref="bpmnCanvas"></div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import BpmnViewer from 'bpmn-js/lib/Viewer'
+import DefaultEmptyXML from './plugins/defaultEmpty'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import { isEmpty } from '@/utils/is'
+
+defineOptions({ name: 'MyProcessViewer' })
+
+const props = defineProps({
+  value: {
+    // BPMN XML 字符串
+    type: String,
+    default: ''
+  },
+  prefix: {
+    // 使用哪个引擎
+    type: String,
+    default: 'camunda'
+  },
+  activityData: {
+    // 活动的数据。传递时，可高亮流程
+    type: Array,
+    default: () => []
+  },
+  processInstanceData: {
+    // 流程实例的数据。传递时，可展示流程发起人等信息
+    type: Object,
+    default: () => {}
+  },
+  taskData: {
+    // 任务实例的数据。传递时，可展示 UserTask 审核相关的信息
+    type: Array,
+    default: () => []
+  }
+})
+
+provide('configGlobal', props)
+
+const emit = defineEmits(['destroy'])
+
+let bpmnModeler
+
+const xml = ref('')
+const activityLists = ref<any[]>([])
+const processInstance = ref<any>(undefined)
+const taskList = ref<any[]>([])
+const bpmnCanvas = ref()
+// const element = ref()
+const elementOverlayIds = ref<any>(null)
+const overlays = ref<any>(null)
+
+const initBpmnModeler = () => {
+  if (bpmnModeler) return
+  bpmnModeler = new BpmnViewer({
+    container: bpmnCanvas.value,
+    bpmnRenderer: {}
+  })
+}
+
+/* 创建新的流程图 */
+const createNewDiagram = async (xml) => {
+  // 将字符串转换成图显示出来
+  let newId = `Process_${new Date().getTime()}`
+  let newName = `业务流程_${new Date().getTime()}`
+  let xmlString = xml || DefaultEmptyXML(newId, newName, props.prefix)
+  try {
+    let { warnings } = await bpmnModeler.importXML(xmlString)
+    if (warnings && warnings.length) {
+      warnings.forEach((warn) => console.warn(warn))
+    }
+    // 高亮流程图
+    await highlightDiagram()
+    const canvas = bpmnModeler.get('canvas')
+    canvas.zoom('fit-viewport', 'auto')
+  } catch (e) {
+    console.error(e)
+    // console.error(`[Process Designer Warn]: ${e?.message || e}`);
+  }
+}
+
+/* 高亮流程图 */
+// TODO 芋艿：如果多个 endActivity 的话，目前的逻辑可能有一定的问题。https://www.jdon.com/workflow/multi-events.html
+const highlightDiagram = async () => {
+  const activityList = activityLists.value
+  if (activityList.length === 0) {
+    return
+  }
+  // 参考自 https://gitee.com/tony2y/RuoYi-flowable/blob/master/ruoyi-ui/src/components/Process/index.vue#L222 实现
+  // 再次基础上，增加不同审批结果的颜色等等
+  let canvas = bpmnModeler.get('canvas')
+  let todoActivity: any = activityList.find((m: any) => !m.endTime) // 找到待办的任务
+  let endActivity: any = activityList[activityList.length - 1] // 获得最后一个任务
+  let findProcessTask = false //是否已经高亮了进行中的任务
+  //进行中高亮之后的任务 key 集合，用于过滤掉 taskList 进行中后面的任务，避免进行中后面的数据 Hover 还有数据
+  let removeTaskDefinitionKeyList = []
+  // debugger
+  bpmnModeler.getDefinitions().rootElements[0].flowElements?.forEach((n: any) => {
+    let activity: any = activityList.find((m: any) => m.key === n.id) // 找到对应的活动
+    if (!activity) {
+      return
+    }
+    if (n.$type === 'bpmn:UserTask') {
+      // 用户任务
+      // 处理用户任务的高亮
+      const task: any = taskList.value.find((m: any) => m.id === activity.taskId) // 找到活动对应的 taskId
+      if (!task) {
+        return
+      }
+      //进行中的任务已经高亮过了，则不高亮后面的任务了
+      if (findProcessTask) {
+        removeTaskDefinitionKeyList.push(n.id)
+        return
+      }
+      // 高亮任务
+      canvas.addMarker(n.id, getResultCss(task.result))
+      //标记是否高亮了进行中任务
+      if (task.result === 1) {
+        findProcessTask = true
+      }
+      // 如果非通过，就不走后面的线条了
+      if (task.result !== 2) {
+        return
+      }
+      // 处理 outgoing 出线
+      const outgoing = getActivityOutgoing(activity)
+      outgoing?.forEach((nn: any) => {
+        // debugger
+        let targetActivity: any = activityList.find((m: any) => m.key === nn.targetRef.id)
+        // 如果目标活动存在，则根据该活动是否结束，进行【bpmn:SequenceFlow】连线的高亮设置
+        if (targetActivity) {
+          canvas.addMarker(nn.id, targetActivity.endTime ? 'highlight' : 'highlight-todo')
+        } else if (nn.targetRef.$type === 'bpmn:ExclusiveGateway') {
+          // TODO 芋艿：这个流程，暂时没走到过
+          canvas.addMarker(nn.id, activity.endTime ? 'highlight' : 'highlight-todo')
+          canvas.addMarker(nn.targetRef.id, activity.endTime ? 'highlight' : 'highlight-todo')
+        } else if (nn.targetRef.$type === 'bpmn:EndEvent') {
+          // TODO 芋艿：这个流程，暂时没走到过
+          if (!todoActivity && endActivity.key === n.id) {
+            canvas.addMarker(nn.id, 'highlight')
+            canvas.addMarker(nn.targetRef.id, 'highlight')
+          }
+          if (!activity.endTime) {
+            canvas.addMarker(nn.id, 'highlight-todo')
+            canvas.addMarker(nn.targetRef.id, 'highlight-todo')
+          }
+        }
+      })
+    } else if (n.$type === 'bpmn:ExclusiveGateway') {
+      // 排它网关
+      // 设置【bpmn:ExclusiveGateway】排它网关的高亮
+      canvas.addMarker(n.id, getActivityHighlightCss(activity))
+      // 查找需要高亮的连线
+      let matchNN: any = undefined
+      let matchActivity: any = undefined
+      n.outgoing?.forEach((nn: any) => {
+        let targetActivity = activityList.find((m: any) => m.key === nn.targetRef.id)
+        if (!targetActivity) {
+          return
+        }
+        // 特殊判断 endEvent 类型的原因，ExclusiveGateway 可能后续连有 2 个路径：
+        //  1. 一个是 UserTask => EndEvent
+        //  2. 一个是 EndEvent
+        // 在选择路径 1 时，其实 EndEvent 可能也存在，导致 1 和 2 都高亮，显然是不正确的。
+        // 所以，在 matchActivity 为 EndEvent 时，需要进行覆盖~~
+        if (!matchActivity || matchActivity.type === 'endEvent') {
+          matchNN = nn
+          matchActivity = targetActivity
+        }
+      })
+      if (matchNN && matchActivity) {
+        canvas.addMarker(matchNN.id, getActivityHighlightCss(matchActivity))
+      }
+    } else if (n.$type === 'bpmn:ParallelGateway') {
+      // 并行网关
+      // 设置【bpmn:ParallelGateway】并行网关的高亮
+      canvas.addMarker(n.id, getActivityHighlightCss(activity))
+      n.outgoing?.forEach((nn: any) => {
+        // 获得连线是否有指向目标。如果有，则进行高亮
+        const targetActivity = activityList.find((m: any) => m.key === nn.targetRef.id)
+        if (targetActivity) {
+          canvas.addMarker(nn.id, getActivityHighlightCss(targetActivity)) // 高亮【bpmn:SequenceFlow】连线
+          // 高亮【...】目标。其中 ... 可以是 bpm:UserTask、也可以是其它的。当然，如果是 bpm:UserTask 的话，其实不做高亮也没问题，因为上面有逻辑做了这块。
+          canvas.addMarker(nn.targetRef.id, getActivityHighlightCss(targetActivity))
+        }
+      })
+    } else if (n.$type === 'bpmn:StartEvent') {
+      // 开始节点
+      n.outgoing?.forEach((nn) => {
+        // outgoing 例如说【bpmn:SequenceFlow】连线
+        // 获得连线是否有指向目标。如果有，则进行高亮
+        let targetActivity = activityList.find((m: any) => m.key === nn.targetRef.id)
+        if (targetActivity) {
+          canvas.addMarker(nn.id, 'highlight') // 高亮【bpmn:SequenceFlow】连线
+          canvas.addMarker(n.id, 'highlight') // 高亮【bpmn:StartEvent】开始节点（自己）
+        }
+      })
+    } else if (n.$type === 'bpmn:EndEvent') {
+      // 结束节点
+      if (!processInstance.value || processInstance.value.result === 1) {
+        return
+      }
+      canvas.addMarker(n.id, getResultCss(processInstance.value.result))
+    } else if (n.$type === 'bpmn:ServiceTask') {
+      //服务任务
+      if (activity.startTime > 0 && activity.endTime === 0) {
+        //进入执行，标识进行色
+        canvas.addMarker(n.id, getResultCss(1))
+      }
+      if (activity.endTime > 0) {
+        // 执行完成，节点标识完成色, 所有outgoing标识完成色。
+        canvas.addMarker(n.id, getResultCss(2))
+        const outgoing = getActivityOutgoing(activity)
+        outgoing?.forEach((out) => {
+          canvas.addMarker(out.id, getResultCss(2))
+        })
+      }
+    }
+  })
+  if (!isEmpty(removeTaskDefinitionKeyList)) {
+    taskList.value = taskList.value.filter(
+      (item) => !removeTaskDefinitionKeyList.includes(item.definitionKey)
+    )
+  }
+}
+const getActivityHighlightCss = (activity) => {
+  return activity.endTime ? 'highlight' : 'highlight-todo'
+}
+const getResultCss = (result) => {
+  if (result === 1) {
+    // 审批中
+    return 'highlight-todo'
+  } else if (result === 2) {
+    // 已通过
+    return 'highlight'
+  } else if (result === 3) {
+    // 不通过
+    return 'highlight-reject'
+  } else if (result === 4) {
+    // 已取消
+    return 'highlight-cancel'
+  } else if (result === 5) {
+    // 退回
+    return 'highlight-return'
+  }
+  return ''
+}
+
+const getActivityOutgoing = (activity) => {
+  // 如果有 outgoing，则直接使用它
+  if (activity.outgoing && activity.outgoing.length > 0) {
+    return activity.outgoing
+  }
+  // 如果没有，则遍历获得起点为它的【bpmn:SequenceFlow】节点们。原因是：bpmn-js 的 UserTask 拿不到 outgoing
+  const flowElements = bpmnModeler.getDefinitions().rootElements[0].flowElements
+  const outgoing: any[] = []
+  flowElements.forEach((item: any) => {
+    if (item.$type !== 'bpmn:SequenceFlow') {
+      return
+    }
+    if (item.sourceRef.id === activity.key) {
+      outgoing.push(item)
+    }
+  })
+  return outgoing
+}
+const initModelListeners = () => {
+  const EventBus = bpmnModeler.get('eventBus')
+  // 注册需要的监听事件
+  EventBus.on('element.hover', function (eventObj) {
+    let element = eventObj ? eventObj.element : null
+    elementHover(element)
+  })
+  EventBus.on('element.out', function (eventObj) {
+    let element = eventObj ? eventObj.element : null
+    elementOut(element)
+  })
+}
+// 流程图的元素被 hover
+const elementHover = (element) => {
+  element.value = element
+  !elementOverlayIds.value && (elementOverlayIds.value = {})
+  !overlays.value && (overlays.value = bpmnModeler.get('overlays'))
+  // 展示信息
+  console.log(activityLists.value, 'activityLists.value')
+  console.log(element.value, 'element.value')
+  const activity = activityLists.value.find((m) => m.key === element.value.id)
+  console.log(activity, 'activityactivityactivityactivity')
+  if (!activity) {
+    return
+  }
+  if (!elementOverlayIds.value[element.value.id] && element.value.type !== 'bpmn:Process') {
+    let html = `<div class="element-overlays">
+            <p>Elemet id: ${element.value.id}</p>
+            <p>Elemet type: ${element.value.type}</p>
+          </div>` // 默认值
+    if (element.value.type === 'bpmn:StartEvent' && processInstance.value) {
+      html = `<p>发起人：${processInstance.value.startUser.nickname}</p>
+                  <p>部门：${processInstance.value.startUser.deptName}</p>
+                  <p>创建时间：${formatDate(processInstance.value.createTime)}`
+    } else if (element.value.type === 'bpmn:UserTask') {
+      // debugger
+      let task = taskList.value.find((m) => m.id === activity.taskId) // 找到活动对应的 taskId
+      if (!task) {
+        return
+      }
+      let optionData = getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT)
+      let dataResult = ''
+      optionData.forEach((element) => {
+        if (element.value == task.result) {
+          dataResult = element.label
+        }
+      })
+      html = `<p>审批人：${task.assigneeUser.nickname}</p>
+                  <p>部门：${task.assigneeUser.deptName}</p>
+                  <p>结果：${dataResult}</p>
+                  <p>创建时间：${formatDate(task.createTime)}</p>`
+      // html = `<p>审批人：${task.assigneeUser.nickname}</p>
+      //             <p>部门：${task.assigneeUser.deptName}</p>
+      //             <p>结果：${getIntDictOptions(
+      //               DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT,
+      //               task.result
+      //             )}</p>
+      //             <p>创建时间：${formatDate(task.createTime)}</p>`
+      if (task.endTime) {
+        html += `<p>结束时间：${formatDate(task.endTime)}</p>`
+      }
+      if (task.reason) {
+        html += `<p>审批建议：${task.reason}</p>`
+      }
+    } else if (element.value.type === 'bpmn:ServiceTask' && processInstance.value) {
+      if (activity.startTime > 0) {
+        html = `<p>创建时间：${formatDate(activity.startTime)}</p>`
+      }
+      if (activity.endTime > 0) {
+        html += `<p>结束时间：${formatDate(activity.endTime)}</p>`
+      }
+      console.log(html)
+    } else if (element.value.type === 'bpmn:EndEvent' && processInstance.value) {
+      let optionData = getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT)
+      let dataResult = ''
+      optionData.forEach((element) => {
+        if (element.value == processInstance.value.result) {
+          dataResult = element.label
+        }
+      })
+      html = `<p>结果：${dataResult}</p>`
+      // html = `<p>结果：${getIntDictOptions(
+      //   DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT,
+      //   processInstance.value.result
+      // )}</p>`
+      if (processInstance.value.endTime) {
+        html += `<p>结束时间：${formatDate(processInstance.value.endTime)}</p>`
+      }
+    }
+    console.log(html, 'html111111111111111')
+    elementOverlayIds.value[element.value.id] = toRaw(overlays.value).add(element.value, {
+      position: { left: 0, bottom: 0 },
+      html: `<div class="element-overlays">${html}</div>`
+    })
+  }
+}
+// 流程图的元素被 out
+const elementOut = (element) => {
+  toRaw(overlays.value).remove({ element })
+  elementOverlayIds.value[element.id] = null
+}
+
+onMounted(() => {
+  xml.value = props.value
+  activityLists.value = props.activityData
+  // 初始化
+  initBpmnModeler()
+  createNewDiagram(xml.value)
+  // 初始模型的监听器
+  initModelListeners()
+})
+onBeforeUnmount(() => {
+  // this.$once('hook:beforeDestroy', () => {
+  // })
+  if (bpmnModeler) bpmnModeler.destroy()
+  emit('destroy', bpmnModeler)
+  bpmnModeler = null
+})
+
+watch(
+  () => props.value,
+  (newValue) => {
+    xml.value = newValue
+    createNewDiagram(xml.value)
+  }
+)
+watch(
+  () => props.activityData,
+  (newActivityData) => {
+    activityLists.value = newActivityData
+    createNewDiagram(xml.value)
+  }
+)
+watch(
+  () => props.processInstanceData,
+  (newProcessInstanceData) => {
+    processInstance.value = newProcessInstanceData
+    createNewDiagram(xml.value)
+  }
+)
+watch(
+  () => props.taskData,
+  (newTaskListData) => {
+    taskList.value = newTaskListData
+    createNewDiagram(xml.value)
+  }
+)
+</script>
+
+<style>
+/** 处理中 */
+.highlight-todo.djs-connection > .djs-visual > path {
+  stroke: #1890ff !important;
+  stroke-dasharray: 4px !important;
+  fill-opacity: 0.2 !important;
+}
+
+.highlight-todo.djs-shape .djs-visual > :nth-child(1) {
+  fill: #1890ff !important;
+  stroke: #1890ff !important;
+  stroke-dasharray: 4px !important;
+  fill-opacity: 0.2 !important;
+}
+
+:deep(.highlight-todo.djs-connection > .djs-visual > path) {
+  stroke: #1890ff !important;
+  stroke-dasharray: 4px !important;
+  fill-opacity: 0.2 !important;
+  marker-end: url('#sequenceflow-end-_E7DFDF-_E7DFDF-803g1kf6zwzmcig1y2ulm5egr');
+}
+
+:deep(.highlight-todo.djs-shape .djs-visual > :nth-child(1)) {
+  fill: #1890ff !important;
+  stroke: #1890ff !important;
+  stroke-dasharray: 4px !important;
+  fill-opacity: 0.2 !important;
+}
+
+/** 通过 */
+.highlight.djs-shape .djs-visual > :nth-child(1) {
+  fill: green !important;
+  stroke: green !important;
+  fill-opacity: 0.2 !important;
+}
+
+.highlight.djs-shape .djs-visual > :nth-child(2) {
+  fill: green !important;
+}
+
+.highlight.djs-shape .djs-visual > path {
+  fill: green !important;
+  fill-opacity: 0.2 !important;
+  stroke: green !important;
+}
+
+.highlight.djs-connection > .djs-visual > path {
+  stroke: green !important;
+}
+
+.highlight:not(.djs-connection) .djs-visual > :nth-child(1) {
+  fill: green !important; /* color elements as green */
+}
+
+:deep(.highlight.djs-shape .djs-visual > :nth-child(1)) {
+  fill: green !important;
+  stroke: green !important;
+  fill-opacity: 0.2 !important;
+}
+
+:deep(.highlight.djs-shape .djs-visual > :nth-child(2)) {
+  fill: green !important;
+}
+
+:deep(.highlight.djs-shape .djs-visual > path) {
+  fill: green !important;
+  fill-opacity: 0.2 !important;
+  stroke: green !important;
+}
+
+:deep(.highlight.djs-connection > .djs-visual > path) {
+  stroke: green !important;
+}
+
+/** 不通过 */
+.highlight-reject.djs-shape .djs-visual > :nth-child(1) {
+  fill: red !important;
+  stroke: red !important;
+  fill-opacity: 0.2 !important;
+}
+
+.highlight-reject.djs-shape .djs-visual > :nth-child(2) {
+  fill: red !important;
+}
+
+.highlight-reject.djs-shape .djs-visual > path {
+  fill: red !important;
+  fill-opacity: 0.2 !important;
+  stroke: red !important;
+}
+
+.highlight-reject.djs-connection > .djs-visual > path {
+  stroke: red !important;
+}
+
+.highlight-reject:not(.djs-connection) .djs-visual > :nth-child(1) {
+  fill: red !important; /* color elements as green */
+}
+
+:deep(.highlight-reject.djs-shape .djs-visual > :nth-child(1)) {
+  fill: red !important;
+  stroke: red !important;
+  fill-opacity: 0.2 !important;
+}
+
+:deep(.highlight-reject.djs-shape .djs-visual > :nth-child(2)) {
+  fill: red !important;
+}
+
+:deep(.highlight-reject.djs-shape .djs-visual > path) {
+  fill: red !important;
+  fill-opacity: 0.2 !important;
+  stroke: red !important;
+}
+
+:deep(.highlight-reject.djs-connection > .djs-visual > path) {
+  stroke: red !important;
+}
+
+/** 已取消 */
+.highlight-cancel.djs-shape .djs-visual > :nth-child(1) {
+  fill: grey !important;
+  stroke: grey !important;
+  fill-opacity: 0.2 !important;
+}
+
+.highlight-cancel.djs-shape .djs-visual > :nth-child(2) {
+  fill: grey !important;
+}
+
+.highlight-cancel.djs-shape .djs-visual > path {
+  fill: grey !important;
+  fill-opacity: 0.2 !important;
+  stroke: grey !important;
+}
+
+.highlight-cancel.djs-connection > .djs-visual > path {
+  stroke: grey !important;
+}
+
+.highlight-cancel:not(.djs-connection) .djs-visual > :nth-child(1) {
+  fill: grey !important; /* color elements as green */
+}
+
+:deep(.highlight-cancel.djs-shape .djs-visual > :nth-child(1)) {
+  fill: grey !important;
+  stroke: grey !important;
+  fill-opacity: 0.2 !important;
+}
+
+:deep(.highlight-cancel.djs-shape .djs-visual > :nth-child(2)) {
+  fill: grey !important;
+}
+
+:deep(.highlight-cancel.djs-shape .djs-visual > path) {
+  fill: grey !important;
+  fill-opacity: 0.2 !important;
+  stroke: grey !important;
+}
+
+:deep(.highlight-cancel.djs-connection > .djs-visual > path) {
+  stroke: grey !important;
+}
+
+/** 回退 */
+.highlight-return.djs-shape .djs-visual > :nth-child(1) {
+  fill: #e6a23c !important;
+  stroke: #e6a23c !important;
+  fill-opacity: 0.2 !important;
+}
+.highlight-return.djs-shape .djs-visual > :nth-child(2) {
+  fill: #e6a23c !important;
+}
+.highlight-return.djs-shape .djs-visual > path {
+  fill: #e6a23c !important;
+  fill-opacity: 0.2 !important;
+  stroke: #e6a23c !important;
+}
+.highlight-return.djs-connection > .djs-visual > path {
+  stroke: #e6a23c !important;
+}
+
+.highlight-return:not(.djs-connection) .djs-visual > :nth-child(1) {
+  fill: #e6a23c !important; /* color elements as green */
+}
+
+:deep(.highlight-return.djs-shape .djs-visual > :nth-child(1)) {
+  fill: #e6a23c !important;
+  stroke: #e6a23c !important;
+  fill-opacity: 0.2 !important;
+}
+:deep(.highlight-return.djs-shape .djs-visual > :nth-child(2)) {
+  fill: #e6a23c !important;
+}
+:deep(.highlight-return.djs-shape .djs-visual > path) {
+  fill: #e6a23c !important;
+  fill-opacity: 0.2 !important;
+  stroke: #e6a23c !important;
+}
+:deep(.highlight-return.djs-connection > .djs-visual > path) {
+  stroke: #e6a23c !important;
+}
+
+.element-overlays {
+  width: 200px;
+  padding: 8px;
+  color: #fafafa;
+  background: rgb(0 0 0 / 60%);
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+</style>
diff --git a/src/components/bpmnProcessDesigner/package/designer/index.ts b/src/components/bpmnProcessDesigner/package/designer/index.ts
new file mode 100644
index 000000000..852284688
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/index.ts
@@ -0,0 +1,8 @@
+import MyProcessDesigner from './ProcessDesigner.vue'
+
+MyProcessDesigner.install = function (Vue) {
+  Vue.component(MyProcessDesigner.name, MyProcessDesigner)
+}
+
+// 流程图的设计器，可编辑
+export default MyProcessDesigner
diff --git a/src/components/bpmnProcessDesigner/package/designer/index2.ts b/src/components/bpmnProcessDesigner/package/designer/index2.ts
new file mode 100644
index 000000000..ebe8ca78c
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/index2.ts
@@ -0,0 +1,8 @@
+import MyProcessViewer from './ProcessViewer.vue'
+
+MyProcessViewer.install = function (Vue) {
+  Vue.component(MyProcessViewer.name, MyProcessViewer)
+}
+
+// 流程图的查看器，不可编辑
+export default MyProcessViewer
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/contentPadProvider.js b/src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/contentPadProvider.js
new file mode 100644
index 000000000..87834931b
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/contentPadProvider.js
@@ -0,0 +1,423 @@
+import { assign, forEach, isArray } from 'min-dash'
+
+import { is } from 'bpmn-js/lib/util/ModelUtil'
+
+import { isExpanded, isEventSubProcess } from 'bpmn-js/lib/util/DiUtil'
+
+import { isAny } from 'bpmn-js/lib/features/modeling/util/ModelingUtil'
+
+import { getChildLanes } from 'bpmn-js/lib/features/modeling/util/LaneUtil'
+
+import { hasPrimaryModifier } from 'diagram-js/lib/util/Mouse'
+
+/**
+ * A provider for BPMN 2.0 elements context pad
+ */
+export default function ContextPadProvider(
+  config,
+  injector,
+  eventBus,
+  contextPad,
+  modeling,
+  elementFactory,
+  connect,
+  create,
+  popupMenu,
+  canvas,
+  rules,
+  translate
+) {
+  config = config || {}
+
+  contextPad.registerProvider(this)
+
+  this._contextPad = contextPad
+
+  this._modeling = modeling
+
+  this._elementFactory = elementFactory
+  this._connect = connect
+  this._create = create
+  this._popupMenu = popupMenu
+  this._canvas = canvas
+  this._rules = rules
+  this._translate = translate
+
+  if (config.autoPlace !== false) {
+    this._autoPlace = injector.get('autoPlace', false)
+  }
+
+  eventBus.on('create.end', 250, function (event) {
+    const context = event.context,
+      shape = context.shape
+
+    if (!hasPrimaryModifier(event) || !contextPad.isOpen(shape)) {
+      return
+    }
+
+    const entries = contextPad.getEntries(shape)
+
+    if (entries.replace) {
+      entries.replace.action.click(event, shape)
+    }
+  })
+}
+
+ContextPadProvider.$inject = [
+  'config.contextPad',
+  'injector',
+  'eventBus',
+  'contextPad',
+  'modeling',
+  'elementFactory',
+  'connect',
+  'create',
+  'popupMenu',
+  'canvas',
+  'rules',
+  'translate',
+  'elementRegistry'
+]
+
+ContextPadProvider.prototype.getContextPadEntries = function (element) {
+  const contextPad = this._contextPad,
+    modeling = this._modeling,
+    elementFactory = this._elementFactory,
+    connect = this._connect,
+    create = this._create,
+    popupMenu = this._popupMenu,
+    canvas = this._canvas,
+    rules = this._rules,
+    autoPlace = this._autoPlace,
+    translate = this._translate
+
+  const actions = {}
+
+  if (element.type === 'label') {
+    return actions
+  }
+
+  const businessObject = element.businessObject
+
+  function startConnect(event, element) {
+    connect.start(event, element)
+  }
+
+  function removeElement() {
+    modeling.removeElements([element])
+  }
+
+  function getReplaceMenuPosition(element) {
+    const Y_OFFSET = 5
+
+    const diagramContainer = canvas.getContainer(),
+      pad = contextPad.getPad(element).html
+
+    const diagramRect = diagramContainer.getBoundingClientRect(),
+      padRect = pad.getBoundingClientRect()
+
+    const top = padRect.top - diagramRect.top
+    const left = padRect.left - diagramRect.left
+
+    const pos = {
+      x: left,
+      y: top + padRect.height + Y_OFFSET
+    }
+
+    return pos
+  }
+
+  /**
+   * Create an append action
+   *
+   * @param {string} type
+   * @param {string} className
+   * @param {string} [title]
+   * @param {Object} [options]
+   *
+   * @return {Object} descriptor
+   */
+  function appendAction(type, className, title, options) {
+    if (typeof title !== 'string') {
+      options = title
+      title = translate('Append {type}', { type: type.replace(/^bpmn:/, '') })
+    }
+
+    function appendStart(event, element) {
+      const shape = elementFactory.createShape(assign({ type: type }, options))
+      create.start(event, shape, {
+        source: element
+      })
+    }
+
+    const append = autoPlace
+      ? function (event, element) {
+          const shape = elementFactory.createShape(assign({ type: type }, options))
+
+          autoPlace.append(element, shape)
+        }
+      : appendStart
+
+    return {
+      group: 'model',
+      className: className,
+      title: title,
+      action: {
+        dragstart: appendStart,
+        click: append
+      }
+    }
+  }
+
+  function splitLaneHandler(count) {
+    return function (event, element) {
+      // actual split
+      modeling.splitLane(element, count)
+
+      // refresh context pad after split to
+      // get rid of split icons
+      contextPad.open(element, true)
+    }
+  }
+
+  if (isAny(businessObject, ['bpmn:Lane', 'bpmn:Participant']) && isExpanded(businessObject)) {
+    const childLanes = getChildLanes(element)
+
+    assign(actions, {
+      'lane-insert-above': {
+        group: 'lane-insert-above',
+        className: 'bpmn-icon-lane-insert-above',
+        title: translate('Add Lane above'),
+        action: {
+          click: function (event, element) {
+            modeling.addLane(element, 'top')
+          }
+        }
+      }
+    })
+
+    if (childLanes.length < 2) {
+      if (element.height >= 120) {
+        assign(actions, {
+          'lane-divide-two': {
+            group: 'lane-divide',
+            className: 'bpmn-icon-lane-divide-two',
+            title: translate('Divide into two Lanes'),
+            action: {
+              click: splitLaneHandler(2)
+            }
+          }
+        })
+      }
+
+      if (element.height >= 180) {
+        assign(actions, {
+          'lane-divide-three': {
+            group: 'lane-divide',
+            className: 'bpmn-icon-lane-divide-three',
+            title: translate('Divide into three Lanes'),
+            action: {
+              click: splitLaneHandler(3)
+            }
+          }
+        })
+      }
+    }
+
+    assign(actions, {
+      'lane-insert-below': {
+        group: 'lane-insert-below',
+        className: 'bpmn-icon-lane-insert-below',
+        title: translate('Add Lane below'),
+        action: {
+          click: function (event, element) {
+            modeling.addLane(element, 'bottom')
+          }
+        }
+      }
+    })
+  }
+
+  if (is(businessObject, 'bpmn:FlowNode')) {
+    if (is(businessObject, 'bpmn:EventBasedGateway')) {
+      assign(actions, {
+        'append.receive-task': appendAction(
+          'bpmn:ReceiveTask',
+          'bpmn-icon-receive-task',
+          translate('Append ReceiveTask')
+        ),
+        'append.message-intermediate-event': appendAction(
+          'bpmn:IntermediateCatchEvent',
+          'bpmn-icon-intermediate-event-catch-message',
+          translate('Append MessageIntermediateCatchEvent'),
+          { eventDefinitionType: 'bpmn:MessageEventDefinition' }
+        ),
+        'append.timer-intermediate-event': appendAction(
+          'bpmn:IntermediateCatchEvent',
+          'bpmn-icon-intermediate-event-catch-timer',
+          translate('Append TimerIntermediateCatchEvent'),
+          { eventDefinitionType: 'bpmn:TimerEventDefinition' }
+        ),
+        'append.condition-intermediate-event': appendAction(
+          'bpmn:IntermediateCatchEvent',
+          'bpmn-icon-intermediate-event-catch-condition',
+          translate('Append ConditionIntermediateCatchEvent'),
+          { eventDefinitionType: 'bpmn:ConditionalEventDefinition' }
+        ),
+        'append.signal-intermediate-event': appendAction(
+          'bpmn:IntermediateCatchEvent',
+          'bpmn-icon-intermediate-event-catch-signal',
+          translate('Append SignalIntermediateCatchEvent'),
+          { eventDefinitionType: 'bpmn:SignalEventDefinition' }
+        )
+      })
+    } else if (
+      isEventType(businessObject, 'bpmn:BoundaryEvent', 'bpmn:CompensateEventDefinition')
+    ) {
+      assign(actions, {
+        'append.compensation-activity': appendAction(
+          'bpmn:Task',
+          'bpmn-icon-task',
+          translate('Append compensation activity'),
+          {
+            isForCompensation: true
+          }
+        )
+      })
+    } else if (
+      !is(businessObject, 'bpmn:EndEvent') &&
+      !businessObject.isForCompensation &&
+      !isEventType(businessObject, 'bpmn:IntermediateThrowEvent', 'bpmn:LinkEventDefinition') &&
+      !isEventSubProcess(businessObject)
+    ) {
+      assign(actions, {
+        'append.end-event': appendAction(
+          'bpmn:EndEvent',
+          'bpmn-icon-end-event-none',
+          translate('Append EndEvent')
+        ),
+        'append.gateway': appendAction(
+          'bpmn:ExclusiveGateway',
+          'bpmn-icon-gateway-none',
+          translate('Append Gateway')
+        ),
+        'append.append-task': appendAction(
+          'bpmn:UserTask',
+          'bpmn-icon-user-task',
+          translate('Append Task')
+        ),
+        'append.intermediate-event': appendAction(
+          'bpmn:IntermediateThrowEvent',
+          'bpmn-icon-intermediate-event-none',
+          translate('Append Intermediate/Boundary Event')
+        )
+      })
+    }
+  }
+
+  if (!popupMenu.isEmpty(element, 'bpmn-replace')) {
+    // Replace menu entry
+    assign(actions, {
+      replace: {
+        group: 'edit',
+        className: 'bpmn-icon-screw-wrench',
+        title: '修改类型',
+        action: {
+          click: function (event, element) {
+            const position = assign(getReplaceMenuPosition(element), {
+              cursor: { x: event.x, y: event.y }
+            })
+
+            popupMenu.open(element, 'bpmn-replace', position)
+          }
+        }
+      }
+    })
+  }
+
+  if (
+    isAny(businessObject, [
+      'bpmn:FlowNode',
+      'bpmn:InteractionNode',
+      'bpmn:DataObjectReference',
+      'bpmn:DataStoreReference'
+    ])
+  ) {
+    assign(actions, {
+      'append.text-annotation': appendAction('bpmn:TextAnnotation', 'bpmn-icon-text-annotation'),
+
+      connect: {
+        group: 'connect',
+        className: 'bpmn-icon-connection-multi',
+        title: translate(
+          'Connect using ' +
+            (businessObject.isForCompensation ? '' : 'Sequence/MessageFlow or ') +
+            'Association'
+        ),
+        action: {
+          click: startConnect,
+          dragstart: startConnect
+        }
+      }
+    })
+  }
+
+  if (isAny(businessObject, ['bpmn:DataObjectReference', 'bpmn:DataStoreReference'])) {
+    assign(actions, {
+      connect: {
+        group: 'connect',
+        className: 'bpmn-icon-connection-multi',
+        title: translate('Connect using DataInputAssociation'),
+        action: {
+          click: startConnect,
+          dragstart: startConnect
+        }
+      }
+    })
+  }
+
+  if (is(businessObject, 'bpmn:Group')) {
+    assign(actions, {
+      'append.text-annotation': appendAction('bpmn:TextAnnotation', 'bpmn-icon-text-annotation')
+    })
+  }
+
+  // delete element entry, only show if allowed by rules
+  let deleteAllowed = rules.allowed('elements.delete', { elements: [element] })
+
+  if (isArray(deleteAllowed)) {
+    // was the element returned as a deletion candidate?
+    deleteAllowed = deleteAllowed[0] === element
+  }
+
+  if (deleteAllowed) {
+    assign(actions, {
+      delete: {
+        group: 'edit',
+        className: 'bpmn-icon-trash',
+        title: translate('Remove'),
+        action: {
+          click: removeElement
+        }
+      }
+    })
+  }
+
+  return actions
+}
+
+// helpers /////////
+
+function isEventType(eventBo, type, definition) {
+  const isType = eventBo.$instanceOf(type)
+  let isDefinition = false
+
+  const definitions = eventBo.eventDefinitions || []
+  forEach(definitions, function (def) {
+    if (def.$type === definition) {
+      isDefinition = true
+    }
+  })
+
+  return isType && isDefinition
+}
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/index.js b/src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/index.js
new file mode 100644
index 000000000..80009efc6
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/index.js
@@ -0,0 +1,6 @@
+import CustomContextPadProvider from './contentPadProvider'
+
+export default {
+  __init__: ['contextPadProvider'],
+  contextPadProvider: ['type', CustomContextPadProvider]
+}
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/defaultEmpty.js b/src/components/bpmnProcessDesigner/package/designer/plugins/defaultEmpty.js
new file mode 100644
index 000000000..f3bc894fe
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/defaultEmpty.js
@@ -0,0 +1,24 @@
+export default (key, name, type) => {
+  if (!type) type = 'camunda'
+  const TYPE_TARGET = {
+    activiti: 'http://activiti.org/bpmn',
+    camunda: 'http://bpmn.io/schema/bpmn',
+    flowable: 'http://flowable.org/bpmn'
+  }
+  return `<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL"
+  xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
+  xmlns:dc="http://www.omg.org/spec/DD/20100524/DC"
+  xmlns:di="http://www.omg.org/spec/DD/20100524/DI"
+  id="diagram_${key}"
+  targetNamespace="${TYPE_TARGET[type]}">
+  <bpmn2:process id="${key}" name="${name}" isExecutable="true">
+  </bpmn2:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="${key}">
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn2:definitions>`
+}
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/activitiDescriptor.json b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/activitiDescriptor.json
new file mode 100644
index 000000000..db5e49011
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/activitiDescriptor.json
@@ -0,0 +1,994 @@
+{
+  "name": "Activiti",
+  "uri": "http://activiti.org/bpmn",
+  "prefix": "activiti",
+  "xml": {
+    "tagAlias": "lowerCase"
+  },
+  "associations": [],
+  "types": [
+    {
+      "name": "Definitions",
+      "isAbstract": true,
+      "extends": ["bpmn:Definitions"],
+      "properties": [
+        {
+          "name": "diagramRelationId",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InOutBinding",
+      "superClass": ["Element"],
+      "isAbstract": true,
+      "properties": [
+        {
+          "name": "source",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "sourceExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "target",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "businessKey",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "local",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "variables",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "In",
+      "superClass": ["InOutBinding"],
+      "meta": {
+        "allowedIn": ["bpmn:CallActivity"]
+      }
+    },
+    {
+      "name": "Out",
+      "superClass": ["InOutBinding"],
+      "meta": {
+        "allowedIn": ["bpmn:CallActivity"]
+      }
+    },
+    {
+      "name": "AsyncCapable",
+      "isAbstract": true,
+      "extends": ["bpmn:Activity", "bpmn:Gateway", "bpmn:Event"],
+      "properties": [
+        {
+          "name": "async",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "asyncBefore",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "asyncAfter",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "exclusive",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        }
+      ]
+    },
+    {
+      "name": "JobPriorized",
+      "isAbstract": true,
+      "extends": ["bpmn:Process", "activiti:AsyncCapable"],
+      "properties": [
+        {
+          "name": "jobPriority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "SignalEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:SignalEventDefinition"],
+      "properties": [
+        {
+          "name": "async",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        }
+      ]
+    },
+    {
+      "name": "ErrorEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:ErrorEventDefinition"],
+      "properties": [
+        {
+          "name": "errorCodeVariable",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "errorMessageVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Error",
+      "isAbstract": true,
+      "extends": ["bpmn:Error"],
+      "properties": [
+        {
+          "name": "activiti:errorMessage",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "PotentialStarter",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "resourceAssignmentExpression",
+          "type": "bpmn:ResourceAssignmentExpression"
+        }
+      ]
+    },
+    {
+      "name": "FormSupported",
+      "isAbstract": true,
+      "extends": ["bpmn:StartEvent", "bpmn:UserTask"],
+      "properties": [
+        {
+          "name": "formHandlerClass",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "formKey",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "TemplateSupported",
+      "isAbstract": true,
+      "extends": ["bpmn:Process", "bpmn:FlowElement"],
+      "properties": [
+        {
+          "name": "modelerTemplate",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Initiator",
+      "isAbstract": true,
+      "extends": ["bpmn:StartEvent"],
+      "properties": [
+        {
+          "name": "initiator",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ScriptTask",
+      "isAbstract": true,
+      "extends": ["bpmn:ScriptTask"],
+      "properties": [
+        {
+          "name": "resultVariable",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Process",
+      "isAbstract": true,
+      "extends": ["bpmn:Process"],
+      "properties": [
+        {
+          "name": "candidateStarterGroups",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateStarterUsers",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "versionTag",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "historyTimeToLive",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "isStartableInTasklist",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        },
+        {
+          "name": "executionListener",
+          "isAbstract": true,
+          "type": "Expression"
+        }
+      ]
+    },
+    {
+      "name": "EscalationEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:EscalationEventDefinition"],
+      "properties": [
+        {
+          "name": "escalationCodeVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "FormalExpression",
+      "isAbstract": true,
+      "extends": ["bpmn:FormalExpression"],
+      "properties": [
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "multiinstance_type",
+      "superClass": ["Element"]
+    },
+    {
+      "name": "multiinstance_condition",
+      "superClass": ["Element"]
+    },
+    {
+      "name": "Assignable",
+      "extends": ["bpmn:UserTask"],
+      "properties": [
+        {
+          "name": "assignee",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateUsers",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateGroups",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "dueDate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "followUpDate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "priority",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "multiinstance_condition",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "CallActivity",
+      "extends": ["bpmn:CallActivity"],
+      "properties": [
+        {
+          "name": "calledElementBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "calledElementVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "calledElementVersionTag",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "calledElementTenantId",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseRef",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "caseVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseTenantId",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableMappingClass",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableMappingDelegateExpression",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ServiceTaskLike",
+      "extends": [
+        "bpmn:ServiceTask",
+        "bpmn:BusinessRuleTask",
+        "bpmn:SendTask",
+        "bpmn:MessageEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resultVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "DmnCapable",
+      "extends": ["bpmn:BusinessRuleTask"],
+      "properties": [
+        {
+          "name": "decisionRef",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "decisionRefBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "decisionRefVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "mapDecisionResult",
+          "isAttr": true,
+          "type": "String",
+          "default": "resultList"
+        },
+        {
+          "name": "decisionRefTenantId",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExternalCapable",
+      "extends": ["activiti:ServiceTaskLike"],
+      "properties": [
+        {
+          "name": "type",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "topic",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "TaskPriorized",
+      "extends": ["bpmn:Process", "activiti:ExternalCapable"],
+      "properties": [
+        {
+          "name": "taskPriority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Properties",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["*"]
+      },
+      "properties": [
+        {
+          "name": "values",
+          "type": "Property",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Property",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "value",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "Connector",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["activiti:ServiceTaskLike"]
+      },
+      "properties": [
+        {
+          "name": "inputOutput",
+          "type": "InputOutput"
+        },
+        {
+          "name": "connectorId",
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InputOutput",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:FlowNode", "activiti:Connector"]
+      },
+      "properties": [
+        {
+          "name": "inputOutput",
+          "type": "InputOutput"
+        },
+        {
+          "name": "connectorId",
+          "type": "String"
+        },
+        {
+          "name": "inputParameters",
+          "isMany": true,
+          "type": "InputParameter"
+        },
+        {
+          "name": "outputParameters",
+          "isMany": true,
+          "type": "OutputParameter"
+        }
+      ]
+    },
+    {
+      "name": "InputOutputParameter",
+      "properties": [
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        },
+        {
+          "name": "definition",
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "InputOutputParameterDefinition",
+      "isAbstract": true
+    },
+    {
+      "name": "List",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "items",
+          "isMany": true,
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "Map",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "entries",
+          "isMany": true,
+          "type": "Entry"
+        }
+      ]
+    },
+    {
+      "name": "Entry",
+      "properties": [
+        {
+          "name": "key",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        },
+        {
+          "name": "definition",
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "Value",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "id",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Script",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "scriptFormat",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Field",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": [
+          "activiti:ServiceTaskLike",
+          "activiti:ExecutionListener",
+          "activiti:TaskListener"
+        ]
+      },
+      "properties": [
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "expression",
+          "type": "String"
+        },
+        {
+          "name": "stringValue",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "string",
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InputParameter",
+      "superClass": ["InputOutputParameter"]
+    },
+    {
+      "name": "OutputParameter",
+      "superClass": ["InputOutputParameter"]
+    },
+    {
+      "name": "Collectable",
+      "isAbstract": true,
+      "extends": ["bpmn:MultiInstanceLoopCharacteristics"],
+      "superClass": ["activiti:AsyncCapable"],
+      "properties": [
+        {
+          "name": "collection",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "elementVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "FailedJobRetryTimeCycle",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["activiti:AsyncCapable", "bpmn:MultiInstanceLoopCharacteristics"]
+      },
+      "properties": [
+        {
+          "name": "body",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExecutionListener",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": [
+          "bpmn:Task",
+          "bpmn:ServiceTask",
+          "bpmn:UserTask",
+          "bpmn:BusinessRuleTask",
+          "bpmn:ScriptTask",
+          "bpmn:ReceiveTask",
+          "bpmn:ManualTask",
+          "bpmn:ExclusiveGateway",
+          "bpmn:SequenceFlow",
+          "bpmn:ParallelGateway",
+          "bpmn:InclusiveGateway",
+          "bpmn:EventBasedGateway",
+          "bpmn:StartEvent",
+          "bpmn:IntermediateCatchEvent",
+          "bpmn:IntermediateThrowEvent",
+          "bpmn:EndEvent",
+          "bpmn:BoundaryEvent",
+          "bpmn:CallActivity",
+          "bpmn:SubProcess",
+          "bpmn:Process"
+        ]
+      },
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "event",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "script",
+          "type": "Script"
+        },
+        {
+          "name": "fields",
+          "type": "Field",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "TaskListener",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "event",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "script",
+          "type": "Script"
+        },
+        {
+          "name": "fields",
+          "type": "Field",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormProperty",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:StartEvent", "bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "required",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "readable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "writable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "variable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "expression",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "default",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormProperty",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "label",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "defaultValue",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "properties",
+          "type": "Properties"
+        },
+        {
+          "name": "validation",
+          "type": "Validation"
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Validation",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "constraints",
+          "type": "Constraint",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Constraint",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "config",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "ConditionalEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:ConditionalEventDefinition"],
+      "properties": [
+        {
+          "name": "variableName",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableEvent",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    }
+  ],
+  "emumerations": []
+}
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/camundaDescriptor.json b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/camundaDescriptor.json
new file mode 100644
index 000000000..79b86bca6
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/camundaDescriptor.json
@@ -0,0 +1,1010 @@
+{
+  "name": "Camunda",
+  "uri": "http://camunda.org/schema/1.0/bpmn",
+  "prefix": "camunda",
+  "xml": {
+    "tagAlias": "lowerCase"
+  },
+  "associations": [],
+  "types": [
+    {
+      "name": "Definitions",
+      "isAbstract": true,
+      "extends": ["bpmn:Definitions"],
+      "properties": [
+        {
+          "name": "diagramRelationId",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InOutBinding",
+      "superClass": ["Element"],
+      "isAbstract": true,
+      "properties": [
+        {
+          "name": "source",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "sourceExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "target",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "businessKey",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "local",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "variables",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "In",
+      "superClass": ["InOutBinding"],
+      "meta": {
+        "allowedIn": ["bpmn:CallActivity", "bpmn:SignalEventDefinition"]
+      }
+    },
+    {
+      "name": "Out",
+      "superClass": ["InOutBinding"],
+      "meta": {
+        "allowedIn": ["bpmn:CallActivity"]
+      }
+    },
+    {
+      "name": "AsyncCapable",
+      "isAbstract": true,
+      "extends": ["bpmn:Activity", "bpmn:Gateway", "bpmn:Event"],
+      "properties": [
+        {
+          "name": "async",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "asyncBefore",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "asyncAfter",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "exclusive",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        }
+      ]
+    },
+    {
+      "name": "JobPriorized",
+      "isAbstract": true,
+      "extends": ["bpmn:Process", "camunda:AsyncCapable"],
+      "properties": [
+        {
+          "name": "jobPriority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "SignalEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:SignalEventDefinition"],
+      "properties": [
+        {
+          "name": "async",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        }
+      ]
+    },
+    {
+      "name": "ErrorEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:ErrorEventDefinition"],
+      "properties": [
+        {
+          "name": "errorCodeVariable",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "errorMessageVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Error",
+      "isAbstract": true,
+      "extends": ["bpmn:Error"],
+      "properties": [
+        {
+          "name": "camunda:errorMessage",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "PotentialStarter",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "resourceAssignmentExpression",
+          "type": "bpmn:ResourceAssignmentExpression"
+        }
+      ]
+    },
+    {
+      "name": "FormSupported",
+      "isAbstract": true,
+      "extends": ["bpmn:StartEvent", "bpmn:UserTask"],
+      "properties": [
+        {
+          "name": "formHandlerClass",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "formKey",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "TemplateSupported",
+      "isAbstract": true,
+      "extends": ["bpmn:Process", "bpmn:FlowElement"],
+      "properties": [
+        {
+          "name": "modelerTemplate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "modelerTemplateVersion",
+          "isAttr": true,
+          "type": "Integer"
+        }
+      ]
+    },
+    {
+      "name": "Initiator",
+      "isAbstract": true,
+      "extends": ["bpmn:StartEvent"],
+      "properties": [
+        {
+          "name": "initiator",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ScriptTask",
+      "isAbstract": true,
+      "extends": ["bpmn:ScriptTask"],
+      "properties": [
+        {
+          "name": "resultVariable",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Process",
+      "isAbstract": true,
+      "extends": ["bpmn:Process"],
+      "properties": [
+        {
+          "name": "candidateStarterGroups",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateStarterUsers",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "versionTag",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "historyTimeToLive",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "isStartableInTasklist",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        }
+      ]
+    },
+    {
+      "name": "EscalationEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:EscalationEventDefinition"],
+      "properties": [
+        {
+          "name": "escalationCodeVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "FormalExpression",
+      "isAbstract": true,
+      "extends": ["bpmn:FormalExpression"],
+      "properties": [
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Assignable",
+      "extends": ["bpmn:UserTask"],
+      "properties": [
+        {
+          "name": "assignee",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateUsers",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateGroups",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "dueDate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "followUpDate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "priority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "CallActivity",
+      "extends": ["bpmn:CallActivity"],
+      "properties": [
+        {
+          "name": "calledElementBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "calledElementVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "calledElementVersionTag",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "calledElementTenantId",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseRef",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "caseVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseTenantId",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableMappingClass",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableMappingDelegateExpression",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ServiceTaskLike",
+      "extends": [
+        "bpmn:ServiceTask",
+        "bpmn:BusinessRuleTask",
+        "bpmn:SendTask",
+        "bpmn:MessageEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resultVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "DmnCapable",
+      "extends": ["bpmn:BusinessRuleTask"],
+      "properties": [
+        {
+          "name": "decisionRef",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "decisionRefBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "decisionRefVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "mapDecisionResult",
+          "isAttr": true,
+          "type": "String",
+          "default": "resultList"
+        },
+        {
+          "name": "decisionRefTenantId",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExternalCapable",
+      "extends": ["camunda:ServiceTaskLike"],
+      "properties": [
+        {
+          "name": "type",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "topic",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "TaskPriorized",
+      "extends": ["bpmn:Process", "camunda:ExternalCapable"],
+      "properties": [
+        {
+          "name": "taskPriority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Properties",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["*"]
+      },
+      "properties": [
+        {
+          "name": "values",
+          "type": "Property",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Property",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "value",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "Connector",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["camunda:ServiceTaskLike"]
+      },
+      "properties": [
+        {
+          "name": "inputOutput",
+          "type": "InputOutput"
+        },
+        {
+          "name": "connectorId",
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InputOutput",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:FlowNode", "camunda:Connector"]
+      },
+      "properties": [
+        {
+          "name": "inputOutput",
+          "type": "InputOutput"
+        },
+        {
+          "name": "connectorId",
+          "type": "String"
+        },
+        {
+          "name": "inputParameters",
+          "isMany": true,
+          "type": "InputParameter"
+        },
+        {
+          "name": "outputParameters",
+          "isMany": true,
+          "type": "OutputParameter"
+        }
+      ]
+    },
+    {
+      "name": "InputOutputParameter",
+      "properties": [
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        },
+        {
+          "name": "definition",
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "InputOutputParameterDefinition",
+      "isAbstract": true
+    },
+    {
+      "name": "List",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "items",
+          "isMany": true,
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "Map",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "entries",
+          "isMany": true,
+          "type": "Entry"
+        }
+      ]
+    },
+    {
+      "name": "Entry",
+      "properties": [
+        {
+          "name": "key",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        },
+        {
+          "name": "definition",
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "Value",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "id",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Script",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "scriptFormat",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Field",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": [
+          "camunda:ServiceTaskLike",
+          "camunda:ExecutionListener",
+          "camunda:TaskListener"
+        ]
+      },
+      "properties": [
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "expression",
+          "type": "String"
+        },
+        {
+          "name": "stringValue",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "string",
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InputParameter",
+      "superClass": ["InputOutputParameter"]
+    },
+    {
+      "name": "OutputParameter",
+      "superClass": ["InputOutputParameter"]
+    },
+    {
+      "name": "Collectable",
+      "isAbstract": true,
+      "extends": ["bpmn:MultiInstanceLoopCharacteristics"],
+      "superClass": ["camunda:AsyncCapable"],
+      "properties": [
+        {
+          "name": "collection",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "elementVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "FailedJobRetryTimeCycle",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["camunda:AsyncCapable", "bpmn:MultiInstanceLoopCharacteristics"]
+      },
+      "properties": [
+        {
+          "name": "body",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExecutionListener",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": [
+          "bpmn:Task",
+          "bpmn:ServiceTask",
+          "bpmn:UserTask",
+          "bpmn:BusinessRuleTask",
+          "bpmn:ScriptTask",
+          "bpmn:ReceiveTask",
+          "bpmn:ManualTask",
+          "bpmn:ExclusiveGateway",
+          "bpmn:SequenceFlow",
+          "bpmn:ParallelGateway",
+          "bpmn:InclusiveGateway",
+          "bpmn:EventBasedGateway",
+          "bpmn:StartEvent",
+          "bpmn:IntermediateCatchEvent",
+          "bpmn:IntermediateThrowEvent",
+          "bpmn:EndEvent",
+          "bpmn:BoundaryEvent",
+          "bpmn:CallActivity",
+          "bpmn:SubProcess",
+          "bpmn:Process"
+        ]
+      },
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "event",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "script",
+          "type": "Script"
+        },
+        {
+          "name": "fields",
+          "type": "Field",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "TaskListener",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "event",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "script",
+          "type": "Script"
+        },
+        {
+          "name": "fields",
+          "type": "Field",
+          "isMany": true
+        },
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "eventDefinitions",
+          "type": "bpmn:TimerEventDefinition",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormProperty",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:StartEvent", "bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "required",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "readable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "writable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "variable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "expression",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "default",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormData",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:StartEvent", "bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "fields",
+          "type": "FormField",
+          "isMany": true
+        },
+        {
+          "name": "businessKey",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "FormField",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "label",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "defaultValue",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "properties",
+          "type": "Properties"
+        },
+        {
+          "name": "validation",
+          "type": "Validation"
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Validation",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "constraints",
+          "type": "Constraint",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Constraint",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "config",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "ConditionalEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:ConditionalEventDefinition"],
+      "properties": [
+        {
+          "name": "variableName",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableEvents",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    }
+  ],
+  "emumerations": []
+}
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json
new file mode 100644
index 000000000..7fe7ad14f
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json
@@ -0,0 +1,1207 @@
+{
+  "name": "Flowable",
+  "uri": "http://flowable.org/bpmn",
+  "prefix": "flowable",
+  "xml": {
+    "tagAlias": "lowerCase"
+  },
+  "associations": [],
+  "types": [
+    {
+      "name": "InOutBinding",
+      "superClass": ["Element"],
+      "isAbstract": true,
+      "properties": [
+        {
+          "name": "source",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "sourceExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "target",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "businessKey",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "local",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "variables",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "In",
+      "superClass": ["InOutBinding"],
+      "meta": {
+        "allowedIn": ["bpmn:CallActivity"]
+      }
+    },
+    {
+      "name": "Out",
+      "superClass": ["InOutBinding"],
+      "meta": {
+        "allowedIn": ["bpmn:CallActivity"]
+      }
+    },
+    {
+      "name": "AsyncCapable",
+      "isAbstract": true,
+      "extends": ["bpmn:Activity", "bpmn:Gateway", "bpmn:Event"],
+      "properties": [
+        {
+          "name": "async",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "asyncBefore",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "asyncAfter",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "exclusive",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        }
+      ]
+    },
+    {
+      "name": "JobPriorized",
+      "isAbstract": true,
+      "extends": ["bpmn:Process", "flowable:AsyncCapable"],
+      "properties": [
+        {
+          "name": "jobPriority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "SignalEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:SignalEventDefinition"],
+      "properties": [
+        {
+          "name": "async",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        }
+      ]
+    },
+    {
+      "name": "ErrorEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:ErrorEventDefinition"],
+      "properties": [
+        {
+          "name": "errorCodeVariable",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "errorMessageVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Error",
+      "isAbstract": true,
+      "extends": ["bpmn:Error"],
+      "properties": [
+        {
+          "name": "flowable:errorMessage",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "PotentialStarter",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "resourceAssignmentExpression",
+          "type": "bpmn:ResourceAssignmentExpression"
+        }
+      ]
+    },
+    {
+      "name": "FormSupported",
+      "isAbstract": true,
+      "extends": ["bpmn:StartEvent", "bpmn:UserTask"],
+      "properties": [
+        {
+          "name": "formHandlerClass",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "formKey",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "formType",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "formReadOnly",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "formInit",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        }
+      ]
+    },
+    {
+      "name": "TemplateSupported",
+      "isAbstract": true,
+      "extends": ["bpmn:Process", "bpmn:FlowElement"],
+      "properties": [
+        {
+          "name": "modelerTemplate",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Initiator",
+      "isAbstract": true,
+      "extends": ["bpmn:StartEvent"],
+      "properties": [
+        {
+          "name": "initiator",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ScriptTask",
+      "isAbstract": true,
+      "extends": ["bpmn:ScriptTask"],
+      "properties": [
+        {
+          "name": "resultVariable",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Process",
+      "isAbstract": true,
+      "extends": ["bpmn:Process"],
+      "properties": [
+        {
+          "name": "candidateStarterGroups",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateStarterUsers",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "versionTag",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "historyTimeToLive",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "isStartableInTasklist",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        }
+      ]
+    },
+    {
+      "name": "EscalationEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:EscalationEventDefinition"],
+      "properties": [
+        {
+          "name": "escalationCodeVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "FormalExpression",
+      "isAbstract": true,
+      "extends": ["bpmn:FormalExpression"],
+      "properties": [
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Assignable",
+      "extends": ["bpmn:UserTask"],
+      "properties": [
+        {
+          "name": "assignee",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateUsers",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateGroups",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "dueDate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "followUpDate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "priority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Assignee",
+      "supperClass": "Element",
+      "meta": {
+        "allowedIn": ["*"]
+      },
+      "properties": [
+        {
+          "name": "label",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "viewId",
+          "type": "Number",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "CallActivity",
+      "extends": ["bpmn:CallActivity"],
+      "properties": [
+        {
+          "name": "calledElementBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "calledElementVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "calledElementVersionTag",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "calledElementTenantId",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseRef",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "caseVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseTenantId",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableMappingClass",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableMappingDelegateExpression",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ServiceTaskLike",
+      "extends": [
+        "bpmn:ServiceTask",
+        "bpmn:BusinessRuleTask",
+        "bpmn:SendTask",
+        "bpmn:MessageEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resultVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "DmnCapable",
+      "extends": ["bpmn:BusinessRuleTask"],
+      "properties": [
+        {
+          "name": "decisionRef",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "decisionRefBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "decisionRefVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "mapDecisionResult",
+          "isAttr": true,
+          "type": "String",
+          "default": "resultList"
+        },
+        {
+          "name": "decisionRefTenantId",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExternalCapable",
+      "extends": ["flowable:ServiceTaskLike"],
+      "properties": [
+        {
+          "name": "type",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "topic",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "TaskPriorized",
+      "extends": ["bpmn:Process", "flowable:ExternalCapable"],
+      "properties": [
+        {
+          "name": "taskPriority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Properties",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["*"]
+      },
+      "properties": [
+        {
+          "name": "values",
+          "type": "Property",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Property",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "value",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "Button",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "code",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "isHide",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "next",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "sort",
+          "type": "Integer",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "Assignee",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "value",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "condition",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "operationType",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "sort",
+          "type": "Integer",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "Connector",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["flowable:ServiceTaskLike"]
+      },
+      "properties": [
+        {
+          "name": "inputOutput",
+          "type": "InputOutput"
+        },
+        {
+          "name": "connectorId",
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InputOutput",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:FlowNode", "flowable:Connector"]
+      },
+      "properties": [
+        {
+          "name": "inputOutput",
+          "type": "InputOutput"
+        },
+        {
+          "name": "connectorId",
+          "type": "String"
+        },
+        {
+          "name": "inputParameters",
+          "isMany": true,
+          "type": "InputParameter"
+        },
+        {
+          "name": "outputParameters",
+          "isMany": true,
+          "type": "OutputParameter"
+        }
+      ]
+    },
+    {
+      "name": "InputOutputParameter",
+      "properties": [
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        },
+        {
+          "name": "definition",
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "InputOutputParameterDefinition",
+      "isAbstract": true
+    },
+    {
+      "name": "List",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "items",
+          "isMany": true,
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "Map",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "entries",
+          "isMany": true,
+          "type": "Entry"
+        }
+      ]
+    },
+    {
+      "name": "Entry",
+      "properties": [
+        {
+          "name": "key",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        },
+        {
+          "name": "definition",
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "Value",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "id",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Script",
+      "superClass": ["InputOutputParameterDefinition"],
+      "properties": [
+        {
+          "name": "scriptFormat",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Field",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": [
+          "flowable:ServiceTaskLike",
+          "flowable:ExecutionListener",
+          "flowable:TaskListener"
+        ]
+      },
+      "properties": [
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "expression",
+          "type": "String"
+        },
+        {
+          "name": "stringValue",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "string",
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ChildField",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "required",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "readable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "writable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "variable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "expression",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "default",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "InputParameter",
+      "superClass": ["InputOutputParameter"]
+    },
+    {
+      "name": "OutputParameter",
+      "superClass": ["InputOutputParameter"]
+    },
+    {
+      "name": "Collectable",
+      "isAbstract": true,
+      "extends": ["bpmn:MultiInstanceLoopCharacteristics"],
+      "superClass": ["flowable:AsyncCapable"],
+      "properties": [
+        {
+          "name": "collection",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "elementVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "FailedJobRetryTimeCycle",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["flowable:AsyncCapable", "bpmn:MultiInstanceLoopCharacteristics"]
+      },
+      "properties": [
+        {
+          "name": "body",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExecutionListener",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": [
+          "bpmn:Task",
+          "bpmn:ServiceTask",
+          "bpmn:UserTask",
+          "bpmn:BusinessRuleTask",
+          "bpmn:ScriptTask",
+          "bpmn:ReceiveTask",
+          "bpmn:ManualTask",
+          "bpmn:ExclusiveGateway",
+          "bpmn:SequenceFlow",
+          "bpmn:ParallelGateway",
+          "bpmn:InclusiveGateway",
+          "bpmn:EventBasedGateway",
+          "bpmn:StartEvent",
+          "bpmn:IntermediateCatchEvent",
+          "bpmn:IntermediateThrowEvent",
+          "bpmn:EndEvent",
+          "bpmn:BoundaryEvent",
+          "bpmn:CallActivity",
+          "bpmn:SubProcess",
+          "bpmn:Process"
+        ]
+      },
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "event",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "script",
+          "type": "Script"
+        },
+        {
+          "name": "fields",
+          "type": "Field",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "TaskListener",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "event",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "script",
+          "type": "Script"
+        },
+        {
+          "name": "fields",
+          "type": "Field",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormProperty",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:StartEvent", "bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "required",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "readable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "writable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "variable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "expression",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "default",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        },
+        {
+          "name": "children",
+          "type": "ChildField",
+          "isMany": true
+        },
+        {
+          "name": "extensionElements",
+          "type": "bpmn:ExtensionElements",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormData",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:StartEvent", "bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "fields",
+          "type": "FormField",
+          "isMany": true
+        },
+        {
+          "name": "businessKey",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "FormField",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "label",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "defaultValue",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "properties",
+          "type": "Properties"
+        },
+        {
+          "name": "validation",
+          "type": "Validation"
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Validation",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "constraints",
+          "type": "Constraint",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Constraint",
+      "superClass": ["Element"],
+      "properties": [
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "config",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "ConditionalEventDefinition",
+      "isAbstract": true,
+      "extends": ["bpmn:ConditionalEventDefinition"],
+      "properties": [
+        {
+          "name": "variableName",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableEvent",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Condition",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:SequenceFlow"]
+      },
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "field",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "compare",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "value",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "logic",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "sort",
+          "type": "Integer",
+          "isAttr": true
+        }
+      ]
+    }
+  ],
+  "emumerations": []
+}
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/activitiExtension.js b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/activitiExtension.js
new file mode 100644
index 000000000..56ef38aa9
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/activitiExtension.js
@@ -0,0 +1,83 @@
+'use strict'
+
+import { some } from 'min-dash'
+
+// const some = require('min-dash').some
+// const some = some
+
+const ALLOWED_TYPES = {
+  FailedJobRetryTimeCycle: [
+    'bpmn:StartEvent',
+    'bpmn:BoundaryEvent',
+    'bpmn:IntermediateCatchEvent',
+    'bpmn:Activity'
+  ],
+  Connector: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent'],
+  Field: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent']
+}
+
+function is(element, type) {
+  return element && typeof element.$instanceOf === 'function' && element.$instanceOf(type)
+}
+
+function exists(element) {
+  return element && element.length
+}
+
+function includesType(collection, type) {
+  return (
+    exists(collection) &&
+    some(collection, function (element) {
+      return is(element, type)
+    })
+  )
+}
+
+function anyType(element, types) {
+  return some(types, function (type) {
+    return is(element, type)
+  })
+}
+
+function isAllowed(propName, propDescriptor, newElement) {
+  const name = propDescriptor.name,
+    types = ALLOWED_TYPES[name.replace(/activiti:/, '')]
+
+  return name === propName && anyType(newElement, types)
+}
+
+function ActivitiModdleExtension(eventBus) {
+  eventBus.on(
+    'property.clone',
+    function (context) {
+      const newElement = context.newElement,
+        propDescriptor = context.propertyDescriptor
+
+      this.canCloneProperty(newElement, propDescriptor)
+    },
+    this
+  )
+}
+
+ActivitiModdleExtension.$inject = ['eventBus']
+
+ActivitiModdleExtension.prototype.canCloneProperty = function (newElement, propDescriptor) {
+  if (isAllowed('activiti:FailedJobRetryTimeCycle', propDescriptor, newElement)) {
+    return (
+      includesType(newElement.eventDefinitions, 'bpmn:TimerEventDefinition') ||
+      includesType(newElement.eventDefinitions, 'bpmn:SignalEventDefinition') ||
+      is(newElement.loopCharacteristics, 'bpmn:MultiInstanceLoopCharacteristics')
+    )
+  }
+
+  if (isAllowed('activiti:Connector', propDescriptor, newElement)) {
+    return includesType(newElement.eventDefinitions, 'bpmn:MessageEventDefinition')
+  }
+
+  if (isAllowed('activiti:Field', propDescriptor, newElement)) {
+    return includesType(newElement.eventDefinitions, 'bpmn:MessageEventDefinition')
+  }
+}
+
+// module.exports = ActivitiModdleExtension;
+export default ActivitiModdleExtension
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/index.js b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/index.js
new file mode 100644
index 000000000..c22ca345f
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/index.js
@@ -0,0 +1,11 @@
+/*
+ * @author igdianov
+ * address https://github.com/igdianov/activiti-bpmn-moddle
+ * */
+
+import activitiExtension from './activitiExtension'
+
+export default {
+  __init__: ['ActivitiModdleExtension'],
+  ActivitiModdleExtension: ['type', activitiExtension]
+}
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/extension.js b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/extension.js
new file mode 100644
index 000000000..b8c37a575
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/extension.js
@@ -0,0 +1,151 @@
+'use strict'
+
+import { isFunction, isObject, some } from 'min-dash'
+
+// const isFunction = isFunction,
+//   isObject = isObject,
+//   some = some
+// const isFunction = require('min-dash').isFunction,
+//   isObject = require('min-dash').isObject,
+//   some = require('min-dash').some
+
+const WILDCARD = '*'
+
+function CamundaModdleExtension(eventBus) {
+  // eslint-disable-next-line @typescript-eslint/no-this-alias
+  const self = this
+
+  eventBus.on('moddleCopy.canCopyProperty', function (context) {
+    const property = context.property,
+      parent = context.parent
+
+    return self.canCopyProperty(property, parent)
+  })
+}
+
+CamundaModdleExtension.$inject = ['eventBus']
+
+/**
+ * Check wether to disallow copying property.
+ */
+CamundaModdleExtension.prototype.canCopyProperty = function (property, parent) {
+  // (1) check wether property is allowed in parent
+  if (isObject(property) && !isAllowedInParent(property, parent)) {
+    return false
+  }
+
+  // (2) check more complex scenarios
+
+  if (is(property, 'camunda:InputOutput') && !this.canHostInputOutput(parent)) {
+    return false
+  }
+
+  if (isAny(property, ['camunda:Connector', 'camunda:Field']) && !this.canHostConnector(parent)) {
+    return false
+  }
+
+  if (is(property, 'camunda:In') && !this.canHostIn(parent)) {
+    return false
+  }
+}
+
+CamundaModdleExtension.prototype.canHostInputOutput = function (parent) {
+  // allowed in camunda:Connector
+  const connector = getParent(parent, 'camunda:Connector')
+
+  if (connector) {
+    return true
+  }
+
+  // special rules inside bpmn:FlowNode
+  const flowNode = getParent(parent, 'bpmn:FlowNode')
+
+  if (!flowNode) {
+    return false
+  }
+
+  if (isAny(flowNode, ['bpmn:StartEvent', 'bpmn:Gateway', 'bpmn:BoundaryEvent'])) {
+    return false
+  }
+
+  return !(is(flowNode, 'bpmn:SubProcess') && flowNode.get('triggeredByEvent'))
+}
+
+CamundaModdleExtension.prototype.canHostConnector = function (parent) {
+  const serviceTaskLike = getParent(parent, 'camunda:ServiceTaskLike')
+
+  if (is(serviceTaskLike, 'bpmn:MessageEventDefinition')) {
+    // only allow on throw and end events
+    return getParent(parent, 'bpmn:IntermediateThrowEvent') || getParent(parent, 'bpmn:EndEvent')
+  }
+
+  return true
+}
+
+CamundaModdleExtension.prototype.canHostIn = function (parent) {
+  const callActivity = getParent(parent, 'bpmn:CallActivity')
+
+  if (callActivity) {
+    return true
+  }
+
+  const signalEventDefinition = getParent(parent, 'bpmn:SignalEventDefinition')
+
+  if (signalEventDefinition) {
+    // only allow on throw and end events
+    return getParent(parent, 'bpmn:IntermediateThrowEvent') || getParent(parent, 'bpmn:EndEvent')
+  }
+
+  return true
+}
+
+// module.exports = CamundaModdleExtension;
+export default CamundaModdleExtension
+
+// helpers //////////
+
+function is(element, type) {
+  return element && isFunction(element.$instanceOf) && element.$instanceOf(type)
+}
+
+function isAny(element, types) {
+  return some(types, function (t) {
+    return is(element, t)
+  })
+}
+
+function getParent(element, type) {
+  if (!type) {
+    return element.$parent
+  }
+
+  if (is(element, type)) {
+    return element
+  }
+
+  if (!element.$parent) {
+    return
+  }
+
+  return getParent(element.$parent, type)
+}
+
+function isAllowedInParent(property, parent) {
+  // (1) find property descriptor
+  const descriptor = property.$type && property.$model.getTypeDescriptor(property.$type)
+
+  const allowedIn = descriptor && descriptor.meta && descriptor.meta.allowedIn
+
+  if (!allowedIn || isWildcard(allowedIn)) {
+    return true
+  }
+
+  // (2) check wether property has parent of allowed type
+  return some(allowedIn, function (type) {
+    return getParent(parent, type)
+  })
+}
+
+function isWildcard(allowedIn) {
+  return allowedIn.indexOf(WILDCARD) !== -1
+}
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/index.js b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/index.js
new file mode 100644
index 000000000..1da1bc70a
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/index.js
@@ -0,0 +1,8 @@
+'use strict'
+
+import extension from './extension'
+
+export default {
+  __init__: ['camundaModdleExtension'],
+  camundaModdleExtension: ['type', extension]
+}
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/flowableExtension.js b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/flowableExtension.js
new file mode 100644
index 000000000..3dcea6772
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/flowableExtension.js
@@ -0,0 +1,83 @@
+'use strict'
+
+import { some } from 'min-dash'
+
+// const some = some
+// const some = require('min-dash').some
+
+const ALLOWED_TYPES = {
+  FailedJobRetryTimeCycle: [
+    'bpmn:StartEvent',
+    'bpmn:BoundaryEvent',
+    'bpmn:IntermediateCatchEvent',
+    'bpmn:Activity'
+  ],
+  Connector: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent'],
+  Field: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent']
+}
+
+function is(element, type) {
+  return element && typeof element.$instanceOf === 'function' && element.$instanceOf(type)
+}
+
+function exists(element) {
+  return element && element.length
+}
+
+function includesType(collection, type) {
+  return (
+    exists(collection) &&
+    some(collection, function (element) {
+      return is(element, type)
+    })
+  )
+}
+
+function anyType(element, types) {
+  return some(types, function (type) {
+    return is(element, type)
+  })
+}
+
+function isAllowed(propName, propDescriptor, newElement) {
+  const name = propDescriptor.name,
+    types = ALLOWED_TYPES[name.replace(/flowable:/, '')]
+
+  return name === propName && anyType(newElement, types)
+}
+
+function FlowableModdleExtension(eventBus) {
+  eventBus.on(
+    'property.clone',
+    function (context) {
+      const newElement = context.newElement,
+        propDescriptor = context.propertyDescriptor
+
+      this.canCloneProperty(newElement, propDescriptor)
+    },
+    this
+  )
+}
+
+FlowableModdleExtension.$inject = ['eventBus']
+
+FlowableModdleExtension.prototype.canCloneProperty = function (newElement, propDescriptor) {
+  if (isAllowed('flowable:FailedJobRetryTimeCycle', propDescriptor, newElement)) {
+    return (
+      includesType(newElement.eventDefinitions, 'bpmn:TimerEventDefinition') ||
+      includesType(newElement.eventDefinitions, 'bpmn:SignalEventDefinition') ||
+      is(newElement.loopCharacteristics, 'bpmn:MultiInstanceLoopCharacteristics')
+    )
+  }
+
+  if (isAllowed('flowable:Connector', propDescriptor, newElement)) {
+    return includesType(newElement.eventDefinitions, 'bpmn:MessageEventDefinition')
+  }
+
+  if (isAllowed('flowable:Field', propDescriptor, newElement)) {
+    return includesType(newElement.eventDefinitions, 'bpmn:MessageEventDefinition')
+  }
+}
+
+// module.exports = FlowableModdleExtension;
+export default FlowableModdleExtension
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/index.js b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/index.js
new file mode 100644
index 000000000..6d59b67fc
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/index.js
@@ -0,0 +1,10 @@
+/*
+ * @author igdianov
+ * address https://github.com/igdianov/activiti-bpmn-moddle
+ * */
+import flowableExtension from './flowableExtension'
+
+export default {
+  __init__: ['FlowableModdleExtension'],
+  FlowableModdleExtension: ['type', flowableExtension]
+}
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js
new file mode 100644
index 000000000..5e2803b58
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js
@@ -0,0 +1,221 @@
+import PaletteProvider from 'bpmn-js/lib/features/palette/PaletteProvider'
+import { assign } from 'min-dash'
+
+export default function CustomPalette(
+  palette,
+  create,
+  elementFactory,
+  spaceTool,
+  lassoTool,
+  handTool,
+  globalConnect,
+  translate
+) {
+  PaletteProvider.call(
+    this,
+    palette,
+    create,
+    elementFactory,
+    spaceTool,
+    lassoTool,
+    handTool,
+    globalConnect,
+    translate,
+    2000
+  )
+}
+
+const F = function () {} // 核心，利用空对象作为中介；
+F.prototype = PaletteProvider.prototype // 核心，将父类的原型赋值给空对象F；
+
+// 利用中介函数重写原型链方法
+F.prototype.getPaletteEntries = function () {
+  const actions = {},
+    create = this._create,
+    elementFactory = this._elementFactory,
+    spaceTool = this._spaceTool,
+    lassoTool = this._lassoTool,
+    handTool = this._handTool,
+    globalConnect = this._globalConnect,
+    translate = this._translate
+
+  function createAction(type, group, className, title, options) {
+    function createListener(event) {
+      const shape = elementFactory.createShape(assign({ type: type }, options))
+
+      if (options) {
+        shape.businessObject.di.isExpanded = options.isExpanded
+      }
+
+      create.start(event, shape)
+    }
+
+    const shortType = type.replace(/^bpmn:/, '')
+
+    return {
+      group: group,
+      className: className,
+      title: title || translate('Create {type}', { type: shortType }),
+      action: {
+        dragstart: createListener,
+        click: createListener
+      }
+    }
+  }
+
+  function createSubprocess(event) {
+    const subProcess = elementFactory.createShape({
+      type: 'bpmn:SubProcess',
+      x: 0,
+      y: 0,
+      isExpanded: true
+    })
+
+    const startEvent = elementFactory.createShape({
+      type: 'bpmn:StartEvent',
+      x: 40,
+      y: 82,
+      parent: subProcess
+    })
+
+    create.start(event, [subProcess, startEvent], {
+      hints: {
+        autoSelect: [startEvent]
+      }
+    })
+  }
+
+  function createParticipant(event) {
+    create.start(event, elementFactory.createParticipantShape())
+  }
+
+  assign(actions, {
+    'hand-tool': {
+      group: 'tools',
+      className: 'bpmn-icon-hand-tool',
+      title: '激活抓手工具',
+      // title: translate("Activate the hand tool"),
+      action: {
+        click: function (event) {
+          handTool.activateHand(event)
+        }
+      }
+    },
+    'lasso-tool': {
+      group: 'tools',
+      className: 'bpmn-icon-lasso-tool',
+      title: translate('Activate the lasso tool'),
+      action: {
+        click: function (event) {
+          lassoTool.activateSelection(event)
+        }
+      }
+    },
+    'space-tool': {
+      group: 'tools',
+      className: 'bpmn-icon-space-tool',
+      title: translate('Activate the create/remove space tool'),
+      action: {
+        click: function (event) {
+          spaceTool.activateSelection(event)
+        }
+      }
+    },
+    'global-connect-tool': {
+      group: 'tools',
+      className: 'bpmn-icon-connection-multi',
+      title: translate('Activate the global connect tool'),
+      action: {
+        click: function (event) {
+          globalConnect.toggle(event)
+        }
+      }
+    },
+    'tool-separator': {
+      group: 'tools',
+      separator: true
+    },
+    'create.start-event': createAction(
+      'bpmn:StartEvent',
+      'event',
+      'bpmn-icon-start-event-none',
+      translate('Create StartEvent')
+    ),
+    'create.intermediate-event': createAction(
+      'bpmn:IntermediateThrowEvent',
+      'event',
+      'bpmn-icon-intermediate-event-none',
+      translate('Create Intermediate/Boundary Event')
+    ),
+    'create.end-event': createAction(
+      'bpmn:EndEvent',
+      'event',
+      'bpmn-icon-end-event-none',
+      translate('Create EndEvent')
+    ),
+    'create.exclusive-gateway': createAction(
+      'bpmn:ExclusiveGateway',
+      'gateway',
+      'bpmn-icon-gateway-none',
+      translate('Create Gateway')
+    ),
+    'create.user-task': createAction(
+      'bpmn:UserTask',
+      'activity',
+      'bpmn-icon-user-task',
+      translate('Create User Task')
+    ),
+    'create.data-object': createAction(
+      'bpmn:DataObjectReference',
+      'data-object',
+      'bpmn-icon-data-object',
+      translate('Create DataObjectReference')
+    ),
+    'create.data-store': createAction(
+      'bpmn:DataStoreReference',
+      'data-store',
+      'bpmn-icon-data-store',
+      translate('Create DataStoreReference')
+    ),
+    'create.subprocess-expanded': {
+      group: 'activity',
+      className: 'bpmn-icon-subprocess-expanded',
+      title: translate('Create expanded SubProcess'),
+      action: {
+        dragstart: createSubprocess,
+        click: createSubprocess
+      }
+    },
+    'create.participant-expanded': {
+      group: 'collaboration',
+      className: 'bpmn-icon-participant',
+      title: translate('Create Pool/Participant'),
+      action: {
+        dragstart: createParticipant,
+        click: createParticipant
+      }
+    },
+    'create.group': createAction(
+      'bpmn:Group',
+      'artifact',
+      'bpmn-icon-group',
+      translate('Create Group')
+    )
+  })
+
+  return actions
+}
+
+CustomPalette.$inject = [
+  'palette',
+  'create',
+  'elementFactory',
+  'spaceTool',
+  'lassoTool',
+  'handTool',
+  'globalConnect',
+  'translate'
+]
+
+CustomPalette.prototype = new F() // 核心，将 F的实例赋值给子类；
+CustomPalette.prototype.constructor = CustomPalette // 修复子类CustomPalette的构造器指向，防止原型链的混乱；
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/index.js b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/index.js
new file mode 100644
index 000000000..8e4f3ac90
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/index.js
@@ -0,0 +1,22 @@
+// import PaletteModule from "diagram-js/lib/features/palette";
+// import CreateModule from "diagram-js/lib/features/create";
+// import SpaceToolModule from "diagram-js/lib/features/space-tool";
+// import LassoToolModule from "diagram-js/lib/features/lasso-tool";
+// import HandToolModule from "diagram-js/lib/features/hand-tool";
+// import GlobalConnectModule from "diagram-js/lib/features/global-connect";
+// import translate from "diagram-js/lib/i18n/translate";
+//
+// import PaletteProvider from "./paletteProvider";
+//
+// export default {
+//   __depends__: [PaletteModule, CreateModule, SpaceToolModule, LassoToolModule, HandToolModule, GlobalConnectModule, translate],
+//   __init__: ["paletteProvider"],
+//   paletteProvider: ["type", PaletteProvider]
+// };
+
+import CustomPalette from './CustomPalette'
+
+export default {
+  __init__: ['paletteProvider'],
+  paletteProvider: ['type', CustomPalette]
+}
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js
new file mode 100644
index 000000000..7098981c6
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js
@@ -0,0 +1,213 @@
+import { assign } from 'min-dash'
+
+/**
+ * A palette provider for BPMN 2.0 elements.
+ */
+export default function PaletteProvider(
+  palette,
+  create,
+  elementFactory,
+  spaceTool,
+  lassoTool,
+  handTool,
+  globalConnect,
+  translate
+) {
+  this._palette = palette
+  this._create = create
+  this._elementFactory = elementFactory
+  this._spaceTool = spaceTool
+  this._lassoTool = lassoTool
+  this._handTool = handTool
+  this._globalConnect = globalConnect
+  this._translate = translate
+
+  palette.registerProvider(this)
+}
+
+PaletteProvider.$inject = [
+  'palette',
+  'create',
+  'elementFactory',
+  'spaceTool',
+  'lassoTool',
+  'handTool',
+  'globalConnect',
+  'translate'
+]
+
+PaletteProvider.prototype.getPaletteEntries = function () {
+  const actions = {},
+    create = this._create,
+    elementFactory = this._elementFactory,
+    spaceTool = this._spaceTool,
+    lassoTool = this._lassoTool,
+    handTool = this._handTool,
+    globalConnect = this._globalConnect,
+    translate = this._translate
+
+  function createAction(type, group, className, title, options) {
+    function createListener(event) {
+      const shape = elementFactory.createShape(assign({ type: type }, options))
+
+      if (options) {
+        shape.businessObject.di.isExpanded = options.isExpanded
+      }
+
+      create.start(event, shape)
+    }
+
+    const shortType = type.replace(/^bpmn:/, '')
+
+    return {
+      group: group,
+      className: className,
+      title: title || translate('Create {type}', { type: shortType }),
+      action: {
+        dragstart: createListener,
+        click: createListener
+      }
+    }
+  }
+
+  function createSubprocess(event) {
+    const subProcess = elementFactory.createShape({
+      type: 'bpmn:SubProcess',
+      x: 0,
+      y: 0,
+      isExpanded: true
+    })
+
+    const startEvent = elementFactory.createShape({
+      type: 'bpmn:StartEvent',
+      x: 40,
+      y: 82,
+      parent: subProcess
+    })
+
+    create.start(event, [subProcess, startEvent], {
+      hints: {
+        autoSelect: [startEvent]
+      }
+    })
+  }
+
+  function createParticipant(event) {
+    create.start(event, elementFactory.createParticipantShape())
+  }
+
+  assign(actions, {
+    'hand-tool': {
+      group: 'tools',
+      className: 'bpmn-icon-hand-tool',
+      title: translate('Activate the hand tool'),
+      action: {
+        click: function (event) {
+          handTool.activateHand(event)
+        }
+      }
+    },
+    'lasso-tool': {
+      group: 'tools',
+      className: 'bpmn-icon-lasso-tool',
+      title: translate('Activate the lasso tool'),
+      action: {
+        click: function (event) {
+          lassoTool.activateSelection(event)
+        }
+      }
+    },
+    'space-tool': {
+      group: 'tools',
+      className: 'bpmn-icon-space-tool',
+      title: translate('Activate the create/remove space tool'),
+      action: {
+        click: function (event) {
+          spaceTool.activateSelection(event)
+        }
+      }
+    },
+    'global-connect-tool': {
+      group: 'tools',
+      className: 'bpmn-icon-connection-multi',
+      title: translate('Activate the global connect tool'),
+      action: {
+        click: function (event) {
+          globalConnect.toggle(event)
+        }
+      }
+    },
+    'tool-separator': {
+      group: 'tools',
+      separator: true
+    },
+    'create.start-event': createAction(
+      'bpmn:StartEvent',
+      'event',
+      'bpmn-icon-start-event-none',
+      translate('Create StartEvent')
+    ),
+    'create.intermediate-event': createAction(
+      'bpmn:IntermediateThrowEvent',
+      'event',
+      'bpmn-icon-intermediate-event-none',
+      translate('Create Intermediate/Boundary Event')
+    ),
+    'create.end-event': createAction(
+      'bpmn:EndEvent',
+      'event',
+      'bpmn-icon-end-event-none',
+      translate('Create EndEvent')
+    ),
+    'create.exclusive-gateway': createAction(
+      'bpmn:ExclusiveGateway',
+      'gateway',
+      'bpmn-icon-gateway-none',
+      translate('Create Gateway')
+    ),
+    'create.user-task': createAction(
+      'bpmn:UserTask',
+      'activity',
+      'bpmn-icon-user-task',
+      translate('Create User Task')
+    ),
+    'create.data-object': createAction(
+      'bpmn:DataObjectReference',
+      'data-object',
+      'bpmn-icon-data-object',
+      translate('Create DataObjectReference')
+    ),
+    'create.data-store': createAction(
+      'bpmn:DataStoreReference',
+      'data-store',
+      'bpmn-icon-data-store',
+      translate('Create DataStoreReference')
+    ),
+    'create.subprocess-expanded': {
+      group: 'activity',
+      className: 'bpmn-icon-subprocess-expanded',
+      title: translate('Create expanded SubProcess'),
+      action: {
+        dragstart: createSubprocess,
+        click: createSubprocess
+      }
+    },
+    'create.participant-expanded': {
+      group: 'collaboration',
+      className: 'bpmn-icon-participant',
+      title: translate('Create Pool/Participant'),
+      action: {
+        dragstart: createParticipant,
+        click: createParticipant
+      }
+    },
+    'create.group': createAction(
+      'bpmn:Group',
+      'artifact',
+      'bpmn-icon-group',
+      translate('Create Group')
+    )
+  })
+
+  return actions
+}
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/customTranslate.js b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/customTranslate.js
new file mode 100644
index 000000000..c1b99e122
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/customTranslate.js
@@ -0,0 +1,44 @@
+// import translations from "./zh";
+//
+// export default function customTranslate(template, replacements) {
+//   replacements = replacements || {};
+//
+//   // Translate
+//   template = translations[template] || template;
+//
+//   // Replace
+//   return template.replace(/{([^}]+)}/g, function(_, key) {
+//     let str = replacements[key];
+//     if (
+//       translations[replacements[key]] !== null &&
+//       translations[replacements[key]] !== "undefined"
+//     ) {
+//       // eslint-disable-next-line no-mixed-spaces-and-tabs
+//       str = translations[replacements[key]];
+//       // eslint-disable-next-line no-mixed-spaces-and-tabs
+//     }
+//     return str || "{" + key + "}";
+//   });
+// }
+
+export default function customTranslate(translations) {
+  return function (template, replacements) {
+    replacements = replacements || {}
+    // Translate
+    template = translations[template] || template
+
+    // Replace
+    return template.replace(/{([^}]+)}/g, function (_, key) {
+      let str = replacements[key]
+      if (
+        translations[replacements[key]] !== null &&
+        translations[replacements[key]] !== undefined
+      ) {
+        // eslint-disable-next-line no-mixed-spaces-and-tabs
+        str = translations[replacements[key]]
+        // eslint-disable-next-line no-mixed-spaces-and-tabs
+      }
+      return str || '{' + key + '}'
+    })
+  }
+}
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
new file mode 100644
index 000000000..777db3e7f
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
@@ -0,0 +1,240 @@
+/**
+ * This is a sample file that should be replaced with the actual translation.
+ *
+ * Checkout https://github.com/bpmn-io/bpmn-js-i18n for a list of available
+ * translations and labels to translate.
+ */
+export default {
+  // 添加部分
+  'Append EndEvent': '追加结束事件',
+  'Append Gateway': '追加网关',
+  'Append Task': '追加任务',
+  'Append Intermediate/Boundary Event': '追加中间抛出事件/边界事件',
+
+  'Activate the global connect tool': '激活全局连接工具',
+  'Append {type}': '添加 {type}',
+  'Add Lane above': '在上面添加道',
+  'Divide into two Lanes': '分割成两个道',
+  'Divide into three Lanes': '分割成三个道',
+  'Add Lane below': '在下面添加道',
+  'Append compensation activity': '追加补偿活动',
+  'Change type': '修改类型',
+  'Connect using Association': '使用关联连接',
+  'Connect using Sequence/MessageFlow or Association': '使用顺序/消息流或者关联连接',
+  'Connect using DataInputAssociation': '使用数据输入关联连接',
+  Remove: '移除',
+  'Activate the hand tool': '激活抓手工具',
+  'Activate the lasso tool': '激活套索工具',
+  'Activate the create/remove space tool': '激活创建/删除空间工具',
+  'Create expanded SubProcess': '创建扩展子过程',
+  'Create IntermediateThrowEvent/BoundaryEvent': '创建中间抛出事件/边界事件',
+  'Create Pool/Participant': '创建池/参与者',
+  'Parallel Multi Instance': '并行多重事件',
+  'Sequential Multi Instance': '时序多重事件',
+  DataObjectReference: '数据对象参考',
+  DataStoreReference: '数据存储参考',
+  Loop: '循环',
+  'Ad-hoc': '即席',
+  'Create {type}': '创建 {type}',
+  Task: '任务',
+  'Send Task': '发送任务',
+  'Receive Task': '接收任务',
+  'User Task': '用户任务',
+  'Manual Task': '手工任务',
+  'Business Rule Task': '业务规则任务',
+  'Service Task': '服务任务',
+  'Script Task': '脚本任务',
+  'Call Activity': '调用活动',
+  'Sub Process (collapsed)': '子流程（折叠的）',
+  'Sub Process (expanded)': '子流程（展开的）',
+  'Start Event': '开始事件',
+  StartEvent: '开始事件',
+  'Intermediate Throw Event': '中间事件',
+  'End Event': '结束事件',
+  EndEvent: '结束事件',
+  'Create StartEvent': '创建开始事件',
+  'Create EndEvent': '创建结束事件',
+  'Create Task': '创建任务',
+  'Create User Task': '创建用户任务',
+  'Create Gateway': '创建网关',
+  'Create DataObjectReference': '创建数据对象',
+  'Create DataStoreReference': '创建数据存储',
+  'Create Group': '创建分组',
+  'Create Intermediate/Boundary Event': '创建中间/边界事件',
+  'Message Start Event': '消息开始事件',
+  'Timer Start Event': '定时开始事件',
+  'Conditional Start Event': '条件开始事件',
+  'Signal Start Event': '信号开始事件',
+  'Error Start Event': '错误开始事件',
+  'Escalation Start Event': '升级开始事件',
+  'Compensation Start Event': '补偿开始事件',
+  'Message Start Event (non-interrupting)': '消息开始事件（非中断）',
+  'Timer Start Event (non-interrupting)': '定时开始事件（非中断）',
+  'Conditional Start Event (non-interrupting)': '条件开始事件（非中断）',
+  'Signal Start Event (non-interrupting)': '信号开始事件（非中断）',
+  'Escalation Start Event (non-interrupting)': '升级开始事件（非中断）',
+  'Message Intermediate Catch Event': '消息中间捕获事件',
+  'Message Intermediate Throw Event': '消息中间抛出事件',
+  'Timer Intermediate Catch Event': '定时中间捕获事件',
+  'Escalation Intermediate Throw Event': '升级中间抛出事件',
+  'Conditional Intermediate Catch Event': '条件中间捕获事件',
+  'Link Intermediate Catch Event': '链接中间捕获事件',
+  'Link Intermediate Throw Event': '链接中间抛出事件',
+  'Compensation Intermediate Throw Event': '补偿中间抛出事件',
+  'Signal Intermediate Catch Event': '信号中间捕获事件',
+  'Signal Intermediate Throw Event': '信号中间抛出事件',
+  'Message End Event': '消息结束事件',
+  'Escalation End Event': '定时结束事件',
+  'Error End Event': '错误结束事件',
+  'Cancel End Event': '取消结束事件',
+  'Compensation End Event': '补偿结束事件',
+  'Signal End Event': '信号结束事件',
+  'Terminate End Event': '终止结束事件',
+  'Message Boundary Event': '消息边界事件',
+  'Message Boundary Event (non-interrupting)': '消息边界事件（非中断）',
+  'Timer Boundary Event': '定时边界事件',
+  'Timer Boundary Event (non-interrupting)': '定时边界事件（非中断）',
+  'Escalation Boundary Event': '升级边界事件',
+  'Escalation Boundary Event (non-interrupting)': '升级边界事件（非中断）',
+  'Conditional Boundary Event': '条件边界事件',
+  'Conditional Boundary Event (non-interrupting)': '条件边界事件（非中断）',
+  'Error Boundary Event': '错误边界事件',
+  'Cancel Boundary Event': '取消边界事件',
+  'Signal Boundary Event': '信号边界事件',
+  'Signal Boundary Event (non-interrupting)': '信号边界事件（非中断）',
+  'Compensation Boundary Event': '补偿边界事件',
+  'Exclusive Gateway': '互斥网关',
+  'Parallel Gateway': '并行网关',
+  'Inclusive Gateway': '相容网关',
+  'Complex Gateway': '复杂网关',
+  'Event based Gateway': '事件网关',
+  Transaction: '转运',
+  'Sub Process': '子流程',
+  'Event Sub Process': '事件子流程',
+  'Collapsed Pool': '折叠池',
+  'Expanded Pool': '展开池',
+
+  // Errors
+  'no parent for {element} in {parent}': '在{parent}里，{element}没有父类',
+  'no shape type specified': '没有指定的形状类型',
+  'flow elements must be children of pools/participants': '流元素必须是池/参与者的子类',
+  'out of bounds release': 'out of bounds release',
+  'more than {count} child lanes': '子道大于{count} ',
+  'element required': '元素不能为空',
+  'diagram not part of bpmn:Definitions': '流程图不符合bpmn规范',
+  'no diagram to display': '没有可展示的流程图',
+  'no process or collaboration to display': '没有可展示的流程/协作',
+  'element {element} referenced by {referenced}#{property} not yet drawn':
+    '由{referenced}#{property}引用的{element}元素仍未绘制',
+  'already rendered {element}': '{element} 已被渲染',
+  'failed to import {element}': '导入{element}失败',
+  //属性面板的参数
+  Id: '编号',
+  Name: '名称',
+  General: '常规',
+  Details: '详情',
+  'Message Name': '消息名称',
+  Message: '消息',
+  Initiator: '创建者',
+  'Asynchronous Continuations': '持续异步',
+  'Asynchronous Before': '异步前',
+  'Asynchronous After': '异步后',
+  'Job Configuration': '工作配置',
+  Exclusive: '排除',
+  'Job Priority': '工作优先级',
+  'Retry Time Cycle': '重试时间周期',
+  Documentation: '文档',
+  'Element Documentation': '元素文档',
+  'History Configuration': '历史配置',
+  'History Time To Live': '历史的生存时间',
+  Forms: '表单',
+  'Form Key': '表单key',
+  'Form Fields': '表单字段',
+  'Business Key': '业务key',
+  'Form Field': '表单字段',
+  ID: '编号',
+  Type: '类型',
+  Label: '名称',
+  'Default Value': '默认值',
+  'Default Flow': '默认流转路径',
+  'Conditional Flow': '条件流转路径',
+  'Sequence Flow': '普通流转路径',
+  Validation: '校验',
+  'Add Constraint': '添加约束',
+  Config: '配置',
+  Properties: '属性',
+  'Add Property': '添加属性',
+  Value: '值',
+  Listeners: '监听器',
+  'Execution Listener': '执行监听',
+  'Event Type': '事件类型',
+  'Listener Type': '监听器类型',
+  'Java Class': 'Java类',
+  Expression: '表达式',
+  'Must provide a value': '必须提供一个值',
+  'Delegate Expression': '代理表达式',
+  Script: '脚本',
+  'Script Format': '脚本格式',
+  'Script Type': '脚本类型',
+  'Inline Script': '内联脚本',
+  'External Script': '外部脚本',
+  Resource: '资源',
+  'Field Injection': '字段注入',
+  Extensions: '扩展',
+  'Input/Output': '输入/输出',
+  'Input Parameters': '输入参数',
+  'Output Parameters': '输出参数',
+  Parameters: '参数',
+  'Output Parameter': '输出参数',
+  'Timer Definition Type': '定时器定义类型',
+  'Timer Definition': '定时器定义',
+  Date: '日期',
+  Duration: '持续',
+  Cycle: '循环',
+  Signal: '信号',
+  'Signal Name': '信号名称',
+  Escalation: '升级',
+  Error: '错误',
+  'Link Name': '链接名称',
+  Condition: '条件名称',
+  'Variable Name': '变量名称',
+  'Variable Event': '变量事件',
+  'Specify more than one variable change event as a comma separated list.':
+    '多个变量事件以逗号隔开',
+  'Wait for Completion': '等待完成',
+  'Activity Ref': '活动参考',
+  'Version Tag': '版本标签',
+  Executable: '可执行文件',
+  'External Task Configuration': '扩展任务配置',
+  'Task Priority': '任务优先级',
+  External: '外部',
+  Connector: '连接器',
+  'Must configure Connector': '必须配置连接器',
+  'Connector Id': '连接器编号',
+  Implementation: '实现方式',
+  'Field Injections': '字段注入',
+  Fields: '字段',
+  'Result Variable': '结果变量',
+  Topic: '主题',
+  'Configure Connector': '配置连接器',
+  'Input Parameter': '输入参数',
+  Assignee: '代理人',
+  'Candidate Users': '候选用户',
+  'Candidate Groups': '候选组',
+  'Due Date': '到期时间',
+  'Follow Up Date': '跟踪日期',
+  Priority: '优先级',
+  'The follow up date as an EL expression (e.g. ${someDate} or an ISO date (e.g. 2015-06-26T09:54:00)':
+    '跟踪日期必须符合EL表达式，如： ${someDate} ,或者一个ISO标准日期，如：2015-06-26T09:54:00',
+  'The due date as an EL expression (e.g. ${someDate} or an ISO date (e.g. 2015-06-26T09:54:00)':
+    '跟踪日期必须符合EL表达式，如： ${someDate} ,或者一个ISO标准日期，如：2015-06-26T09:54:00',
+  Variables: '变量',
+  'Candidate Starter Configuration': '候选人起动器配置',
+  'Candidate Starter Groups': '候选人起动器组',
+  'This maps to the process definition key.': '这映射到流程定义键。',
+  'Candidate Starter Users': '候选人起动器的用户',
+  'Specify more than one user as a comma separated list.': '指定多个用户作为逗号分隔的列表。',
+  'Tasklist Configuration': 'Tasklist配置',
+  Startable: '启动',
+  'Specify more than one group as a comma separated list.': '指定多个组作为逗号分隔的列表。'
+}
diff --git a/src/components/bpmnProcessDesigner/package/index.ts b/src/components/bpmnProcessDesigner/package/index.ts
new file mode 100644
index 000000000..ce44a3c58
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/index.ts
@@ -0,0 +1,11 @@
+import MyProcessDesigner from './designer'
+import MyProcessPenal from './penal'
+import MyProcessViewer from './designer/index2'
+
+import './theme/index.scss'
+import 'bpmn-js/dist/assets/diagram-js.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'
+
+export { MyProcessDesigner, MyProcessPenal, MyProcessViewer }
diff --git a/src/components/bpmnProcessDesigner/package/palette/ProcessPalette.vue b/src/components/bpmnProcessDesigner/package/palette/ProcessPalette.vue
new file mode 100644
index 000000000..ba97d9673
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/palette/ProcessPalette.vue
@@ -0,0 +1,45 @@
+<template>
+  <div class="my-process-palette">
+    <div class="test-button" @click="addTask" @mousedown="addTask">测试任务</div>
+    <div class="test-container" id="palette-container">1</div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { assign } from 'min-dash'
+
+defineOptions({ name: 'MyProcessPalette' })
+
+const bpmnInstances = () => (window as any).bpmnInstances
+const addTask = (event, options: any = {}) => {
+  const ElementFactory = bpmnInstances().elementFactory
+  const create = bpmnInstances().modeler.get('create')
+
+  console.log(ElementFactory, create)
+
+  const shape = ElementFactory.createShape(assign({ type: 'bpmn:UserTask' }, options))
+
+  if (options) {
+    shape.businessObject.di.isExpanded = options.isExpanded
+  }
+
+  console.log(event, 'event')
+  console.log(shape, 'shape')
+  create.start(event, shape)
+}
+</script>
+
+<style scoped lang="scss">
+.my-process-palette {
+  padding: 80px 20px 20px;
+  box-sizing: border-box;
+
+  .test-button {
+    padding: 8px 16px;
+    cursor: pointer;
+    border: 1px solid rgb(24 144 255 / 80%);
+    border-radius: 4px;
+    box-sizing: border-box;
+  }
+}
+</style>
diff --git a/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
new file mode 100644
index 000000000..377592f4d
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
@@ -0,0 +1,211 @@
+<template>
+  <div class="process-panel__container" :style="{ width: `${width}px` }">
+    <el-collapse v-model="activeTab">
+      <el-collapse-item name="base">
+        <!-- class="panel-tab__title" -->
+        <template #title>
+          <Icon icon="ep:info-filled" />
+          常规</template
+        >
+        <ElementBaseInfo
+          :id-edit-disabled="idEditDisabled"
+          :business-object="elementBusinessObject"
+          :type="elementType"
+          :model="model"
+        />
+      </el-collapse-item>
+      <el-collapse-item name="condition" v-if="elementType === 'Process'" key="message">
+        <template #title><Icon icon="ep:comment" />消息与信号</template>
+        <signal-and-massage />
+      </el-collapse-item>
+      <el-collapse-item name="condition" v-if="conditionFormVisible" key="condition">
+        <template #title><Icon icon="ep:promotion" />流转条件</template>
+        <flow-condition :business-object="elementBusinessObject" :type="elementType" />
+      </el-collapse-item>
+      <el-collapse-item name="condition" v-if="formVisible" key="form">
+        <template #title><Icon icon="ep:list" />表单</template>
+        <!-- <element-form :id="elementId" :type="elementType" /> -->
+        友情提示：使用
+        <router-link :to="{ path: '/bpm/manager/form' }"
+          ><el-link type="danger">流程表单</el-link>
+        </router-link>
+        替代，提供更好的表单设计功能
+      </el-collapse-item>
+      <el-collapse-item name="task" v-if="elementType.indexOf('Task') !== -1" key="task">
+        <template #title><Icon icon="ep:checked" />任务</template>
+        <element-task :id="elementId" :type="elementType" />
+      </el-collapse-item>
+      <el-collapse-item
+        name="multiInstance"
+        v-if="elementType.indexOf('Task') !== -1"
+        key="multiInstance"
+      >
+        <template #title><Icon icon="ep:help-filled" />多实例</template>
+        <element-multi-instance :business-object="elementBusinessObject" :type="elementType" />
+      </el-collapse-item>
+      <el-collapse-item name="listeners" key="listeners">
+        <template #title><Icon icon="ep:bell-filled" />执行监听器</template>
+        <element-listeners :id="elementId" :type="elementType" />
+      </el-collapse-item>
+      <el-collapse-item name="taskListeners" v-if="elementType === 'UserTask'" key="taskListeners">
+        <template #title><Icon icon="ep:bell-filled" />任务监听器</template>
+        <user-task-listeners :id="elementId" :type="elementType" />
+      </el-collapse-item>
+      <el-collapse-item name="extensions" key="extensions">
+        <template #title><Icon icon="ep:circle-plus-filled" />扩展属性</template>
+        <element-properties :id="elementId" :type="elementType" />
+      </el-collapse-item>
+      <el-collapse-item name="other" key="other">
+        <template #title><Icon icon="ep:promotion" />其他</template>
+        <element-other-config :id="elementId" />
+      </el-collapse-item>
+    </el-collapse>
+  </div>
+</template>
+<script lang="ts" setup>
+import ElementBaseInfo from './base/ElementBaseInfo.vue'
+import ElementOtherConfig from './other/ElementOtherConfig.vue'
+import ElementTask from './task/ElementTask.vue'
+import ElementMultiInstance from './multi-instance/ElementMultiInstance.vue'
+import FlowCondition from './flow-condition/FlowCondition.vue'
+import SignalAndMassage from './signal-message/SignalAndMessage.vue'
+import ElementListeners from './listeners/ElementListeners.vue'
+import ElementProperties from './properties/ElementProperties.vue'
+// import ElementForm from './form/ElementForm.vue'
+import UserTaskListeners from './listeners/UserTaskListeners.vue'
+
+defineOptions({ name: 'MyPropertiesPanel' })
+
+/**
+ * 侧边栏
+ * @Author MiyueFE
+ * @Home https://github.com/miyuesc
+ * @Date 2021年3月31日18:57:51
+ */
+const props = defineProps({
+  bpmnModeler: {
+    type: Object,
+    default: () => {}
+  },
+  prefix: {
+    type: String,
+    default: 'camunda'
+  },
+  width: {
+    type: Number,
+    default: 480
+  },
+  idEditDisabled: {
+    type: Boolean,
+    default: false
+  },
+  model: Object // 流程模型的数据
+})
+
+const activeTab = ref('base')
+const elementId = ref('')
+const elementType = ref('')
+const elementBusinessObject = ref<any>({}) // 元素 businessObject 镜像，提供给需要做判断的组件使用
+const conditionFormVisible = ref(false) // 流转条件设置
+const formVisible = ref(false) // 表单配置
+const bpmnElement = ref()
+
+provide('prefix', props.prefix)
+provide('width', props.width)
+const bpmnInstances = () => (window as any)?.bpmnInstances
+
+// 监听 props.bpmnModeler 然后 initModels
+const unwatchBpmn = watch(
+  () => props.bpmnModeler,
+  () => {
+    // 避免加载时 流程图 并未加载完成
+    if (!props.bpmnModeler) {
+      console.log('缺少props.bpmnModeler')
+      return
+    }
+
+    console.log('props.bpmnModeler 有值了！！！')
+    const w = window as any
+    w.bpmnInstances = {
+      modeler: props.bpmnModeler,
+      modeling: props.bpmnModeler.get('modeling'),
+      moddle: props.bpmnModeler.get('moddle'),
+      eventBus: props.bpmnModeler.get('eventBus'),
+      bpmnFactory: props.bpmnModeler.get('bpmnFactory'),
+      elementFactory: props.bpmnModeler.get('elementFactory'),
+      elementRegistry: props.bpmnModeler.get('elementRegistry'),
+      replace: props.bpmnModeler.get('replace'),
+      selection: props.bpmnModeler.get('selection')
+    }
+
+    console.log(bpmnInstances(), 'window.bpmnInstances')
+    getActiveElement()
+    unwatchBpmn()
+  },
+  {
+    immediate: true
+  }
+)
+
+const getActiveElement = () => {
+  // 初始第一个选中元素 bpmn:Process
+  initFormOnChanged(null)
+  props.bpmnModeler.on('import.done', (e) => {
+    console.log(e, 'eeeee')
+    initFormOnChanged(null)
+  })
+  // 监听选择事件，修改当前激活的元素以及表单
+  props.bpmnModeler.on('selection.changed', ({ newSelection }) => {
+    initFormOnChanged(newSelection[0] || null)
+  })
+  props.bpmnModeler.on('element.changed', ({ element }) => {
+    // 保证 修改 "默认流转路径" 类似需要修改多个元素的事件发生的时候，更新表单的元素与原选中元素不一致。
+    if (element && element.id === elementId.value) {
+      initFormOnChanged(element)
+    }
+  })
+}
+// 初始化数据
+const initFormOnChanged = (element) => {
+  let activatedElement = element
+  if (!activatedElement) {
+    activatedElement =
+      bpmnInstances().elementRegistry.find((el) => el.type === 'bpmn:Process') ??
+      bpmnInstances().elementRegistry.find((el) => el.type === 'bpmn:Collaboration')
+  }
+  if (!activatedElement) return
+  console.log(`
+              ----------
+      select element changed:
+                id:  ${activatedElement.id}
+              type:  ${activatedElement.businessObject.$type}
+              ----------
+              `)
+  console.log('businessObject: ', activatedElement.businessObject)
+  bpmnInstances().bpmnElement = activatedElement
+  bpmnElement.value = activatedElement
+  elementId.value = activatedElement.id
+  elementType.value = activatedElement.type.split(':')[1] || ''
+  elementBusinessObject.value = JSON.parse(JSON.stringify(activatedElement.businessObject))
+  conditionFormVisible.value = !!(
+    elementType.value === 'SequenceFlow' &&
+    activatedElement.source &&
+    activatedElement.source.type.indexOf('StartEvent') === -1
+  )
+  formVisible.value = elementType.value === 'UserTask' || elementType.value === 'StartEvent'
+}
+
+onBeforeUnmount(() => {
+  const w = window as any
+  w.bpmnInstances = null
+  console.log(props, 'props1')
+  console.log(props.bpmnModeler, 'props.bpmnModeler1')
+})
+
+watch(
+  () => elementId.value,
+  () => {
+    activeTab.value = 'base'
+  }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue b/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue
new file mode 100644
index 000000000..639c1cb2d
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="panel-tab__content">
+    <el-form label-width="90px" :model="needProps" :rules="rules">
+      <div v-if="needProps.type == 'bpmn:Process'">
+        <!-- 如果是 Process 信息的时候，使用自定义表单 -->
+        <el-link
+          href="https://doc.iocoder.cn/bpm/#_3-%E6%B5%81%E7%A8%8B%E5%9B%BE%E7%A4%BA%E4%BE%8B"
+          type="danger"
+          target="_blank"
+        >
+          如何实现实现会签、或签？
+        </el-link>
+        <el-form-item label="流程标识" prop="id">
+          <el-input
+            v-model="needProps.id"
+            placeholder="请输入流标标识"
+            :disabled="needProps.id !== undefined && needProps.id.length > 0"
+            @change="handleKeyUpdate"
+          />
+        </el-form-item>
+        <el-form-item label="流程名称" prop="name">
+          <el-input
+            v-model="needProps.name"
+            placeholder="请输入流程名称"
+            clearable
+            @change="handleNameUpdate"
+          />
+        </el-form-item>
+      </div>
+      <div v-else>
+        <el-form-item label="ID">
+          <el-input v-model="elementBaseInfo.id" clearable @change="updateBaseInfo('id')" />
+        </el-form-item>
+        <el-form-item label="名称">
+          <el-input v-model="elementBaseInfo.name" clearable @change="updateBaseInfo('name')" />
+        </el-form-item>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script lang="ts" setup>
+defineOptions({ name: 'ElementBaseInfo' })
+
+const props = defineProps({
+  businessObject: {
+    type: Object,
+    default: () => {}
+  },
+  model: {
+    type: Object,
+    default: () => {}
+  }
+})
+const needProps = ref<any>({})
+const bpmnElement = ref()
+const elementBaseInfo = ref<any>({})
+// 流程表单的下拉框的数据
+// const forms = ref([])
+// 流程模型的校验
+const rules = reactive({
+  id: [{ required: true, message: '流程标识不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '流程名称不能为空', trigger: 'blur' }]
+})
+
+const bpmnInstances = () => (window as any)?.bpmnInstances
+const resetBaseInfo = () => {
+  console.log(window, 'window')
+  console.log(bpmnElement.value, 'bpmnElement')
+
+  bpmnElement.value = bpmnInstances()?.bpmnElement
+  console.log(bpmnElement.value, 'resetBaseInfo11111111111')
+  elementBaseInfo.value = bpmnElement.value.businessObject
+  needProps.value['type'] = bpmnElement.value.businessObject.$type
+  // elementBaseInfo.value['typess'] = bpmnElement.value.businessObject.$type
+
+  // elementBaseInfo.value = JSON.parse(JSON.stringify(bpmnElement.value.businessObject))
+  console.log(elementBaseInfo.value, 'elementBaseInfo22222222222')
+}
+const handleKeyUpdate = (value) => {
+  // 校验 value 的值，只有 XML NCName 通过的情况下，才进行赋值。否则，会导致流程图报错，无法绘制的问题
+  if (!value) {
+    return
+  }
+  if (!value.match(/[a-zA-Z_][\-_.0-9a-zA-Z$]*/)) {
+    console.log('key 不满足 XML NCName 规则，所以不进行赋值')
+    return
+  }
+  console.log('key 满足 XML NCName 规则，所以进行赋值')
+
+  // 在 BPMN 的 XML 中，流程标识 key，其实对应的是 id 节点
+  elementBaseInfo.value['id'] = value
+
+  setTimeout(() => {
+    updateBaseInfo('id')
+  }, 100)
+}
+const handleNameUpdate = (value) => {
+  console.log(elementBaseInfo, 'elementBaseInfo')
+  if (!value) {
+    return
+  }
+  elementBaseInfo.value['name'] = value
+
+  setTimeout(() => {
+    updateBaseInfo('name')
+  }, 100)
+}
+// const handleDescriptionUpdate=(value)=> {
+// TODO 芋艿：documentation 暂时无法修改，后续在看看
+// this.elementBaseInfo['documentation'] = value;
+// this.updateBaseInfo('documentation');
+// }
+const updateBaseInfo = (key) => {
+  console.log(key, 'key')
+  // 触发 elementBaseInfo 对应的字段
+  const attrObj = Object.create(null)
+  // console.log(attrObj, 'attrObj')
+  attrObj[key] = elementBaseInfo.value[key]
+  // console.log(attrObj, 'attrObj111')
+  // const attrObj = {
+  //   id: elementBaseInfo.value[key]
+  //   // di: { id: `${elementBaseInfo.value[key]}_di` }
+  // }
+  console.log(elementBaseInfo, 'elementBaseInfo11111111111')
+  needProps.value = { ...elementBaseInfo.value, ...needProps.value }
+
+  if (key === 'id') {
+    console.log('jinru')
+    console.log(window, 'window')
+    console.log(bpmnElement.value, 'bpmnElement')
+    console.log(toRaw(bpmnElement.value), 'bpmnElement')
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+      id: elementBaseInfo.value[key],
+      di: { id: `${elementBaseInfo.value[key]}_di` }
+    })
+  } else {
+    console.log(attrObj, 'attrObj')
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), attrObj)
+  }
+}
+onMounted(() => {
+  // 针对上传的 bpmn 流程图时，需要延迟 1 秒的时间，保证 key 和 name 的更新
+  setTimeout(() => {
+    console.log(props.model, 'props.model')
+    handleKeyUpdate(props.model.key)
+    handleNameUpdate(props.model.name)
+    console.log(props, 'propsssssssssssssssssssss')
+  }, 1000)
+})
+
+watch(
+  () => props.businessObject,
+  (val) => {
+    console.log(val, 'val11111111111111111111')
+    if (val) {
+      // nextTick(() => {
+      resetBaseInfo()
+      // })
+    }
+  }
+)
+// watch(
+//   () => ({ ...props }),
+//   (oldVal, newVal) => {
+//     console.log(oldVal, 'oldVal')
+//     console.log(newVal, 'newVal')
+//     if (newVal) {
+//       needProps.value = newVal
+//     }
+//   },
+//   {
+//     immediate: true
+//   }
+// )
+// 'model.key': {
+//   immediate: false,
+//   handler: function (val) {
+//     this.handleKeyUpdate(val)
+//   }
+// }
+onBeforeUnmount(() => {
+  bpmnElement.value = null
+})
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue b/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
new file mode 100644
index 000000000..345670ae2
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
@@ -0,0 +1,191 @@
+<template>
+  <div class="panel-tab__content">
+    <el-form :model="flowConditionForm" label-width="90px" size="small">
+      <el-form-item label="流转类型">
+        <el-select v-model="flowConditionForm.type" @change="updateFlowType">
+          <el-option label="普通流转路径" value="normal" />
+          <el-option label="默认流转路径" value="default" />
+          <el-option label="条件流转路径" value="condition" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="条件格式" v-if="flowConditionForm.type === 'condition'" key="condition">
+        <el-select v-model="flowConditionForm.conditionType">
+          <el-option label="表达式" value="expression" />
+          <el-option label="脚本" value="script" />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="表达式"
+        v-if="flowConditionForm.conditionType && flowConditionForm.conditionType === 'expression'"
+        key="express"
+      >
+        <el-input
+          v-model="flowConditionForm.body"
+          style="width: 192px"
+          clearable
+          @change="updateFlowCondition"
+        />
+      </el-form-item>
+      <template
+        v-if="flowConditionForm.conditionType && flowConditionForm.conditionType === 'script'"
+      >
+        <el-form-item label="脚本语言" key="language">
+          <el-input v-model="flowConditionForm.language" clearable @change="updateFlowCondition" />
+        </el-form-item>
+        <el-form-item label="脚本类型" key="scriptType">
+          <el-select v-model="flowConditionForm.scriptType">
+            <el-option label="内联脚本" value="inlineScript" />
+            <el-option label="外部脚本" value="externalScript" />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label="脚本"
+          v-if="flowConditionForm.scriptType === 'inlineScript'"
+          key="body"
+        >
+          <el-input
+            v-model="flowConditionForm.body"
+            type="textarea"
+            clearable
+            @change="updateFlowCondition"
+          />
+        </el-form-item>
+        <el-form-item
+          label="资源地址"
+          v-if="flowConditionForm.scriptType === 'externalScript'"
+          key="resource"
+        >
+          <el-input v-model="flowConditionForm.resource" clearable @change="updateFlowCondition" />
+        </el-form-item>
+      </template>
+    </el-form>
+  </div>
+</template>
+
+<script lang="ts" setup>
+defineOptions({ name: 'FlowCondition' })
+
+const props = defineProps({
+  businessObject: Object,
+  type: String
+})
+const flowConditionForm = ref<any>({})
+const bpmnElement = ref()
+const bpmnElementSource = ref()
+const bpmnElementSourceRef = ref()
+const flowConditionRef = ref()
+const bpmnInstances = () => (window as any)?.bpmnInstances
+const resetFlowCondition = () => {
+  bpmnElement.value = bpmnInstances().bpmnElement
+  bpmnElementSource.value = bpmnElement.value.source
+  bpmnElementSourceRef.value = bpmnElement.value.businessObject.sourceRef
+  if (
+    bpmnElementSourceRef.value &&
+    bpmnElementSourceRef.value.default &&
+    bpmnElementSourceRef.value.default.id === bpmnElement.value.id &&
+    flowConditionForm.value.type == 'default'
+  ) {
+    // 默认
+    flowConditionForm.value = { type: 'default' }
+  } else if (!bpmnElement.value.businessObject.conditionExpression) {
+    // 普通
+    flowConditionForm.value = { type: 'normal' }
+  } else {
+    // 带条件
+    const conditionExpression = bpmnElement.value.businessObject.conditionExpression
+    flowConditionForm.value = { ...conditionExpression, type: 'condition' }
+    // resource 可直接标识 是否是外部资源脚本
+    if (flowConditionForm.value.resource) {
+      // this.$set(this.flowConditionForm, "conditionType", "script");
+      // this.$set(this.flowConditionForm, "scriptType", "externalScript");
+      flowConditionForm.value['conditionType'] = 'script'
+      flowConditionForm.value['scriptType'] = 'externalScript'
+      return
+    }
+    if (conditionExpression.language) {
+      // this.$set(this.flowConditionForm, "conditionType", "script");
+      // this.$set(this.flowConditionForm, "scriptType", "inlineScript");
+      flowConditionForm.value['conditionType'] = 'script'
+      flowConditionForm.value['scriptType'] = 'inlineScript'
+
+      return
+    }
+    // this.$set(this.flowConditionForm, "conditionType", "expression");
+    flowConditionForm.value['conditionType'] = 'expression'
+  }
+}
+const updateFlowType = (flowType) => {
+  // 正常条件类
+  if (flowType === 'condition') {
+    flowConditionRef.value = bpmnInstances().moddle.create('bpmn:FormalExpression')
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+      conditionExpression: flowConditionRef.value
+    })
+    return
+  }
+  // 默认路径
+  if (flowType === 'default') {
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+      conditionExpression: null
+    })
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElementSource.value), {
+      default: bpmnElement.value
+    })
+    return
+  }
+  // 正常路径，如果来源节点的默认路径是当前连线时，清除父元素的默认路径配置
+  if (
+    bpmnElementSourceRef.value.default &&
+    bpmnElementSourceRef.value.default.id === bpmnElement.value.id
+  ) {
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElementSource.value), {
+      default: null
+    })
+  }
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+    conditionExpression: null
+  })
+}
+const updateFlowCondition = () => {
+  let { conditionType, scriptType, body, resource, language } = flowConditionForm.value
+  let condition
+  if (conditionType === 'expression') {
+    condition = bpmnInstances().moddle.create('bpmn:FormalExpression', { body })
+  } else {
+    if (scriptType === 'inlineScript') {
+      condition = bpmnInstances().moddle.create('bpmn:FormalExpression', { body, language })
+      // this.$set(this.flowConditionForm, "resource", "");
+      flowConditionForm.value['resource'] = ''
+    } else {
+      // this.$set(this.flowConditionForm, "body", "");
+      flowConditionForm.value['body'] = ''
+      condition = bpmnInstances().moddle.create('bpmn:FormalExpression', {
+        resource,
+        language
+      })
+    }
+  }
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+    conditionExpression: condition
+  })
+}
+
+onBeforeUnmount(() => {
+  bpmnElement.value = null
+  bpmnElementSource.value = null
+  bpmnElementSourceRef.value = null
+})
+
+watch(
+  () => props.businessObject,
+  (val) => {
+    console.log(val, 'val')
+    nextTick(() => {
+      resetFlowCondition()
+    })
+  },
+  {
+    immediate: true
+  }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue b/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
new file mode 100644
index 000000000..da1d1ae9c
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
@@ -0,0 +1,465 @@
+<template>
+  <div class="panel-tab__content">
+    <el-form label-width="80px">
+      <el-form-item label="表单标识">
+        <el-input v-model="formKey" clearable @change="updateElementFormKey" />
+      </el-form-item>
+      <el-form-item label="业务标识">
+        <el-select v-model="businessKey" @change="updateElementBusinessKey">
+          <el-option v-for="i in fieldList" :key="i.id" :value="i.id" :label="i.label" />
+          <el-option label="无" value="" />
+        </el-select>
+      </el-form-item>
+    </el-form>
+
+    <!--字段列表-->
+    <div class="element-property list-property">
+      <el-divider><Icon icon="ep:coin" /> 表单字段</el-divider>
+      <el-table :data="fieldList" max-height="240" fit border>
+        <el-table-column label="序号" type="index" width="50px" />
+        <el-table-column label="字段名称" prop="label" min-width="80px" show-overflow-tooltip />
+        <el-table-column
+          label="字段类型"
+          prop="type"
+          min-width="80px"
+          :formatter="(row) => fieldType[row.type] || row.type"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="默认值"
+          prop="defaultValue"
+          min-width="80px"
+          show-overflow-tooltip
+        />
+        <el-table-column label="操作" width="90px">
+          <template #default="scope">
+            <el-button type="primary" link @click="openFieldForm(scope, scope.$index)"
+              >编辑</el-button
+            >
+            <el-divider direction="vertical" />
+            <el-button
+              type="primary"
+              link
+              style="color: #ff4d4f"
+              @click="removeField(scope, scope.$index)"
+              >移除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="element-drawer__button">
+      <XButton type="primary" proIcon="ep:plus" title="添加字段" @click="openFieldForm(null, -1)" />
+    </div>
+
+    <!--字段配置侧边栏-->
+    <el-drawer
+      v-model="fieldModelVisible"
+      title="字段配置"
+      :size="`${width}px`"
+      append-to-body
+      destroy-on-close
+    >
+      <el-form :model="formFieldForm" label-width="90px">
+        <el-form-item label="字段ID">
+          <el-input v-model="formFieldForm.id" clearable />
+        </el-form-item>
+        <el-form-item label="类型">
+          <el-select
+            v-model="formFieldForm.typeType"
+            placeholder="请选择字段类型"
+            clearable
+            @change="changeFieldTypeType"
+          >
+            <el-option v-for="(value, key) of fieldType" :label="value" :value="key" :key="key" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类型名称" v-if="formFieldForm.typeType === 'custom'">
+          <el-input v-model="formFieldForm.type" clearable />
+        </el-form-item>
+        <el-form-item label="名称">
+          <el-input v-model="formFieldForm.label" clearable />
+        </el-form-item>
+        <el-form-item label="时间格式" v-if="formFieldForm.typeType === 'date'">
+          <el-input v-model="formFieldForm.datePattern" clearable />
+        </el-form-item>
+        <el-form-item label="默认值">
+          <el-input v-model="formFieldForm.defaultValue" clearable />
+        </el-form-item>
+      </el-form>
+
+      <!-- 枚举值设置 -->
+      <template v-if="formFieldForm.type === 'enum'">
+        <el-divider key="enum-divider" />
+        <p class="listener-filed__title" key="enum-title">
+          <span><Icon icon="ep:menu" />枚举值列表：</span>
+          <el-button type="primary" @click="openFieldOptionForm(null, -1, 'enum')"
+            >添加枚举值</el-button
+          >
+        </p>
+        <el-table :data="fieldEnumList" key="enum-table" max-height="240" fit border>
+          <el-table-column label="序号" width="50px" type="index" />
+          <el-table-column label="枚举值编号" prop="id" min-width="100px" show-overflow-tooltip />
+          <el-table-column label="枚举值名称" prop="name" min-width="100px" show-overflow-tooltip />
+          <el-table-column label="操作" width="90px">
+            <template #default="scope">
+              <el-button
+                type="primary"
+                link
+                @click="openFieldOptionForm(scope, scope.$index, 'enum')"
+                >编辑</el-button
+              >
+              <el-divider direction="vertical" />
+              <el-button
+                type="primary"
+                link
+                style="color: #ff4d4f"
+                @click="removeFieldOptionItem(scope, scope.$index, 'enum')"
+                >移除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </template>
+
+      <!-- 校验规则 -->
+      <el-divider key="validation-divider" />
+      <p class="listener-filed__title" key="validation-title">
+        <span><Icon icon="ep:menu" />约束条件列表：</span>
+        <el-button type="primary" @click="openFieldOptionForm(null, -1, 'constraint')"
+          >添加约束</el-button
+        >
+      </p>
+      <el-table :data="fieldConstraintsList" key="validation-table" max-height="240" fit border>
+        <el-table-column label="序号" width="50px" type="index" />
+        <el-table-column label="约束名称" prop="name" min-width="100px" show-overflow-tooltip />
+        <el-table-column label="约束配置" prop="config" min-width="100px" show-overflow-tooltip />
+        <el-table-column label="操作" width="90px">
+          <template #default="scope">
+            <el-button
+              type="primary"
+              link
+              @click="openFieldOptionForm(scope, scope.$index, 'constraint')"
+              >编辑</el-button
+            >
+            <el-divider direction="vertical" />
+            <el-button
+              type="primary"
+              link
+              style="color: #ff4d4f"
+              @click="removeFieldOptionItem(scope, scope.$index, 'constraint')"
+              >移除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 表单属性 -->
+      <el-divider key="property-divider" />
+      <p class="listener-filed__title" key="property-title">
+        <span><Icon icon="ep:menu" />字段属性列表：</span>
+        <el-button type="primary" @click="openFieldOptionForm(null, -1, 'property')"
+          >添加属性</el-button
+        >
+      </p>
+      <el-table :data="fieldPropertiesList" key="property-table" max-height="240" fit border>
+        <el-table-column label="序号" width="50px" type="index" />
+        <el-table-column label="属性编号" prop="id" min-width="100px" show-overflow-tooltip />
+        <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />
+        <el-table-column label="操作" width="90px">
+          <template #default="scope">
+            <el-button
+              type="primary"
+              link
+              @click="openFieldOptionForm(scope, scope.$index, 'property')"
+              >编辑</el-button
+            >
+            <el-divider direction="vertical" />
+            <el-button
+              type="primary"
+              link
+              style="color: #ff4d4f"
+              @click="removeFieldOptionItem(scope, scope.$index, 'property')"
+              >移除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 底部按钮 -->
+      <div class="element-drawer__button">
+        <el-button>取 消</el-button>
+        <el-button type="primary" @click="saveField">保 存</el-button>
+      </div>
+    </el-drawer>
+
+    <el-dialog
+      v-model="fieldOptionModelVisible"
+      :title="optionModelTitle"
+      width="600px"
+      append-to-body
+      destroy-on-close
+    >
+      <el-form :model="fieldOptionForm" label-width="96px">
+        <el-form-item label="编号/ID" v-if="fieldOptionType !== 'constraint'" key="option-id">
+          <el-input v-model="fieldOptionForm.id" clearable />
+        </el-form-item>
+        <el-form-item label="名称" v-if="fieldOptionType !== 'property'" key="option-name">
+          <el-input v-model="fieldOptionForm.name" clearable />
+        </el-form-item>
+        <el-form-item label="配置" v-if="fieldOptionType === 'constraint'" key="option-config">
+          <el-input v-model="fieldOptionForm.config" clearable />
+        </el-form-item>
+        <el-form-item label="值" v-if="fieldOptionType === 'property'" key="option-value">
+          <el-input v-model="fieldOptionForm.value" clearable />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="fieldOptionModelVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveFieldOption">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script lang="ts" setup>
+defineOptions({ name: 'ElementForm' })
+
+const props = defineProps({
+  id: String,
+  type: String
+})
+const prefix = inject('prefix')
+const width = inject('width')
+
+const formKey = ref('')
+const businessKey = ref('')
+const optionModelTitle = ref('')
+const fieldList = ref<any[]>([])
+const formFieldForm = ref<any>({})
+const fieldType = ref({
+  long: '长整型',
+  string: '字符串',
+  boolean: '布尔类',
+  date: '日期类',
+  enum: '枚举类',
+  custom: '自定义类型'
+})
+const formFieldIndex = ref(-1) // 编辑中的字段， -1 为新增
+const formFieldOptionIndex = ref(-1) // 编辑中的字段配置项， -1 为新增
+const fieldModelVisible = ref(false)
+const fieldOptionModelVisible = ref(false)
+const fieldOptionForm = ref<any>({}) // 当前激活的字段配置项数据
+const fieldOptionType = ref('') // 当前激活的字段配置项弹窗 类型
+const fieldEnumList = ref<any[]>([]) // 枚举值列表
+const fieldConstraintsList = ref<any[]>([]) // 约束条件列表
+const fieldPropertiesList = ref<any[]>([]) // 绑定属性列表
+const bpmnELement = ref()
+const elExtensionElements = ref()
+const formData = ref()
+const otherExtensions = ref()
+
+const bpmnInstances = () => (window as any)?.bpmnInstances
+const resetFormList = () => {
+  bpmnELement.value = bpmnInstances().bpmnElement
+  formKey.value = bpmnELement.value.businessObject.formKey
+  // 获取元素扩展属性 或者 创建扩展属性
+  elExtensionElements.value =
+    bpmnELement.value.businessObject.get('extensionElements') ||
+    bpmnInstances().moddle.create('bpmn:ExtensionElements', { values: [] })
+  // 获取元素表单配置 或者 创建新的表单配置
+  formData.value =
+    elExtensionElements.value.values.filter((ex) => ex.$type === `${prefix}:FormData`)?.[0] ||
+    bpmnInstances().moddle.create(`${prefix}:FormData`, { fields: [] })
+
+  // 业务标识 businessKey， 绑定在 formData 中
+  businessKey.value = formData.value.businessKey
+
+  // 保留剩余扩展元素，便于后面更新该元素对应属性
+  otherExtensions.value = elExtensionElements.value.values.filter(
+    (ex) => ex.$type !== `${prefix}:FormData`
+  )
+
+  // 复制原始值，填充表格
+  fieldList.value = JSON.parse(JSON.stringify(formData.value.fields || []))
+
+  // 更新元素扩展属性，避免后续报错
+  updateElementExtensions()
+}
+const updateElementFormKey = () => {
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnELement.value), {
+    formKey: formKey.value
+  })
+}
+const updateElementBusinessKey = () => {
+  bpmnInstances().modeling.updateModdleProperties(toRaw(bpmnELement.value), formData.value, {
+    businessKey: businessKey.value
+  })
+}
+// 根据类型调整字段type
+const changeFieldTypeType = (type) => {
+  // this.$set(this.formFieldForm, "type", type === "custom" ? "" : type);
+  formFieldForm.value['type'] = type === 'custom' ? '' : type
+}
+
+// 打开字段详情侧边栏
+const openFieldForm = (field, index) => {
+  formFieldIndex.value = index
+  if (index !== -1) {
+    const FieldObject = formData.value.fields[index]
+    formFieldForm.value = JSON.parse(JSON.stringify(field))
+    // 设置自定义类型
+    // this.$set(this.formFieldForm, "typeType", !this.fieldType[field.type] ? "custom" : field.type);
+    formFieldForm.value['typeType'] = !fieldType.value[field.type] ? 'custom' : field.type
+    // 初始化枚举值列表
+    field.type === 'enum' &&
+      (fieldEnumList.value = JSON.parse(JSON.stringify(FieldObject?.values || [])))
+    // 初始化约束条件列表
+    fieldConstraintsList.value = JSON.parse(
+      JSON.stringify(FieldObject?.validation?.constraints || [])
+    )
+    // 初始化自定义属性列表
+    fieldPropertiesList.value = JSON.parse(JSON.stringify(FieldObject?.properties?.values || []))
+  } else {
+    formFieldForm.value = {}
+    // 初始化枚举值列表
+    fieldEnumList.value = []
+    // 初始化约束条件列表
+    fieldConstraintsList.value = []
+    // 初始化自定义属性列表
+    fieldPropertiesList.value = []
+  }
+  fieldModelVisible.value = true
+}
+// 打开字段 某个 配置项 弹窗
+const openFieldOptionForm = (option, index, type) => {
+  fieldOptionModelVisible.value = true
+  fieldOptionType.value = type
+  formFieldOptionIndex.value = index
+  if (type === 'property') {
+    fieldOptionForm.value = option ? JSON.parse(JSON.stringify(option)) : {}
+    return (optionModelTitle.value = '属性配置')
+  }
+  if (type === 'enum') {
+    fieldOptionForm.value = option ? JSON.parse(JSON.stringify(option)) : {}
+    return (optionModelTitle.value = '枚举值配置')
+  }
+  fieldOptionForm.value = option ? JSON.parse(JSON.stringify(option)) : {}
+  return (optionModelTitle.value = '约束条件配置')
+}
+
+// 保存字段 某个 配置项
+const saveFieldOption = () => {
+  if (formFieldOptionIndex.value === -1) {
+    if (fieldOptionType.value === 'property') {
+      fieldPropertiesList.value.push(fieldOptionForm.value)
+    }
+    if (fieldOptionType.value === 'constraint') {
+      fieldConstraintsList.value.push(fieldOptionForm.value)
+    }
+    if (fieldOptionType.value === 'enum') {
+      fieldEnumList.value.push(fieldOptionForm.value)
+    }
+  } else {
+    fieldOptionType.value === 'property' &&
+      fieldPropertiesList.value.splice(formFieldOptionIndex.value, 1, fieldOptionForm.value)
+    fieldOptionType.value === 'constraint' &&
+      fieldConstraintsList.value.splice(formFieldOptionIndex.value, 1, fieldOptionForm.value)
+    fieldOptionType.value === 'enum' &&
+      fieldEnumList.value.splice(formFieldOptionIndex.value, 1, fieldOptionForm.value)
+  }
+  fieldOptionModelVisible.value = false
+  fieldOptionForm.value = {}
+}
+// 保存字段配置
+const saveField = () => {
+  const { id, type, label, defaultValue, datePattern } = formFieldForm.value
+  const Field = bpmnInstances().moddle.create(`${prefix}:FormField`, { id, type, label })
+  defaultValue && (Field.defaultValue = defaultValue)
+  datePattern && (Field.datePattern = datePattern)
+  // 构建属性
+  if (fieldPropertiesList.value && fieldPropertiesList.value.length) {
+    const fieldPropertyList = fieldPropertiesList.value.map((fp) => {
+      return bpmnInstances().moddle.create(`${prefix}:Property`, {
+        id: fp.id,
+        value: fp.value
+      })
+    })
+    Field.properties = bpmnInstances().moddle.create(`${prefix}:Properties`, {
+      values: fieldPropertyList
+    })
+  }
+  // 构建校验规则
+  if (fieldConstraintsList.value && fieldConstraintsList.value.length) {
+    const fieldConstraintList = fieldConstraintsList.value.map((fc) => {
+      return bpmnInstances().moddle.create(`${prefix}:Constraint`, {
+        name: fc.name,
+        config: fc.config
+      })
+    })
+    Field.validation = bpmnInstances().moddle.create(`${prefix}:Validation`, {
+      constraints: fieldConstraintList
+    })
+  }
+  // 构建枚举值
+  if (fieldEnumList.value && fieldEnumList.value.length) {
+    Field.values = fieldEnumList.value.map((fe) => {
+      return bpmnInstances().moddle.create(`${prefix}:Value`, { name: fe.name, id: fe.id })
+    })
+  }
+  // 更新数组 与 表单配置实例
+  if (formFieldIndex.value === -1) {
+    fieldList.value.push(formFieldForm.value)
+    formData.value.fields.push(Field)
+  } else {
+    fieldList.value.splice(formFieldIndex.value, 1, formFieldForm.value)
+    formData.value.fields.splice(formFieldIndex.value, 1, Field)
+  }
+  updateElementExtensions()
+  fieldModelVisible.value = false
+}
+
+// 移除某个 字段的 配置项
+const removeFieldOptionItem = (option, index, type) => {
+  console.log(option, 'option')
+  if (type === 'property') {
+    fieldPropertiesList.value.splice(index, 1)
+    return
+  }
+  if (type === 'enum') {
+    fieldEnumList.value.splice(index, 1)
+    return
+  }
+  fieldConstraintsList.value.splice(index, 1)
+}
+// 移除 字段
+const removeField = (field, index) => {
+  console.log(field, 'field')
+  fieldList.value.splice(index, 1)
+  formData.value.fields.splice(index, 1)
+  updateElementExtensions()
+}
+
+const updateElementExtensions = () => {
+  // 更新回扩展元素
+  const newElExtensionElements = bpmnInstances().moddle.create(`bpmn:ExtensionElements`, {
+    values: otherExtensions.value.concat(formData.value)
+  })
+  // 更新到元素上
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnELement.value), {
+    extensionElements: newElExtensionElements
+  })
+}
+
+watch(
+  () => props.id,
+  (val) => {
+    val &&
+      val.length &&
+      nextTick(() => {
+        resetFormList()
+      })
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/index.js b/src/components/bpmnProcessDesigner/package/penal/index.js
new file mode 100644
index 000000000..7fa561708
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/index.js
@@ -0,0 +1,7 @@
+import MyPropertiesPanel from './PropertiesPanel.vue'
+
+MyPropertiesPanel.install = function (Vue) {
+  Vue.component(MyPropertiesPanel.name, MyPropertiesPanel)
+}
+
+export default MyPropertiesPanel
diff --git a/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue b/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
new file mode 100644
index 000000000..45ee8f93a
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
@@ -0,0 +1,403 @@
+<template>
+  <div class="panel-tab__content">
+    <el-table :data="elementListenersList" size="small" border>
+      <el-table-column label="序号" width="50px" type="index" />
+      <el-table-column label="事件类型" min-width="100px" prop="event" />
+      <el-table-column
+        label="监听器类型"
+        min-width="100px"
+        show-overflow-tooltip
+        :formatter="(row) => listenerTypeObject[row.listenerType]"
+      />
+      <el-table-column label="操作" width="100px">
+        <template #default="scope">
+          <el-button size="small" link @click="openListenerForm(scope.row, scope.$index)"
+            >编辑</el-button
+          >
+          <el-divider direction="vertical" />
+          <el-button size="small" link style="color: #ff4d4f" @click="removeListener(scope.$index)"
+            >移除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="element-drawer__button">
+      <XButton
+        type="primary"
+        preIcon="ep:plus"
+        title="添加监听器"
+        @click="openListenerForm(null)"
+      />
+    </div>
+
+    <!-- 监听器 编辑/创建 部分 -->
+    <el-drawer
+      v-model="listenerFormModelVisible"
+      title="执行监听器"
+      :size="`${width}px`"
+      append-to-body
+      destroy-on-close
+    >
+      <el-form :model="listenerForm" label-width="96px" ref="listenerFormRef">
+        <el-form-item
+          label="事件类型"
+          prop="event"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-select v-model="listenerForm.event">
+            <el-option label="start" value="start" />
+            <el-option label="end" value="end" />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label="监听器类型"
+          prop="listenerType"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-select v-model="listenerForm.listenerType">
+            <el-option
+              v-for="i in Object.keys(listenerTypeObject)"
+              :key="i"
+              :label="listenerTypeObject[i]"
+              :value="i"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'classListener'"
+          label="Java类"
+          prop="class"
+          key="listener-class"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.class" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'expressionListener'"
+          label="表达式"
+          prop="expression"
+          key="listener-expression"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.expression" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'delegateExpressionListener'"
+          label="代理表达式"
+          prop="delegateExpression"
+          key="listener-delegate"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.delegateExpression" clearable />
+        </el-form-item>
+        <template v-if="listenerForm.listenerType === 'scriptListener'">
+          <el-form-item
+            label="脚本格式"
+            prop="scriptFormat"
+            key="listener-script-format"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本格式' }"
+          >
+            <el-input v-model="listenerForm.scriptFormat" clearable />
+          </el-form-item>
+          <el-form-item
+            label="脚本类型"
+            prop="scriptType"
+            key="listener-script-type"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请选择脚本类型' }"
+          >
+            <el-select v-model="listenerForm.scriptType">
+              <el-option label="内联脚本" value="inlineScript" />
+              <el-option label="外部脚本" value="externalScript" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="listenerForm.scriptType === 'inlineScript'"
+            label="脚本内容"
+            prop="value"
+            key="listener-script"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本内容' }"
+          >
+            <el-input v-model="listenerForm.value" clearable />
+          </el-form-item>
+          <el-form-item
+            v-if="listenerForm.scriptType === 'externalScript'"
+            label="资源地址"
+            prop="resource"
+            key="listener-resource"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写资源地址' }"
+          >
+            <el-input v-model="listenerForm.resource" clearable />
+          </el-form-item>
+        </template>
+      </el-form>
+      <el-divider />
+      <p class="listener-filed__title">
+        <span><Icon icon="ep:menu" />注入字段：</span>
+        <XButton type="primary" @click="openListenerFieldForm(null)" title="添加字段" />
+      </p>
+      <el-table
+        :data="fieldsListOfListener"
+        size="small"
+        max-height="240"
+        fit
+        border
+        style="flex: none"
+      >
+        <el-table-column label="序号" width="50px" type="index" />
+        <el-table-column label="字段名称" min-width="100px" prop="name" />
+        <el-table-column
+          label="字段类型"
+          min-width="80px"
+          show-overflow-tooltip
+          :formatter="(row) => fieldTypeObject[row.fieldType]"
+        />
+        <el-table-column
+          label="字段值/表达式"
+          min-width="100px"
+          show-overflow-tooltip
+          :formatter="(row) => row.string || row.expression"
+        />
+        <el-table-column label="操作" width="130px">
+          <template #default="scope">
+            <el-button size="small" link @click="openListenerFieldForm(scope.row, scope.$index)"
+              >编辑</el-button
+            >
+            <el-divider direction="vertical" />
+            <el-button
+              size="small"
+              link
+              style="color: #ff4d4f"
+              @click="removeListenerField(scope.$index)"
+              >移除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="element-drawer__button">
+        <el-button @click="listenerFormModelVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveListenerConfig">保 存</el-button>
+      </div>
+    </el-drawer>
+
+    <!-- 注入西段 编辑/创建 部分 -->
+    <el-dialog
+      title="字段配置"
+      v-model="listenerFieldFormModelVisible"
+      width="600px"
+      append-to-body
+      destroy-on-close
+    >
+      <el-form
+        :model="listenerFieldForm"
+        label-width="96spx"
+        ref="listenerFieldFormRef"
+        style="height: 136px"
+      >
+        <el-form-item
+          label="字段名称："
+          prop="name"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.name" clearable />
+        </el-form-item>
+        <el-form-item
+          label="字段类型："
+          prop="fieldType"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-select v-model="listenerFieldForm.fieldType">
+            <el-option
+              v-for="i in Object.keys(fieldTypeObject)"
+              :key="i"
+              :label="fieldTypeObject[i]"
+              :value="i"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="listenerFieldForm.fieldType === 'string'"
+          label="字段值："
+          prop="string"
+          key="field-string"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.string" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerFieldForm.fieldType === 'expression'"
+          label="表达式："
+          prop="expression"
+          key="field-expression"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.expression" clearable />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button size="small" @click="listenerFieldFormModelVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="saveListenerFiled">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts" setup>
+import { ElMessageBox } from 'element-plus'
+import { createListenerObject, updateElementExtensions } from '../../utils'
+import { initListenerType, initListenerForm, listenerType, fieldType } from './utilSelf'
+
+defineOptions({ name: 'ElementListeners' })
+
+const props = defineProps({
+  id: String,
+  type: String
+})
+const prefix = inject('prefix')
+const width = inject('width')
+const elementListenersList = ref<any[]>([]) // 监听器列表
+const listenerForm = ref<any>({}) // 监听器详情表单
+const listenerFormModelVisible = ref(false) // 监听器 编辑 侧边栏显示状态
+const fieldsListOfListener = ref<any[]>([])
+const listenerFieldForm = ref<any>({}) // 监听器 注入字段 详情表单
+const listenerFieldFormModelVisible = ref(false) // 监听器 注入字段表单弹窗 显示状态
+const editingListenerIndex = ref(-1) // 监听器所在下标，-1 为新增
+const editingListenerFieldIndex = ref(-1) // 字段所在下标，-1 为新增
+const listenerTypeObject = ref(listenerType)
+const fieldTypeObject = ref(fieldType)
+const bpmnElement = ref()
+const otherExtensionList = ref()
+const bpmnElementListeners = ref()
+const listenerFormRef = ref()
+const listenerFieldFormRef = ref()
+const bpmnInstances = () => (window as any)?.bpmnInstances
+
+const resetListenersList = () => {
+  bpmnElement.value = bpmnInstances().bpmnElement
+  otherExtensionList.value = []
+  bpmnElementListeners.value =
+    bpmnElement.value.businessObject?.extensionElements?.values?.filter(
+      (ex) => ex.$type === `${prefix}:ExecutionListener`
+    ) ?? []
+  elementListenersList.value = bpmnElementListeners.value.map((listener) =>
+    initListenerType(listener)
+  )
+}
+// 打开 监听器详情 侧边栏
+const openListenerForm = (listener, index?) => {
+  if (listener) {
+    listenerForm.value = initListenerForm(listener)
+    editingListenerIndex.value = index
+  } else {
+    listenerForm.value = {}
+    editingListenerIndex.value = -1 // 标记为新增
+  }
+  if (listener && listener.fields) {
+    fieldsListOfListener.value = listener.fields.map((field) => ({
+      ...field,
+      fieldType: field.string ? 'string' : 'expression'
+    }))
+  } else {
+    fieldsListOfListener.value = []
+    listenerForm.value['fields'] = []
+  }
+  // 打开侧边栏并清楚验证状态
+  listenerFormModelVisible.value = true
+  nextTick(() => {
+    if (listenerFormRef.value) {
+      listenerFormRef.value.clearValidate()
+    }
+  })
+}
+// 打开监听器字段编辑弹窗
+const openListenerFieldForm = (field, index?) => {
+  listenerFieldForm.value = field ? JSON.parse(JSON.stringify(field)) : {}
+  editingListenerFieldIndex.value = field ? index : -1
+  listenerFieldFormModelVisible.value = true
+  nextTick(() => {
+    if (listenerFieldFormRef.value) {
+      listenerFieldFormRef.value.clearValidate()
+    }
+  })
+}
+// 保存监听器注入字段
+const saveListenerFiled = async () => {
+  let validateStatus = await listenerFieldFormRef.value.validate()
+  if (!validateStatus) return // 验证不通过直接返回
+  if (editingListenerFieldIndex.value === -1) {
+    fieldsListOfListener.value.push(listenerFieldForm.value)
+    listenerForm.value.fields.push(listenerFieldForm.value)
+  } else {
+    fieldsListOfListener.value.splice(editingListenerFieldIndex.value, 1, listenerFieldForm.value)
+    listenerForm.value.fields.splice(editingListenerFieldIndex.value, 1, listenerFieldForm.value)
+  }
+  listenerFieldFormModelVisible.value = false
+  nextTick(() => {
+    listenerFieldForm.value = {}
+  })
+}
+// 移除监听器字段
+const removeListenerField = (index) => {
+  ElMessageBox.confirm('确认移除该字段吗？', '提示', {
+    confirmButtonText: '确 认',
+    cancelButtonText: '取 消'
+  })
+    .then(() => {
+      fieldsListOfListener.value.splice(index, 1)
+      listenerForm.value.fields.splice(index, 1)
+    })
+    .catch(() => console.info('操作取消'))
+}
+// 移除监听器
+const removeListener = (index) => {
+  ElMessageBox.confirm('确认移除该监听器吗？', '提示', {
+    confirmButtonText: '确 认',
+    cancelButtonText: '取 消'
+  })
+    .then(() => {
+      bpmnElementListeners.value.splice(index, 1)
+      elementListenersList.value.splice(index, 1)
+      updateElementExtensions(
+        bpmnElement.value,
+        otherExtensionList.value.concat(bpmnElementListeners.value)
+      )
+    })
+    .catch(() => console.info('操作取消'))
+}
+// 保存监听器配置
+const saveListenerConfig = async () => {
+  let validateStatus = await listenerFormRef.value.validate()
+  if (!validateStatus) return // 验证不通过直接返回
+  const listenerObject = createListenerObject(listenerForm.value, false, prefix)
+  if (editingListenerIndex.value === -1) {
+    bpmnElementListeners.value.push(listenerObject)
+    elementListenersList.value.push(listenerForm.value)
+  } else {
+    bpmnElementListeners.value.splice(editingListenerIndex.value, 1, listenerObject)
+    elementListenersList.value.splice(editingListenerIndex.value, 1, listenerForm.value)
+  }
+  // 保存其他配置
+  otherExtensionList.value =
+    bpmnElement.value.businessObject?.extensionElements?.values?.filter(
+      (ex) => ex.$type !== `${prefix}:ExecutionListener`
+    ) ?? []
+  updateElementExtensions(
+    bpmnElement.value,
+    otherExtensionList.value.concat(bpmnElementListeners.value)
+  )
+  // 4. 隐藏侧边栏
+  listenerFormModelVisible.value = false
+  listenerForm.value = {}
+}
+
+watch(
+  () => props.id,
+  (val) => {
+    val &&
+      val.length &&
+      nextTick(() => {
+        resetListenersList()
+      })
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue b/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
new file mode 100644
index 000000000..9464883c2
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
@@ -0,0 +1,451 @@
+<template>
+  <div class="panel-tab__content">
+    <el-table :data="elementListenersList" size="small" border>
+      <el-table-column label="序号" width="50px" type="index" />
+      <el-table-column
+        label="事件类型"
+        min-width="80px"
+        show-overflow-tooltip
+        :formatter="(row) => listenerEventTypeObject[row.event]"
+      />
+      <el-table-column label="事件id" min-width="80px" prop="id" show-overflow-tooltip />
+      <el-table-column
+        label="监听器类型"
+        min-width="80px"
+        show-overflow-tooltip
+        :formatter="(row) => listenerTypeObject[row.listenerType]"
+      />
+      <el-table-column label="操作" width="90px">
+        <template #default="scope">
+          <el-button size="small" link @click="openListenerForm(scope.row, scope.$index)"
+            >编辑</el-button
+          >
+          <el-divider direction="vertical" />
+          <el-button
+            size="small"
+            link
+            style="color: #ff4d4f"
+            @click="removeListener(scope.row, scope.$index)"
+            >移除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="element-drawer__button">
+      <XButton
+        size="small"
+        type="primary"
+        preIcon="ep:plus"
+        title="添加监听器"
+        @click="openListenerForm(null)"
+      />
+    </div>
+
+    <!-- 监听器 编辑/创建 部分 -->
+    <el-drawer
+      v-model="listenerFormModelVisible"
+      title="任务监听器"
+      :size="`${width}px`"
+      append-to-body
+      destroy-on-close
+    >
+      <el-form size="small" :model="listenerForm" label-width="96px" ref="listenerFormRef">
+        <el-form-item
+          label="事件类型"
+          prop="event"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-select v-model="listenerForm.event">
+            <el-option
+              v-for="i in Object.keys(listenerEventTypeObject)"
+              :key="i"
+              :label="listenerEventTypeObject[i]"
+              :value="i"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label="监听器ID"
+          prop="id"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.id" clearable />
+        </el-form-item>
+        <el-form-item
+          label="监听器类型"
+          prop="listenerType"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-select v-model="listenerForm.listenerType">
+            <el-option
+              v-for="i in Object.keys(listenerTypeObject)"
+              :key="i"
+              :label="listenerTypeObject[i]"
+              :value="i"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'classListener'"
+          label="Java类"
+          prop="class"
+          key="listener-class"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.class" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'expressionListener'"
+          label="表达式"
+          prop="expression"
+          key="listener-expression"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.expression" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'delegateExpressionListener'"
+          label="代理表达式"
+          prop="delegateExpression"
+          key="listener-delegate"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.delegateExpression" clearable />
+        </el-form-item>
+        <template v-if="listenerForm.listenerType === 'scriptListener'">
+          <el-form-item
+            label="脚本格式"
+            prop="scriptFormat"
+            key="listener-script-format"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本格式' }"
+          >
+            <el-input v-model="listenerForm.scriptFormat" clearable />
+          </el-form-item>
+          <el-form-item
+            label="脚本类型"
+            prop="scriptType"
+            key="listener-script-type"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请选择脚本类型' }"
+          >
+            <el-select v-model="listenerForm.scriptType">
+              <el-option label="内联脚本" value="inlineScript" />
+              <el-option label="外部脚本" value="externalScript" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="listenerForm.scriptType === 'inlineScript'"
+            label="脚本内容"
+            prop="value"
+            key="listener-script"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本内容' }"
+          >
+            <el-input v-model="listenerForm.value" clearable />
+          </el-form-item>
+          <el-form-item
+            v-if="listenerForm.scriptType === 'externalScript'"
+            label="资源地址"
+            prop="resource"
+            key="listener-resource"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写资源地址' }"
+          >
+            <el-input v-model="listenerForm.resource" clearable />
+          </el-form-item>
+        </template>
+
+        <template v-if="listenerForm.event === 'timeout'">
+          <el-form-item label="定时器类型" prop="eventDefinitionType" key="eventDefinitionType">
+            <el-select v-model="listenerForm.eventDefinitionType">
+              <el-option label="日期" value="date" />
+              <el-option label="持续时长" value="duration" />
+              <el-option label="循环" value="cycle" />
+              <el-option label="无" value="null" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="!!listenerForm.eventDefinitionType && listenerForm.eventDefinitionType !== 'null'"
+            label="定时器"
+            prop="eventTimeDefinitions"
+            key="eventTimeDefinitions"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写定时器配置' }"
+          >
+            <el-input v-model="listenerForm.eventTimeDefinitions" clearable />
+          </el-form-item>
+        </template>
+      </el-form>
+
+      <el-divider />
+      <p class="listener-filed__title">
+        <span><Icon icon="ep:menu" />注入字段：</span>
+        <el-button size="small" type="primary" @click="openListenerFieldForm(null)"
+          >添加字段</el-button
+        >
+      </p>
+      <el-table
+        :data="fieldsListOfListener"
+        size="small"
+        max-height="240"
+        fit
+        border
+        style="flex: none"
+      >
+        <el-table-column label="序号" width="50px" type="index" />
+        <el-table-column label="字段名称" min-width="100px" prop="name" />
+        <el-table-column
+          label="字段类型"
+          min-width="80px"
+          show-overflow-tooltip
+          :formatter="(row) => fieldTypeObject[row.fieldType]"
+        />
+        <el-table-column
+          label="字段值/表达式"
+          min-width="100px"
+          show-overflow-tooltip
+          :formatter="(row) => row.string || row.expression"
+        />
+        <el-table-column label="操作" width="100px">
+          <template #default="scope">
+            <el-button size="small" link @click="openListenerFieldForm(scope.row, scope.$index)"
+              >编辑</el-button
+            >
+            <el-divider direction="vertical" />
+            <el-button
+              size="small"
+              link
+              style="color: #ff4d4f"
+              @click="removeListenerField(scope.row, scope.$index)"
+              >移除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="element-drawer__button">
+        <el-button size="small" @click="listenerFormModelVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="saveListenerConfig">保 存</el-button>
+      </div>
+    </el-drawer>
+
+    <!-- 注入西段 编辑/创建 部分 -->
+    <el-dialog
+      title="字段配置"
+      v-model="listenerFieldFormModelVisible"
+      width="600px"
+      append-to-body
+      destroy-on-close
+    >
+      <el-form
+        :model="listenerFieldForm"
+        size="small"
+        label-width="96px"
+        ref="listenerFieldFormRef"
+        style="height: 136px"
+      >
+        <el-form-item
+          label="字段名称："
+          prop="name"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.name" clearable />
+        </el-form-item>
+        <el-form-item
+          label="字段类型："
+          prop="fieldType"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-select v-model="listenerFieldForm.fieldType">
+            <el-option
+              v-for="i in Object.keys(fieldTypeObject)"
+              :key="i"
+              :label="fieldTypeObject[i]"
+              :value="i"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="listenerFieldForm.fieldType === 'string'"
+          label="字段值："
+          prop="string"
+          key="field-string"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.string" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerFieldForm.fieldType === 'expression'"
+          label="表达式："
+          prop="expression"
+          key="field-expression"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.expression" clearable />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button size="small" @click="listenerFieldFormModelVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="saveListenerFiled">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts" setup>
+import { ElMessageBox } from 'element-plus'
+import { createListenerObject, updateElementExtensions } from '../../utils'
+import { initListenerForm, initListenerType, eventType, listenerType, fieldType } from './utilSelf'
+
+defineOptions({ name: 'UserTaskListeners' })
+
+const props = defineProps({
+  id: String,
+  type: String
+})
+const prefix = inject('prefix')
+const width = inject('width')
+const elementListenersList = ref<any[]>([])
+const listenerEventTypeObject = ref(eventType)
+const listenerTypeObject = ref(listenerType)
+const listenerFormModelVisible = ref(false)
+const listenerForm = ref<any>({})
+const fieldTypeObject = ref(fieldType)
+const fieldsListOfListener = ref<any[]>([])
+const listenerFieldFormModelVisible = ref(false) // 监听器 注入字段表单弹窗 显示状态
+const editingListenerIndex = ref(-1) // 监听器所在下标，-1 为新增
+const editingListenerFieldIndex = ref(-1) // 字段所在下标，-1 为新增
+const listenerFieldForm = ref<any>({}) // 监听器 注入字段 详情表单
+const bpmnElement = ref()
+const bpmnElementListeners = ref()
+const otherExtensionList = ref()
+const listenerFormRef = ref()
+const listenerFieldFormRef = ref()
+const bpmnInstances = () => (window as any)?.bpmnInstances
+
+const resetListenersList = () => {
+  console.log(
+    bpmnInstances().bpmnElement,
+    'window.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElement'
+  )
+  bpmnElement.value = bpmnInstances().bpmnElement
+  otherExtensionList.value = []
+  bpmnElementListeners.value =
+    bpmnElement.value.businessObject?.extensionElements?.values.filter(
+      (ex) => ex.$type === `${prefix}:TaskListener`
+    ) ?? []
+  elementListenersList.value = bpmnElementListeners.value.map((listener) =>
+    initListenerType(listener)
+  )
+}
+const openListenerForm = (listener, index?) => {
+  if (listener) {
+    listenerForm.value = initListenerForm(listener)
+    editingListenerIndex.value = index
+  } else {
+    listenerForm.value = {}
+    editingListenerIndex.value = -1 // 标记为新增
+  }
+  if (listener && listener.fields) {
+    fieldsListOfListener.value = listener.fields.map((field) => ({
+      ...field,
+      fieldType: field.string ? 'string' : 'expression'
+    }))
+  } else {
+    fieldsListOfListener.value = []
+    listenerForm.value['fields'] = []
+  }
+  // 打开侧边栏并清楚验证状态
+  listenerFormModelVisible.value = true
+  nextTick(() => {
+    if (listenerFormRef.value) listenerFormRef.value.clearValidate()
+  })
+}
+// 移除监听器
+const removeListener = (listener, index?) => {
+  console.log(listener, 'listener')
+  ElMessageBox.confirm('确认移除该监听器吗？', '提示', {
+    confirmButtonText: '确 认',
+    cancelButtonText: '取 消'
+  })
+    .then(() => {
+      bpmnElementListeners.value.splice(index, 1)
+      elementListenersList.value.splice(index, 1)
+      updateElementExtensions(
+        bpmnElement.value,
+        otherExtensionList.value.concat(bpmnElementListeners.value)
+      )
+    })
+    .catch(() => console.info('操作取消'))
+}
+// 保存监听器
+const saveListenerConfig = async () => {
+  let validateStatus = await listenerFormRef.value.validate()
+  if (!validateStatus) return // 验证不通过直接返回
+  const listenerObject = createListenerObject(listenerForm.value, true, prefix)
+  if (editingListenerIndex.value === -1) {
+    bpmnElementListeners.value.push(listenerObject)
+    elementListenersList.value.push(listenerForm.value)
+  } else {
+    bpmnElementListeners.value.splice(editingListenerIndex.value, 1, listenerObject)
+    elementListenersList.value.splice(editingListenerIndex.value, 1, listenerForm.value)
+  }
+  // 保存其他配置
+  otherExtensionList.value =
+    bpmnElement.value.businessObject?.extensionElements?.values?.filter(
+      (ex) => ex.$type !== `${prefix}:TaskListener`
+    ) ?? []
+  updateElementExtensions(
+    bpmnElement.value,
+    otherExtensionList.value.concat(bpmnElementListeners.value)
+  )
+  // 4. 隐藏侧边栏
+  listenerFormModelVisible.value = false
+  listenerForm.value = {}
+}
+// 打开监听器字段编辑弹窗
+const openListenerFieldForm = (field, index?) => {
+  listenerFieldForm.value = field ? JSON.parse(JSON.stringify(field)) : {}
+  editingListenerFieldIndex.value = field ? index : -1
+  listenerFieldFormModelVisible.value = true
+  nextTick(() => {
+    if (listenerFieldFormRef.value) listenerFieldFormRef.value.clearValidate()
+  })
+}
+// 保存监听器注入字段
+const saveListenerFiled = async () => {
+  let validateStatus = await listenerFieldFormRef.value.validate()
+  if (!validateStatus) return // 验证不通过直接返回
+  if (editingListenerFieldIndex.value === -1) {
+    fieldsListOfListener.value.push(listenerFieldForm.value)
+    listenerForm.value.fields.push(listenerFieldForm.value)
+  } else {
+    fieldsListOfListener.value.splice(editingListenerFieldIndex.value, 1, listenerFieldForm.value)
+    listenerForm.value.fields.splice(editingListenerFieldIndex.value, 1, listenerFieldForm.value)
+  }
+  listenerFieldFormModelVisible.value = false
+  nextTick(() => {
+    listenerFieldForm.value = {}
+  })
+}
+// 移除监听器字段
+const removeListenerField = (field, index) => {
+  console.log(field, 'field')
+  ElMessageBox.confirm('确认移除该字段吗？', '提示', {
+    confirmButtonText: '确 认',
+    cancelButtonText: '取 消'
+  })
+    .then(() => {
+      fieldsListOfListener.value.splice(index, 1)
+      listenerForm.value.fields.splice(index, 1)
+    })
+    .catch(() => console.info('操作取消'))
+}
+
+watch(
+  () => props.id,
+  (val) => {
+    val &&
+      val.length &&
+      nextTick(() => {
+        resetListenersList()
+      })
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/listeners/template.js b/src/components/bpmnProcessDesigner/package/penal/listeners/template.js
new file mode 100644
index 000000000..430dc64b4
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/listeners/template.js
@@ -0,0 +1,178 @@
+export const template = (isTaskListener) => {
+  return `
+  <div class="panel-tab__content">
+    <el-table :data="elementListenersList" size="small" border>
+      <el-table-column label="序号" width="50px" type="index" />
+      <el-table-column label="事件类型" min-width="100px" prop="event" />
+      <el-table-column label="监听器类型" min-width="100px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
+      <el-table-column label="操作" width="90px">
+        <template #default="scope">
+          <el-button size="small" type="primary" link @click="openListenerForm(scope, scope.$index)">编辑</el-button>
+          <el-divider direction="vertical" />
+          <el-button size="small" type="primary" link style="color: #ff4d4f" @click="removeListener(scope, scope.$index)">移除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="element-drawer__button">
+      <el-button size="small" type="primary" icon="el-icon-plus" @click="openListenerForm(null)">添加监听器</el-button>
+    </div>
+
+    <!-- 监听器 编辑/创建 部分 -->
+    <el-drawer :visible.sync="listenerFormModelVisible" title="执行监听器" :size="width + 'px'" append-to-body destroy-on-close>
+      <el-form size="small" :model="listenerForm" label-width="96px" ref="listenerFormRef" @submit.native.prevent>
+        <el-form-item label="事件类型" prop="event" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-select v-model="listenerForm.event">
+            <el-option label="start" value="start" />
+            <el-option label="end" value="end" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="监听器类型" prop="listenerType" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-select v-model="listenerForm.listenerType">
+            <el-option v-for="i in Object.keys(listenerTypeObject)" :key="i" :label="listenerTypeObject[i]" :value="i" />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'classListener'"
+          label="Java类"
+          prop="class"
+          key="listener-class"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.class" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'expressionListener'"
+          label="表达式"
+          prop="expression"
+          key="listener-expression"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.expression" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'delegateExpressionListener'"
+          label="代理表达式"
+          prop="delegateExpression"
+          key="listener-delegate"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.delegateExpression" clearable />
+        </el-form-item>
+        <template v-if="listenerForm.listenerType === 'scriptListener'">
+          <el-form-item
+            label="脚本格式"
+            prop="scriptFormat"
+            key="listener-script-format"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本格式' }"
+          >
+            <el-input v-model="listenerForm.scriptFormat" clearable />
+          </el-form-item>
+          <el-form-item
+            label="脚本类型"
+            prop="scriptType"
+            key="listener-script-type"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请选择脚本类型' }"
+          >
+            <el-select v-model="listenerForm.scriptType">
+              <el-option label="内联脚本" value="inlineScript" />
+              <el-option label="外部脚本" value="externalScript" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="listenerForm.scriptType === 'inlineScript'"
+            label="脚本内容"
+            prop="value"
+            key="listener-script"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本内容' }"
+          >
+            <el-input v-model="listenerForm.value" clearable />
+          </el-form-item>
+          <el-form-item
+            v-if="listenerForm.scriptType === 'externalScript'"
+            label="资源地址"
+            prop="resource"
+            key="listener-resource"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写资源地址' }"
+          >
+            <el-input v-model="listenerForm.resource" clearable />
+          </el-form-item>
+        </template>
+        ${
+          isTaskListener
+            ? "<el-form-item label='定时器类型' prop='eventDefinitionType' key='eventDefinitionType'>" +
+              "<el-select v-model='listenerForm.eventDefinitionType'>" +
+              "<el-option label='日期' value='date' />" +
+              "<el-option label='持续时长' value='duration' />" +
+              "<el-option label='循环' value='cycle' />" +
+              "<el-option label='无' value='' />" +
+              '</el-select>' +
+              '</el-form-item>' +
+              "<el-form-item v-if='!!listenerForm.eventDefinitionType' label='定时器' prop='eventDefinitions' key='eventDefinitions'>" +
+              "<el-input v-model='listenerForm.eventDefinitions' clearable />" +
+              '</el-form-item>'
+            : ''
+        }
+      </el-form>
+      <el-divider />
+      <p class="listener-filed__title">
+        <span><i class="el-icon-menu"></i>注入字段：</span>
+        <el-button size="small" type="primary" @click="openListenerFieldForm(null)">添加字段</el-button>
+      </p>
+      <el-table :data="fieldsListOfListener" size="small" max-height="240" border fit style="flex: none">
+        <el-table-column label="序号" width="50px" type="index" />
+        <el-table-column label="字段名称" min-width="100px" prop="name" />
+        <el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" />
+        <el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
+        <el-table-column label="操作" width="100px">
+          <template #default="scope">
+            <el-button size="small" type="primary" link @click="openListenerFieldForm(scope, scope.$index)">编辑</el-button>
+            <el-divider direction="vertical" />
+            <el-button size="small" type="primary" link style="color: #ff4d4f" @click="removeListenerField(scope, scope.$index)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="element-drawer__button">
+        <el-button size="small" @click="listenerFormModelVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="saveListenerConfig">保 存</el-button>
+      </div>
+    </el-drawer>
+
+    <!-- 注入西段 编辑/创建 部分 -->
+    <el-dialog title="字段配置" :visible.sync="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close>
+      <el-form :model="listenerFieldForm" size="small" label-width="96px" ref="listenerFieldFormRef" style="height: 136px" @submit.native.prevent>
+        <el-form-item label="字段名称：" prop="name" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-input v-model="listenerFieldForm.name" clearable />
+        </el-form-item>
+        <el-form-item label="字段类型：" prop="fieldType" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-select v-model="listenerFieldForm.fieldType">
+            <el-option v-for="i in Object.keys(fieldTypeObject)" :key="i" :label="fieldTypeObject[i]" :value="i" />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="listenerFieldForm.fieldType === 'string'"
+          label="字段值："
+          prop="string"
+          key="field-string"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.string" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerFieldForm.fieldType === 'expression'"
+          label="表达式："
+          prop="expression"
+          key="field-expression"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.expression" clearable />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button size="small" @click="listenerFieldFormModelVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="saveListenerFiled">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+  `
+}
diff --git a/src/components/bpmnProcessDesigner/package/penal/listeners/utilSelf.ts b/src/components/bpmnProcessDesigner/package/penal/listeners/utilSelf.ts
new file mode 100644
index 000000000..5f46abd05
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/listeners/utilSelf.ts
@@ -0,0 +1,62 @@
+// 初始化表单数据
+export function initListenerForm(listener) {
+  let self = {
+    ...listener
+  }
+  if (listener.script) {
+    self = {
+      ...listener,
+      ...listener.script,
+      scriptType: listener.script.resource ? 'externalScript' : 'inlineScript'
+    }
+  }
+  if (listener.event === 'timeout' && listener.eventDefinitions) {
+    if (listener.eventDefinitions.length) {
+      let k = ''
+      for (const key in listener.eventDefinitions[0]) {
+        console.log(listener.eventDefinitions, key)
+        if (key.indexOf('time') !== -1) {
+          k = key
+          self.eventDefinitionType = key.replace('time', '').toLowerCase()
+        }
+      }
+      console.log(k)
+      self.eventTimeDefinitions = listener.eventDefinitions[0][k].body
+    }
+  }
+  return self
+}
+
+export function initListenerType(listener) {
+  let listenerType
+  if (listener.class) listenerType = 'classListener'
+  if (listener.expression) listenerType = 'expressionListener'
+  if (listener.delegateExpression) listenerType = 'delegateExpressionListener'
+  if (listener.script) listenerType = 'scriptListener'
+  return {
+    ...JSON.parse(JSON.stringify(listener)),
+    ...(listener.script ?? {}),
+    listenerType: listenerType
+  }
+}
+
+export const listenerType = {
+  classListener: 'Java 类',
+  expressionListener: '表达式',
+  delegateExpressionListener: '代理表达式',
+  scriptListener: '脚本'
+}
+
+export const eventType = {
+  create: '创建',
+  assignment: '指派',
+  complete: '完成',
+  delete: '删除',
+  update: '更新',
+  timeout: '超时'
+}
+
+export const fieldType = {
+  string: '字符串',
+  expression: '表达式'
+}
diff --git a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
new file mode 100644
index 000000000..28db5aa71
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
@@ -0,0 +1,254 @@
+<template>
+  <div class="panel-tab__content">
+    <el-form label-width="90px">
+      <el-form-item label="回路特性">
+        <el-select v-model="loopCharacteristics" @change="changeLoopCharacteristicsType">
+          <el-option label="并行多重事件" value="ParallelMultiInstance" />
+          <el-option label="时序多重事件" value="SequentialMultiInstance" />
+          <el-option label="循环事件" value="StandardLoop" />
+          <el-option label="无" value="Null" />
+        </el-select>
+      </el-form-item>
+      <template
+        v-if="
+          loopCharacteristics === 'ParallelMultiInstance' ||
+          loopCharacteristics === 'SequentialMultiInstance'
+        "
+      >
+        <el-form-item label="循环基数" key="loopCardinality">
+          <el-input
+            v-model="loopInstanceForm.loopCardinality"
+            clearable
+            @change="updateLoopCardinality"
+          />
+        </el-form-item>
+        <el-form-item label="集合" key="collection" v-show="false">
+          <el-input v-model="loopInstanceForm.collection" clearable @change="updateLoopBase" />
+        </el-form-item>
+        <el-form-item label="元素变量" key="elementVariable">
+          <el-input v-model="loopInstanceForm.elementVariable" clearable @change="updateLoopBase" />
+        </el-form-item>
+        <el-form-item label="完成条件" key="completionCondition">
+          <el-input
+            v-model="loopInstanceForm.completionCondition"
+            clearable
+            @change="updateLoopCondition"
+          />
+        </el-form-item>
+        <el-form-item label="异步状态" key="async">
+          <el-checkbox
+            v-model="loopInstanceForm.asyncBefore"
+            label="异步前"
+            @change="updateLoopAsync('asyncBefore')"
+          />
+          <el-checkbox
+            v-model="loopInstanceForm.asyncAfter"
+            label="异步后"
+            @change="updateLoopAsync('asyncAfter')"
+          />
+          <el-checkbox
+            v-model="loopInstanceForm.exclusive"
+            v-if="loopInstanceForm.asyncAfter || loopInstanceForm.asyncBefore"
+            label="排除"
+            @change="updateLoopAsync('exclusive')"
+          />
+        </el-form-item>
+        <el-form-item
+          label="重试周期"
+          prop="timeCycle"
+          v-if="loopInstanceForm.asyncAfter || loopInstanceForm.asyncBefore"
+          key="timeCycle"
+        >
+          <el-input v-model="loopInstanceForm.timeCycle" clearable @change="updateLoopTimeCycle" />
+        </el-form-item>
+      </template>
+    </el-form>
+  </div>
+</template>
+
+<script lang="ts" setup>
+defineOptions({ name: 'ElementMultiInstance' })
+
+const props = defineProps({
+  businessObject: Object,
+  type: String
+})
+const prefix = inject('prefix')
+const loopCharacteristics = ref('')
+//默认配置，用来覆盖原始不存在的选项，避免报错
+const defaultLoopInstanceForm = ref({
+  completionCondition: '',
+  loopCardinality: '',
+  extensionElements: [],
+  asyncAfter: false,
+  asyncBefore: false,
+  exclusive: false
+})
+const loopInstanceForm = ref<any>({})
+const bpmnElement = ref(null)
+const multiLoopInstance = ref(null)
+const bpmnInstances = () => (window as any)?.bpmnInstances
+
+const getElementLoop = (businessObject) => {
+  if (!businessObject.loopCharacteristics) {
+    loopCharacteristics.value = 'Null'
+    loopInstanceForm.value = {}
+    return
+  }
+  if (businessObject.loopCharacteristics.$type === 'bpmn:StandardLoopCharacteristics') {
+    loopCharacteristics.value = 'StandardLoop'
+    loopInstanceForm.value = {}
+    return
+  }
+  if (businessObject.loopCharacteristics.isSequential) {
+    loopCharacteristics.value = 'SequentialMultiInstance'
+  } else {
+    loopCharacteristics.value = 'ParallelMultiInstance'
+  }
+  // 合并配置
+  loopInstanceForm.value = {
+    ...defaultLoopInstanceForm.value,
+    ...businessObject.loopCharacteristics,
+    completionCondition: businessObject.loopCharacteristics?.completionCondition?.body ?? '',
+    loopCardinality: businessObject.loopCharacteristics?.loopCardinality?.body ?? ''
+  }
+  // 保留当前元素 businessObject 上的 loopCharacteristics 实例
+  multiLoopInstance.value = bpmnInstances().bpmnElement.businessObject.loopCharacteristics
+  // 更新表单
+  if (
+    businessObject.loopCharacteristics.extensionElements &&
+    businessObject.loopCharacteristics.extensionElements.values &&
+    businessObject.loopCharacteristics.extensionElements.values.length
+  ) {
+    loopInstanceForm.value['timeCycle'] =
+      businessObject.loopCharacteristics.extensionElements.values[0].body
+  }
+}
+const changeLoopCharacteristicsType = (type) => {
+  // this.loopInstanceForm = { ...this.defaultLoopInstanceForm }; // 切换类型取消原表单配置
+  // 取消多实例配置
+  if (type === 'Null') {
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+      loopCharacteristics: null
+    })
+    return
+  }
+  // 配置循环
+  if (type === 'StandardLoop') {
+    const loopCharacteristicsObject = bpmnInstances().moddle.create(
+      'bpmn:StandardLoopCharacteristics'
+    )
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+      loopCharacteristics: loopCharacteristicsObject
+    })
+    multiLoopInstance.value = null
+    return
+  }
+  // 时序
+  if (type === 'SequentialMultiInstance') {
+    multiLoopInstance.value = bpmnInstances().moddle.create(
+      'bpmn:MultiInstanceLoopCharacteristics',
+      { isSequential: true }
+    )
+  } else {
+    multiLoopInstance.value = bpmnInstances().moddle.create(
+      'bpmn:MultiInstanceLoopCharacteristics',
+      { collection: '${coll_userList}' }
+    )
+  }
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+    loopCharacteristics: toRaw(multiLoopInstance.value)
+  })
+}
+// 循环基数
+const updateLoopCardinality = (cardinality) => {
+  let loopCardinality = null
+  if (cardinality && cardinality.length) {
+    loopCardinality = bpmnInstances().moddle.create('bpmn:FormalExpression', {
+      body: cardinality
+    })
+  }
+  bpmnInstances().modeling.updateModdleProperties(
+    toRaw(bpmnElement.value),
+    multiLoopInstance.value,
+    {
+      loopCardinality
+    }
+  )
+}
+// 完成条件
+const updateLoopCondition = (condition) => {
+  let completionCondition = null
+  if (condition && condition.length) {
+    completionCondition = bpmnInstances().moddle.create('bpmn:FormalExpression', {
+      body: condition
+    })
+  }
+  bpmnInstances().modeling.updateModdleProperties(
+    toRaw(bpmnElement.value),
+    multiLoopInstance.value,
+    {
+      completionCondition
+    }
+  )
+}
+// 重试周期
+const updateLoopTimeCycle = (timeCycle) => {
+  const extensionElements = bpmnInstances().moddle.create('bpmn:ExtensionElements', {
+    values: [
+      bpmnInstances().moddle.create(`${prefix}:FailedJobRetryTimeCycle`, {
+        body: timeCycle
+      })
+    ]
+  })
+  bpmnInstances().modeling.updateModdleProperties(
+    toRaw(bpmnElement.value),
+    multiLoopInstance.value,
+    {
+      extensionElements
+    }
+  )
+}
+// 直接更新的基础信息
+const updateLoopBase = () => {
+  bpmnInstances().modeling.updateModdleProperties(
+    toRaw(bpmnElement.value),
+    multiLoopInstance.value,
+    {
+      collection: loopInstanceForm.value.collection || null,
+      elementVariable: loopInstanceForm.value.elementVariable || null
+    }
+  )
+}
+// 各异步状态
+const updateLoopAsync = (key) => {
+  const { asyncBefore, asyncAfter } = loopInstanceForm.value
+  let asyncAttr = Object.create(null)
+  if (!asyncBefore && !asyncAfter) {
+    // this.$set(this.loopInstanceForm, "exclusive", false);
+    loopInstanceForm.value['exclusive'] = false
+    asyncAttr = { asyncBefore: false, asyncAfter: false, exclusive: false, extensionElements: null }
+  } else {
+    asyncAttr[key] = loopInstanceForm.value[key]
+  }
+  bpmnInstances().modeling.updateModdleProperties(
+    toRaw(bpmnElement.value),
+    multiLoopInstance.value,
+    asyncAttr
+  )
+}
+
+onBeforeUnmount(() => {
+  multiLoopInstance.value = null
+  bpmnElement.value = null
+})
+
+watch(
+  () => props.businessObject,
+  (val) => {
+    bpmnElement.value = bpmnInstances().bpmnElement
+    getElementLoop(val)
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/other/ElementOtherConfig.vue b/src/components/bpmnProcessDesigner/package/penal/other/ElementOtherConfig.vue
new file mode 100644
index 000000000..05532c69c
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/other/ElementOtherConfig.vue
@@ -0,0 +1,55 @@
+<template>
+  <div class="panel-tab__content">
+    <div class="element-property input-property">
+      <div class="element-property__label">元素文档：</div>
+      <div class="element-property__value">
+        <el-input
+          type="textarea"
+          v-model="documentation"
+          resize="vertical"
+          :autosize="{ minRows: 2, maxRows: 4 }"
+          @input="updateDocumentation"
+          @blur="updateDocumentation"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+defineOptions({ name: 'ElementOtherConfig' })
+const props = defineProps({
+  id: String
+})
+const documentation = ref('')
+const bpmnElement = ref()
+const bpmnInstances = () => (window as any).bpmnInstances
+const updateDocumentation = () => {
+  ;(bpmnElement.value && bpmnElement.value.id === props.id) ||
+    (bpmnElement.value = bpmnInstances().elementRegistry.get(props.id))
+  const documentations = bpmnInstances().bpmnFactory.create('bpmn:Documentation', {
+    text: documentation.value
+  })
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+    documentation: [documentations]
+  })
+}
+onBeforeUnmount(() => {
+  bpmnElement.value = null
+})
+
+watch(
+  () => props.id,
+  (id) => {
+    if (id && id.length) {
+      nextTick(() => {
+        const documentations = bpmnInstances().bpmnElement.businessObject?.documentation
+        documentation.value = documentations && documentations.length ? documentations[0].text : ''
+      })
+    } else {
+      documentation.value = ''
+    }
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue b/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
new file mode 100644
index 000000000..494b3d972
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
@@ -0,0 +1,169 @@
+<template>
+  <div class="panel-tab__content">
+    <el-table :data="elementPropertyList" max-height="240" fit border>
+      <el-table-column label="序号" width="50px" type="index" />
+      <el-table-column label="属性名" prop="name" min-width="100px" show-overflow-tooltip />
+      <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />
+      <el-table-column label="操作" width="110px">
+        <template #default="scope">
+          <el-button link @click="openAttributesForm(scope.row, scope.$index)" size="small">
+            编辑
+          </el-button>
+          <el-divider direction="vertical" />
+          <el-button
+            link
+            size="small"
+            style="color: #ff4d4f"
+            @click="removeAttributes(scope.row, scope.$index)"
+          >
+            移除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="element-drawer__button">
+      <XButton
+        type="primary"
+        preIcon="ep:plus"
+        title="添加属性"
+        @click="openAttributesForm(null, -1)"
+      />
+    </div>
+
+    <el-dialog
+      v-model="propertyFormModelVisible"
+      title="属性配置"
+      width="600px"
+      append-to-body
+      destroy-on-close
+    >
+      <el-form :model="propertyForm" label-width="80px" ref="attributeFormRef">
+        <el-form-item label="属性名：" prop="name">
+          <el-input v-model="propertyForm.name" clearable />
+        </el-form-item>
+        <el-form-item label="属性值：" prop="value">
+          <el-input v-model="propertyForm.value" clearable />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="propertyFormModelVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveAttribute">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ElMessageBox } from 'element-plus'
+defineOptions({ name: 'ElementProperties' })
+const props = defineProps({
+  id: String,
+  type: String
+})
+const prefix = inject('prefix')
+// const width = inject('width')
+
+const elementPropertyList = ref<any[]>([])
+const propertyForm = ref<any>({})
+const editingPropertyIndex = ref(-1)
+const propertyFormModelVisible = ref(false)
+const bpmnElement = ref()
+const otherExtensionList = ref()
+const bpmnElementProperties = ref()
+const bpmnElementPropertyList = ref()
+const attributeFormRef = ref()
+const bpmnInstances = () => (window as any)?.bpmnInstances
+
+const resetAttributesList = () => {
+  console.log(window, 'windowwindowwindowwindowwindowwindowwindow')
+  bpmnElement.value = bpmnInstances().bpmnElement
+  otherExtensionList.value = [] // 其他扩展配置
+  bpmnElementProperties.value =
+    // bpmnElement.value.businessObject?.extensionElements?.filter((ex) => {
+    bpmnElement.value.businessObject?.extensionElements?.values.filter((ex) => {
+      if (ex.$type !== `${prefix}:Properties`) {
+        otherExtensionList.value.push(ex)
+      }
+      return ex.$type === `${prefix}:Properties`
+    }) ?? []
+
+  // 保存所有的 扩展属性字段
+  bpmnElementPropertyList.value = bpmnElementProperties.value.reduce(
+    (pre, current) => pre.concat(current.values),
+    []
+  )
+  // 复制 显示
+  elementPropertyList.value = JSON.parse(JSON.stringify(bpmnElementPropertyList.value ?? []))
+}
+const openAttributesForm = (attr, index) => {
+  editingPropertyIndex.value = index
+  propertyForm.value = index === -1 ? {} : JSON.parse(JSON.stringify(attr))
+  propertyFormModelVisible.value = true
+  nextTick(() => {
+    if (attributeFormRef.value) attributeFormRef.value.clearValidate()
+  })
+}
+const removeAttributes = (attr, index) => {
+  console.log(attr, 'attr')
+  ElMessageBox.confirm('确认移除该属性吗？', '提示', {
+    confirmButtonText: '确 认',
+    cancelButtonText: '取 消'
+  })
+    .then(() => {
+      elementPropertyList.value.splice(index, 1)
+      bpmnElementPropertyList.value.splice(index, 1)
+      // 新建一个属性字段的保存列表
+      const propertiesObject = bpmnInstances().moddle.create(`${prefix}:Properties`, {
+        values: bpmnElementPropertyList.value
+      })
+      updateElementExtensions(propertiesObject)
+      resetAttributesList()
+    })
+    .catch(() => console.info('操作取消'))
+}
+const saveAttribute = () => {
+  console.log(propertyForm.value, 'propertyForm.value')
+  const { name, value } = propertyForm.value
+  if (editingPropertyIndex.value !== -1) {
+    bpmnInstances().modeling.updateModdleProperties(
+      toRaw(bpmnElement.value),
+      toRaw(bpmnElementPropertyList.value)[toRaw(editingPropertyIndex.value)],
+      {
+        name,
+        value
+      }
+    )
+  } else {
+    // 新建属性字段
+    const newPropertyObject = bpmnInstances().moddle.create(`${prefix}:Property`, {
+      name,
+      value
+    })
+    // 新建一个属性字段的保存列表
+    const propertiesObject = bpmnInstances().moddle.create(`${prefix}:Properties`, {
+      values: bpmnElementPropertyList.value.concat([newPropertyObject])
+    })
+    updateElementExtensions(propertiesObject)
+  }
+  propertyFormModelVisible.value = false
+  resetAttributesList()
+}
+const updateElementExtensions = (properties) => {
+  const extensions = bpmnInstances().moddle.create('bpmn:ExtensionElements', {
+    values: otherExtensionList.value.concat([properties])
+  })
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+    extensionElements: extensions
+  })
+}
+
+watch(
+  () => props.id,
+  (val) => {
+    if (val) {
+      val && val.length && resetAttributesList()
+    }
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue b/src/components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue
new file mode 100644
index 000000000..f38f31c65
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue
@@ -0,0 +1,113 @@
+<template>
+  <div class="panel-tab__content">
+    <div class="panel-tab__content--title">
+      <span><Icon icon="ep:menu" style="margin-right: 8px; color: #555" />消息列表</span>
+      <XButton type="primary" title="创建新消息" preIcon="ep:plus" @click="openModel('message')" />
+    </div>
+    <el-table :data="messageList" border>
+      <el-table-column type="index" label="序号" width="60px" />
+      <el-table-column label="消息ID" prop="id" max-width="300px" show-overflow-tooltip />
+      <el-table-column label="消息名称" prop="name" max-width="300px" show-overflow-tooltip />
+    </el-table>
+    <div
+      class="panel-tab__content--title"
+      style="padding-top: 8px; margin-top: 8px; border-top: 1px solid #eee"
+    >
+      <span><Icon icon="ep:menu" style="margin-right: 8px; color: #555" />信号列表</span>
+      <XButton type="primary" title="创建新信号" preIcon="ep:plus" @click="openModel('signal')" />
+    </div>
+    <el-table :data="signalList" border>
+      <el-table-column type="index" label="序号" width="60px" />
+      <el-table-column label="信号ID" prop="id" max-width="300px" show-overflow-tooltip />
+      <el-table-column label="信号名称" prop="name" max-width="300px" show-overflow-tooltip />
+    </el-table>
+
+    <el-dialog
+      v-model="dialogVisible"
+      :title="modelConfig.title"
+      :close-on-click-modal="false"
+      width="400px"
+      append-to-body
+      destroy-on-close
+    >
+      <el-form :model="modelObjectForm" label-width="90px">
+        <el-form-item :label="modelConfig.idLabel">
+          <el-input v-model="modelObjectForm.id" clearable />
+        </el-form-item>
+        <el-form-item :label="modelConfig.nameLabel">
+          <el-input v-model="modelObjectForm.name" clearable />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="addNewObject">保 存</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts" setup>
+defineOptions({ name: 'SignalAndMassage' })
+
+const message = useMessage()
+const signalList = ref<any[]>([])
+const messageList = ref<any[]>([])
+const dialogVisible = ref(false)
+const modelType = ref('')
+const modelObjectForm = ref<any>({})
+const rootElements = ref()
+const messageIdMap = ref()
+const signalIdMap = ref()
+const modelConfig = computed(() => {
+  if (modelType.value === 'message') {
+    return { title: '创建消息', idLabel: '消息ID', nameLabel: '消息名称' }
+  } else {
+    return { title: '创建信号', idLabel: '信号ID', nameLabel: '信号名称' }
+  }
+})
+const bpmnInstances = () => (window as any)?.bpmnInstances
+
+const initDataList = () => {
+  console.log(window, 'window')
+  rootElements.value = bpmnInstances().modeler.getDefinitions().rootElements
+  messageIdMap.value = {}
+  signalIdMap.value = {}
+  messageList.value = []
+  signalList.value = []
+  rootElements.value.forEach((el) => {
+    if (el.$type === 'bpmn:Message') {
+      messageIdMap.value[el.id] = true
+      messageList.value.push({ ...el })
+    }
+    if (el.$type === 'bpmn:Signal') {
+      signalIdMap.value[el.id] = true
+      signalList.value.push({ ...el })
+    }
+  })
+}
+const openModel = (type) => {
+  modelType.value = type
+  modelObjectForm.value = {}
+  dialogVisible.value = true
+}
+const addNewObject = () => {
+  if (modelType.value === 'message') {
+    if (messageIdMap.value[modelObjectForm.value.id]) {
+      message.error('该消息已存在，请修改id后重新保存')
+    }
+    const messageRef = bpmnInstances().moddle.create('bpmn:Message', modelObjectForm.value)
+    rootElements.value.push(messageRef)
+  } else {
+    if (signalIdMap.value[modelObjectForm.value.id]) {
+      message.error('该信号已存在，请修改id后重新保存')
+    }
+    const signalRef = bpmnInstances().moddle.create('bpmn:Signal', modelObjectForm.value)
+    rootElements.value.push(signalRef)
+  }
+  dialogVisible.value = false
+  initDataList()
+}
+
+onMounted(() => {
+  initDataList()
+})
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue
new file mode 100644
index 000000000..33a12a74c
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue
@@ -0,0 +1,86 @@
+<template>
+  <div class="panel-tab__content">
+    <el-form size="small" label-width="90px">
+      <el-form-item label="异步延续">
+        <el-checkbox
+          v-model="taskConfigForm.asyncBefore"
+          label="异步前"
+          @change="changeTaskAsync"
+        />
+        <el-checkbox v-model="taskConfigForm.asyncAfter" label="异步后" @change="changeTaskAsync" />
+        <el-checkbox
+          v-model="taskConfigForm.exclusive"
+          v-if="taskConfigForm.asyncAfter || taskConfigForm.asyncBefore"
+          label="排除"
+          @change="changeTaskAsync"
+        />
+      </el-form-item>
+      <component :is="witchTaskComponent" v-bind="$props" />
+    </el-form>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import UserTask from './task-components/UserTask.vue'
+import ScriptTask from './task-components/ScriptTask.vue'
+import ReceiveTask from './task-components/ReceiveTask.vue'
+
+defineOptions({ name: 'ElementTaskConfig' })
+
+const props = defineProps({
+  id: String,
+  type: String
+})
+const taskConfigForm = ref({
+  asyncAfter: false,
+  asyncBefore: false,
+  exclusive: false
+})
+const witchTaskComponent = ref()
+const installedComponent = ref({
+  // 手工任务与普通任务一致，不需要其他配置
+  // 接收消息任务，需要在全局下插入新的消息实例，并在该节点下的 messageRef 属性绑定该实例
+  // 发送任务、服务任务、业务规则任务共用一个相同配置
+  UserTask: 'UserTask', // 用户任务配置
+  ScriptTask: 'ScriptTask', // 脚本任务配置
+  ReceiveTask: 'ReceiveTask' // 消息接收任务
+})
+const bpmnElement = ref()
+
+const bpmnInstances = () => (window as any).bpmnInstances
+const changeTaskAsync = () => {
+  if (!taskConfigForm.value.asyncBefore && !taskConfigForm.value.asyncAfter) {
+    taskConfigForm.value.exclusive = false
+  }
+  bpmnInstances().modeling.updateProperties(bpmnInstances().bpmnElement, {
+    ...taskConfigForm.value
+  })
+}
+
+watch(
+  () => props.id,
+  () => {
+    bpmnElement.value = bpmnInstances().bpmnElement
+    taskConfigForm.value.asyncBefore = bpmnElement.value?.businessObject?.asyncBefore
+    taskConfigForm.value.asyncAfter = bpmnElement.value?.businessObject?.asyncAfter
+    taskConfigForm.value.exclusive = bpmnElement.value?.businessObject?.exclusive
+  },
+  { immediate: true }
+)
+watch(
+  () => props.type,
+  () => {
+    // witchTaskComponent.value = installedComponent.value[props.type]
+    if (props.type == installedComponent.value.UserTask) {
+      witchTaskComponent.value = UserTask
+    }
+    if (props.type == installedComponent.value.ScriptTask) {
+      witchTaskComponent.value = ScriptTask
+    }
+    if (props.type == installedComponent.value.ReceiveTask) {
+      witchTaskComponent.value = ReceiveTask
+    }
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue
new file mode 100644
index 000000000..83ed24ebd
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue
@@ -0,0 +1,125 @@
+<template>
+  <div style="margin-top: 16px">
+    <el-form-item label="消息实例">
+      <div
+        style="
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          flex-wrap: nowrap;
+        "
+      >
+        <el-select v-model="bindMessageId" @change="updateTaskMessage">
+          <el-option
+            v-for="key in Object.keys(messageMap)"
+            :value="key"
+            :label="messageMap[key]"
+            :key="key"
+          />
+        </el-select>
+        <XButton
+          type="primary"
+          preIcon="ep:plus"
+          style="margin-left: 8px"
+          @click="openMessageModel"
+        />
+      </div>
+    </el-form-item>
+    <el-dialog
+      v-model="messageModelVisible"
+      :close-on-click-modal="false"
+      title="创建新消息"
+      width="400px"
+      append-to-body
+      destroy-on-close
+    >
+      <el-form :model="newMessageForm" size="small" label-width="90px">
+        <el-form-item label="消息ID">
+          <el-input v-model="newMessageForm.id" clearable />
+        </el-form-item>
+        <el-form-item label="消息名称">
+          <el-input v-model="newMessageForm.name" clearable />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button size="small" type="primary" @click="createNewMessage">确 认</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script lang="ts" setup>
+defineOptions({ name: 'ReceiveTask' })
+const props = defineProps({
+  id: String,
+  type: String
+})
+
+const message = useMessage()
+
+const bindMessageId = ref('')
+const newMessageForm = ref<any>({})
+const messageMap = ref<any>({})
+const messageModelVisible = ref(false)
+const bpmnElement = ref<any>()
+const bpmnMessageRefsMap = ref<any>()
+const bpmnRootElements = ref<any>()
+
+const bpmnInstances = () => (window as any).bpmnInstances
+const getBindMessage = () => {
+  bpmnElement.value = bpmnInstances().bpmnElement
+  bindMessageId.value = bpmnElement.value.businessObject?.messageRef?.id || '-1'
+}
+const openMessageModel = () => {
+  messageModelVisible.value = true
+  newMessageForm.value = {}
+}
+const createNewMessage = () => {
+  if (messageMap.value[newMessageForm.value.id]) {
+    message.error('该消息已存在，请修改id后重新保存')
+    return
+  }
+  const newMessage = bpmnInstances().moddle.create('bpmn:Message', newMessageForm.value)
+  bpmnRootElements.value.push(newMessage)
+  messageMap.value[newMessageForm.value.id] = newMessageForm.value.name
+  bpmnMessageRefsMap.value[newMessageForm.value.id] = newMessage
+  messageModelVisible.value = false
+}
+const updateTaskMessage = (messageId) => {
+  if (messageId === '-1') {
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+      messageRef: null
+    })
+  } else {
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+      messageRef: bpmnMessageRefsMap.value[messageId]
+    })
+  }
+}
+
+onMounted(() => {
+  bpmnMessageRefsMap.value = Object.create(null)
+  bpmnRootElements.value = bpmnInstances().modeler.getDefinitions().rootElements
+  bpmnRootElements.value
+    .filter((el) => el.$type === 'bpmn:Message')
+    .forEach((m) => {
+      bpmnMessageRefsMap.value[m.id] = m
+      messageMap.value[m.id] = m.name
+    })
+  messageMap.value['-1'] = '无'
+})
+
+onBeforeUnmount(() => {
+  bpmnElement.value = null
+})
+watch(
+  () => props.id,
+  () => {
+    // bpmnElement.value = bpmnInstances().bpmnElement
+    nextTick(() => {
+      getBindMessage()
+    })
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue
new file mode 100644
index 000000000..683fef3be
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue
@@ -0,0 +1,99 @@
+<template>
+  <div style="margin-top: 16px">
+    <el-form-item label="脚本格式">
+      <el-input
+        v-model="scriptTaskForm.scriptFormat"
+        clearable
+        @input="updateElementTask()"
+        @change="updateElementTask()"
+      />
+    </el-form-item>
+    <el-form-item label="脚本类型">
+      <el-select v-model="scriptTaskForm.scriptType">
+        <el-option label="内联脚本" value="inline" />
+        <el-option label="外部资源" value="external" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="脚本" v-show="scriptTaskForm.scriptType === 'inline'">
+      <el-input
+        v-model="scriptTaskForm.script"
+        type="textarea"
+        resize="vertical"
+        :autosize="{ minRows: 2, maxRows: 4 }"
+        clearable
+        @input="updateElementTask()"
+        @change="updateElementTask()"
+      />
+    </el-form-item>
+    <el-form-item label="资源地址" v-show="scriptTaskForm.scriptType === 'external'">
+      <el-input
+        v-model="scriptTaskForm.resource"
+        clearable
+        @input="updateElementTask()"
+        @change="updateElementTask()"
+      />
+    </el-form-item>
+    <el-form-item label="结果变量">
+      <el-input
+        v-model="scriptTaskForm.resultVariable"
+        clearable
+        @input="updateElementTask()"
+        @change="updateElementTask()"
+      />
+    </el-form-item>
+  </div>
+</template>
+
+<script lang="ts" setup>
+defineOptions({ name: 'ScriptTask' })
+const props = defineProps({
+  id: String,
+  type: String
+})
+const defaultTaskForm = ref({
+  scriptFormat: '',
+  script: '',
+  resource: '',
+  resultVariable: ''
+})
+const scriptTaskForm = ref<any>({})
+const bpmnElement = ref()
+
+const bpmnInstances = () => (window as any)?.bpmnInstances
+
+const resetTaskForm = () => {
+  for (let key in defaultTaskForm.value) {
+    let value = bpmnElement.value?.businessObject[key] || defaultTaskForm.value[key]
+    scriptTaskForm.value[key] = value
+  }
+  scriptTaskForm.value.scriptType = scriptTaskForm.value.script ? 'inline' : 'external'
+}
+const updateElementTask = () => {
+  let taskAttr = Object.create(null)
+  taskAttr.scriptFormat = scriptTaskForm.value.scriptFormat || null
+  taskAttr.resultVariable = scriptTaskForm.value.resultVariable || null
+  if (scriptTaskForm.value.scriptType === 'inline') {
+    taskAttr.script = scriptTaskForm.value.script || null
+    taskAttr.resource = null
+  } else {
+    taskAttr.resource = scriptTaskForm.value.resource || null
+    taskAttr.script = null
+  }
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), taskAttr)
+}
+
+onBeforeUnmount(() => {
+  bpmnElement.value = null
+})
+
+watch(
+  () => props.id,
+  () => {
+    bpmnElement.value = bpmnInstances().bpmnElement
+    nextTick(() => {
+      resetTaskForm()
+    })
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
new file mode 100644
index 000000000..7b793dbc3
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
@@ -0,0 +1,98 @@
+<template>
+  <div style="margin-top: 16px">
+    <!--    <el-form-item label="处理用户">-->
+    <!--      <el-select v-model="userTaskForm.assignee" @change="updateElementTask('assignee')">-->
+    <!--        <el-option v-for="ak in mockData" :key="'ass-' + ak" :label="`用户${ak}`" :value="`user${ak}`" />-->
+    <!--      </el-select>-->
+    <!--    </el-form-item>-->
+    <!--    <el-form-item label="候选用户">-->
+    <!--      <el-select v-model="userTaskForm.candidateUsers" multiple collapse-tags @change="updateElementTask('candidateUsers')">-->
+    <!--        <el-option v-for="uk in mockData" :key="'user-' + uk" :label="`用户${uk}`" :value="`user${uk}`" />-->
+    <!--      </el-select>-->
+    <!--    </el-form-item>-->
+    <!--    <el-form-item label="候选分组">-->
+    <!--      <el-select v-model="userTaskForm.candidateGroups" multiple collapse-tags @change="updateElementTask('candidateGroups')">-->
+    <!--        <el-option v-for="gk in mockData" :key="'ass-' + gk" :label="`分组${gk}`" :value="`group${gk}`" />-->
+    <!--      </el-select>-->
+    <!--    </el-form-item>-->
+    <el-form-item label="到期时间">
+      <el-input v-model="userTaskForm.dueDate" clearable @change="updateElementTask('dueDate')" />
+    </el-form-item>
+    <el-form-item label="跟踪时间">
+      <el-input
+        v-model="userTaskForm.followUpDate"
+        clearable
+        @change="updateElementTask('followUpDate')"
+      />
+    </el-form-item>
+    <el-form-item label="优先级">
+      <el-input v-model="userTaskForm.priority" clearable @change="updateElementTask('priority')" />
+    </el-form-item>
+    友情提示：任务的分配规则，使用
+    <router-link target="_blank" :to="{ path: '/bpm/manager/model' }"
+      ><el-link type="danger">流程模型</el-link>
+    </router-link>
+    下的【分配规则】替代，提供指定角色、部门负责人、部门成员、岗位、工作组、自定义脚本等 7
+    种维护的任务分配维度，更加灵活！
+  </div>
+</template>
+
+<script lang="ts" setup>
+defineOptions({ name: 'UserTask' })
+const props = defineProps({
+  id: String,
+  type: String
+})
+const defaultTaskForm = ref({
+  assignee: '',
+  candidateUsers: [],
+  candidateGroups: [],
+  dueDate: '',
+  followUpDate: '',
+  priority: ''
+})
+const userTaskForm = ref<any>({})
+// const mockData=ref([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+const bpmnElement = ref()
+const bpmnInstances = () => (window as any)?.bpmnInstances
+
+const resetTaskForm = () => {
+  for (let key in defaultTaskForm.value) {
+    let value
+    if (key === 'candidateUsers' || key === 'candidateGroups') {
+      value = bpmnElement.value?.businessObject[key]
+        ? bpmnElement.value.businessObject[key].split(',')
+        : []
+    } else {
+      value = bpmnElement.value?.businessObject[key] || defaultTaskForm.value[key]
+    }
+    userTaskForm.value[key] = value
+  }
+}
+const updateElementTask = (key) => {
+  const taskAttr = Object.create(null)
+  if (key === 'candidateUsers' || key === 'candidateGroups') {
+    taskAttr[key] =
+      userTaskForm.value[key] && userTaskForm.value[key].length
+        ? userTaskForm.value[key].join()
+        : null
+  } else {
+    taskAttr[key] = userTaskForm.value[key] || null
+  }
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), taskAttr)
+}
+
+watch(
+  () => props.id,
+  () => {
+    bpmnElement.value = bpmnInstances().bpmnElement
+    nextTick(() => {
+      resetTaskForm()
+    })
+  },
+  { immediate: true }
+)
+onBeforeUnmount(() => {
+  bpmnElement.value = null
+})
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/theme/element-variables.scss b/src/components/bpmnProcessDesigner/package/theme/element-variables.scss
new file mode 100644
index 000000000..49bd326dc
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/theme/element-variables.scss
@@ -0,0 +1,70 @@
+/* 改变主题色变量 */
+$--color-primary: #1890ff;
+$--color-danger: #ff4d4f;
+
+/* 改变 icon 字体路径变量，必需 */
+$--font-path: '~element-ui/lib/theme-chalk/fonts';
+
+@import '~element-ui/packages/theme-chalk/src/index';
+
+.el-table td,
+.el-table th {
+  color: #333;
+}
+.el-drawer__header {
+  padding: 16px 16px 8px 16px;
+  margin: 0;
+  line-height: 24px;
+  font-size: 18px;
+  color: #303133;
+  box-sizing: border-box;
+  border-bottom: 1px solid #e8e8e8;
+}
+div[class^='el-drawer']:focus,
+span:focus {
+  outline: none;
+}
+.el-drawer__body {
+  box-sizing: border-box;
+  padding: 16px;
+  width: 100%;
+  overflow-y: auto;
+}
+
+.el-dialog {
+  margin-top: 50vh !important;
+  transform: translateY(-50%);
+  overflow: hidden;
+}
+.el-dialog__wrapper {
+  overflow: hidden;
+  max-height: 100vh;
+}
+.el-dialog__header {
+  padding: 16px 16px 8px 16px;
+  box-sizing: border-box;
+  border-bottom: 1px solid #e8e8e8;
+}
+.el-dialog__body {
+  padding: 16px;
+  max-height: 80vh;
+  box-sizing: border-box;
+  overflow-y: auto;
+}
+.el-dialog__footer {
+  padding: 16px;
+  box-sizing: border-box;
+  border-top: 1px solid #e8e8e8;
+}
+.el-dialog__close {
+  font-weight: 600;
+}
+.el-select {
+  width: 100%;
+}
+.el-divider:not(.el-divider--horizontal) {
+  margin: 0 8px;
+}
+.el-divider.el-divider--horizontal {
+  margin: 16px 0;
+}
diff --git a/src/components/bpmnProcessDesigner/package/theme/index.scss b/src/components/bpmnProcessDesigner/package/theme/index.scss
new file mode 100644
index 000000000..2e60fad47
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/theme/index.scss
@@ -0,0 +1,2 @@
+@import './process-designer.scss';
+@import './process-panel.scss';
diff --git a/src/components/bpmnProcessDesigner/package/theme/process-designer.scss b/src/components/bpmnProcessDesigner/package/theme/process-designer.scss
new file mode 100644
index 000000000..6af945dac
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/theme/process-designer.scss
@@ -0,0 +1,161 @@
+@import 'bpmn-js-token-simulation/assets/css/bpmn-js-token-simulation.css';
+@import 'bpmn-js-token-simulation/assets/css/font-awesome.min.css';
+@import 'bpmn-js-token-simulation/assets/css/normalize.css';
+
+// 边框被 token-simulation 样式覆盖了
+.djs-palette {
+  background: var(--palette-background-color);
+  border: solid 1px var(--palette-border-color) !important;
+  border-radius: 2px;
+}
+
+.my-process-designer {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  .my-process-designer__header {
+    width: 100%;
+    min-height: 36px;
+    .el-button {
+      text-align: center;
+    }
+    .el-button-group {
+      margin: 4px;
+    }
+    .el-tooltip__popper {
+      .el-button {
+        width: 100%;
+        text-align: left;
+        padding-left: 8px;
+        padding-right: 8px;
+      }
+      .el-button:hover {
+        background: rgba(64, 158, 255, 0.8);
+        color: #ffffff;
+      }
+    }
+    .align {
+      position: relative;
+      i {
+        &:after {
+          content: '|';
+          position: absolute;
+          // transform: rotate(90deg) translate(200%, 60%);
+          transform: rotate(180deg) translate(271%, -10%);
+        }
+      }
+    }
+    .align.align-left i {
+      transform: rotate(90deg);
+    }
+    .align.align-right i {
+      transform: rotate(-90deg);
+    }
+    .align.align-top i {
+      transform: rotate(180deg);
+    }
+    .align.align-bottom i {
+      transform: rotate(0deg);
+    }
+    .align.align-center i {
+      transform: rotate(0deg);
+      &:after {
+        // transform: rotate(90deg) translate(0, 60%);
+        transform: rotate(0deg) translate(-0%, -5%);
+      }
+    }
+    .align.align-middle i {
+      transform: rotate(-90deg);
+      &:after {
+        // transform: rotate(90deg) translate(0, 60%);
+        transform: rotate(0deg) translate(0, -10%);
+      }
+    }
+  }
+  .my-process-designer__container {
+    display: inline-flex;
+    width: 100%;
+    flex: 1;
+    .my-process-designer__canvas {
+      flex: 1;
+      height: 100%;
+      position: relative;
+      background: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImEiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTTAgMTBoNDBNMTAgMHY0ME0wIDIwaDQwTTIwIDB2NDBNMCAzMGg0ME0zMCAwdjQwIiBmaWxsPSJub25lIiBzdHJva2U9IiNlMGUwZTAiIG9wYWNpdHk9Ii4yIi8+PHBhdGggZD0iTTQwIDBIMHY0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZTBlMGUwIi8+PC9wYXR0ZXJuPjwvZGVmcz48cmVjdCB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2EpIi8+PC9zdmc+')
+        repeat !important;
+      div.toggle-mode {
+        display: none;
+      }
+    }
+    .my-process-designer__property-panel {
+      height: 100%;
+      overflow: scroll;
+      overflow-y: auto;
+      z-index: 10;
+      * {
+        box-sizing: border-box;
+      }
+    }
+    svg {
+      width: 100%;
+      height: 100%;
+      min-height: 100%;
+      overflow: hidden;
+    }
+  }
+}
+
+//侧边栏配置
+// .djs-palette .two-column .open {
+.open {
+  // .djs-palette.open {
+  .djs-palette-entries {
+    div[class^='bpmn-icon-']:before,
+    div[class*='bpmn-icon-']:before {
+      line-height: unset;
+    }
+    div.entry {
+      position: relative;
+    }
+    div.entry:hover {
+      &::after {
+        width: max-content;
+        content: attr(title);
+        vertical-align: text-bottom;
+        position: absolute;
+        right: -10px;
+        top: 0;
+        bottom: 0;
+        overflow: hidden;
+        transform: translateX(100%);
+        font-size: 0.5em;
+        display: inline-block;
+        text-decoration: inherit;
+        font-variant: normal;
+        text-transform: none;
+        background: #fafafa;
+        box-shadow: 0 0 6px #eeeeee;
+        border: 1px solid #cccccc;
+        box-sizing: border-box;
+        padding: 0 16px;
+        border-radius: 4px;
+        z-index: 100;
+      }
+    }
+  }
+}
+pre {
+  margin: 0;
+  height: 100%;
+  overflow: hidden;
+  max-height: calc(80vh - 32px);
+  overflow-y: auto;
+}
+.hljs {
+  word-break: break-word;
+  white-space: pre-wrap;
+}
+.hljs * {
+  font-family: Consolas, Monaco, monospace;
+}
diff --git a/src/components/bpmnProcessDesigner/package/theme/process-panel.scss b/src/components/bpmnProcessDesigner/package/theme/process-panel.scss
new file mode 100644
index 000000000..f840cdde6
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/theme/process-panel.scss
@@ -0,0 +1,107 @@
+.process-panel__container {
+  box-sizing: border-box;
+  padding: 0 8px;
+  border-left: 1px solid #eeeeee;
+  box-shadow: 0 0 8px #cccccc;
+  max-height: 100%;
+  overflow-y: scroll;
+}
+.panel-tab__title {
+  font-weight: 600;
+  padding: 0 8px;
+  font-size: 1.1em;
+  line-height: 1.2em;
+  i {
+    margin-right: 8px;
+    font-size: 1.2em;
+  }
+}
+.panel-tab__content {
+  width: 100%;
+  box-sizing: border-box;
+  border-top: 1px solid #eeeeee;
+  padding: 8px 16px;
+  .panel-tab__content--title {
+    display: flex;
+    justify-content: space-between;
+    padding-bottom: 8px;
+    span {
+      flex: 1;
+      text-align: left;
+    }
+  }
+}
+.element-property {
+  width: 100%;
+  display: flex;
+  align-items: flex-start;
+  margin: 8px 0;
+  .element-property__label {
+    display: block;
+    width: 90px;
+    text-align: right;
+    overflow: hidden;
+    padding-right: 12px;
+    line-height: 32px;
+    font-size: 14px;
+    box-sizing: border-box;
+  }
+  .element-property__value {
+    flex: 1;
+    line-height: 32px;
+  }
+  .el-form-item {
+    width: 100%;
+    margin-bottom: 0;
+    padding-bottom: 18px;
+  }
+}
+.list-property {
+  flex-direction: column;
+  .element-listener-item {
+    width: 100%;
+    display: inline-grid;
+    grid-template-columns: 16px auto 32px 32px;
+    grid-column-gap: 8px;
+  }
+  .element-listener-item + .element-listener-item {
+    margin-top: 8px;
+  }
+}
+.listener-filed__title {
+  display: inline-flex;
+  width: 100%;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 0;
+  span {
+    width: 200px;
+    text-align: left;
+    font-size: 14px;
+  }
+  i {
+    margin-right: 8px;
+  }
+}
+.element-drawer__button {
+  margin-top: 8px;
+  width: 100%;
+  display: inline-flex;
+  justify-content: space-around;
+}
+.element-drawer__button > .el-button {
+  width: 100%;
+}
+
+.el-collapse-item__content {
+  padding-bottom: 0;
+}
+.el-input.is-disabled .el-input__inner {
+  color: #999999;
+}
+.el-form-item.el-form-item--mini {
+  margin-bottom: 0;
+  & + .el-form-item {
+    margin-top: 16px;
+  }
+}
diff --git a/src/components/bpmnProcessDesigner/package/utils.ts b/src/components/bpmnProcessDesigner/package/utils.ts
new file mode 100644
index 000000000..bb6c5d529
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/utils.ts
@@ -0,0 +1,77 @@
+import { toRaw } from 'vue'
+const bpmnInstances = () => (window as any)?.bpmnInstances
+// 创建监听器实例
+export function createListenerObject(options, isTask, prefix) {
+  const listenerObj = Object.create(null)
+  listenerObj.event = options.event
+  isTask && (listenerObj.id = options.id) // 任务监听器特有的 id 字段
+  switch (options.listenerType) {
+    case 'scriptListener':
+      listenerObj.script = createScriptObject(options, prefix)
+      break
+    case 'expressionListener':
+      listenerObj.expression = options.expression
+      break
+    case 'delegateExpressionListener':
+      listenerObj.delegateExpression = options.delegateExpression
+      break
+    default:
+      listenerObj.class = options.class
+  }
+  // 注入字段
+  if (options.fields) {
+    listenerObj.fields = options.fields.map((field) => {
+      return createFieldObject(field, prefix)
+    })
+  }
+  // 任务监听器的 定时器 设置
+  if (isTask && options.event === 'timeout' && !!options.eventDefinitionType) {
+    const timeDefinition = bpmnInstances().moddle.create('bpmn:FormalExpression', {
+      body: options.eventTimeDefinitions
+    })
+    const TimerEventDefinition = bpmnInstances().moddle.create('bpmn:TimerEventDefinition', {
+      id: `TimerEventDefinition_${uuid(8)}`,
+      [`time${options.eventDefinitionType.replace(/^\S/, (s) => s.toUpperCase())}`]: timeDefinition
+    })
+    listenerObj.eventDefinitions = [TimerEventDefinition]
+  }
+  return bpmnInstances().moddle.create(
+    `${prefix}:${isTask ? 'TaskListener' : 'ExecutionListener'}`,
+    listenerObj
+  )
+}
+
+// 创建 监听器的注入字段 实例
+export function createFieldObject(option, prefix) {
+  const { name, fieldType, string, expression } = option
+  const fieldConfig = fieldType === 'string' ? { name, string } : { name, expression }
+  return bpmnInstances().moddle.create(`${prefix}:Field`, fieldConfig)
+}
+
+// 创建脚本实例
+export function createScriptObject(options, prefix) {
+  const { scriptType, scriptFormat, value, resource } = options
+  const scriptConfig =
+    scriptType === 'inlineScript' ? { scriptFormat, value } : { scriptFormat, resource }
+  return bpmnInstances().moddle.create(`${prefix}:Script`, scriptConfig)
+}
+
+// 更新元素扩展属性
+export function updateElementExtensions(element, extensionList) {
+  const extensions = bpmnInstances().moddle.create('bpmn:ExtensionElements', {
+    values: extensionList
+  })
+  bpmnInstances().modeling.updateProperties(toRaw(element), {
+    extensionElements: extensions
+  })
+}
+
+// 创建一个id
+export function uuid(length = 8, chars?) {
+  let result = ''
+  const charsString = chars || '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+  for (let i = length; i > 0; --i) {
+    result += charsString[Math.floor(Math.random() * charsString.length)]
+  }
+  return result
+}
diff --git a/src/components/bpmnProcessDesigner/src/highlight/index.js b/src/components/bpmnProcessDesigner/src/highlight/index.js
new file mode 100644
index 000000000..5df38c9a9
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/src/highlight/index.js
@@ -0,0 +1,5 @@
+const hljs = require('highlight.js/lib/core')
+hljs.registerLanguage('xml', require('highlight.js/lib/languages/xml'))
+hljs.registerLanguage('json', require('highlight.js/lib/languages/json'))
+
+module.exports = hljs
diff --git a/src/components/bpmnProcessDesigner/src/modules/custom-renderer/CustomRenderer.js b/src/components/bpmnProcessDesigner/src/modules/custom-renderer/CustomRenderer.js
new file mode 100644
index 000000000..e8760315e
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/src/modules/custom-renderer/CustomRenderer.js
@@ -0,0 +1,14 @@
+import BpmnRenderer from 'bpmn-js/lib/draw/BpmnRenderer'
+
+export default function CustomRenderer(config, eventBus, styles, pathMap, canvas, textRenderer) {
+  BpmnRenderer.call(this, config, eventBus, styles, pathMap, canvas, textRenderer, 2000)
+
+  this.handlers['label'] = function () {
+    return null
+  }
+}
+
+const F = function () {} // 核心，利用空对象作为中介；
+F.prototype = BpmnRenderer.prototype // 核心，将父类的原型赋值给空对象F；
+CustomRenderer.prototype = new F() // 核心，将 F的实例赋值给子类；
+CustomRenderer.prototype.constructor = CustomRenderer // 修复子类CustomRenderer的构造器指向，防止原型链的混乱；
diff --git a/src/components/bpmnProcessDesigner/src/modules/custom-renderer/index.js b/src/components/bpmnProcessDesigner/src/modules/custom-renderer/index.js
new file mode 100644
index 000000000..79d8bd046
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/src/modules/custom-renderer/index.js
@@ -0,0 +1,6 @@
+import CustomRenderer from './CustomRenderer'
+
+export default {
+  __init__: ['customRenderer'],
+  customRenderer: ['type', CustomRenderer]
+}
diff --git a/src/components/bpmnProcessDesigner/src/modules/rules/CustomRules.js b/src/components/bpmnProcessDesigner/src/modules/rules/CustomRules.js
new file mode 100644
index 000000000..9fa1d14a3
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/src/modules/rules/CustomRules.js
@@ -0,0 +1,16 @@
+import BpmnRules from 'bpmn-js/lib/features/rules/BpmnRules'
+import inherits from 'inherits'
+
+export default function CustomRules(eventBus) {
+  BpmnRules.call(this, eventBus)
+}
+
+inherits(CustomRules, BpmnRules)
+
+CustomRules.prototype.canDrop = function () {
+  return false
+}
+
+CustomRules.prototype.canMove = function () {
+  return false
+}
diff --git a/src/components/bpmnProcessDesigner/src/modules/rules/index.js b/src/components/bpmnProcessDesigner/src/modules/rules/index.js
new file mode 100644
index 000000000..12cf05a73
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/src/modules/rules/index.js
@@ -0,0 +1,6 @@
+import CustomRules from './CustomRules'
+
+export default {
+  __init__: ['customRules'],
+  customRules: ['type', CustomRules]
+}
diff --git a/src/components/bpmnProcessDesigner/src/translations.ts b/src/components/bpmnProcessDesigner/src/translations.ts
new file mode 100644
index 000000000..5f9b9a513
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/src/translations.ts
@@ -0,0 +1,25 @@
+/**
+ * This is a sample file that should be replaced with the actual translation.
+ *
+ * Checkout https://github.com/bpmn-io/bpmn-js-i18n for a list of available
+ * translations and labels to translate.
+ */
+export default {
+  'Exclusive Gateway': 'Exklusives Gateway',
+  'Parallel Gateway': 'Paralleles Gateway',
+  'Inclusive Gateway': 'Inklusives Gateway',
+  'Complex Gateway': 'Komplexes Gateway',
+  'Event based Gateway': 'Ereignis-basiertes Gateway',
+  'Message Start Event': '消息启动事件',
+  'Timer Start Event': '定时启动事件',
+  'Conditional Start Event': '条件启动事件',
+  'Signal Start Event': '信号启动事件',
+  'Error Start Event': '错误启动事件',
+  'Escalation Start Event': '升级启动事件',
+  'Compensation Start Event': '补偿启动事件',
+  'Message Start Event (non-interrupting)': '消息启动事件 (非中断)',
+  'Timer Start Event (non-interrupting)': '定时启动事件 (非中断)',
+  'Conditional Start Event (non-interrupting)': '条件启动事件 (非中断)',
+  'Signal Start Event (non-interrupting)': '信号启动事件 (非中断)',
+  'Escalation Start Event (non-interrupting)': '升级启动事件 (非中断)'
+}
diff --git a/src/components/bpmnProcessDesigner/src/utils/directive/clickOutSide.js b/src/components/bpmnProcessDesigner/src/utils/directive/clickOutSide.js
new file mode 100644
index 000000000..bb71d4420
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/src/utils/directive/clickOutSide.js
@@ -0,0 +1,39 @@
+//outside.js
+
+const ctx = '@@clickoutsideContext'
+
+export default {
+  bind(el, binding, vnode) {
+    const ele = el
+    const documentHandler = (e) => {
+      if (!vnode.context || ele.contains(e.target)) {
+        return false
+      }
+      // 调用指令回调
+      if (binding.expression) {
+        vnode.context[el[ctx].methodName](e)
+      } else {
+        el[ctx].bindingFn(e)
+      }
+    }
+    // 将方法添加到ele
+    ele[ctx] = {
+      documentHandler,
+      methodName: binding.expression,
+      bindingFn: binding.value
+    }
+
+    setTimeout(() => {
+      document.addEventListener('touchstart', documentHandler) // 为document绑定事件
+    })
+  },
+  update(el, binding) {
+    const ele = el
+    ele[ctx].methodName = binding.expression
+    ele[ctx].bindingFn = binding.value
+  },
+  unbind(el) {
+    document.removeEventListener('touchstart', el[ctx].documentHandler) // 解绑
+    delete el[ctx]
+  }
+}
diff --git a/src/components/bpmnProcessDesigner/src/utils/index.js b/src/components/bpmnProcessDesigner/src/utils/index.js
new file mode 100644
index 000000000..7d970ecd4
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/src/utils/index.js
@@ -0,0 +1,10 @@
+export function debounce(fn, delay = 500) {
+  let timer
+  return function (...args) {
+    if (timer) {
+      clearTimeout(timer)
+      timer = null
+    }
+    timer = setTimeout(fn.bind(this, ...args), delay)
+  }
+}
diff --git a/src/components/bpmnProcessDesigner/src/utils/xml2json.js b/src/components/bpmnProcessDesigner/src/utils/xml2json.js
new file mode 100644
index 000000000..fe1a52fb4
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/src/utils/xml2json.js
@@ -0,0 +1,50 @@
+function xmlStr2XmlObj(xmlStr) {
+  let xmlObj = {}
+  if (document.all) {
+    const xmlDom = new window.ActiveXObject('Microsoft.XMLDOM')
+    xmlDom.loadXML(xmlStr)
+    xmlObj = xmlDom
+  } else {
+    xmlObj = new DOMParser().parseFromString(xmlStr, 'text/xml')
+  }
+  return xmlObj
+}
+
+function xml2json(xml) {
+  try {
+    let obj = {}
+    if (xml.children.length > 0) {
+      for (let i = 0; i < xml.children.length; i++) {
+        const item = xml.children.item(i)
+        const nodeName = item.nodeName
+        if (typeof obj[nodeName] == 'undefined') {
+          obj[nodeName] = xml2json(item)
+        } else {
+          if (typeof obj[nodeName].push == 'undefined') {
+            const old = obj[nodeName]
+            obj[nodeName] = []
+            obj[nodeName].push(old)
+          }
+          obj[nodeName].push(xml2json(item))
+        }
+      }
+    } else {
+      obj = xml.textContent
+    }
+    return obj
+  } catch (e) {
+    console.log(e.message)
+  }
+}
+
+function xmlObj2json(xml) {
+  const xmlObj = xmlStr2XmlObj(xml)
+  console.log(xmlObj)
+  let jsonObj = {}
+  if (xmlObj.childNodes.length > 0) {
+    jsonObj = xml2json(xmlObj)
+  }
+  return jsonObj
+}
+
+export default xmlObj2json
diff --git a/src/components/iFrame/index.ts b/src/components/iFrame/index.ts
new file mode 100644
index 000000000..9f8cf24a5
--- /dev/null
+++ b/src/components/iFrame/index.ts
@@ -0,0 +1,3 @@
+import IFrame from './src/IFrame.vue'
+
+export { IFrame }
diff --git a/src/components/iFrame/src/IFrame.vue b/src/components/iFrame/src/IFrame.vue
new file mode 100644
index 000000000..85b3e3c34
--- /dev/null
+++ b/src/components/iFrame/src/IFrame.vue
@@ -0,0 +1,68 @@
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import { getAccessToken, getTenantId } from '@/utils/auth'
+
+defineOptions({ name: 'IFrame' })
+
+const props = defineProps({
+  src: propTypes.string.def('')
+})
+const loading = ref(true)
+const height = ref('')
+const frameRef = ref<HTMLElement | null>(null)
+const init = () => {
+  height.value = document.documentElement.clientHeight - 94.5 + 'px'
+  loading.value = false
+}
+console.log(props.src);
+
+function populateIframe(iframe, headers) {
+  var xhr = new XMLHttpRequest();
+  xhr.open("GET", props.src);
+  xhr.responseType = "blob";
+  headers.forEach((header) => {
+    xhr.setRequestHeader(header[0], header[1]);
+  });
+  // xhr.onreadystatechange = () => {
+  //   if (xhr.readyState === xhr.DONE) {
+      
+  //     if (xhr.status === 200) {
+  //       iframe.src = URL.createObjectURL(xhr.response);
+  //     }
+  //   }
+  // };
+  xhr.send();
+}
+
+
+onMounted(() => {
+  
+  setTimeout(() => {
+    var iframe = document.querySelector("#iframe");
+    populateIframe(iframe, [["Authorization", 'Bearer ' +  getAccessToken()], ["tenant-id", getTenantId()]]);
+  }, 300);
+  setTimeout(() => {
+    init()
+  }, 300)
+})
+</script>
+<template>
+  <div v-loading="loading" :style="'height:' + height">
+    <!-- <iframe
+      ref="frameRef"
+      :src="props.src"
+      frameborder="no"
+      scrolling="auto"
+      style="width: 100%; height: 100%"
+      id="iframe"
+    ></iframe> -->
+    <iframe
+        ref="frameRef"
+        frameborder="no"
+        scrolling="auto"
+        style="width: 100%; height: 100%"
+        id="iframe"
+        :src="props.src"
+      ></iframe>
+  </div>
+</template>
diff --git a/src/components/index.ts b/src/components/index.ts
new file mode 100644
index 000000000..4d030c379
--- /dev/null
+++ b/src/components/index.ts
@@ -0,0 +1,6 @@
+import type { App } from 'vue'
+import { Icon } from './Icon'
+
+export const setupGlobCom = (app: App<Element>): void => {
+  app.component('Icon', Icon)
+}
diff --git a/src/components/rowDrop/index.vue b/src/components/rowDrop/index.vue
new file mode 100644
index 000000000..72c2fb400
--- /dev/null
+++ b/src/components/rowDrop/index.vue
@@ -0,0 +1,236 @@
+<template>
+  <!-- <Dialog title="字段设置"  width="270" v-model="popoverVisible" :scroll="true" :maxHeight="500"> -->
+    <div class="test_wrapper" @dragover="dragover($event)">
+      <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handlecheckallchange">全部</el-checkbox>
+      <el-checkbox-group v-model="checkedDataList" @change="handlecheckedchange">
+        <draggable :list="allData" :force-fallback="true" chosen-class="chosen" animation="300" @end="dragend" @update="dragenter" >
+          <template #item="{element}">
+            <div><el-checkbox :key="element" :label="element">{{element}}</el-checkbox></div>
+          </template>
+        </draggable>
+      </el-checkbox-group>
+    </div>
+    <div class="footer">
+    <!-- <template #footer> -->
+      <el-button size="small" @click="reset">重置</el-button>
+      <el-button size="small" @click="closeRowDrop">关闭</el-button>
+    <!-- </template> -->
+  </div>
+  <!-- </Dialog> -->
+</template>
+<script setup lang="ts">
+import { ElMessageBox } from 'element-plus'
+import * as RedisApi from '@/api/redis'
+import draggable from "vuedraggable";
+
+defineOptions({ name: 'RowDrop' })
+
+
+const props = defineProps({
+  allSchemas: {
+    type: Object,
+    default: null
+  }
+})
+const popoverVisible = ref(false)
+const route = useRoute() // 路由信息
+const routeName = ref(route.name)
+
+
+const isIndeterminate = ref(true)
+const allData = ref([]) // 字段设置列表展现字段 除操作外
+const checkedDataList = ref([])
+const checkAll = ref(true)
+const handlecheckallchange = (val: boolean) => {
+  checkedDataList.value = val ? allData.value : []
+  isIndeterminate.value = false
+  save()
+}
+const handlecheckedchange = (value: string[]) => {
+  const checkedCount = value.length
+  checkAll.value = checkedCount === allData.value.length
+  isIndeterminate.value = checkedCount > 0 && checkedCount < allData.value.length
+  save()
+}
+
+const reset = () => {
+  ElMessageBox.confirm('重置后，字段设置将恢复初始设置，是否继续?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    RedisApi.deleteRedis(routeName.value).then(() => {
+      initSelectSta()
+      closeRowDrop()
+    }).catch(err => {
+      console.log(err)
+    })
+  })
+}
+
+// 关闭页面
+const closeRowDrop = () => {
+  emit('closeRowDrop')
+}
+
+// 保存
+const save = () => {
+  let saveDate:any[] = []
+  // 默认列表第一列（弹出详情用）
+  saveDate.push(props.allSchemas.tableColumns[0])
+  allData.value.forEach((item) => {
+    const _item:any = props.allSchemas.tableColumns.find(itemColumns => (itemColumns.label == item ))
+    _item.isTable = false
+    if (checkedDataList.value.indexOf(_item.label) > -1) {
+      _item.isTable = true
+      saveDate.push(_item)
+    }
+  })
+  // 默认操作列
+  saveDate.push(props.allSchemas.tableColumns[props.allSchemas.tableColumns.length-1])
+  updataTableColumns(saveDate)
+  console.log(99, saveDate)
+  RedisApi.addRedis({key: routeName.value,value: JSON.stringify(saveDate)}).then(() => {
+  }).catch(err => {
+    console.log(err)
+  })
+}
+
+// 记录移动过程中信息
+const dragenter = (e) => {
+  e.preventDefault()
+}
+
+// 拖拽最终操作
+const dragend = ( e) => {
+  sort(checkedDataList.value,allData.value)
+  save()
+  e.preventDefault()
+}
+
+// 数组排序 arr1 按照 arr2 排序
+const sort = (arr1,arr2) => {
+  arr1.sort((a,b) => arr2.indexOf(a)-arr2.indexOf(b))
+}
+
+// 拖动事件（主要是为了拖动时鼠标光标不变为禁止）
+const dragover = (e) => {
+  e.preventDefault()
+}
+
+// 初始化当前全选状态
+const initSelectSta = () => {
+  RedisApi.getRedis(routeName.value).then(res => {
+    const _myTableColumns = props.allSchemas?.tableColumns
+    // 有缓存
+    if (res) {
+      checkedDataList.value = []
+      allData.value = []
+      // 缓存回显临时变量
+      const _showTableColumns = []
+      _showTableColumns.push(_myTableColumns[0])
+      // 显示缓存中的字段
+      JSON.parse(res).forEach((item, index) => {
+        // 列表字段第一个不能参与排序及显隐操作（详情弹窗必备）
+        // 列表字段操作列不能参与排序及显隐操作
+        if (!item.fixed) {
+          if (item.field != 'action') {
+            checkedDataList.value.push(item.label)
+            _showTableColumns.push(_myTableColumns.find(myItem => (myItem.label == item.label)))
+            allData.value.push(item.label)
+          }
+        }
+      })
+      // 字段设置 显示全部字段
+      _myTableColumns?.forEach((myTableItem, index) => {
+        // 列表字段第一个不能参与排序及显隐操作（详情弹窗必备）
+        // 列表字段操作列不能参与排序及显隐操作
+        if (!myTableItem.fixed) {
+          if (myTableItem.field != 'action') {
+            if (allData.value.indexOf(myTableItem.label) == -1) {
+              allData.value.push(myTableItem.label)
+            }
+          }
+        }
+      })
+      
+      _showTableColumns.push(_myTableColumns[_myTableColumns.length-1])
+      if(checkedDataList.value.length>0){
+        if(allData.value?.length != checkedDataList.value.length){
+          isIndeterminate.value = true
+        }else{
+          isIndeterminate.value = false
+          checkAll.value = true
+        }
+      }else{
+        isIndeterminate.value = false
+        checkAll.value = false
+      }
+     
+      updataTableColumns(_showTableColumns)
+     
+    } else { // 无缓存
+      checkedDataList.value = []
+      allData.value = []
+      _myTableColumns?.forEach((item, index) => {
+        // 列表字段第一个不能参与排序及显隐操作（详情弹窗必备）
+        // 列表字段操作列不能参与排序及显隐操作
+        if (!item.fixed) {
+          if (item.field != 'action') {
+            checkedDataList.value.push(item.label)
+            allData.value.push(item.label)
+          }
+        }
+      })
+      checkAll.value = true
+      updataTableColumns(_myTableColumns)
+    }
+  }).catch(err => {
+    console.log(err)
+  })
+}
+
+// 更新主列表字段
+const updataTableColumns = (val) => {
+  emit('updataTableColumns', val)
+}
+
+// 传递给父类
+const emit = defineEmits([
+  'updataTableColumns',
+  'closeRowDrop'
+])
+
+/** 初始化 **/
+onMounted(() => {
+  initSelectSta()
+})
+
+defineExpose({
+  popoverVisible
+})
+
+</script>
+<style lang="scss" scoped>
+.test_wrapper{
+  max-height: calc(100vh - 350px);
+  overflow-y: auto;
+}
+.footer{
+  margin-top: 10px;
+}
+.el-checkbox-group ::v-deep(.el-checkbox .el-checkbox__inner){
+  background: url(../../assets/imgs/Eyes-closed.png) no-repeat 0px 0px;
+  background-size: 16px;
+  width: 16px;
+  height: 16px;
+  border: none;
+}
+.el-checkbox-group ::v-deep(.el-checkbox .is-checked .el-checkbox__inner){
+  background: url(../../assets/imgs/eye.png) no-repeat 0px 0px;
+  background-size: 16px;
+  width: 16px;
+  height: 16px;
+  border: none;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/workstationBind/index.ts b/src/components/workstationBind/index.ts
new file mode 100644
index 000000000..d3fcb5cad
--- /dev/null
+++ b/src/components/workstationBind/index.ts
@@ -0,0 +1,3 @@
+import Detail from './src/Detail.vue'
+
+export { Detail }
diff --git a/src/components/workstationBind/src/Detail.vue b/src/components/workstationBind/src/Detail.vue
new file mode 100644
index 000000000..899d5fc31
--- /dev/null
+++ b/src/components/workstationBind/src/Detail.vue
@@ -0,0 +1,693 @@
+<template>
+  <div>
+    <el-drawer
+      v-model="isShowDrawer"
+      title="详情"
+      direction="rtl"
+      size="80%"
+      v-loading="detailLoading"
+    >
+      <template #header>
+        <div class="font-size-18px">
+          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
+        </div>
+      </template>
+      <ContentWrap v-if="!isBasic">
+        <Descriptions
+          :data="detailData"
+          labelClassName="label-class-name"
+          label-align="left"
+          direction="vertical"
+          :column="8"
+          :schema="allSchemas.detailSchema"
+          :columns="2"
+          width="200px"
+        />
+      </ContentWrap>
+
+      <Tabs :tabsList="tabsList" :current="current" @change="change" />
+      <div class="flex">
+        <!-- 详情 -->
+        <ContentWrap class="w-[73%]">
+          <!-- 列表头部 -->
+          <TableHead
+            v-if="!isBasic"
+            :HeadButttondata="HeadButttondata"
+            :masterId="masterParmas.masterId"
+            @button-base-click="buttonBaseClick"
+            :routeName="routeName"
+            @searchFormClick="searchFormClick"
+            :allSchemas="detailAllSchemas"
+          />
+          <!-- 默认单表展现 -->
+          <Descriptions
+            v-if="isBasic && !tabsExtend"
+            :data="detailData"
+            :schema="allSchemas.detailSchema"
+            :columns="2"
+          />
+          <!-- 单表切换tabs 展现table -->
+          <Table
+            v-if="isBasic && tabsExtend"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          >
+            <!-- <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template> -->
+          </Table>
+          <Table
+            v-if="!isBasic && fromeWhere != 'countPlan'"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          >
+          <template #photos="{ row }">
+             <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>
+            </template>
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template>
+          </Table>
+          <DetailTable
+            v-if="!isBasic && fromeWhere == 'countPlan' && isShowDrawer"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :allList="allList"
+            :countScopeType="countScopeType"
+            :key="updateKey"
+          >
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template>
+          </DetailTable>
+        </ContentWrap>
+        <ContentWrap class="w-[27%] ml-16px">
+          <!-- 附件组件 -->
+          <Annex
+            :annexData="annexData"
+            @handleAnnexSuccess="handleAnnexSuccess"
+            @deleteAnnexSuccess="deleteAnnexSuccess"
+            :upData="remarksData.data"
+          />
+          <!-- 备注组件 -->
+          <Remarks
+            :remarksData="remarksData"
+            class="mt-20px"
+            @remarksSubmitScuess="remarksSubmitScuess"
+          />
+          <!-- 变更记录组件 -->
+          <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
+        </ContentWrap>
+      </div>
+    </el-drawer>
+    <!-- 表单弹窗：添加/修改 -->
+    <BasicForm
+      ref="formRef"
+      @success="submitForm"
+      :rules="detailAllSchemasRules"
+      :formAllSchemas="detailAllSchemas"
+      :isBusiness="false"
+      :apiUpdate="apiUpdate"
+      :apiCreate="apiCreate"
+      :fromeWhere="fromeWhere"
+      :isDetail="true"
+      @searchTableSuccess="searchTableSuccess"
+      :detailData="detailData"
+      @submitForm="submitForm"
+      @selectChangeDetail="selectChangeDetail"
+      :formTypeDetail="formTypeDetail"
+      :countPlanAllList="countPlanAllList"
+      @onChange="detailBasicFormOnChange"
+      @onBlur="onBlur"
+      @formFormDateChange="formFormDateChange"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import Annex from '@/components/Annex/src/Annex.vue'
+import Remarks from '@/components/Remarks/src/Remarks.vue'
+import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
+import Tabs from '@/components/Tabs/src/Tabs.vue'
+import * as RemarkApi from '@/api/wms/remark'
+import * as FileApi from '@/api/wms/file'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
+
+defineOptions({ name: 'Detail' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
+const updateKey = ref(0)
+
+const props = defineProps({
+  // 标签参数
+  tabs: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 是否是基础数据 展现详情顶部表单
+  isBasic: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 表单，列表 相关信息
+  allSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 明细列表相关信息
+  detailAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  明细验证
+  detailAllSchemasRules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 子表新增API
+  apiCreate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表编辑API
+  apiUpdate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表分页列表API
+  apiPage: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表删除API
+  apiDelete: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表新增修改校验
+  detailValidate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 获取接口列表集合
+  allList: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 盘点范围类型
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
+  formTypeDetail: {
+    type: String,
+    required: false,
+    default: 'InputString'
+  },
+  //盘点详情子表新增的时候判断盘点范围值的下拉列表
+  countPlanAllList: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 详情列表扩展操作按钮
+  buttondataTable: {
+    type: Array,
+    required: false,
+    default: ()=>{
+      return []
+    }
+  },
+  // 针对基础数据tabs扩展 显示table列表 默认false
+  tabsExtend: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // tableObject 数据过滤条件 针对 详情扩展标签页 传入不同条件
+  tableObjectExtend: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 子列表 筛选 展示与隐藏 ，默认展示
+  detailButtonIsShowFilter:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 新增 展示与隐藏 ，默认展示
+  detailButtonIsShowAdd:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 编辑 展示与隐藏 ，默认展示
+  detailButtonIsShowEdit:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 删除 展示与隐藏 ，默认展示
+  detailButtonIsShowDelete:{
+    type: Boolean,
+    required: false,
+    default: true
+  }
+})
+const isShowDrawer = ref(false)
+const detailLoading = ref(false)
+const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
+
+if (props.isBasic == true) {
+  if (tabsList.value && tabsList.value.length > 0) {
+    tabsList.value.unshift({
+      label: '详情',
+      prop: 'Detail'
+    })
+  }
+} else {
+  if (tabsList.value && tabsList.value.length > 0) {
+  } else {
+    tabsList.value = [
+      {
+        label: '明细',
+        prop: 'Detail'
+      }
+    ]
+  }
+}
+if (tabsList.value) {
+}
+
+// 附件默认数据
+const annexData = reactive({
+  annexList: []
+})
+
+// 备注数据
+const remarksData = reactive({
+  remarksList: [],
+  data: {}
+})
+
+// 变更记录默认数据
+const changeRecordData = reactive({
+  changeRecordList: []
+})
+const detailData = ref({}) //详情数据
+// 获取附件列表篇
+const getFileList = async () => {
+  detailLoading.value = true
+  try {
+    annexData.annexList = await FileApi.getFileList(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+/** 添加附件 */
+const handleAnnexSuccess = () => {
+  getFileList()
+  getChangeRecordList()
+}
+// 删除附件成功之后所走的方法
+const deleteAnnexSuccess = async () => {
+  getFileList()
+  getChangeRecordList()
+}
+
+// Tabs当前选择
+const current = ref(0)
+const change = (item, index) => {
+  current.value = index
+  emit('changeTabs', item)
+}
+
+//主表所需的参数
+const masterParmas = ref({
+  masterId: '', //主表id
+  number: '', //主表单据号
+  status: '' //主表状态 用于控制子表新增编辑按钮显示情况
+})
+
+// 列表头部按钮
+const HeadButttondata = ref()
+// 列表-操作按钮
+const buttondata = ref()
+
+/** 打开弹窗 */
+const formRef = ref()
+const titleNameRef = ref()
+const titleValueRef = ref()
+const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
+  titleNameRef.value = titleName
+  titleValueRef.value = titleValue
+  remarksData.data = {
+    tableId: row.id,
+    tableName: tableName
+  }
+  // 加载明细列表
+  if (!props.isBasic) {
+    // 设置主表id
+    masterParmas.value.masterId = row.id
+    masterParmas.value.number = row.number
+    masterParmas.value.status = row.status
+    tableObjectRef.value.params = {
+      masterId: row.id
+    }
+    await getList()
+  }
+  isShowDrawer.value = true
+  if (row) {
+    detailLoading.value = true
+    try {
+      detailData.value = row
+      getRemarkList()
+      getFileList()
+      getChangeRecordList()
+      // 判断详情按钮是否显示
+      let detailButtonFilter: any = []
+      let detailButtonAdd: any = []
+      if (props.detailButtonIsShowFilter) {
+        // 筛选
+        detailButtonFilter = [
+          defaultButtons.defaultFilterBtn(null)
+        ]
+      }
+      if (props.detailButtonIsShowAdd) {
+        // 新增
+        detailButtonAdd = [
+          defaultButtons.defaultAddBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      HeadButttondata.value = [...detailButtonFilter,...detailButtonAdd]
+
+      // 针对特殊处理 当业务是任务的 只显示筛选 正常情况下应在业务页面设置 后期再作优化
+      if (routeName.value.indexOf('Job') > -1) {
+        HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+        ]
+      }
+
+      let detailButtonEdit: any = []
+      let detailButtonDelete: any = []
+      if (props.detailButtonIsShowEdit) {
+        // 编辑
+        detailButtonEdit = [
+          defaultButtons.mainListEditBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      if (props.detailButtonIsShowDelete) {
+        // 删除
+        detailButtonDelete = [
+          defaultButtons.mainListDeleteBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      buttondata.value = [...detailButtonEdit,...detailButtonDelete,...props.buttondataTable]
+
+    } finally {
+      detailLoading.value = false
+    }
+  }
+}
+defineExpose({ openDetail, formRef }) // 提供 open 方法，用于打开弹窗
+
+// 获取备注列表
+const getRemarkList = async () => {
+  detailLoading.value = true
+  try {
+    remarksData.remarksList = await RemarkApi.getRemarkPage(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+// 备注提交成功之后
+const remarksSubmitScuess = async (remark) => {
+  detailLoading.value = false
+  getRemarkList()
+  getChangeRecordList()
+}
+// 获取变更记录
+const getChangeRecordList = async () => {
+  changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
+}
+
+const tableObjectRef = ref()
+const tableMethodsRef = ref()
+const detailAllSchemasRef = ref()
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: props.apiPage // 分页接口
+})
+
+tableObjectRef.value = tableObject
+tableMethodsRef.value = tableMethods
+detailAllSchemasRef.value = props.detailAllSchemas
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 获得表格的各种操作
+const { getList } = tableMethodsRef.value
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 字段设置 更新主列表字段
+// const updataTableColumns = (val) => {
+//   detailAllSchemas.tableColumns.value = val
+// }
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  } else {
+    emit('tableFormButton',val, row)
+  }
+}
+/** 添加/修改操作 */
+const openForm = async (type: string, row?: number) => {
+  formRef.value.open(type, row, masterParmas.value)
+  emit('detailOpenForm', type, row)
+}
+// form 提交
+const submitForm = async (formType, data) => {
+  try {
+    // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
+    const rs = (await props.detailValidate) ? await props.detailValidate(data) : true
+    if (!rs) return
+    if (formType === 'create') {
+      await props.apiCreate(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await props.apiUpdate(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    await getList()
+    updateKey.value += 1
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
+}
+// 传递给父类
+const emit = defineEmits([
+  'searchTableSuccessDetail',
+  'changeTabs',
+  'selectChangeDetail',
+  'detailOpenForm',
+  'tableFormButton',
+  'openImage',
+  'onBlur',
+  'detailBasicFormOnChange',
+  'formFormDateChange'
+])
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await props.apiDelete(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+    updateKey.value += 1
+  } catch {}
+}
+// 筛选提交
+const searchFormClick = async (searchData) => {
+  const { tableObject, tableMethods } = useTable({
+    getListApi: props.apiPage // 分页接口
+  })
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+      ? searchData.filters
+      : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  }
+  detailAllSchemasRef.value = props.detailAllSchemas
+  tableObjectRef.value = tableObject
+  tableMethodsRef.value = tableMethods
+  tableObjectRef.value.tableList = []
+  const { getList } = tableMethods
+  await getList()
+  updateKey.value += 1
+  // tableObjectRef.value.params = {
+  //   isSearch: true,
+  //   filters: searchData.filters
+  //     ? searchData.filters
+  //     : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  // }
+  // getList() // 刷新当前列表
+}
+// 选择盘点类型的时候针对限值的操作
+const selectChangeDetail = (field, val) => {
+  emit('selectChangeDetail', field, val)
+}
+// 打开图片
+const openImage=(item)=>{
+  emit('openImage', item)
+}
+/**
+ * 监听改变事件
+ * @param field 当前操作字段
+ * @param cur 改变后值
+ */
+ const detailBasicFormOnChange = (field, cur) => {
+  emit('detailBasicFormOnChange', field, cur)
+}
+
+/**
+ * 监听失焦事件
+ * @param field 当前操作字段
+ * @param e 
+ */
+ const onBlur = (field, e) => {
+  emit('onBlur', field, e)
+}
+
+// 日期改变事件
+const formFormDateChange = (field, val,row, index) => {
+  emit('formFormDateChange', field, val,row, index)
+}
+//监视属性
+watch(
+  () => props.apiPage,
+  () => {
+    const { tableObject, tableMethods } = useTable({
+      getListApi: props.apiPage // 分页接口
+    })
+    tableObject.params.masterId = masterParmas.value.masterId
+    detailAllSchemasRef.value = props.detailAllSchemas
+    if (props.tableObjectExtend) {
+      props.tableObjectExtend.forEach(item => {
+        tableObject.params[item.key] = item.value
+      })
+    }
+    tableObjectRef.value = tableObject
+    tableMethodsRef.value = tableMethods
+    const { getList } = tableMethods
+    getList()
+  }
+)
+</script>
+<style lang="scss">
+.el-drawer__body {
+  background: #f5f5f5 !important;
+}
+
+::v-deep(.label-class-name) {
+  color: #dedede;
+}
+</style>
+<style scoped lang="scss"></style>
diff --git a/src/config/axios/config.ts b/src/config/axios/config.ts
new file mode 100644
index 000000000..811650873
--- /dev/null
+++ b/src/config/axios/config.ts
@@ -0,0 +1,28 @@
+const config: {
+  base_url: string
+  result_code: number | string
+  default_headers: AxiosHeaders
+  request_timeout: number
+} = {
+  /**
+   * api请求基础路径
+   */
+  base_url: import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL,
+  /**
+   * 接口成功返回状态码
+   */
+  result_code: 200,
+
+  /**
+   * 接口请求超时时间
+   */
+  request_timeout: 30000,
+
+  /**
+   * 默认接口请求类型
+   * 可选值：application/x-www-form-urlencoded multipart/form-data
+   */
+  default_headers: 'application/json'
+}
+
+export { config }
diff --git a/src/config/axios/errorCode.ts b/src/config/axios/errorCode.ts
new file mode 100644
index 000000000..94d719f8d
--- /dev/null
+++ b/src/config/axios/errorCode.ts
@@ -0,0 +1,6 @@
+export default {
+  '401': '认证失败，无法访问系统资源',
+  '403': '当前操作没有权限',
+  '404': '访问资源不存在',
+  default: '系统未知错误，请反馈给管理员'
+}
diff --git a/src/config/axios/index.ts b/src/config/axios/index.ts
new file mode 100644
index 000000000..69c5e72ac
--- /dev/null
+++ b/src/config/axios/index.ts
@@ -0,0 +1,59 @@
+import { service } from './service'
+
+import { config } from './config'
+import { useCache } from '@/hooks/web/useCache'
+
+const { default_headers } = config
+const { wsCache } = useCache()
+console.log('lang='+wsCache.get('lang'));
+const language = wsCache.get('lang')
+const request = (option: any) => {
+  const { url, method, params, data, headersType, responseType, ...config } = option
+  return service({
+    url: url,
+    method,
+    params,
+    data,
+    ...config,
+    responseType: responseType,
+    headers: {
+      'Content-Type': headersType || default_headers,
+      'language': language
+    }
+  })
+}
+export default {
+  get: async <T = any>(option: any) => {
+    const res = await request({ method: 'GET', ...option })
+    return res.data as unknown as T
+  },
+  post: async <T = any>(option: any) => {
+    const res = await request({ method: 'POST', ...option })
+    return res.data as unknown as T
+  },
+  postOriginal: async (option: any) => {
+    const res = await request({ method: 'POST', ...option })
+    return res
+  },
+  delete: async <T = any>(option: any) => {
+    const res = await request({ method: 'DELETE', ...option })
+    return res.data as unknown as T
+  },
+  put: async <T = any>(option: any) => {
+    const res = await request({ method: 'PUT', ...option })
+    return res.data as unknown as T
+  },
+  download: async <T = any>(option: any) => {
+    const res = await request({ method: 'GET', responseType: 'blob', ...option })
+    return res as unknown as Promise<T>
+  },
+  downloadPost: async <T = any>(option: any) => {
+    const res = await request({ method: 'POST', responseType: 'blob', ...option })
+    return res as unknown as Promise<T>
+  },
+  upload: async <T = any>(option: any) => {
+    option.headersType = 'multipart/form-data'
+    const res = await request({ method: 'POST', ...option })
+    return res as unknown as Promise<T>
+  }
+}
diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts
new file mode 100644
index 000000000..1a4741b69
--- /dev/null
+++ b/src/config/axios/service.ts
@@ -0,0 +1,239 @@
+import axios, {
+  AxiosError,
+  AxiosInstance,
+  AxiosRequestHeaders,
+  AxiosResponse,
+  InternalAxiosRequestConfig
+} from 'axios'
+
+import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
+import qs from 'qs'
+import { config } from '@/config/axios/config'
+import { getAccessToken, getRefreshToken, getTenantId, removeToken, setToken } from '@/utils/auth'
+import errorCode from './errorCode'
+
+import { resetRouter } from '@/router'
+import { useCache } from '@/hooks/web/useCache'
+
+const tenantEnable = import.meta.env.VITE_APP_TENANT_ENABLE
+const { result_code, base_url, request_timeout } = config
+
+// 需要忽略的提示。忽略后，自动 Promise.reject('error')
+const ignoreMsgs = [
+  '无效的刷新令牌', // 刷新令牌被删除时，不用提示
+  '刷新令牌已过期' // 使用刷新令牌，刷新获取新的访问令牌时，结果因为过期失败，此时需要忽略。否则，会导致继续 401，无法跳转到登出界面
+]
+// 是否显示重新登录
+export const isRelogin = { show: false }
+// Axios 无感知刷新令牌，参考 https://www.dashingdog.cn/article/11 与 https://segmentfault.com/a/1190000020210980 实现
+// 请求队列
+let requestList: any[] = []
+// 是否正在刷新中
+let isRefreshToken = false
+// 请求白名单，无须token的接口
+const whiteList: string[] = ['/login', '/refresh-token']
+
+// 创建axios实例
+const service: AxiosInstance = axios.create({
+  baseURL: base_url, // api 的 base_url
+  timeout: request_timeout, // 请求超时时间
+  withCredentials: false // 禁用 Cookie 等信息
+})
+
+// request拦截器
+service.interceptors.request.use(
+  (config: InternalAxiosRequestConfig) => {
+    // 是否需要设置 token
+    let isToken = (config!.headers || {}).isToken === false
+    whiteList.some((v) => {
+      if (config.url) {
+        config.url.indexOf(v) > -1
+        return (isToken = false)
+      }
+    })
+    if (getAccessToken() && !isToken) {
+      ;(config as Recordable).headers.Authorization = 'Bearer ' + getAccessToken() // 让每个请求携带自定义token
+    }
+    // 设置租户
+    if (tenantEnable && tenantEnable === 'true') {
+      const tenantId = getTenantId()
+      if (tenantId) (config as Recordable).headers['tenant-id'] = tenantId
+    }
+    const params = config.params || {}
+    const data = config.data || false
+    if (
+      config.method?.toUpperCase() === 'POST' &&
+      (config.headers as AxiosRequestHeaders)['Content-Type'] ===
+        'application/x-www-form-urlencoded'
+    ) {
+      config.data = qs.stringify(data)
+    }
+    // get参数编码
+    if (config.method?.toUpperCase() === 'GET' && params) {
+      let url = config.url + '?'
+      for (const propName of Object.keys(params)) {
+        const value = params[propName]
+        if (value !== void 0 && value !== null && typeof value !== 'undefined') {
+          if (typeof value === 'object') {
+            for (const val of Object.keys(value)) {
+              const params = propName + '[' + val + ']'
+              const subPart = encodeURIComponent(params) + '='
+              url += subPart + encodeURIComponent(value[val]) + '&'
+            }
+          } else {
+            url += `${propName}=${encodeURIComponent(value)}&`
+          }
+        }
+      }
+      // 给 get 请求加上时间戳参数，避免从缓存中拿数据
+      // const now = new Date().getTime()
+      // params = params.substring(0, url.length - 1) + `?_t=${now}`
+      url = url.slice(0, -1)
+      config.params = {}
+      config.url = url
+    }
+    return config
+  },
+  (error: AxiosError) => {
+    // Do something with request error
+    console.log(error) // for debug
+    Promise.reject(error)
+  }
+)
+
+// response 拦截器
+service.interceptors.response.use(
+  async (response: AxiosResponse<any>) => {
+    const { data } = response
+    const config = response.config
+    if (!data) {
+      // 返回“[HTTP]请求没有返回值”;
+      throw new Error()
+    }
+    const { t } = useI18n()
+    // 未设置状态码则默认成功状态
+    const code = data.code || result_code
+    // 二进制数据则直接返回
+    if (
+      response.request.responseType === 'blob' ||
+      response.request.responseType === 'arraybuffer'
+    ) {
+      return response.data
+    }
+    // 获取错误信息
+    const msg = data.msg || errorCode[code] || errorCode['default']
+    if (ignoreMsgs.indexOf(msg) !== -1) {
+      // 如果是忽略的错误码，直接返回 msg 异常
+      return Promise.reject(msg)
+    } else if (code === 401) {
+      // 如果未认证，并且未进行刷新令牌，说明可能是访问令牌过期了
+      if (!isRefreshToken) {
+        isRefreshToken = true
+        // 1. 如果获取不到刷新令牌，则只能执行登出操作
+        if (!getRefreshToken()) {
+          return handleAuthorized()
+        }
+        // 2. 进行刷新访问令牌
+        try {
+          const refreshTokenRes = await refreshToken()
+          // 2.1 刷新成功，则回放队列的请求 + 当前请求
+          setToken((await refreshTokenRes).data.data)
+          config.headers!.Authorization = 'Bearer ' + getAccessToken()
+          requestList.forEach((cb: any) => {
+            cb()
+          })
+          requestList = []
+          return service(config)
+        } catch (e) {
+          // 为什么需要 catch 异常呢？刷新失败时，请求因为 Promise.reject 触发异常。
+          // 2.2 刷新失败，只回放队列的请求
+          requestList.forEach((cb: any) => {
+            cb()
+          })
+          // 提示是否要登出。即不回放当前请求！不然会形成递归
+          return handleAuthorized()
+        } finally {
+          requestList = []
+          isRefreshToken = false
+        }
+      } else {
+        // 添加到队列，等待刷新获取到新的令牌
+        return new Promise((resolve) => {
+          requestList.push(() => {
+            config.headers!.Authorization = 'Bearer ' + getAccessToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+            resolve(service(config))
+          })
+        })
+      }
+    } else if (code === 500) {
+      ElMessage.error(t('sys.api.errMsg500'))
+      return Promise.reject(new Error(msg))
+    } else if (code === 901) {
+      ElMessage.error({
+        offset: 300,
+        dangerouslyUseHTMLString: true,
+        message:
+          '<div>' +
+          t('sys.api.errMsg901') +
+          '</div>' +
+          '<div> &nbsp; </div>' +
+          '<div>参考 https://doc.iocoder.cn/ 教程</div>' +
+          '<div> &nbsp; </div>' +
+          '<div>5 分钟搭建本地环境</div>'
+      })
+      return Promise.reject(new Error(msg))
+    } else if (code !== 200) {
+      if (msg === '无效的刷新令牌') {
+        // hard coding：忽略这个提示，直接登出
+        console.log(msg)
+      } else {
+        ElNotification.error({ title: msg })
+      }
+      return Promise.reject('error')
+    } else {
+      return data
+    }
+  },
+  (error: AxiosError) => {
+    console.log('err' + error) // for debug
+    let { message } = error
+    const { t } = useI18n()
+    if (message === 'Network Error') {
+      message = t('sys.api.errorMessage')
+    } else if (message.includes('timeout')) {
+      message = t('sys.api.apiTimeoutMessage')
+    } else if (message.includes('Request failed with status code')) {
+      message = t('sys.api.apiRequestFailed') + message.substr(message.length - 3)
+    }
+    ElMessage.error(message)
+    return Promise.reject(error)
+  }
+)
+
+const refreshToken = async () => {
+  axios.defaults.headers.common['tenant-id'] = getTenantId()
+  return await axios.post(base_url + '/system/auth/refresh-token?refreshToken=' + getRefreshToken())
+}
+const handleAuthorized = () => {
+  const { t } = useI18n()
+  if (!isRelogin.show) {
+    isRelogin.show = true
+    ElMessageBox.confirm(t('sys.api.timeoutMessage'), t('common.confirmTitle'), {
+      showCancelButton: false,
+      closeOnClickModal: false,
+      showClose: false,
+      confirmButtonText: t('login.relogin'),
+      type: 'warning'
+    }).then(() => {
+      const { wsCache } = useCache()
+      resetRouter() // 重置静态路由表
+      wsCache.clear()
+      removeToken()
+      isRelogin.show = false
+      // 干掉token后再走一次路由让它过router.beforeEach的校验
+      window.location.href = window.location.href
+    })
+  }
+  return Promise.reject(t('sys.api.timeoutMessage'))
+}
+export { service }
diff --git a/src/directives/index.ts b/src/directives/index.ts
new file mode 100644
index 000000000..89cc8ba14
--- /dev/null
+++ b/src/directives/index.ts
@@ -0,0 +1,13 @@
+import type { App } from 'vue'
+import { hasRole } from './permission/hasRole'
+import { hasPermi } from './permission/hasPermi'
+
+/**
+ * 导出指令：v-xxx
+ * @methods hasRole 用户权限，用法: v-hasRole
+ * @methods hasPermi 按钮权限，用法: v-hasPermi
+ */
+export const setupAuth = (app: App<Element>) => {
+  hasRole(app)
+  hasPermi(app)
+}
diff --git a/src/directives/permission/hasPermi.ts b/src/directives/permission/hasPermi.ts
new file mode 100644
index 000000000..d86d2f54c
--- /dev/null
+++ b/src/directives/permission/hasPermi.ts
@@ -0,0 +1,27 @@
+import type { App } from 'vue'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+const { t } = useI18n() // 国际化
+
+export function hasPermi(app: App<Element>) {
+  app.directive('hasPermi', (el, binding) => {
+    const { wsCache } = useCache()
+    const { value } = binding
+    const all_permission = '*:*:*'
+    const permissions = wsCache.get(CACHE_KEY.USER).permissions
+
+    if (value && value instanceof Array && value.length > 0) {
+      const permissionFlag = value
+
+      const hasPermissions = permissions.some((permission: string) => {
+        return all_permission === permission || permissionFlag.includes(permission)
+      })
+
+      if (!hasPermissions) {
+        el.parentNode && el.parentNode.removeChild(el)
+      }
+    } else {
+      throw new Error(t('permission.hasPermission'))
+    }
+  })
+}
diff --git a/src/directives/permission/hasRole.ts b/src/directives/permission/hasRole.ts
new file mode 100644
index 000000000..ae253cbae
--- /dev/null
+++ b/src/directives/permission/hasRole.ts
@@ -0,0 +1,30 @@
+import type { App } from 'vue'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+const { t } = useI18n() // 国际化
+
+export function hasRole(app: App<Element>) {
+  app.directive('hasRole', (el, binding) => {
+    const { wsCache } = useCache()
+    const { value } = binding
+    const super_admin = 'admin'
+    let roles = []
+    if(wsCache.get(CACHE_KEY.USER)?.roles){
+      roles = wsCache.get(CACHE_KEY.USER).roles
+    }
+
+    if (value && value instanceof Array && value.length > 0) {
+      const roleFlag = value
+
+      const hasRole = roles.some((role: string) => {
+        return super_admin === role || roleFlag.includes(role)
+      })
+
+      if (!hasRole) {
+        el.parentNode && el.parentNode.removeChild(el)
+      }
+    } else {
+      throw new Error(t('permission.hasRole'))
+    }
+  })
+}
diff --git a/src/hooks/event/useScrollTo.ts b/src/hooks/event/useScrollTo.ts
new file mode 100644
index 000000000..92aec8722
--- /dev/null
+++ b/src/hooks/event/useScrollTo.ts
@@ -0,0 +1,60 @@
+export interface ScrollToParams {
+  el: HTMLElement
+  to: number
+  position: string
+  duration?: number
+  callback?: () => void
+}
+
+const easeInOutQuad = (t: number, b: number, c: number, d: number) => {
+  t /= d / 2
+  if (t < 1) {
+    return (c / 2) * t * t + b
+  }
+  t--
+  return (-c / 2) * (t * (t - 2) - 1) + b
+}
+const move = (el: HTMLElement, position: string, amount: number) => {
+  el[position] = amount
+}
+
+export function useScrollTo({
+  el,
+  position = 'scrollLeft',
+  to,
+  duration = 500,
+  callback
+}: ScrollToParams) {
+  const isActiveRef = ref(false)
+  const start = el[position]
+  const change = to - start
+  const increment = 20
+  let currentTime = 0
+
+  function animateScroll() {
+    if (!unref(isActiveRef)) {
+      return
+    }
+    currentTime += increment
+    const val = easeInOutQuad(currentTime, start, change, duration)
+    move(el, position, val)
+    if (currentTime < duration && unref(isActiveRef)) {
+      requestAnimationFrame(animateScroll)
+    } else {
+      if (callback) {
+        callback()
+      }
+    }
+  }
+
+  function run() {
+    isActiveRef.value = true
+    animateScroll()
+  }
+
+  function stop() {
+    isActiveRef.value = false
+  }
+
+  return { start: run, stop }
+}
diff --git a/src/hooks/web/useCache.ts b/src/hooks/web/useCache.ts
new file mode 100644
index 000000000..38b816a9e
--- /dev/null
+++ b/src/hooks/web/useCache.ts
@@ -0,0 +1,28 @@
+/**
+ * 配置浏览器本地存储的方式，可直接存储对象数组。
+ */
+
+import WebStorageCache from 'web-storage-cache'
+
+type CacheType = 'localStorage' | 'sessionStorage'
+
+export const CACHE_KEY = {
+  IS_DARK: 'isDark',
+  USER: 'user',
+  LANG: 'lang',
+  THEME: 'theme',
+  LAYOUT: 'layout',
+  ROLE_ROUTERS: 'roleRouters',
+  DICT_CACHE: 'dictCache',
+  DEPT: 'dept'
+}
+
+export const useCache = (type: CacheType = 'localStorage') => {
+  const wsCache: WebStorageCache = new WebStorageCache({
+    storage: type
+  })
+
+  return {
+    wsCache
+  }
+}
diff --git a/src/hooks/web/useConfigGlobal.ts b/src/hooks/web/useConfigGlobal.ts
new file mode 100644
index 000000000..afb3db3a9
--- /dev/null
+++ b/src/hooks/web/useConfigGlobal.ts
@@ -0,0 +1,9 @@
+import { ConfigGlobalTypes } from '@/types/configGlobal'
+
+export const useConfigGlobal = () => {
+  const configGlobal = inject('configGlobal', {}) as ConfigGlobalTypes
+
+  return {
+    configGlobal
+  }
+}
diff --git a/src/hooks/web/useCrudSchemas.ts b/src/hooks/web/useCrudSchemas.ts
new file mode 100644
index 000000000..b39d0453f
--- /dev/null
+++ b/src/hooks/web/useCrudSchemas.ts
@@ -0,0 +1,374 @@
+import { reactive } from 'vue'
+import { AxiosPromise } from 'axios'
+import { findIndex } from '@/utils'
+import { eachTree, filter, treeMap } from '@/utils/tree'
+import { getBoolDictOptions, getDictOptions, getIntDictOptions } from '@/utils/dict'
+
+import { FormSchema } from '@/types/form'
+import { TableColumn } from '@/types/table'
+import { DescriptionsSchema } from '@/types/descriptions'
+import { TableFormColumn } from '@/types/tableForm'
+import { ComponentOptions, ComponentProps } from '@/types/components'
+import { DictTag } from '@/components/DictTag'
+import { cloneDeep, merge } from 'lodash-es'
+
+export type CrudSchema = Omit<TableColumn, 'children'> & {
+  isSearch?: boolean // 是否在查询显示
+  search?: CrudSearchParams // 查询的详细配置
+  isTable?: boolean // 是否在列表显示
+  table?: CrudTableParams // 列表的详细配置
+  isForm?: boolean // 是否在表单显示
+  form?: CrudFormParams // 表单的详细配置
+  isDetail?: boolean // 是否在详情显示
+  detail?: CrudDescriptionsParams // 详情的详细配置
+  isTableForm?: boolean // 是否在表格嵌套表单显示
+  tableForm?: CrudTableFormParams // 表格嵌套表单的详细配置
+  children?: CrudSchema[]
+  dictType?: string // 字典类型
+  dictClass?: 'string' | 'number' | 'boolean' // 字典数据类型 string | number | boolean
+}
+
+type CrudSearchParams = {
+  // 是否显示在查询项
+  show?: boolean
+  // 接口
+  api?: () => Promise<any>
+  // 搜索字段
+  field?: string
+} & Omit<FormSchema, 'field'>
+
+type CrudTableParams = {
+  // 是否显示表头
+  show?: boolean
+  // 列宽配置
+  width?: number | string
+  // 列是否固定在左侧或者右侧
+  fixed?: 'left' | 'right'
+} & Omit<FormSchema, 'field'>
+type CrudFormParams = {
+  // 是否显示表单项
+  show?: boolean
+  // 接口
+  api?: () => Promise<any>
+} & Omit<FormSchema, 'field'>
+
+type CrudDescriptionsParams = {
+  // 是否显示表单项
+  show?: boolean
+} & Omit<DescriptionsSchema, 'field'>
+
+type CrudTableFormParams = {
+  // 是否显示表单项
+  show?: boolean
+} & Omit<TableFormColumn, 'field'>
+interface AllSchemas {
+  searchSchema: FormSchema[]
+  tableColumns: TableColumn[]
+  formSchema: FormSchema[]
+  detailSchema: DescriptionsSchema[]
+  tableFormColumns: TableFormColumn[]
+}
+
+const { t } = useI18n()
+
+// 过滤所有结构
+export const useCrudSchemas = (
+  crudSchema: CrudSchema[]
+): {
+  allSchemas: AllSchemas
+} => {
+  // 所有结构数据
+  const allSchemas = reactive<AllSchemas>({
+    searchSchema: [],
+    tableColumns: [],
+    formSchema: [],
+    detailSchema: [],
+    tableFormColumns:[]
+  })
+
+  const searchSchema = filterSearchSchema(crudSchema, allSchemas)
+  allSchemas.searchSchema = searchSchema || []
+
+  const tableColumns = filterTableSchema(crudSchema)
+  allSchemas.tableColumns = tableColumns || []
+
+  const formSchema = filterFormSchema(crudSchema, allSchemas)
+  allSchemas.formSchema = formSchema
+
+  const detailSchema = filterDescriptionsSchema(crudSchema)
+  allSchemas.detailSchema = detailSchema
+
+  const tableFormColumns=  filterTableFormSchema(crudSchema)
+    allSchemas.tableFormColumns =tableFormColumns || []
+  return {
+    allSchemas
+  }
+}
+
+// 过滤 Search 结构
+const filterSearchSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): FormSchema[] => {
+  const searchSchema: FormSchema[] = []
+
+  // 获取字典列表队列
+  const searchRequestTask: Array<() => Promise<void>> = []
+  eachTree(crudSchema, (schemaItem: CrudSchema) => {
+    // 判断是否显示
+    if (schemaItem?.isSearch || schemaItem.search?.show) {
+      let component = schemaItem?.search?.component || 'Input'
+      const options: ComponentOptions[] = []
+      let comonentProps: ComponentProps = {}
+      if (schemaItem.dictType) {
+        const allOptions: ComponentOptions = { label: '全部', value: '' }
+        options.push(allOptions)
+        getDictOptions(schemaItem.dictType).forEach((dict) => {
+          options.push(dict)
+        })
+        comonentProps = {
+          options: options
+        }
+        if (!schemaItem.search?.component) component = 'Select'
+      }
+
+      // updated by AKing: 解决了当使用默认的dict选项时，form中事件不能触发的问题
+      const searchSchemaItem = merge(
+        {
+          // 默认为 input
+          component,
+          ...schemaItem.search,
+          field: schemaItem.field,
+          label: schemaItem.search?.label || schemaItem.label
+        },
+        { componentProps: comonentProps }
+      )
+      if (searchSchemaItem.api) {
+        searchRequestTask.push(async () => {
+          const res = await (searchSchemaItem.api as () => AxiosPromise)()
+          if (res) {
+            const index = findIndex(allSchemas.searchSchema, (v: FormSchema) => {
+              return v.field === searchSchemaItem.field
+            })
+            if (index !== -1) {
+              allSchemas.searchSchema[index]!.componentProps!.options = filterOptions(
+                res,
+                searchSchemaItem.componentProps.optionsAlias?.labelField
+              )
+            }
+          }
+        })
+      }
+      // 删除不必要的字段
+      delete searchSchemaItem.show
+
+      searchSchema.push(searchSchemaItem)
+    }
+  })
+  for (const task of searchRequestTask) {
+    task()
+  }
+  return searchSchema
+}
+
+// 过滤 table 结构
+const filterTableSchema = (crudSchema: CrudSchema[]): TableColumn[] => {
+  const tableColumns = treeMap<CrudSchema>(crudSchema, {
+    conversion: (schema: CrudSchema) => {
+      if (schema?.isTable !== false && schema?.table?.show !== false) {
+        // add by 芋艿：增加对 dict 字典数据的支持
+        if (!schema.formatter && schema.dictType) {
+          schema.formatter = (_: Recordable, __: TableColumn, cellValue: any) => {
+            return h(DictTag, {
+              type: schema.dictType!, // ! 表示一定不为空
+              value: cellValue
+            })
+          }
+        }
+        return {
+          ...schema.table,
+          ...schema
+        }
+      }
+    }
+  })
+
+  // 第一次过滤会有 undefined 所以需要二次过滤
+  return filter<TableColumn>(tableColumns as TableColumn[], (data) => {
+    if (data.children === void 0) {
+      delete data.children
+    }
+    return !!data.field
+  })
+}
+// 过滤 tableForm 结构
+const filterTableFormSchema = (crudSchema: CrudSchema[]): TableFormColumn[] => {
+  const tableFormColumns = treeMap<CrudSchema>(crudSchema, {
+    conversion: (schema: CrudSchema) => {
+      if (schema?.isTableForm !== false && schema?.tableForm?.show !== false) {
+        // add by 芋艿：增加对 dict 字典数据的支持
+        if (!schema.formatter && schema.dictType) {
+          schema.formatter = (_: Recordable, __: TableFormColumn, cellValue: any) => {
+            return h(DictTag, {
+              type: schema.dictType!, // ! 表示一定不为空
+              value: cellValue
+            })
+          }
+        }
+        return {
+          ...schema.tableForm,
+          ...schema
+        }
+      }
+    }
+  })
+
+  // 第一次过滤会有 undefined 所以需要二次过滤
+  return filter<TableFormColumn>(tableFormColumns as TableFormColumn[], (data) => {
+    if (data.children === void 0) {
+      delete data.children
+    }
+    return !!data.field
+  })
+}
+// 过滤 form 结构
+const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): FormSchema[] => {
+  const formSchema: FormSchema[] = []
+
+  // 获取字典列表队列
+  const formRequestTask: Array<() => Promise<void>> = []
+
+  eachTree(crudSchema, (schemaItem: CrudSchema) => {
+    // 判断是否显示
+    if (schemaItem?.isForm !== false && schemaItem?.form?.show !== false) {
+      let component = schemaItem?.form?.component || 'Input'
+      let defaultValue: any = ''
+      if (schemaItem.form?.value) {
+        defaultValue = schemaItem.form?.value
+      } else {
+        if (component === 'InputNumber') {
+          defaultValue = 0
+        }
+      }
+      let comonentProps: ComponentProps = {}
+      if (schemaItem.dictType) {
+        const options: ComponentOptions[] = []
+        if (schemaItem.dictClass && schemaItem.dictClass === 'number') {
+          getIntDictOptions(schemaItem.dictType).forEach((dict) => {
+            options.push(dict)
+          })
+        } else if (schemaItem.dictClass && schemaItem.dictClass === 'boolean') {
+          getBoolDictOptions(schemaItem.dictType).forEach((dict) => {
+            options.push(dict)
+          })
+        } else {
+          getDictOptions(schemaItem.dictType).forEach((dict) => {
+            options.push(dict)
+          })
+        }
+        comonentProps = {
+          options: options
+        }
+        if (!(schemaItem.form && schemaItem.form.component)) component = 'Select'
+      }
+
+      // updated by AKing: 解决了当使用默认的dict选项时，form中事件不能触发的问题
+      const formSchemaItem = merge(
+        {
+          // 默认为 input
+          component,
+          value: defaultValue,
+          ...schemaItem.form,
+          field: schemaItem.field,
+          label: schemaItem.form?.label || schemaItem.label
+        },
+        { componentProps: comonentProps }
+      )
+
+      if (formSchemaItem.api) {
+        formRequestTask.push(async () => {
+          const res = await (formSchemaItem.api as () => AxiosPromise)()
+          if (res) {
+            const index = findIndex(allSchemas.formSchema, (v: FormSchema) => {
+              return v.field === formSchemaItem.field
+            })
+            if (index !== -1) {
+              allSchemas.formSchema[index]!.componentProps!.options = filterOptions(
+                res,
+                formSchemaItem.componentProps.optionsAlias?.labelField
+              )
+            }
+          }
+        })
+      }
+
+      // 删除不必要的字段
+      delete formSchemaItem.show
+
+      formSchema.push(formSchemaItem)
+    }
+  })
+
+  for (const task of formRequestTask) {
+    task()
+  }
+  return formSchema
+}
+
+// 过滤 descriptions 结构
+const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[] => {
+  const descriptionsSchema: FormSchema[] = []
+
+  eachTree(crudSchema, (schemaItem: CrudSchema) => {
+    // 判断是否显示
+    if (schemaItem?.isDetail !== false && schemaItem.detail?.show !== false) {
+      const descriptionsSchemaItem = {
+        ...schemaItem.detail,
+        field: schemaItem.field,
+        label: schemaItem.detail?.label || schemaItem.label
+      }
+      if (schemaItem.dictType) {
+        descriptionsSchemaItem.dictType = schemaItem.dictType
+      }
+      if (schemaItem.detail?.dateFormat || schemaItem.formatter == 'formatDate') {
+        // 优先使用 detail 下的配置，如果没有默认为 YYYY-MM-DD HH:mm:ss
+        descriptionsSchemaItem.dateFormat = schemaItem?.detail?.dateFormat
+          ? schemaItem?.detail?.dateFormat
+          : 'YYYY-MM-DD HH:mm:ss'
+      }
+
+      // 删除不必要的字段
+      delete descriptionsSchemaItem.show
+
+      descriptionsSchema.push(descriptionsSchemaItem)
+    }
+  })
+
+  return descriptionsSchema
+}
+
+// 给options添加国际化
+const filterOptions = (options: Recordable, labelField?: string) => {
+  return options?.map((v: Recordable) => {
+    if (labelField) {
+      v['labelField'] = t(v.labelField)
+    } else {
+      v['label'] = t(v.label)
+    }
+    return v
+  })
+}
+
+// 将 tableColumns 指定 fields 放到最前面
+export const sortTableColumns = (tableColumns: TableColumn[], field: string) => {
+  const fieldIndex = tableColumns.findIndex((item) => item.field === field)
+  const fieldColumn = cloneDeep(tableColumns[fieldIndex])
+  tableColumns.splice(fieldIndex, 1)
+  // 添加到开头
+  tableColumns.unshift(fieldColumn)
+}
+// 将 tableColumns 指定 fields 放到最前面
+export const sortTableFormColumns = (tableFormColumns: TableFormColumn[], field: string) => {
+  const fieldIndex = tableFormColumns.findIndex((item) => item.field === field)
+  const fieldColumn = cloneDeep(tableFormColumns[fieldIndex])
+  tableFormColumns.splice(fieldIndex, 1)
+  // 添加到开头
+  tableFormColumns.unshift(fieldColumn)
+}
diff --git a/src/hooks/web/useDesign.ts b/src/hooks/web/useDesign.ts
new file mode 100644
index 000000000..8ee3b38cd
--- /dev/null
+++ b/src/hooks/web/useDesign.ts
@@ -0,0 +1,18 @@
+import variables from '@/styles/global.module.scss'
+
+export const useDesign = () => {
+  const scssVariables = variables
+
+  /**
+   * @param scope 类名
+   * @returns 返回空间名-类名
+   */
+  const getPrefixCls = (scope: string) => {
+    return `${scssVariables.namespace}-${scope}`
+  }
+
+  return {
+    variables: scssVariables,
+    getPrefixCls
+  }
+}
diff --git a/src/hooks/web/useEmitt.ts b/src/hooks/web/useEmitt.ts
new file mode 100644
index 000000000..d4efea728
--- /dev/null
+++ b/src/hooks/web/useEmitt.ts
@@ -0,0 +1,22 @@
+import mitt from 'mitt'
+
+interface Option {
+  name: string // 事件名称
+  callback: Fn // 回调
+}
+
+const emitter = mitt()
+
+export const useEmitt = (option?: Option) => {
+  if (option) {
+    emitter.on(option.name, option.callback)
+
+    onBeforeUnmount(() => {
+      emitter.off(option.name)
+    })
+  }
+
+  return {
+    emitter
+  }
+}
diff --git a/src/hooks/web/useForm.ts b/src/hooks/web/useForm.ts
new file mode 100644
index 000000000..53a8a94d1
--- /dev/null
+++ b/src/hooks/web/useForm.ts
@@ -0,0 +1,94 @@
+import type { Form, FormExpose } from '@/components/Form'
+import type { ElForm } from 'element-plus'
+import type { FormProps } from '@/components/Form/src/types'
+import { FormSchema, FormSetPropsType } from '@/types/form'
+
+export const useForm = (props?: FormProps) => {
+  // From实例
+  const formRef = ref<typeof Form & FormExpose>()
+
+  // ElForm实例
+  const elFormRef = ref<ComponentRef<typeof ElForm>>()
+
+  /**
+   * @param ref Form实例
+   * @param elRef ElForm实例
+   */
+  const register = (ref: typeof Form & FormExpose, elRef: ComponentRef<typeof ElForm>) => {
+    formRef.value = ref
+    elFormRef.value = elRef
+  }
+
+  const getForm = async () => {
+    await nextTick()
+    const form = unref(formRef)
+    if (!form) {
+      console.error('The form is not registered. Please use the register method to register')
+    }
+    return form
+  }
+
+  // 一些内置的方法
+  const methods: {
+    setProps: (props: Recordable) => void
+    setValues: (data: Recordable) => void
+    getFormData: <T = Recordable | undefined>() => Promise<T>
+    setSchema: (schemaProps: FormSetPropsType[]) => void
+    addSchema: (formSchema: FormSchema, index?: number) => void
+    delSchema: (field: string) => void
+  } = {
+    setProps: async (props: FormProps = {}) => {
+      const form = await getForm()
+      form?.setProps(props)
+      if (props.model) {
+        form?.setValues(props.model)
+      }
+    },
+
+    setValues: async (data: Recordable) => {
+      const form = await getForm()
+      form?.setValues(data)
+    },
+
+    /**
+     * @param schemaProps 需要设置的schemaProps
+     */
+    setSchema: async (schemaProps: FormSetPropsType[]) => {
+      const form = await getForm()
+      form?.setSchema(schemaProps)
+    },
+
+    /**
+     * @param formSchema 需要新增数据
+     * @param index 在哪里新增
+     */
+    addSchema: async (formSchema: FormSchema, index?: number) => {
+      const form = await getForm()
+      form?.addSchema(formSchema, index)
+    },
+
+    /**
+     * @param field 删除哪个数据
+     */
+    delSchema: async (field: string) => {
+      const form = await getForm()
+      form?.delSchema(field)
+    },
+
+    /**
+     * @returns form data
+     */
+    getFormData: async <T = Recordable>(): Promise<T> => {
+      const form = await getForm()
+      return form?.formModel as T
+    }
+  }
+
+  props && methods.setProps(props)
+
+  return {
+    register,
+    elFormRef,
+    methods
+  }
+}
diff --git a/src/hooks/web/useI18n.ts b/src/hooks/web/useI18n.ts
new file mode 100644
index 000000000..d1ab70fa8
--- /dev/null
+++ b/src/hooks/web/useI18n.ts
@@ -0,0 +1,53 @@
+import { i18n } from '@/plugins/vueI18n'
+
+type I18nGlobalTranslation = {
+  (key: string): string
+  (key: string, locale: string): string
+  (key: string, locale: string, list: unknown[]): string
+  (key: string, locale: string, named: Record<string, unknown>): string
+  (key: string, list: unknown[]): string
+  (key: string, named: Record<string, unknown>): string
+}
+
+type I18nTranslationRestParameters = [string, any]
+
+const getKey = (namespace: string | undefined, key: string) => {
+  if (!namespace) {
+    return key
+  }
+  if (key.startsWith(namespace)) {
+    return key
+  }
+  return `${namespace}.${key}`
+}
+
+export const useI18n = (
+  namespace?: string
+): {
+  t: I18nGlobalTranslation
+} => {
+  const normalFn = {
+    t: (key: string) => {
+      return getKey(namespace, key)
+    }
+  }
+
+  if (!i18n) {
+    return normalFn
+  }
+
+  const { t, ...methods } = i18n.global
+
+  const tFn: I18nGlobalTranslation = (key: string, ...arg: any[]) => {
+    if (!key) return ''
+    if (!key.includes('.') && !namespace) return key
+    //@ts-ignore
+    return t(getKey(namespace, key), ...(arg as I18nTranslationRestParameters))
+  }
+  return {
+    ...methods,
+    t: tFn
+  }
+}
+
+export const t = (key: string) => key
diff --git a/src/hooks/web/useIcon.ts b/src/hooks/web/useIcon.ts
new file mode 100644
index 000000000..35002049f
--- /dev/null
+++ b/src/hooks/web/useIcon.ts
@@ -0,0 +1,8 @@
+import { h } from 'vue'
+import type { VNode } from 'vue'
+import { Icon } from '@/components/Icon'
+import { IconTypes } from '@/types/icon'
+
+export const useIcon = (props: IconTypes): VNode => {
+  return h(Icon, props)
+}
diff --git a/src/hooks/web/useIntro.ts b/src/hooks/web/useIntro.ts
new file mode 100644
index 000000000..7fe00845d
--- /dev/null
+++ b/src/hooks/web/useIntro.ts
@@ -0,0 +1,47 @@
+import introJs from 'intro.js'
+import { IntroJs, Step, Options } from 'intro.js'
+import 'intro.js/introjs.css'
+
+import { useDesign } from '@/hooks/web/useDesign'
+
+export const useIntro = (setps?: Step[], options?: Options) => {
+  const { t } = useI18n()
+
+  const { variables } = useDesign()
+
+  const defaultSetps: Step[] = setps || [
+    {
+      element: `#${variables.namespace}-menu`,
+      title: t('common.menu'),
+      intro: t('common.menuDes'),
+      position: 'right'
+    },
+    {
+      element: `#${variables.namespace}-tool-header`,
+      title: t('common.tool'),
+      intro: t('common.toolDes'),
+      position: 'left'
+    },
+    {
+      element: `#${variables.namespace}-tags-view`,
+      title: t('common.tagsView'),
+      intro: t('common.tagsViewDes'),
+      position: 'bottom'
+    }
+  ]
+
+  const defaultOptions: Options = options || {
+    prevLabel: t('common.prevLabel'),
+    nextLabel: t('common.nextLabel'),
+    skipLabel: t('common.skipLabel'),
+    doneLabel: t('common.doneLabel')
+  }
+
+  const introRef: IntroJs = introJs()
+
+  introRef.addSteps(defaultSetps).setOptions(defaultOptions)
+
+  return {
+    introRef
+  }
+}
diff --git a/src/hooks/web/useLocale.ts b/src/hooks/web/useLocale.ts
new file mode 100644
index 000000000..c65070ef3
--- /dev/null
+++ b/src/hooks/web/useLocale.ts
@@ -0,0 +1,35 @@
+import { i18n } from '@/plugins/vueI18n'
+import { useLocaleStoreWithOut } from '@/store/modules/locale'
+import { setHtmlPageLang } from '@/plugins/vueI18n/helper'
+
+const setI18nLanguage = (locale: LocaleType) => {
+  const localeStore = useLocaleStoreWithOut()
+
+  if (i18n.mode === 'legacy') {
+    i18n.global.locale = locale
+  } else {
+    ;(i18n.global.locale as any).value = locale
+  }
+  localeStore.setCurrentLocale({
+    lang: locale
+  })
+  setHtmlPageLang(locale)
+}
+
+export const useLocale = () => {
+  // Switching the language will change the locale of useI18n
+  // And submit to configuration modification
+  const changeLocale = async (locale: LocaleType) => {
+    const globalI18n = i18n.global
+
+    const langModule = await import(`../../locales/${locale}.ts`)
+
+    globalI18n.setLocaleMessage(locale, langModule.default)
+
+    setI18nLanguage(locale)
+  }
+
+  return {
+    changeLocale
+  }
+}
diff --git a/src/hooks/web/useMessage.ts b/src/hooks/web/useMessage.ts
new file mode 100644
index 000000000..ac2b552e0
--- /dev/null
+++ b/src/hooks/web/useMessage.ts
@@ -0,0 +1,95 @@
+import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
+import { useI18n } from './useI18n'
+export const useMessage = () => {
+  const { t } = useI18n()
+  return {
+    // 消息提示
+    info(content: string) {
+      ElMessage.info(content)
+    },
+    // 错误消息
+    error(content: string) {
+      ElMessage.error(content)
+    },
+    // 成功消息
+    success(content: string) {
+      ElMessage.success(content)
+    },
+    // 警告消息
+    warning(content: string) {
+      ElMessage.warning(content)
+    },
+    // 弹出提示
+    alert(content: string) {
+      ElMessageBox.alert(content, t('common.confirmTitle'))
+    },
+    // 错误提示
+    alertError(content: string) {
+      ElMessageBox.alert(content, t('common.confirmTitle'), { type: 'error' })
+    },
+    // 成功提示
+    alertSuccess(content: string) {
+      ElMessageBox.alert(content, t('common.confirmTitle'), { type: 'success' })
+    },
+    // 警告提示
+    alertWarning(content: string) {
+      ElMessageBox.alert(content, t('common.confirmTitle'), { type: 'warning' })
+    },
+    // 通知提示
+    notify(content: string) {
+      ElNotification.info(content)
+    },
+    // 错误通知
+    notifyError(content: string) {
+      ElNotification.error(content)
+    },
+    // 成功通知
+    notifySuccess(content: string) {
+      ElNotification.success(content)
+    },
+    // 警告通知
+    notifyWarning(content: string) {
+      ElNotification.warning(content)
+    },
+    // 确认窗体
+    confirm(content: string, tip?: string) {
+      return ElMessageBox.confirm(content, tip ? tip : t('common.confirmTitle'), {
+        confirmButtonText: t('common.ok'),
+        cancelButtonText: t('common.cancel'),
+        type: 'warning'
+      })
+    },
+    // 删除窗体
+    delConfirm(content?: string, tip?: string) {
+      return ElMessageBox.confirm(
+        content ? content : t('common.delMessage'),
+        tip ? tip : t('common.confirmTitle'),
+        {
+          confirmButtonText: t('common.ok'),
+          cancelButtonText: t('common.cancel'),
+          type: 'warning'
+        }
+      )
+    },
+    // 导出窗体
+    exportConfirm(content?: string, tip?: string) {
+      return ElMessageBox.confirm(
+        content ? content : t('common.exportMessage'),
+        tip ? tip : t('common.confirmTitle'),
+        {
+          confirmButtonText: t('common.ok'),
+          cancelButtonText: t('common.cancel'),
+          type: 'warning'
+        }
+      )
+    },
+    // 提交内容
+    prompt(content: string, tip: string) {
+      return ElMessageBox.prompt(content, tip, {
+        confirmButtonText: t('common.ok'),
+        cancelButtonText: t('common.cancel'),
+        type: 'warning'
+      })
+    }
+  }
+}
diff --git a/src/hooks/web/useNProgress.ts b/src/hooks/web/useNProgress.ts
new file mode 100644
index 000000000..6d8c0b910
--- /dev/null
+++ b/src/hooks/web/useNProgress.ts
@@ -0,0 +1,33 @@
+import { useCssVar } from '@vueuse/core'
+import type { NProgressOptions } from 'nprogress'
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+
+const primaryColor = useCssVar('--el-color-primary', document.documentElement)
+
+export const useNProgress = () => {
+  NProgress.configure({ showSpinner: false } as NProgressOptions)
+
+  const initColor = async () => {
+    await nextTick()
+    const bar = document.getElementById('nprogress')?.getElementsByClassName('bar')[0] as ElRef
+    if (bar) {
+      bar.style.background = unref(primaryColor.value)
+    }
+  }
+
+  initColor()
+
+  const start = () => {
+    NProgress.start()
+  }
+
+  const done = () => {
+    NProgress.done()
+  }
+
+  return {
+    start,
+    done
+  }
+}
diff --git a/src/hooks/web/usePageLoading.ts b/src/hooks/web/usePageLoading.ts
new file mode 100644
index 000000000..bb89457d9
--- /dev/null
+++ b/src/hooks/web/usePageLoading.ts
@@ -0,0 +1,18 @@
+import { useAppStoreWithOut } from '@/store/modules/app'
+
+const appStore = useAppStoreWithOut()
+
+export const usePageLoading = () => {
+  const loadStart = () => {
+    appStore.setPageLoading(true)
+  }
+
+  const loadDone = () => {
+    appStore.setPageLoading(false)
+  }
+
+  return {
+    loadStart,
+    loadDone
+  }
+}
diff --git a/src/hooks/web/useTable.ts b/src/hooks/web/useTable.ts
new file mode 100644
index 000000000..53cd83cce
--- /dev/null
+++ b/src/hooks/web/useTable.ts
@@ -0,0 +1,242 @@
+import download from '@/utils/download'
+import { Table, TableExpose } from '@/components/Table'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { computed, nextTick, reactive, ref, unref, watch } from 'vue'
+import type { TableProps } from '@/components/Table/src/types'
+
+import { TableSetPropsType } from '@/types/table'
+import { emit } from 'process'
+
+const { t } = useI18n()
+interface ResponseType<T = any> {
+  list: T[]
+  total?: number
+}
+
+interface UseTableConfig<T = any> {
+  getListApi: (option: any) => Promise<T>
+  delListApi?: (option: any) => Promise<T>
+  exportListApi?: (option: any) => Promise<T>
+  // 返回数据格式配置
+  response?: ResponseType
+  // 默认传递的参数
+  defaultParams?: Recordable
+  props?: TableProps
+}
+
+interface TableObject<T = any> {
+  pageSize: number
+  currentPage: number
+  total: number
+  tableList: T[]
+  params: any
+  loading: boolean
+  exportLoading: boolean
+  currentRow: Nullable<T>
+  sort: any
+}
+
+export const useTable = <T = any>(config?: UseTableConfig<T>) => {
+  const tableObject = reactive<TableObject<T>>({
+    // 页数
+    pageSize: 10,
+    // 当前页
+    currentPage: 1,
+    // 总条数
+    total: 10,
+    // 表格数据
+    tableList: [],
+    // AxiosConfig 配置
+    params: {
+      ...(config?.defaultParams || {})
+    },
+    // 加载中
+    loading: true,
+    // 导出加载中
+    exportLoading: false,
+    // 当前行的数据
+    currentRow: null,
+    // 排序
+    sort: {
+      order: '', // 排序规则
+      prop: '' // 排序字段
+    },
+  })
+
+  const paramsObj = computed(() => {
+    return {
+      ...tableObject.params,
+      pageSize: tableObject.pageSize,
+      pageNo: tableObject.currentPage,
+      sort: tableObject.sort.prop,
+      by: tableObject.sort.order == 'descending'?'DESC':'ASC'
+    }
+  })
+
+  watch(
+    () => tableObject.currentPage,
+    () => {
+      methods.getList()
+    }
+  )
+
+  watch(
+    () => tableObject.pageSize,
+    () => {
+      // 当前页不为1时，修改页数后会导致多次调用getList方法
+      if (tableObject.currentPage === 1) {
+        methods.getList()
+      } else {
+        tableObject.currentPage = 1
+        methods.getList()
+      }
+    }
+  )
+
+  watch(
+    () => tableObject.sort,
+    () => {
+      methods.getList()
+    }
+  )
+
+  // Table实例
+  const tableRef = ref<typeof Table & TableExpose>()
+
+  // ElTable实例
+  const elTableRef = ref<ComponentRef<typeof ElTable>>()
+
+  const register = (ref: typeof Table & TableExpose, elRef: ComponentRef<typeof ElTable>) => {
+    tableRef.value = ref
+    elTableRef.value = elRef
+  }
+
+  const getTable = async () => {
+    await nextTick()
+    const table = unref(tableRef)
+    if (!table) {
+      console.error('The table is not registered. Please use the register method to register')
+    }
+    return table
+  }
+
+  const delData = async (ids: string | number | string[] | number[]) => {
+    let idsLength = 1
+    if (ids instanceof Array) {
+      idsLength = ids.length
+      await Promise.all(
+        ids.map(async (id: string | number) => {
+          await (config?.delListApi && config?.delListApi(id))
+        })
+      )
+    } else {
+      await (config?.delListApi && config?.delListApi(ids))
+    }
+    ElMessage.success(t('common.delSuccess'))
+
+    // 计算出临界点
+    tableObject.currentPage =
+      tableObject.total % tableObject.pageSize === idsLength || tableObject.pageSize === 1
+        ? tableObject.currentPage > 1
+          ? tableObject.currentPage - 1
+          : tableObject.currentPage
+        : tableObject.currentPage
+    await methods.getList()
+  }
+
+  const methods = {
+    getList: async () => {
+      tableObject.loading = true
+      const res = await config?.getListApi(unref(paramsObj)).finally(() => {
+        tableObject.loading = false
+      })
+      if (res) {
+        tableObject.tableList = (res as unknown as ResponseType).list
+        tableObject.total = (res as unknown as ResponseType).total ?? 0
+      }
+    },
+    setProps: async (props: TableProps = {}) => {
+      const table = await getTable()
+      table?.setProps(props)
+    },
+    setColumn: async (columnProps: TableSetPropsType[]) => {
+      const table = await getTable()
+      table?.setColumn(columnProps)
+    },
+    getSelections: async () => {
+      const table = await getTable()
+      return (table?.selections || []) as T[]
+    },
+    // 与Search组件结合
+    setSearchParams: (data: Recordable) => {
+      tableObject.params = Object.assign(tableObject.params, {
+        pageSize: tableObject.pageSize,
+        pageNo: 1,
+        ...data
+      })
+      // 查询/重置时，删除筛选相关属性
+      delete tableObject.params.filters
+      delete tableObject.params.isSearch
+      // 页码不等于1时更新页码重新获取数据，页码等于1时重新获取数据
+      if (tableObject.currentPage !== 1) {
+        tableObject.currentPage = 1
+      } else {
+        methods.getList()
+      }
+    },
+    // 删除数据
+    delList: async (
+      ids: string | number | string[] | number[],
+      multiple: boolean,
+      message = true
+    ) => {
+      const tableRef = await getTable()
+      if (multiple) {
+        if (!tableRef?.selections.length) {
+          ElMessage.warning(t('common.delNoData'))
+          return
+        }
+      }
+      if (message) {
+        ElMessageBox.confirm(t('common.delMessage'), t('common.confirmTitle'), {
+          confirmButtonText: t('common.ok'),
+          cancelButtonText: t('common.cancel'),
+          type: 'warning'
+        }).then(async () => {
+          await delData(ids)
+        })
+      } else {
+        await delData(ids)
+      }
+    },
+    // 导出列表
+    exportList: async (fileName: string) => {
+      tableObject.exportLoading = true
+      ElMessageBox.confirm(t('common.exportMessage'), t('common.confirmTitle'), {
+        confirmButtonText: t('common.ok'),
+        cancelButtonText: t('common.cancel'),
+        type: 'warning'
+      })
+        .then(async () => {
+          const res = await config?.exportListApi?.(unref(paramsObj) as unknown as T)
+          if (res) {
+            download.excel(res as unknown as Blob, fileName)
+          }
+        })
+        .finally(() => {
+          tableObject.exportLoading = false
+        })
+    }
+  }
+
+  config?.props && methods.setProps(config.props)
+
+  return {
+    register,
+    elTableRef,
+    tableObject,
+    methods,
+    // add by 芋艿：返回 tableMethods 属性，和 tableObject 更统一
+    tableMethods: methods
+  }
+}
diff --git a/src/hooks/web/useTimeAgo.ts b/src/hooks/web/useTimeAgo.ts
new file mode 100644
index 000000000..a6da28191
--- /dev/null
+++ b/src/hooks/web/useTimeAgo.ts
@@ -0,0 +1,49 @@
+import { useTimeAgo as useTimeAgoCore, UseTimeAgoMessages } from '@vueuse/core'
+import { useLocaleStoreWithOut } from '@/store/modules/locale'
+
+const TIME_AGO_MESSAGE_MAP: {
+  'zh-CN': UseTimeAgoMessages
+  en: UseTimeAgoMessages
+} = {
+  // @ts-ignore
+  'zh-CN': {
+    justNow: '刚刚',
+    past: (n) => (n.match(/\d/) ? `${n}前` : n),
+    future: (n) => (n.match(/\d/) ? `${n}后` : n),
+    month: (n, past) => (n === 1 ? (past ? '上个月' : '下个月') : `${n} 个月`),
+    year: (n, past) => (n === 1 ? (past ? '去年' : '明年') : `${n} 年`),
+    day: (n, past) => (n === 1 ? (past ? '昨天' : '明天') : `${n} 天`),
+    week: (n, past) => (n === 1 ? (past ? '上周' : '下周') : `${n} 周`),
+    hour: (n) => `${n} 小时`,
+    minute: (n) => `${n} 分钟`,
+    second: (n) => `${n} 秒`
+  },
+  // @ts-ignore
+  en: {
+    justNow: 'just now',
+    past: (n) => (n.match(/\d/) ? `${n} ago` : n),
+    future: (n) => (n.match(/\d/) ? `in ${n}` : n),
+    month: (n, past) =>
+      n === 1 ? (past ? 'last month' : 'next month') : `${n} month${n > 1 ? 's' : ''}`,
+    year: (n, past) =>
+      n === 1 ? (past ? 'last year' : 'next year') : `${n} year${n > 1 ? 's' : ''}`,
+    day: (n, past) => (n === 1 ? (past ? 'yesterday' : 'tomorrow') : `${n} day${n > 1 ? 's' : ''}`),
+    week: (n, past) =>
+      n === 1 ? (past ? 'last week' : 'next week') : `${n} week${n > 1 ? 's' : ''}`,
+    hour: (n) => `${n} hour${n > 1 ? 's' : ''}`,
+    minute: (n) => `${n} minute${n > 1 ? 's' : ''}`,
+    second: (n) => `${n} second${n > 1 ? 's' : ''}`
+  }
+}
+
+export const useTimeAgo = (time: Date | number | string) => {
+  const localeStore = useLocaleStoreWithOut()
+
+  const currentLocale = computed(() => localeStore.getCurrentLocale)
+
+  const timeAgo = useTimeAgoCore(time, {
+    messages: TIME_AGO_MESSAGE_MAP[unref(currentLocale).lang]
+  })
+
+  return timeAgo
+}
diff --git a/src/hooks/web/useTitle.ts b/src/hooks/web/useTitle.ts
new file mode 100644
index 000000000..020a9b771
--- /dev/null
+++ b/src/hooks/web/useTitle.ts
@@ -0,0 +1,24 @@
+import { watch, ref } from 'vue'
+import { isString } from '@/utils/is'
+import { useAppStoreWithOut } from '@/store/modules/app'
+
+const appStore = useAppStoreWithOut()
+
+export const useTitle = (newTitle?: string) => {
+  const { t } = useI18n()
+  const title = ref(
+    newTitle ? `${appStore.getTitle} - ${t(newTitle as string)}` : appStore.getTitle
+  )
+
+  watch(
+    title,
+    (n, o) => {
+      if (isString(n) && n !== o && document) {
+        document.title = n
+      }
+    },
+    { immediate: true }
+  )
+
+  return title
+}
diff --git a/src/hooks/web/useValidator.ts b/src/hooks/web/useValidator.ts
new file mode 100644
index 000000000..0c16fa31c
--- /dev/null
+++ b/src/hooks/web/useValidator.ts
@@ -0,0 +1,62 @@
+const { t } = useI18n()
+
+type Callback = (error?: string | Error | undefined) => void
+
+interface LengthRange {
+  min: number
+  max: number
+  message: string
+}
+
+export const useValidator = () => {
+  const required = (message?: string) => {
+    return {
+      required: true,
+      message: message || t('common.required')
+    }
+  }
+
+  const lengthRange = (val: any, callback: Callback, options: LengthRange) => {
+    const { min, max, message } = options
+    if (val.length < min || val.length > max) {
+      callback(new Error(message))
+    } else {
+      callback()
+    }
+  }
+
+  const notSpace = (val: any, callback: Callback, message: string) => {
+    // 用户名不能有空格
+    if (val.indexOf(' ') !== -1) {
+      callback(new Error(message))
+    } else {
+      callback()
+    }
+  }
+
+  const notSpecialCharacters = (val: any, callback: Callback, message: string) => {
+    // 密码不能是特殊字符
+    if (/[`~!@#$%^&*()_+<>?:"{},.\/;'[\]]/gi.test(val)) {
+      callback(new Error(message))
+    } else {
+      callback()
+    }
+  }
+
+  // 两个字符串是否想等
+  const isEqual = (val1: string, val2: string, callback: Callback, message: string) => {
+    if (val1 === val2) {
+      callback()
+    } else {
+      callback(new Error(message))
+    }
+  }
+
+  return {
+    required,
+    lengthRange,
+    notSpace,
+    notSpecialCharacters,
+    isEqual
+  }
+}
diff --git a/src/hooks/web/useWatermark.ts b/src/hooks/web/useWatermark.ts
new file mode 100644
index 000000000..4a313594c
--- /dev/null
+++ b/src/hooks/web/useWatermark.ts
@@ -0,0 +1,55 @@
+const domSymbol = Symbol('watermark-dom')
+
+export function useWatermark(appendEl: HTMLElement | null = document.body) {
+  let func: Fn = () => {}
+  const id = domSymbol.toString()
+  const clear = () => {
+    const domId = document.getElementById(id)
+    if (domId) {
+      const el = appendEl
+      el && el.removeChild(domId)
+    }
+    window.removeEventListener('resize', func)
+  }
+  const createWatermark = (str: string) => {
+    clear()
+
+    const can = document.createElement('canvas')
+    can.width = 300
+    can.height = 240
+
+    const cans = can.getContext('2d')
+    if (cans) {
+      cans.rotate((-20 * Math.PI) / 120)
+      cans.font = '15px Vedana'
+      cans.fillStyle = 'rgba(0, 0, 0, 0.15)'
+      cans.textAlign = 'left'
+      cans.textBaseline = 'middle'
+      cans.fillText(str, can.width / 20, can.height)
+    }
+
+    const div = document.createElement('div')
+    div.id = id
+    div.style.pointerEvents = 'none'
+    div.style.top = '0px'
+    div.style.left = '0px'
+    div.style.position = 'absolute'
+    div.style.zIndex = '100000000'
+    div.style.width = document.documentElement.clientWidth + 'px'
+    div.style.height = document.documentElement.clientHeight + 'px'
+    div.style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat'
+    const el = appendEl
+    el && el.appendChild(div)
+    return id
+  }
+
+  function setWatermark(str: string) {
+    createWatermark(str)
+    func = () => {
+      createWatermark(str)
+    }
+    window.addEventListener('resize', func)
+  }
+
+  return { setWatermark, clear }
+}
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
new file mode 100644
index 000000000..420341e64
--- /dev/null
+++ b/src/layout/Layout.vue
@@ -0,0 +1,78 @@
+<script lang="tsx">
+import { computed, defineComponent, unref } from 'vue'
+import { useAppStore } from '@/store/modules/app'
+import { Backtop } from '@/components/Backtop'
+import { Setting } from '@/layout/components/Setting'
+import { useRenderLayout } from './components/useRenderLayout'
+import { useDesign } from '@/hooks/web/useDesign'
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('layout')
+
+const appStore = useAppStore()
+
+// 是否是移动端
+const mobile = computed(() => appStore.getMobile)
+
+// 菜单折叠
+const collapse = computed(() => appStore.getCollapse)
+
+const layout = computed(() => appStore.getLayout)
+
+const handleClickOutside = () => {
+  appStore.setCollapse(true)
+}
+
+const renderLayout = () => {
+  switch (unref(layout)) {
+    case 'classic':
+      const { renderClassic } = useRenderLayout()
+      return renderClassic()
+    case 'topLeft':
+      const { renderTopLeft } = useRenderLayout()
+      return renderTopLeft()
+    case 'top':
+      const { renderTop } = useRenderLayout()
+      return renderTop()
+    case 'cutMenu':
+      const { renderCutMenu } = useRenderLayout()
+      return renderCutMenu()
+    default:
+      break
+  }
+}
+
+export default defineComponent({
+  name: 'Layout',
+  setup() {
+    return () => (
+      <section class={[prefixCls, `${prefixCls}__${layout.value}`, 'w-[100%] h-[100%] relative']}>
+        {mobile.value && !collapse.value ? (
+          <div
+            class="absolute left-0 top-0 z-99 h-full w-full bg-[var(--el-color-black)] opacity-30"
+            onClick={handleClickOutside}
+          ></div>
+        ) : undefined}
+
+        {renderLayout()}
+
+        <Backtop></Backtop>
+
+        {/* <Setting></Setting> */}
+      </section>
+    )
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-layout;
+
+.#{$prefix-cls} {
+  background-color: var(--app-content-bg-color);
+  :deep(.#{$elNamespace}-scrollbar__view) {
+    height: 100% !important;
+  }
+}
+</style>
diff --git a/src/layout/components/AppView.vue b/src/layout/components/AppView.vue
new file mode 100644
index 000000000..ffdf11f50
--- /dev/null
+++ b/src/layout/components/AppView.vue
@@ -0,0 +1,61 @@
+<script lang="ts" setup>
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import { useAppStore } from '@/store/modules/app'
+import { Footer } from '@/layout/components/Footer'
+
+defineOptions({ name: 'AppView' })
+
+const appStore = useAppStore()
+
+const layout = computed(() => appStore.getLayout)
+
+const fixedHeader = computed(() => appStore.getFixedHeader)
+
+const footer = computed(() => appStore.getFooter)
+
+const tagsViewStore = useTagsViewStore()
+
+const getCaches = computed((): string[] => {
+  return tagsViewStore.getCachedViews
+})
+
+const tagsView = computed(() => appStore.getTagsView)
+</script>
+
+<template>
+  <section
+    :class="[
+      'p-[var(--app-content-padding)] w-[calc(100%-var(--app-content-padding)-var(--app-content-padding))] bg-[var(--app-content-bg-color)] dark:bg-[var(--el-bg-color)]',
+      {
+        '!min-h-[calc(100%-var(--app-content-padding)-var(--app-content-padding)-var(--app-footer-height))]':
+          (fixedHeader &&
+            (layout === 'classic' || layout === 'topLeft' || layout === 'top') &&
+            footer) ||
+          (!tagsView && layout === 'top' && footer),
+        '!min-h-[calc(100%-var(--app-content-padding)-var(--app-content-padding)-var(--app-footer-height)-var(--tags-view-height))]':
+          tagsView && layout === 'top' && footer,
+
+        '!min-h-[calc(100%-var(--tags-view-height)-var(--app-content-padding)-var(--app-content-padding)-var(--top-tool-height)-var(--app-footer-height))]':
+          !fixedHeader && layout === 'classic' && footer,
+
+        '!min-h-[calc(100%-var(--tags-view-height)-var(--app-content-padding)-var(--app-content-padding)-var(--app-footer-height))]':
+          !fixedHeader && layout === 'topLeft' && footer,
+
+        '!min-h-[calc(100%-var(--top-tool-height)-var(--app-content-padding)-var(--app-content-padding))]':
+          fixedHeader && layout === 'cutMenu' && footer,
+
+        '!min-h-[calc(100%-var(--top-tool-height)-var(--app-content-padding)-var(--app-content-padding)-var(--tags-view-height))]':
+          !fixedHeader && layout === 'cutMenu' && footer
+      }
+    ]"
+  >
+    <router-view>
+      <template #default="{ Component, route }">
+        <keep-alive :include="getCaches">
+          <component :is="Component" :key="route.fullPath" />
+        </keep-alive>
+      </template>
+    </router-view>
+  </section>
+  <Footer v-if="footer" />
+</template>
diff --git a/src/layout/components/Breadcrumb/index.ts b/src/layout/components/Breadcrumb/index.ts
new file mode 100644
index 000000000..93ffe7054
--- /dev/null
+++ b/src/layout/components/Breadcrumb/index.ts
@@ -0,0 +1,3 @@
+import Breadcrumb from './src/Breadcrumb.vue'
+
+export { Breadcrumb }
diff --git a/src/layout/components/Breadcrumb/src/Breadcrumb.vue b/src/layout/components/Breadcrumb/src/Breadcrumb.vue
new file mode 100644
index 000000000..de0366543
--- /dev/null
+++ b/src/layout/components/Breadcrumb/src/Breadcrumb.vue
@@ -0,0 +1,128 @@
+<script lang="tsx">
+import { ElBreadcrumb, ElBreadcrumbItem } from 'element-plus'
+import { ref, watch, computed, unref, defineComponent, TransitionGroup } from 'vue'
+import { useRouter } from 'vue-router'
+import { usePermissionStore } from '@/store/modules/permission'
+import { filterBreadcrumb } from './helper'
+import { filter, treeToList } from '@/utils/tree'
+import type { RouteLocationNormalizedLoaded, RouteMeta } from 'vue-router'
+
+import { Icon } from '@/components/Icon'
+import { useAppStore } from '@/store/modules/app'
+import { useDesign } from '@/hooks/web/useDesign'
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('breadcrumb')
+
+const appStore = useAppStore()
+
+// 面包屑图标
+const breadcrumbIcon = computed(() => appStore.getBreadcrumbIcon)
+
+export default defineComponent({
+  name: 'Breadcrumb',
+  setup() {
+    const { currentRoute } = useRouter()
+
+    const { t } = useI18n()
+
+    const levelList = ref<AppRouteRecordRaw[]>([])
+
+    const permissionStore = usePermissionStore()
+
+    const menuRouters = computed(() => {
+      const routers = permissionStore.getRouters
+      return filterBreadcrumb(routers)
+    })
+
+    const getBreadcrumb = () => {
+      const currentPath = currentRoute.value.matched.slice(-1)[0].path
+
+      levelList.value = filter<AppRouteRecordRaw>(unref(menuRouters), (node: AppRouteRecordRaw) => {
+        return node.path === currentPath
+      })
+    }
+
+    const renderBreadcrumb = () => {
+      const breadcrumbList = treeToList<AppRouteRecordRaw[]>(unref(levelList))
+      return breadcrumbList.map((v) => {
+        const disabled = !v.redirect || v.redirect === 'noredirect'
+        const meta = v.meta as RouteMeta
+        return (
+          <ElBreadcrumbItem to={{ path: disabled ? '' : v.path }} key={v.name}>
+            {meta?.icon && breadcrumbIcon.value ? (
+              <>
+                <Icon icon={meta.icon} class="mr-[2px]" svgClass="inline-block"></Icon>
+                {t(v?.meta?.title)}
+              </>
+            ) : (
+              t(v?.meta?.title)
+            )}
+          </ElBreadcrumbItem>
+        )
+      })
+    }
+
+    watch(
+      () => currentRoute.value,
+      (route: RouteLocationNormalizedLoaded) => {
+        if (route.path.startsWith('/redirect/')) {
+          return
+        }
+        getBreadcrumb()
+      },
+      {
+        immediate: true
+      }
+    )
+
+    return () => (
+      <ElBreadcrumb separator="/" class={`${prefixCls} flex items-center h-full ml-[10px]`}>
+        <TransitionGroup appear enter-active-class="animate__animated animate__fadeInRight">
+          {renderBreadcrumb()}
+        </TransitionGroup>
+      </ElBreadcrumb>
+    )
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$elNamespace}-breadcrumb;
+
+.#{$prefix-cls} {
+  :deep(&__item) {
+    display: flex;
+    .#{$prefix-cls}__inner {
+      display: flex;
+      align-items: center;
+      color: var(--top-header-text-color);
+
+      &:hover {
+        color: var(--el-color-primary);
+      }
+    }
+  }
+
+  :deep(&__item):not(:last-child) {
+    .#{$prefix-cls}__inner {
+      color: var(--top-header-text-color);
+
+      &:hover {
+        color: var(--el-color-primary);
+      }
+    }
+  }
+
+  :deep(&__item):last-child {
+    .#{$prefix-cls}__inner {
+      color: var(--el-text-color-placeholder);
+
+      &:hover {
+        color: var(--el-text-color-placeholder);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/layout/components/Breadcrumb/src/helper.ts b/src/layout/components/Breadcrumb/src/helper.ts
new file mode 100644
index 000000000..fb3ec1977
--- /dev/null
+++ b/src/layout/components/Breadcrumb/src/helper.ts
@@ -0,0 +1,31 @@
+import { pathResolve } from '@/utils/routerHelper'
+import type { RouteMeta } from 'vue-router'
+
+export const filterBreadcrumb = (
+  routes: AppRouteRecordRaw[],
+  parentPath = ''
+): AppRouteRecordRaw[] => {
+  const res: AppRouteRecordRaw[] = []
+
+  for (const route of routes) {
+    const meta = route?.meta as RouteMeta
+    if (meta.hidden && !meta.canTo) {
+      continue
+    }
+
+    const data: AppRouteRecordRaw =
+      !meta.alwaysShow && route.children?.length === 1
+        ? { ...route.children[0], path: pathResolve(route.path, route.children[0].path) }
+        : { ...route }
+
+    data.path = pathResolve(parentPath, data.path)
+
+    if (data.children) {
+      data.children = filterBreadcrumb(data.children, data.path)
+    }
+    if (data) {
+      res.push(data)
+    }
+  }
+  return res
+}
diff --git a/src/layout/components/Collapse/index.ts b/src/layout/components/Collapse/index.ts
new file mode 100644
index 000000000..73f65a3a6
--- /dev/null
+++ b/src/layout/components/Collapse/index.ts
@@ -0,0 +1,3 @@
+import Collapse from './src/Collapse.vue'
+
+export { Collapse }
diff --git a/src/layout/components/Collapse/src/Collapse.vue b/src/layout/components/Collapse/src/Collapse.vue
new file mode 100644
index 000000000..ecb6890f0
--- /dev/null
+++ b/src/layout/components/Collapse/src/Collapse.vue
@@ -0,0 +1,36 @@
+<script lang="ts" setup>
+import { useAppStore } from '@/store/modules/app'
+import { propTypes } from '@/utils/propTypes'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'Collapse' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('collapse')
+
+defineProps({
+  color: propTypes.string.def('')
+})
+
+const appStore = useAppStore()
+
+const collapse = computed(() => appStore.getCollapse)
+
+const toggleCollapse = () => {
+  const collapsed = unref(collapse)
+  appStore.setCollapse(!collapsed)
+}
+</script>
+
+<template>
+  <div :class="prefixCls">
+    <Icon
+      :color="color"
+      :icon="collapse ? 'ep:expand' : 'ep:fold'"
+      :size="18"
+      class="cursor-pointer"
+      @click="toggleCollapse"
+    />
+  </div>
+</template>
diff --git a/src/layout/components/ContextMenu/index.ts b/src/layout/components/ContextMenu/index.ts
new file mode 100644
index 000000000..2a7c1f0db
--- /dev/null
+++ b/src/layout/components/ContextMenu/index.ts
@@ -0,0 +1,10 @@
+import ContextMenu from './src/ContextMenu.vue'
+import { ElDropdown } from 'element-plus'
+import type { RouteLocationNormalizedLoaded } from 'vue-router'
+
+export interface ContextMenuExpose {
+  elDropdownMenuRef: ComponentRef<typeof ElDropdown>
+  tagItem: RouteLocationNormalizedLoaded
+}
+
+export { ContextMenu }
diff --git a/src/layout/components/ContextMenu/src/ContextMenu.vue b/src/layout/components/ContextMenu/src/ContextMenu.vue
new file mode 100644
index 000000000..90eea4c29
--- /dev/null
+++ b/src/layout/components/ContextMenu/src/ContextMenu.vue
@@ -0,0 +1,76 @@
+<script lang="ts" setup>
+import { PropType } from 'vue'
+
+import { useDesign } from '@/hooks/web/useDesign'
+import type { RouteLocationNormalizedLoaded } from 'vue-router'
+import { contextMenuSchema } from '@/types/contextMenu'
+import type { ElDropdown } from 'element-plus'
+
+defineOptions({ name: 'ContextMenu' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('context-menu')
+
+const { t } = useI18n()
+
+const emit = defineEmits(['visibleChange'])
+
+const props = defineProps({
+  schema: {
+    type: Array as PropType<contextMenuSchema[]>,
+    default: () => []
+  },
+  trigger: {
+    type: String as PropType<'click' | 'hover' | 'focus' | 'contextmenu'>,
+    default: 'contextmenu'
+  },
+  tagItem: {
+    type: Object as PropType<RouteLocationNormalizedLoaded>,
+    default: () => ({})
+  }
+})
+
+const command = (item: contextMenuSchema) => {
+  item.command && item.command(item)
+}
+
+const visibleChange = (visible: boolean) => {
+  emit('visibleChange', visible, props.tagItem)
+}
+
+const elDropdownMenuRef = ref<ComponentRef<typeof ElDropdown>>()
+
+defineExpose({
+  elDropdownMenuRef,
+  tagItem: props.tagItem
+})
+</script>
+
+<template>
+  <ElDropdown
+    ref="elDropdownMenuRef"
+    :class="prefixCls"
+    :trigger="trigger"
+    placement="bottom-start"
+    popper-class="v-context-menu-popper"
+    @command="command"
+    @visible-change="visibleChange"
+  >
+    <slot></slot>
+    <template #dropdown>
+      <ElDropdownMenu>
+        <ElDropdownItem
+          v-for="(item, index) in schema"
+          :key="`dropdown${index}`"
+          :command="item"
+          :disabled="item.disabled"
+          :divided="item.divided"
+        >
+          <Icon :icon="item.icon" />
+          {{ t(item.label) }}
+        </ElDropdownItem>
+      </ElDropdownMenu>
+    </template>
+  </ElDropdown>
+</template>
diff --git a/src/layout/components/Footer/index.ts b/src/layout/components/Footer/index.ts
new file mode 100644
index 000000000..bd052e0c4
--- /dev/null
+++ b/src/layout/components/Footer/index.ts
@@ -0,0 +1,3 @@
+import Footer from './src/Footer.vue'
+
+export { Footer }
diff --git a/src/layout/components/Footer/src/Footer.vue b/src/layout/components/Footer/src/Footer.vue
new file mode 100644
index 000000000..c350e38af
--- /dev/null
+++ b/src/layout/components/Footer/src/Footer.vue
@@ -0,0 +1,24 @@
+<script lang="ts" setup>
+import { useAppStore } from '@/store/modules/app'
+import { useDesign } from '@/hooks/web/useDesign'
+
+// eslint-disable-next-line vue/no-reserved-component-names
+defineOptions({ name: 'Footer' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('footer')
+
+const appStore = useAppStore()
+
+const title = computed(() => appStore.getTitle)
+</script>
+
+<template>
+  <div
+    :class="prefixCls"
+    class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center leading-[var(--app-footer-height)] text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)]"
+  >
+    <p style="font-size: 14px">Copyright ©2022-{{ title }}</p>
+  </div>
+</template>
diff --git a/src/layout/components/LocaleDropdown/index.ts b/src/layout/components/LocaleDropdown/index.ts
new file mode 100644
index 000000000..d02e640f7
--- /dev/null
+++ b/src/layout/components/LocaleDropdown/index.ts
@@ -0,0 +1,3 @@
+import LocaleDropdown from './src/LocaleDropdown.vue'
+
+export { LocaleDropdown }
diff --git a/src/layout/components/LocaleDropdown/src/LocaleDropdown.vue b/src/layout/components/LocaleDropdown/src/LocaleDropdown.vue
new file mode 100644
index 000000000..95132db20
--- /dev/null
+++ b/src/layout/components/LocaleDropdown/src/LocaleDropdown.vue
@@ -0,0 +1,52 @@
+<script lang="ts" setup>
+import { useLocaleStore } from '@/store/modules/locale'
+import { useLocale } from '@/hooks/web/useLocale'
+import { propTypes } from '@/utils/propTypes'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'LocaleDropdown' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('locale-dropdown')
+
+defineProps({
+  color: propTypes.string.def('')
+})
+
+const localeStore = useLocaleStore()
+
+const langMap = computed(() => localeStore.getLocaleMap)
+
+const currentLang = computed(() => localeStore.getCurrentLocale)
+
+const setLang = (lang: LocaleType) => {
+  if (lang === unref(currentLang).lang) return
+  // 需要重新加载页面让整个语言多初始化
+  window.location.reload()
+  localeStore.setCurrentLocale({
+    lang
+  })
+  const { changeLocale } = useLocale()
+  changeLocale(lang)
+}
+</script>
+
+<template>
+  <ElDropdown :class="prefixCls" trigger="click" @command="setLang">
+    <Icon
+      :class="$attrs.class"
+      :color="color"
+      :size="18"
+      class="cursor-pointer !p-0"
+      icon="ion:language-sharp"
+    />
+    <template #dropdown>
+      <ElDropdownMenu>
+        <ElDropdownItem v-for="item in langMap" :key="item.lang" :command="item.lang">
+          {{ item.name }}
+        </ElDropdownItem>
+      </ElDropdownMenu>
+    </template>
+  </ElDropdown>
+</template>
diff --git a/src/layout/components/Logo/index.ts b/src/layout/components/Logo/index.ts
new file mode 100644
index 000000000..1c4224c99
--- /dev/null
+++ b/src/layout/components/Logo/index.ts
@@ -0,0 +1,3 @@
+import Logo from './src/Logo.vue'
+
+export { Logo }
diff --git a/src/layout/components/Logo/src/Logo.vue b/src/layout/components/Logo/src/Logo.vue
new file mode 100644
index 000000000..474388de2
--- /dev/null
+++ b/src/layout/components/Logo/src/Logo.vue
@@ -0,0 +1,88 @@
+<script lang="ts" setup>
+import { computed, onMounted, ref, unref, watch } from 'vue'
+import { useAppStore } from '@/store/modules/app'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'Logo' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('logo')
+
+const appStore = useAppStore()
+
+const show = ref(true)
+
+const title = computed(() => appStore.getTitle)
+
+const layout = computed(() => appStore.getLayout)
+
+const collapse = computed(() => appStore.getCollapse)
+
+onMounted(() => {
+  if (unref(collapse)) show.value = false
+})
+
+watch(
+  () => collapse.value,
+  (collapse: boolean) => {
+    if (unref(layout) === 'topLeft' || unref(layout) === 'cutMenu') {
+      show.value = true
+      return
+    }
+    if (!collapse) {
+      setTimeout(() => {
+        show.value = !collapse
+      }, 400)
+    } else {
+      show.value = !collapse
+    }
+  }
+)
+
+watch(
+  () => layout.value,
+  (layout) => {
+    if (layout === 'top' || layout === 'cutMenu') {
+      show.value = true
+    } else {
+      if (unref(collapse)) {
+        show.value = false
+      } else {
+        show.value = true
+      }
+    }
+  }
+)
+</script>
+
+<template>
+  <div>
+    <router-link
+      :class="[
+        prefixCls,
+        layout !== 'classic' ? `${prefixCls}__Top` : '',
+        'flex !h-[var(--logo-height)] items-center cursor-pointer pl-8px relative decoration-none overflow-hidden'
+      ]"
+      to="/"
+    >
+      <img
+        class="h-[calc(var(--logo-height)-24px)] w-[calc(var(--logo-height)-10px)]"
+        src="@/assets/imgs/logo.png"
+      />
+      <div
+        v-if="show"
+        :class="[
+          'ml-10px text-16px font-700',
+          {
+            'text-[var(--logo-title-text-color)]': layout === 'classic',
+            'text-[var(--top-header-text-color)]':
+              layout === 'topLeft' || layout === 'top' || layout === 'cutMenu'
+          }
+        ]"
+      >
+        {{ title }}
+      </div>
+    </router-link>
+  </div>
+</template>
diff --git a/src/layout/components/Menu/index.ts b/src/layout/components/Menu/index.ts
new file mode 100644
index 000000000..a6ec6965b
--- /dev/null
+++ b/src/layout/components/Menu/index.ts
@@ -0,0 +1,3 @@
+import Menu from './src/Menu.vue'
+
+export { Menu }
diff --git a/src/layout/components/Menu/src/Menu.vue b/src/layout/components/Menu/src/Menu.vue
new file mode 100644
index 000000000..9033616fe
--- /dev/null
+++ b/src/layout/components/Menu/src/Menu.vue
@@ -0,0 +1,290 @@
+<script lang="tsx">
+import { PropType } from 'vue'
+import { ElMenu, ElScrollbar } from 'element-plus'
+import { useAppStore } from '@/store/modules/app'
+import { usePermissionStore } from '@/store/modules/permission'
+import { useRenderMenuItem } from './components/useRenderMenuItem'
+import { isUrl } from '@/utils/is'
+import { useDesign } from '@/hooks/web/useDesign'
+import { LayoutType } from '@/types/layout'
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('menu')
+
+export default defineComponent({
+  // eslint-disable-next-line vue/no-reserved-component-names
+  name: 'Menu',
+  props: {
+    menuSelect: {
+      type: Function as PropType<(index: string) => void>,
+      default: undefined
+    }
+  },
+  setup(props) {
+    const appStore = useAppStore()
+
+    const layout = computed(() => appStore.getLayout)
+
+    const { push, currentRoute } = useRouter()
+
+    const permissionStore = usePermissionStore()
+
+    const menuMode = computed((): 'vertical' | 'horizontal' => {
+      // 竖
+      const vertical: LayoutType[] = ['classic', 'topLeft', 'cutMenu']
+
+      if (vertical.includes(unref(layout))) {
+        return 'vertical'
+      } else {
+        return 'horizontal'
+      }
+    })
+
+    const routers = computed(() =>
+      unref(layout) === 'cutMenu' ? permissionStore.getMenuTabRouters : permissionStore.getRouters
+    )
+
+    const collapse = computed(() => appStore.getCollapse)
+
+    const uniqueOpened = computed(() => appStore.getUniqueOpened)
+
+    const activeMenu = computed(() => {
+      const { meta, path } = unref(currentRoute)
+      // if set path, the sidebar will highlight the path you set
+      if (meta.activeMenu) {
+        return meta.activeMenu as string
+      }
+      return path
+    })
+
+    const menuSelect = (index: string) => {
+      if (props.menuSelect) {
+        props.menuSelect(index)
+      }
+      // 自定义事件
+      if (isUrl(index)) {
+        window.open(index)
+      } else {
+        push(index)
+      }
+    }
+
+    const renderMenuWrap = () => {
+      if (unref(layout) === 'top') {
+        return renderMenu()
+      } else {
+        return <ElScrollbar>{renderMenu()}</ElScrollbar>
+      }
+    }
+
+    const renderMenu = () => {
+      return (
+        <ElMenu
+          defaultActive={unref(activeMenu)}
+          mode={unref(menuMode)}
+          collapse={
+            unref(layout) === 'top' || unref(layout) === 'cutMenu' ? false : unref(collapse)
+          }
+          uniqueOpened={unref(layout) === 'top' ? false : unref(uniqueOpened)}
+          backgroundColor="var(--left-menu-bg-color)"
+          textColor="var(--left-menu-text-color)"
+          activeTextColor="var(--left-menu-text-active-color)"
+          onSelect={menuSelect}
+        >
+          {{
+            default: () => {
+              const { renderMenuItem } = useRenderMenuItem(unref(menuMode))
+              return renderMenuItem(unref(routers))
+            }
+          }}
+        </ElMenu>
+      )
+    }
+
+    return () => (
+      <div
+        id={prefixCls}
+        class={[
+          `${prefixCls} ${prefixCls}__${unref(menuMode)}`,
+          'h-[100%] overflow-hidden flex-col bg-[var(--left-menu-bg-color)]',
+          {
+            'w-[var(--left-menu-min-width)]': unref(collapse) && unref(layout) !== 'cutMenu',
+            'w-[var(--left-menu-max-width)]': !unref(collapse) && unref(layout) !== 'cutMenu'
+          }
+        ]}
+      >
+        {renderMenuWrap()}
+      </div>
+    )
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-menu;
+
+.is-active--after {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 4px;
+  height: 100%;
+  background-color: var(--el-color-primary);
+  content: '';
+}
+
+.#{$prefix-cls} {
+  position: relative;
+  transition: width var(--transition-time-02);
+
+  :deep(.#{$elNamespace}-menu) {
+    width: 100% !important;
+    border-right: none;
+
+    // 设置选中时子标题的颜色
+    .is-active {
+      & > .#{$elNamespace}-sub-menu__title {
+        color: var(--left-menu-text-active-color) !important;
+      }
+    }
+
+    // 设置子菜单悬停的高亮和背景色
+    .#{$elNamespace}-sub-menu__title,
+    .#{$elNamespace}-menu-item {
+      &:hover {
+        color: var(--left-menu-text-active-color) !important;
+        background-color: var(--left-menu-bg-color) !important;
+      }
+    }
+
+    // 设置选中时的高亮背景和高亮颜色
+    .#{$elNamespace}-sub-menu.is-active,
+    .#{$elNamespace}-menu-item.is-active {
+      color: var(--left-menu-text-active-color) !important;
+      background-color: var(--left-menu-bg-active-color) !important;
+
+      &:hover {
+        background-color: var(--left-menu-bg-active-color) !important;
+      }
+    }
+
+    .#{$elNamespace}-menu-item.is-active {
+      position: relative;
+
+      &::after {
+        @extend .is-active--after;
+      }
+    }
+
+    // 设置子菜单的背景颜色
+    .#{$elNamespace}-menu {
+      .#{$elNamespace}-sub-menu__title,
+      .#{$elNamespace}-menu-item:not(.is-active) {
+        background-color: var(--left-menu-bg-light-color) !important;
+      }
+    }
+  }
+
+  // 折叠时的最小宽度
+  :deep(.#{$elNamespace}-menu--collapse) {
+    width: var(--left-menu-min-width);
+
+    & > .is-active,
+    & > .is-active > .#{$elNamespace}-sub-menu__title {
+      position: relative;
+      background-color: var(--left-menu-collapse-bg-active-color) !important;
+
+      &::after {
+        @extend .is-active--after;
+      }
+    }
+  }
+
+  // 折叠动画的时候，就需要把文字给隐藏掉
+  :deep(.horizontal-collapse-transition) {
+    // transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out !important;
+    .#{$prefix-cls}__title {
+      display: none;
+    }
+  }
+
+  // 水平菜单
+  &__horizontal {
+    height: calc(var(--top-tool-height)) !important;
+
+    :deep(.#{$elNamespace}-menu--horizontal) {
+      height: calc(var(--top-tool-height));
+      border-bottom: none;
+      // 重新设置底部高亮颜色
+      & > .#{$elNamespace}-sub-menu.is-active {
+        .#{$elNamespace}-sub-menu__title {
+          border-bottom-color: var(--el-color-primary) !important;
+        }
+      }
+
+      .#{$elNamespace}-menu-item.is-active {
+        position: relative;
+
+        &::after {
+          display: none !important;
+        }
+      }
+
+      .#{$prefix-cls}__title {
+        /* stylelint-disable-next-line */
+        max-height: calc(var(--top-tool-height) - 2px) !important;
+        /* stylelint-disable-next-line */
+        line-height: calc(var(--top-tool-height) - 2px);
+      }
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+$prefix-cls: #{$namespace}-menu-popper;
+
+.is-active--after {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 4px;
+  height: 100%;
+  background-color: var(--el-color-primary);
+  content: '';
+}
+
+.#{$prefix-cls}--vertical,
+.#{$prefix-cls}--horizontal {
+  // 设置选中时子标题的颜色
+  .is-active {
+    & > .el-sub-menu__title {
+      color: var(--left-menu-text-active-color) !important;
+    }
+  }
+
+  // 设置子菜单悬停的高亮和背景色
+  .el-sub-menu__title,
+  .el-menu-item {
+    &:hover {
+      color: var(--left-menu-text-active-color) !important;
+      background-color: var(--left-menu-bg-color) !important;
+    }
+  }
+
+  // 设置选中时的高亮背景
+  .el-menu-item.is-active {
+    position: relative;
+    background-color: var(--left-menu-bg-active-color) !important;
+
+    &:hover {
+      background-color: var(--left-menu-bg-active-color) !important;
+    }
+
+    &::after {
+      @extend .is-active--after;
+    }
+  }
+}
+</style>
diff --git a/src/layout/components/Menu/src/components/useRenderMenuItem.tsx b/src/layout/components/Menu/src/components/useRenderMenuItem.tsx
new file mode 100644
index 000000000..17a520a61
--- /dev/null
+++ b/src/layout/components/Menu/src/components/useRenderMenuItem.tsx
@@ -0,0 +1,59 @@
+import { ElSubMenu, ElMenuItem } from 'element-plus'
+import type { RouteMeta } from 'vue-router'
+import { hasOneShowingChild } from '../helper'
+import { isUrl } from '@/utils/is'
+import { useRenderMenuTitle } from './useRenderMenuTitle'
+import { useDesign } from '@/hooks/web/useDesign'
+import { pathResolve } from '@/utils/routerHelper'
+
+export const useRenderMenuItem = (
+  // allRouters: AppRouteRecordRaw[] = [],
+  menuMode: 'vertical' | 'horizontal'
+) => {
+  const renderMenuItem = (routers: AppRouteRecordRaw[], parentPath = '/') => {
+    return routers.map((v) => {
+      const meta = (v.meta ?? {}) as RouteMeta
+      if (!meta.hidden) {
+        const { oneShowingChild, onlyOneChild } = hasOneShowingChild(v.children, v)
+        const fullPath = isUrl(v.path) ? v.path : pathResolve(parentPath, v.path) // getAllParentPath<AppRouteRecordRaw>(allRouters, v.path).join('/')
+
+        const { renderMenuTitle } = useRenderMenuTitle()
+
+        if (
+          oneShowingChild &&
+          (!onlyOneChild?.children || onlyOneChild?.noShowingChildren) &&
+          !meta?.alwaysShow
+        ) {
+          return (
+            <ElMenuItem index={onlyOneChild ? pathResolve(fullPath, onlyOneChild.path) : fullPath}>
+              {{
+                default: () => renderMenuTitle(onlyOneChild ? onlyOneChild?.meta : meta)
+              }}
+            </ElMenuItem>
+          )
+        } else {
+          const { getPrefixCls } = useDesign()
+
+          const preFixCls = getPrefixCls('menu-popper')
+          return (
+            <ElSubMenu
+              index={fullPath}
+              popperClass={
+                menuMode === 'vertical' ? `${preFixCls}--vertical` : `${preFixCls}--horizontal`
+              }
+            >
+              {{
+                title: () => renderMenuTitle(meta),
+                default: () => renderMenuItem(v.children!, fullPath)
+              }}
+            </ElSubMenu>
+          )
+        }
+      }
+    })
+  }
+
+  return {
+    renderMenuItem
+  }
+}
diff --git a/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx b/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx
new file mode 100644
index 000000000..fc30b9006
--- /dev/null
+++ b/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx
@@ -0,0 +1,22 @@
+import type { RouteMeta } from 'vue-router'
+import { Icon } from '@/components/Icon'
+
+export const useRenderMenuTitle = () => {
+  const renderMenuTitle = (meta: RouteMeta) => {
+    const { t } = useI18n()
+    const { title = 'Please set title', icon } = meta
+
+    return icon ? (
+      <>
+        <Icon icon={meta.icon}></Icon>
+        <span class="v-menu__title">{t(title as string)}</span>
+      </>
+    ) : (
+      <span class="v-menu__title">{t(title as string)}</span>
+    )
+  }
+
+  return {
+    renderMenuTitle
+  }
+}
diff --git a/src/layout/components/Menu/src/helper.ts b/src/layout/components/Menu/src/helper.ts
new file mode 100644
index 000000000..c26f5f4bf
--- /dev/null
+++ b/src/layout/components/Menu/src/helper.ts
@@ -0,0 +1,54 @@
+import type { RouteMeta } from 'vue-router'
+import { findPath } from '@/utils/tree'
+
+type OnlyOneChildType = AppRouteRecordRaw & { noShowingChildren?: boolean }
+
+interface HasOneShowingChild {
+  oneShowingChild?: boolean
+  onlyOneChild?: OnlyOneChildType
+}
+
+export const getAllParentPath = <T = Recordable>(treeData: T[], path: string) => {
+  const menuList = findPath(treeData, (n) => n.path === path) as AppRouteRecordRaw[]
+  return (menuList || []).map((item) => item.path)
+}
+
+export const hasOneShowingChild = (
+  children: AppRouteRecordRaw[] = [],
+  parent: AppRouteRecordRaw
+): HasOneShowingChild => {
+  const onlyOneChild = ref<OnlyOneChildType>()
+
+  const showingChildren = children.filter((v) => {
+    const meta = (v.meta ?? {}) as RouteMeta
+    if (meta.hidden) {
+      return false
+    } else {
+      // Temp set(will be used if only has one showing child)
+      onlyOneChild.value = v
+      return true
+    }
+  })
+
+  // When there is only one child router, the child router is displayed by default
+  if (showingChildren.length === 1) {
+    return {
+      oneShowingChild: true,
+      onlyOneChild: unref(onlyOneChild)
+    }
+  }
+
+  // Show parent if there are no child router to display
+  if (!showingChildren.length) {
+    onlyOneChild.value = { ...parent, path: '', noShowingChildren: true }
+    return {
+      oneShowingChild: true,
+      onlyOneChild: unref(onlyOneChild)
+    }
+  }
+
+  return {
+    oneShowingChild: false,
+    onlyOneChild: unref(onlyOneChild)
+  }
+}
diff --git a/src/layout/components/Message/index.ts b/src/layout/components/Message/index.ts
new file mode 100644
index 000000000..dfe020760
--- /dev/null
+++ b/src/layout/components/Message/index.ts
@@ -0,0 +1,3 @@
+import Message from './src/Message.vue'
+
+export { Message }
diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue
new file mode 100644
index 000000000..28f796b3b
--- /dev/null
+++ b/src/layout/components/Message/src/Message.vue
@@ -0,0 +1,125 @@
+<script lang="ts" setup>
+import { formatDate } from '@/utils/formatTime'
+import * as NotifyMessageApi from '@/api/system/notify/message'
+
+defineOptions({ name: 'Message' })
+
+const { push } = useRouter()
+const activeName = ref('notice')
+const unreadCount = ref(0) // 未读消息数量
+const list = ref<any[]>([]) // 消息列表
+
+// 获得消息列表
+const getList = async () => {
+  list.value = await NotifyMessageApi.getUnreadNotifyMessageList()
+  // 强制设置 unreadCount 为 0，避免小红点因为轮询太慢，不消除
+  unreadCount.value = 0
+}
+
+// 获得未读消息数
+const getUnreadCount = async () => {
+  NotifyMessageApi.getUnreadNotifyMessageCount().then((data) => {
+    unreadCount.value = data
+  })
+}
+
+// 跳转我的站内信
+const goMyList = () => {
+  push({
+    name: 'MyNotifyMessage'
+  })
+}
+
+// ========== 初始化 =========
+onMounted(() => {
+  // 首次加载小红点
+  getUnreadCount()
+  // 轮询刷新小红点
+  setInterval(
+    () => {
+      getUnreadCount()
+    },
+    1000 * 60 * 2
+  )
+})
+</script>
+<template>
+  <div class="message">
+    <ElPopover :width="400" placement="bottom" trigger="click">
+      <template #reference>
+        <ElBadge :is-dot="unreadCount > 0" class="item">
+          <Icon :size="18" class="cursor-pointer" icon="ep:bell" @click="getList" />
+        </ElBadge>
+      </template>
+      <ElTabs v-model="activeName">
+        <ElTabPane label="我的站内信" name="notice">
+          <div class="message-list">
+            <template v-for="item in list" :key="item.id">
+              <div class="message-item">
+                <img alt="" class="message-icon" src="@/assets/imgs/avatar.gif" />
+                <div class="message-content">
+                  <span class="message-title">
+                    {{ item.templateNickname }}：{{ item.templateContent }}
+                  </span>
+                  <span class="message-date">
+                    {{ formatDate(item.createTime) }}
+                  </span>
+                </div>
+              </div>
+            </template>
+          </div>
+        </ElTabPane>
+      </ElTabs>
+      <!-- 更多 -->
+      <div style="margin-top: 10px; text-align: right">
+        <XButton preIcon="ep:view" title="查看全部" type="primary" @click="goMyList" />
+      </div>
+    </ElPopover>
+  </div>
+</template>
+<style lang="scss" scoped>
+.message-empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 260px;
+  line-height: 45px;
+}
+
+.message-list {
+  display: flex;
+  flex-direction: column;
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    padding: 20px 0;
+    border-bottom: 1px solid var(--el-border-color-light);
+
+    &:last-child {
+      border: none;
+    }
+
+    .message-icon {
+      width: 40px;
+      height: 40px;
+      margin: 0 20px 0 5px;
+    }
+
+    .message-content {
+      display: flex;
+      flex-direction: column;
+
+      .message-title {
+        margin-bottom: 5px;
+      }
+
+      .message-date {
+        font-size: 12px;
+        color: var(--el-text-color-secondary);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/layout/components/Screenfull/index.ts b/src/layout/components/Screenfull/index.ts
new file mode 100644
index 000000000..faec2d8ed
--- /dev/null
+++ b/src/layout/components/Screenfull/index.ts
@@ -0,0 +1,3 @@
+import Screenfull from './src/Screenfull.vue'
+
+export { Screenfull }
diff --git a/src/layout/components/Screenfull/src/Screenfull.vue b/src/layout/components/Screenfull/src/Screenfull.vue
new file mode 100644
index 000000000..4c045f25a
--- /dev/null
+++ b/src/layout/components/Screenfull/src/Screenfull.vue
@@ -0,0 +1,32 @@
+<script lang="ts" setup>
+import { Icon } from '@/components/Icon'
+import { useFullscreen } from '@vueuse/core'
+import { propTypes } from '@/utils/propTypes'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'ScreenFull' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('screenfull')
+
+defineProps({
+  color: propTypes.string.def('')
+})
+
+const { toggle, isFullscreen } = useFullscreen()
+
+const toggleFullscreen = () => {
+  toggle()
+}
+</script>
+
+<template>
+  <div :class="prefixCls" @click="toggleFullscreen">
+    <Icon
+      :color="color"
+      :icon="isFullscreen ? 'zmdi:fullscreen-exit' : 'zmdi:fullscreen'"
+      :size="18"
+    />
+  </div>
+</template>
diff --git a/src/layout/components/Setting/index.ts b/src/layout/components/Setting/index.ts
new file mode 100644
index 000000000..b64c9add8
--- /dev/null
+++ b/src/layout/components/Setting/index.ts
@@ -0,0 +1,3 @@
+import Setting from './src/Setting.vue'
+
+export { Setting }
diff --git a/src/layout/components/Setting/src/Setting.vue b/src/layout/components/Setting/src/Setting.vue
new file mode 100644
index 000000000..e1908b633
--- /dev/null
+++ b/src/layout/components/Setting/src/Setting.vue
@@ -0,0 +1,299 @@
+<script lang="ts" setup>
+import { ElMessage } from 'element-plus'
+import { useClipboard, useCssVar } from '@vueuse/core'
+
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { useDesign } from '@/hooks/web/useDesign'
+
+import { setCssVar, trim } from '@/utils'
+import { colorIsDark, hexToRGB, lighten } from '@/utils/color'
+import { useAppStore } from '@/store/modules/app'
+import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
+import ColorRadioPicker from './components/ColorRadioPicker.vue'
+import InterfaceDisplay from './components/InterfaceDisplay.vue'
+import LayoutRadioPicker from './components/LayoutRadioPicker.vue'
+
+defineOptions({ name: 'Setting' })
+
+const { t } = useI18n()
+const appStore = useAppStore()
+
+const { getPrefixCls } = useDesign()
+const prefixCls = getPrefixCls('setting')
+const layout = computed(() => appStore.getLayout)
+const drawer = ref(false)
+
+// 主题色相关
+const systemTheme = ref(appStore.getTheme.elColorPrimary)
+
+const setSystemTheme = (color: string) => {
+  setCssVar('--el-color-primary', color)
+  appStore.setTheme({ elColorPrimary: color })
+  const leftMenuBgColor = useCssVar('--left-menu-bg-color', document.documentElement)
+  setMenuTheme(trim(unref(leftMenuBgColor)))
+}
+
+// 头部主题相关
+const headerTheme = ref(appStore.getTheme.topHeaderBgColor || '')
+
+const setHeaderTheme = (color: string) => {
+  const isDarkColor = colorIsDark(color)
+  const textColor = isDarkColor ? '#fff' : 'inherit'
+  const textHoverColor = isDarkColor ? lighten(color!, 6) : '#f6f6f6'
+  const topToolBorderColor = isDarkColor ? color : '#eee'
+  setCssVar('--top-header-bg-color', color)
+  setCssVar('--top-header-text-color', textColor)
+  setCssVar('--top-header-hover-color', textHoverColor)
+  appStore.setTheme({
+    topHeaderBgColor: color,
+    topHeaderTextColor: textColor,
+    topHeaderHoverColor: textHoverColor,
+    topToolBorderColor
+  })
+  if (unref(layout) === 'top') {
+    setMenuTheme(color)
+  }
+}
+
+// 菜单主题相关
+const menuTheme = ref(appStore.getTheme.leftMenuBgColor || '')
+
+const setMenuTheme = (color: string) => {
+  const primaryColor = useCssVar('--el-color-primary', document.documentElement)
+  const isDarkColor = colorIsDark(color)
+  const theme: Recordable = {
+    // 左侧菜单边框颜色
+    leftMenuBorderColor: isDarkColor ? 'inherit' : '#eee',
+    // 左侧菜单背景颜色
+    leftMenuBgColor: color,
+    // 左侧菜单浅色背景颜色
+    leftMenuBgLightColor: isDarkColor ? lighten(color!, 6) : color,
+    // 左侧菜单选中背景颜色
+    leftMenuBgActiveColor: isDarkColor
+      ? 'var(--el-color-primary)'
+      : hexToRGB(unref(primaryColor), 0.1),
+    // 左侧菜单收起选中背景颜色
+    leftMenuCollapseBgActiveColor: isDarkColor
+      ? 'var(--el-color-primary)'
+      : hexToRGB(unref(primaryColor), 0.1),
+    // 左侧菜单字体颜色
+    leftMenuTextColor: isDarkColor ? '#bfcbd9' : '#333',
+    // 左侧菜单选中字体颜色
+    leftMenuTextActiveColor: isDarkColor ? '#fff' : 'var(--el-color-primary)',
+    // logo字体颜色
+    logoTitleTextColor: isDarkColor ? '#fff' : 'inherit',
+    // logo边框颜色
+    logoBorderColor: isDarkColor ? color : '#eee'
+  }
+  appStore.setTheme(theme)
+  appStore.setCssVarTheme()
+}
+if (layout.value === 'top' && !appStore.getIsDark) {
+  headerTheme.value = '#fff'
+  setHeaderTheme('#fff')
+}
+
+// 监听layout变化，重置一些主题色
+watch(
+  () => layout.value,
+  (n) => {
+    if (n === 'top' && !appStore.getIsDark) {
+      headerTheme.value = '#fff'
+      setHeaderTheme('#fff')
+    } else {
+      setMenuTheme(unref(menuTheme))
+    }
+  }
+)
+
+// 拷贝
+const copyConfig = async () => {
+  const { copy, copied, isSupported } = useClipboard({
+    source: `
+      // 面包屑
+      breadcrumb: ${appStore.getBreadcrumb},
+      // 面包屑图标
+      breadcrumbIcon: ${appStore.getBreadcrumbIcon},
+      // 折叠图标
+      hamburger: ${appStore.getHamburger},
+      // 全屏图标
+      screenfull: ${appStore.getScreenfull},
+      // 尺寸图标
+      size: ${appStore.getSize},
+      // 多语言图标
+      locale: ${appStore.getLocale},
+      // 消息图标
+      message: ${appStore.getMessage},
+      // 标签页
+      tagsView: ${appStore.getTagsView},
+      // 标签页图标
+      getTagsViewIcon: ${appStore.getTagsViewIcon},
+      // logo
+      logo: ${appStore.getLogo},
+      // 菜单手风琴
+      uniqueOpened: ${appStore.getUniqueOpened},
+      // 固定header
+      fixedHeader: ${appStore.getFixedHeader},
+      // 页脚
+      footer: ${appStore.getFooter},
+      // 灰色模式
+      greyMode: ${appStore.getGreyMode},
+      // layout布局
+      layout: '${appStore.getLayout}',
+      // 暗黑模式
+      isDark: ${appStore.getIsDark},
+      // 组件尺寸
+      currentSize: '${appStore.getCurrentSize}',
+      // 主题相关
+      theme: {
+        // 主题色
+        elColorPrimary: '${appStore.getTheme.elColorPrimary}',
+        // 左侧菜单边框颜色
+        leftMenuBorderColor: '${appStore.getTheme.leftMenuBorderColor}',
+        // 左侧菜单背景颜色
+        leftMenuBgColor: '${appStore.getTheme.leftMenuBgColor}',
+        // 左侧菜单浅色背景颜色
+        leftMenuBgLightColor: '${appStore.getTheme.leftMenuBgLightColor}',
+        // 左侧菜单选中背景颜色
+        leftMenuBgActiveColor: '${appStore.getTheme.leftMenuBgActiveColor}',
+        // 左侧菜单收起选中背景颜色
+        leftMenuCollapseBgActiveColor: '${appStore.getTheme.leftMenuCollapseBgActiveColor}',
+        // 左侧菜单字体颜色
+        leftMenuTextColor: '${appStore.getTheme.leftMenuTextColor}',
+        // 左侧菜单选中字体颜色
+        leftMenuTextActiveColor: '${appStore.getTheme.leftMenuTextActiveColor}',
+        // logo字体颜色
+        logoTitleTextColor: '${appStore.getTheme.logoTitleTextColor}',
+        // logo边框颜色
+        logoBorderColor: '${appStore.getTheme.logoBorderColor}',
+        // 头部背景颜色
+        topHeaderBgColor: '${appStore.getTheme.topHeaderBgColor}',
+        // 头部字体颜色
+        topHeaderTextColor: '${appStore.getTheme.topHeaderTextColor}',
+        // 头部悬停颜色
+        topHeaderHoverColor: '${appStore.getTheme.topHeaderHoverColor}',
+        // 头部边框颜色
+        topToolBorderColor: '${appStore.getTheme.topToolBorderColor}'
+      }
+    `
+  })
+  if (!isSupported) {
+    ElMessage.error(t('setting.copyFailed'))
+  } else {
+    await copy()
+    if (unref(copied)) {
+      ElMessage.success(t('setting.copySuccess'))
+    }
+  }
+}
+
+// 清空缓存
+const clear = () => {
+  const { wsCache } = useCache()
+  wsCache.delete(CACHE_KEY.LAYOUT)
+  wsCache.delete(CACHE_KEY.THEME)
+  wsCache.delete(CACHE_KEY.IS_DARK)
+  window.location.reload()
+}
+</script>
+
+<template>
+  <div
+    :class="prefixCls"
+    class="fixed right-0 top-[45%] h-40px w-40px cursor-pointer bg-[var(--el-color-primary)] text-center leading-40px"
+    @click="drawer = true"
+  >
+    <Icon color="#fff" icon="ep:setting" />
+  </div>
+
+  <ElDrawer v-model="drawer" :z-index="4000" direction="rtl" size="350px">
+    <template #header>
+      <span class="text-16px font-700">{{ t('setting.projectSetting') }}</span>
+    </template>
+
+    <div class="text-center">
+      <!-- 主题 -->
+      <ElDivider>{{ t('setting.theme') }}</ElDivider>
+      <ThemeSwitch />
+
+      <!-- 布局 -->
+      <ElDivider>{{ t('setting.layout') }}</ElDivider>
+      <LayoutRadioPicker />
+
+      <!-- 系统主题 -->
+      <ElDivider>{{ t('setting.systemTheme') }}</ElDivider>
+      <ColorRadioPicker
+        v-model="systemTheme"
+        :schema="[
+          '#409eff',
+          '#009688',
+          '#536dfe',
+          '#ff5c93',
+          '#ee4f12',
+          '#0096c7',
+          '#9c27b0',
+          '#ff9800'
+        ]"
+        @change="setSystemTheme"
+      />
+
+      <!-- 头部主题 -->
+      <ElDivider>{{ t('setting.headerTheme') }}</ElDivider>
+      <ColorRadioPicker
+        v-model="headerTheme"
+        :schema="[
+          '#fff',
+          '#151515',
+          '#5172dc',
+          '#e74c3c',
+          '#24292e',
+          '#394664',
+          '#009688',
+          '#383f45'
+        ]"
+        @change="setHeaderTheme"
+      />
+
+      <!-- 菜单主题 -->
+      <template v-if="layout !== 'top'">
+        <ElDivider>{{ t('setting.menuTheme') }}</ElDivider>
+        <ColorRadioPicker
+          v-model="menuTheme"
+          :schema="[
+            '#fff',
+            '#001529',
+            '#212121',
+            '#273352',
+            '#191b24',
+            '#383f45',
+            '#001628',
+            '#344058'
+          ]"
+          @change="setMenuTheme"
+        />
+      </template>
+    </div>
+
+    <!-- 界面显示 -->
+    <ElDivider>{{ t('setting.interfaceDisplay') }}</ElDivider>
+    <InterfaceDisplay />
+
+    <ElDivider />
+    <div>
+      <ElButton class="w-full" type="primary" @click="copyConfig">{{ t('setting.copy') }}</ElButton>
+    </div>
+    <div class="mt-5px">
+      <ElButton class="w-full" type="danger" @click="clear">
+        {{ t('setting.clearAndReset') }}
+      </ElButton>
+    </div>
+  </ElDrawer>
+</template>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-setting;
+
+.#{$prefix-cls} {
+  border-radius: 6px 0 0 6px;
+}
+</style>
diff --git a/src/layout/components/Setting/src/components/ColorRadioPicker.vue b/src/layout/components/Setting/src/components/ColorRadioPicker.vue
new file mode 100644
index 000000000..fcc5e758f
--- /dev/null
+++ b/src/layout/components/Setting/src/components/ColorRadioPicker.vue
@@ -0,0 +1,67 @@
+<script lang="ts" setup>
+import { PropType } from 'vue'
+import { propTypes } from '@/utils/propTypes'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'ColorRadioPicker' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('color-radio-picker')
+
+const props = defineProps({
+  schema: {
+    type: Array as PropType<string[]>,
+    default: () => []
+  },
+  modelValue: propTypes.string.def('')
+})
+
+const emit = defineEmits(['update:modelValue', 'change'])
+
+const colorVal = ref(props.modelValue)
+
+watch(
+  () => props.modelValue,
+  (val: string) => {
+    if (val === unref(colorVal)) return
+    colorVal.value = val
+  }
+)
+
+// 监听
+watch(
+  () => colorVal.value,
+  (val: string) => {
+    emit('update:modelValue', val)
+    emit('change', val)
+  }
+)
+</script>
+
+<template>
+  <div :class="prefixCls" class="flex flex-wrap space-x-14px">
+    <span
+      v-for="(item, i) in schema"
+      :key="`radio-${i}`"
+      :class="{ 'is-active': colorVal === item }"
+      :style="{
+        background: item
+      }"
+      class="mb-5px h-20px w-20px cursor-pointer border-2px border-gray-300 rounded-2px border-solid text-center leading-20px"
+      @click="colorVal = item"
+    >
+      <Icon v-if="colorVal === item" :size="16" color="#fff" icon="ep:check" />
+    </span>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-color-radio-picker;
+
+.#{$prefix-cls} {
+  .is-active {
+    border-color: var(--el-color-primary);
+  }
+}
+</style>
diff --git a/src/layout/components/Setting/src/components/InterfaceDisplay.vue b/src/layout/components/Setting/src/components/InterfaceDisplay.vue
new file mode 100644
index 000000000..ebbbf4bc5
--- /dev/null
+++ b/src/layout/components/Setting/src/components/InterfaceDisplay.vue
@@ -0,0 +1,224 @@
+<script lang="ts" setup>
+import { setCssVar } from '@/utils'
+
+import { useDesign } from '@/hooks/web/useDesign'
+import { useWatermark } from '@/hooks/web/useWatermark'
+import { useAppStore } from '@/store/modules/app'
+
+defineOptions({ name: 'InterfaceDisplay' })
+
+const { t } = useI18n()
+const { getPrefixCls } = useDesign()
+const { setWatermark } = useWatermark()
+const prefixCls = getPrefixCls('interface-display')
+const appStore = useAppStore()
+
+const water = ref()
+
+// 面包屑
+const breadcrumb = ref(appStore.getBreadcrumb)
+
+const breadcrumbChange = (show: boolean) => {
+  appStore.setBreadcrumb(show)
+}
+
+// 面包屑图标
+const breadcrumbIcon = ref(appStore.getBreadcrumbIcon)
+
+const breadcrumbIconChange = (show: boolean) => {
+  appStore.setBreadcrumbIcon(show)
+}
+
+// 折叠图标
+const hamburger = ref(appStore.getHamburger)
+
+const hamburgerChange = (show: boolean) => {
+  appStore.setHamburger(show)
+}
+
+// 全屏图标
+const screenfull = ref(appStore.getScreenfull)
+
+const screenfullChange = (show: boolean) => {
+  appStore.setScreenfull(show)
+}
+
+// 尺寸图标
+const size = ref(appStore.getSize)
+
+const sizeChange = (show: boolean) => {
+  appStore.setSize(show)
+}
+
+// 多语言图标
+const locale = ref(appStore.getLocale)
+
+const localeChange = (show: boolean) => {
+  appStore.setLocale(show)
+}
+
+// 消息图标
+const message = ref(appStore.getMessage)
+
+const messageChange = (show: boolean) => {
+  appStore.setMessage(show)
+}
+
+// 标签页
+const tagsView = ref(appStore.getTagsView)
+
+const tagsViewChange = (show: boolean) => {
+  // 切换标签栏显示时，同步切换标签栏的高度
+  setCssVar('--tags-view-height', show ? '35px' : '0px')
+  appStore.setTagsView(show)
+}
+
+// 标签页图标
+const tagsViewIcon = ref(appStore.getTagsViewIcon)
+
+const tagsViewIconChange = (show: boolean) => {
+  appStore.setTagsViewIcon(show)
+}
+
+// logo
+const logo = ref(appStore.getLogo)
+
+const logoChange = (show: boolean) => {
+  appStore.setLogo(show)
+}
+
+// 菜单手风琴
+const uniqueOpened = ref(appStore.getUniqueOpened)
+
+const uniqueOpenedChange = (uniqueOpened: boolean) => {
+  appStore.setUniqueOpened(uniqueOpened)
+}
+
+// 固定头部
+const fixedHeader = ref(appStore.getFixedHeader)
+
+const fixedHeaderChange = (show: boolean) => {
+  appStore.setFixedHeader(show)
+}
+
+// 页脚
+const footer = ref(appStore.getFooter)
+
+const footerChange = (show: boolean) => {
+  appStore.setFooter(show)
+}
+
+// 灰色模式
+const greyMode = ref(appStore.getGreyMode)
+
+const greyModeChange = (show: boolean) => {
+  appStore.setGreyMode(show)
+}
+
+// 固定菜单
+const fixedMenu = ref(appStore.getFixedMenu)
+
+const fixedMenuChange = (show: boolean) => {
+  appStore.setFixedMenu(show)
+}
+
+// 设置水印
+const setWater = () => {
+  setWatermark(water.value)
+}
+
+const layout = computed(() => appStore.getLayout)
+
+watch(
+  () => layout.value,
+  (n) => {
+    if (n === 'top') {
+      appStore.setCollapse(false)
+    }
+  }
+)
+</script>
+
+<template>
+  <div :class="prefixCls">
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.breadcrumb') }}</span>
+      <ElSwitch v-model="breadcrumb" @change="breadcrumbChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.breadcrumbIcon') }}</span>
+      <ElSwitch v-model="breadcrumbIcon" @change="breadcrumbIconChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.hamburgerIcon') }}</span>
+      <ElSwitch v-model="hamburger" @change="hamburgerChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.screenfullIcon') }}</span>
+      <ElSwitch v-model="screenfull" @change="screenfullChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.sizeIcon') }}</span>
+      <ElSwitch v-model="size" @change="sizeChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.localeIcon') }}</span>
+      <ElSwitch v-model="locale" @change="localeChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.messageIcon') }}</span>
+      <ElSwitch v-model="message" @change="messageChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.tagsView') }}</span>
+      <ElSwitch v-model="tagsView" @change="tagsViewChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.tagsViewIcon') }}</span>
+      <ElSwitch v-model="tagsViewIcon" @change="tagsViewIconChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.logo') }}</span>
+      <ElSwitch v-model="logo" @change="logoChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.uniqueOpened') }}</span>
+      <ElSwitch v-model="uniqueOpened" @change="uniqueOpenedChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.fixedHeader') }}</span>
+      <ElSwitch v-model="fixedHeader" @change="fixedHeaderChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.footer') }}</span>
+      <ElSwitch v-model="footer" @change="footerChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.greyMode') }}</span>
+      <ElSwitch v-model="greyMode" @change="greyModeChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('setting.fixedMenu') }}</span>
+      <ElSwitch v-model="fixedMenu" @change="fixedMenuChange" />
+    </div>
+
+    <div class="flex items-center justify-between">
+      <span class="text-14px">{{ t('watermark.watermark') }}</span>
+      <ElInput v-model="water" class="right-1 w-20" @change="setWater()" />
+    </div>
+  </div>
+</template>
diff --git a/src/layout/components/Setting/src/components/LayoutRadioPicker.vue b/src/layout/components/Setting/src/components/LayoutRadioPicker.vue
new file mode 100644
index 000000000..801686c2b
--- /dev/null
+++ b/src/layout/components/Setting/src/components/LayoutRadioPicker.vue
@@ -0,0 +1,172 @@
+<script lang="ts" setup>
+import { useAppStore } from '@/store/modules/app'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'LayoutRadioPicker' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('layout-radio-picker')
+
+const appStore = useAppStore()
+
+const layout = computed(() => appStore.getLayout)
+</script>
+
+<template>
+  <div :class="prefixCls" class="flex flex-wrap space-x-14px">
+    <div
+      :class="[
+        `${prefixCls}__classic`,
+        'relative w-56px h-48px cursor-pointer bg-gray-300',
+        {
+          'is-acitve': layout === 'classic'
+        }
+      ]"
+      @click="appStore.setLayout('classic')"
+    ></div>
+    <div
+      :class="[
+        `${prefixCls}__top-left`,
+        'relative w-56px h-48px cursor-pointer bg-gray-300',
+        {
+          'is-acitve': layout === 'topLeft'
+        }
+      ]"
+      @click="appStore.setLayout('topLeft')"
+    ></div>
+    <div
+      :class="[
+        `${prefixCls}__top`,
+        'relative w-56px h-48px cursor-pointer bg-gray-300',
+        {
+          'is-acitve': layout === 'top'
+        }
+      ]"
+      @click="appStore.setLayout('top')"
+    ></div>
+    <div
+      :class="[
+        `${prefixCls}__cut-menu`,
+        'relative w-56px h-48px cursor-pointer bg-gray-300',
+        {
+          'is-acitve': layout === 'cutMenu'
+        }
+      ]"
+      @click="appStore.setLayout('cutMenu')"
+    >
+      <div class="absolute left-[10%] top-0 h-full w-[33%] bg-gray-200"></div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-layout-radio-picker;
+
+.#{$prefix-cls} {
+  &__classic {
+    border: 2px solid #e5e7eb;
+    border-radius: 4px;
+
+    &::before {
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 1;
+      width: 33%;
+      height: 100%;
+      background-color: #273352;
+      border-radius: 4px 0 0 4px;
+      content: '';
+    }
+
+    &::after {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 25%;
+      background-color: #fff;
+      border-radius: 4px 4px 0;
+      content: '';
+    }
+  }
+
+  &__top-left {
+    border: 2px solid #e5e7eb;
+    border-radius: 4px;
+
+    &::before {
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 1;
+      width: 100%;
+      height: 33%;
+      background-color: #273352;
+      border-radius: 4px 4px 0 0;
+      content: '';
+    }
+
+    &::after {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 33%;
+      height: 100%;
+      background-color: #fff;
+      border-radius: 4px 0 0 4px;
+      content: '';
+    }
+  }
+
+  &__top {
+    border: 2px solid #e5e7eb;
+    border-radius: 4px;
+
+    &::before {
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 1;
+      width: 100%;
+      height: 33%;
+      background-color: #273352;
+      border-radius: 4px 4px 0 0;
+      content: '';
+    }
+  }
+
+  &__cut-menu {
+    border: 2px solid #e5e7eb;
+    border-radius: 4px;
+
+    &::before {
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 1;
+      width: 100%;
+      height: 33%;
+      background-color: #273352;
+      border-radius: 4px 4px 0 0;
+      content: '';
+    }
+
+    &::after {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 10%;
+      height: 100%;
+      background-color: #fff;
+      border-radius: 4px 0 0 4px;
+      content: '';
+    }
+  }
+
+  .is-acitve {
+    border-color: var(--el-color-primary);
+  }
+}
+</style>
diff --git a/src/layout/components/SizeDropdown/index.ts b/src/layout/components/SizeDropdown/index.ts
new file mode 100644
index 000000000..516488d63
--- /dev/null
+++ b/src/layout/components/SizeDropdown/index.ts
@@ -0,0 +1,3 @@
+import SizeDropdown from './src/SizeDropdown.vue'
+
+export { SizeDropdown }
diff --git a/src/layout/components/SizeDropdown/src/SizeDropdown.vue b/src/layout/components/SizeDropdown/src/SizeDropdown.vue
new file mode 100644
index 000000000..3e1522448
--- /dev/null
+++ b/src/layout/components/SizeDropdown/src/SizeDropdown.vue
@@ -0,0 +1,40 @@
+<script lang="ts" setup>
+import { useAppStore } from '@/store/modules/app'
+
+import { propTypes } from '@/utils/propTypes'
+import { useDesign } from '@/hooks/web/useDesign'
+import { ElementPlusSize } from '@/types/elementPlus'
+
+defineOptions({ name: 'SizeDropdown' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('size-dropdown')
+
+defineProps({
+  color: propTypes.string.def('')
+})
+
+const { t } = useI18n()
+
+const appStore = useAppStore()
+
+const sizeMap = computed(() => appStore.sizeMap)
+
+const setCurrentSize = (size: ElementPlusSize) => {
+  appStore.setCurrentSize(size)
+}
+</script>
+
+<template>
+  <ElDropdown :class="prefixCls" trigger="click" @command="setCurrentSize">
+    <Icon :color="color" :size="18" class="cursor-pointer" icon="mdi:format-size" />
+    <template #dropdown>
+      <ElDropdownMenu>
+        <ElDropdownItem v-for="item in sizeMap" :key="item" :command="item">
+          {{ t(`size.${item}`) }}
+        </ElDropdownItem>
+      </ElDropdownMenu>
+    </template>
+  </ElDropdown>
+</template>
diff --git a/src/layout/components/TabMenu/index.ts b/src/layout/components/TabMenu/index.ts
new file mode 100644
index 000000000..b5fd71cdd
--- /dev/null
+++ b/src/layout/components/TabMenu/index.ts
@@ -0,0 +1,3 @@
+import TabMenu from './src/TabMenu.vue'
+
+export { TabMenu }
diff --git a/src/layout/components/TabMenu/src/TabMenu.vue b/src/layout/components/TabMenu/src/TabMenu.vue
new file mode 100644
index 000000000..c4f63a3fe
--- /dev/null
+++ b/src/layout/components/TabMenu/src/TabMenu.vue
@@ -0,0 +1,240 @@
+<script lang="tsx">
+import { usePermissionStore } from '@/store/modules/permission'
+import { useAppStore } from '@/store/modules/app'
+
+import { ElScrollbar } from 'element-plus'
+import { Icon } from '@/components/Icon'
+import { Menu } from '@/layout/components/Menu'
+import { pathResolve } from '@/utils/routerHelper'
+import { cloneDeep } from 'lodash-es'
+import { filterMenusPath, initTabMap, tabPathMap } from './helper'
+import { useDesign } from '@/hooks/web/useDesign'
+import { isUrl } from '@/utils/is'
+
+const { getPrefixCls, variables } = useDesign()
+
+const prefixCls = getPrefixCls('tab-menu')
+
+export default defineComponent({
+  name: 'TabMenu',
+  setup() {
+    const { push, currentRoute } = useRouter()
+
+    const { t } = useI18n()
+
+    const appStore = useAppStore()
+
+    const collapse = computed(() => appStore.getCollapse)
+
+    const fixedMenu = computed(() => appStore.getFixedMenu)
+
+    const permissionStore = usePermissionStore()
+
+    const routers = computed(() => permissionStore.getRouters)
+
+    const tabRouters = computed(() => unref(routers).filter((v) => !v?.meta?.hidden))
+
+    const setCollapse = () => {
+      appStore.setCollapse(!unref(collapse))
+    }
+
+    onMounted(() => {
+      if (unref(fixedMenu)) {
+        const path = `/${unref(currentRoute).path.split('/')[1]}`
+        const children = unref(tabRouters).find(
+          (v) =>
+            (v.meta?.alwaysShow || (v?.children?.length && v?.children?.length > 1)) &&
+            v.path === path
+        )?.children
+
+        tabActive.value = path
+        if (children) {
+          permissionStore.setMenuTabRouters(
+            cloneDeep(children).map((v) => {
+              v.path = pathResolve(unref(tabActive), v.path)
+              return v
+            })
+          )
+        }
+      }
+    })
+
+    watch(
+      () => routers.value,
+      (routers: AppRouteRecordRaw[]) => {
+        initTabMap(routers)
+        filterMenusPath(routers, routers)
+      },
+      {
+        immediate: true,
+        deep: true
+      }
+    )
+
+    const showTitle = ref(true)
+
+    watch(
+      () => collapse.value,
+      (collapse: boolean) => {
+        if (!collapse) {
+          setTimeout(() => {
+            showTitle.value = !collapse
+          }, 200)
+        } else {
+          showTitle.value = !collapse
+        }
+      }
+    )
+
+    // 是否显示菜单
+    const showMenu = ref(unref(fixedMenu) ? true : false)
+
+    // tab高亮
+    const tabActive = ref('')
+
+    // tab点击事件
+    const tabClick = (item: AppRouteRecordRaw) => {
+      if (isUrl(item.path)) {
+        window.open(item.path)
+        return
+      }
+      const newPath = item.children ? item.path : item.path.split('/')[0]
+      const oldPath = unref(tabActive)
+      tabActive.value = item.children ? item.path : item.path.split('/')[0]
+      if (item.children) {
+        if (newPath === oldPath || !unref(showMenu)) {
+          showMenu.value = unref(fixedMenu) ? true : !unref(showMenu)
+        }
+        if (unref(showMenu)) {
+          permissionStore.setMenuTabRouters(
+            cloneDeep(item.children).map((v) => {
+              v.path = pathResolve(unref(tabActive), v.path)
+              return v
+            })
+          )
+        }
+      } else {
+        push(item.path)
+        permissionStore.setMenuTabRouters([])
+        showMenu.value = false
+      }
+    }
+
+    // 设置高亮
+    const isActive = (currentPath: string) => {
+      const { path } = unref(currentRoute)
+      if (tabPathMap[currentPath].includes(path)) {
+        return true
+      }
+      return false
+    }
+
+    const mouseleave = () => {
+      if (!unref(showMenu) || unref(fixedMenu)) return
+      showMenu.value = false
+    }
+
+    return () => (
+      <div
+        id={`${variables.namespace}-menu`}
+        class={[
+          prefixCls,
+          'relative bg-[var(--left-menu-bg-color)] top-1px z-3000 layout-border__right',
+          {
+            'w-[var(--tab-menu-max-width)]': !unref(collapse),
+            'w-[var(--tab-menu-min-width)]': unref(collapse)
+          }
+        ]}
+        onMouseleave={mouseleave}
+      >
+        <ElScrollbar class="!h-[calc(100%-var(--tab-menu-collapse-height)-1px)]">
+          <div>
+            {() => {
+              return unref(tabRouters).map((v) => {
+                const item = (
+                  v.meta?.alwaysShow || (v?.children?.length && v?.children?.length > 1)
+                    ? v
+                    : {
+                        ...(v?.children && v?.children[0]),
+                        path: pathResolve(v.path, (v?.children && v?.children[0])?.path as string)
+                      }
+                ) as AppRouteRecordRaw
+                return (
+                  <div
+                    class={[
+                      `${prefixCls}__item`,
+                      'text-center text-12px relative py-12px cursor-pointer',
+                      {
+                        'is-active': isActive(v.path)
+                      }
+                    ]}
+                    onClick={() => {
+                      tabClick(item)
+                    }}
+                  >
+                    <div>
+                      <Icon icon={item?.meta?.icon}></Icon>
+                    </div>
+                    {!unref(showTitle) ? undefined : (
+                      <p class="mt-5px break-words px-2px">{t(item.meta?.title)}</p>
+                    )}
+                  </div>
+                )
+              })
+            }}
+          </div>
+        </ElScrollbar>
+        <div
+          class={[
+            `${prefixCls}--collapse`,
+            'text-center h-[var(--tab-menu-collapse-height)] leading-[var(--tab-menu-collapse-height)] cursor-pointer'
+          ]}
+          onClick={setCollapse}
+        >
+          <Icon icon={unref(collapse) ? 'ep:d-arrow-right' : 'ep:d-arrow-left'}></Icon>
+        </div>
+        <Menu
+          class={[
+            '!absolute top-0',
+            {
+              '!left-[var(--tab-menu-min-width)]': unref(collapse),
+              '!left-[var(--tab-menu-max-width)]': !unref(collapse),
+              '!w-[calc(var(--left-menu-max-width)+1px)]': unref(showMenu) || unref(fixedMenu),
+              '!w-0': !unref(showMenu) && !unref(fixedMenu)
+            }
+          ]}
+          style="transition: width var(--transition-time-02), left var(--transition-time-02);"
+        ></Menu>
+      </div>
+    )
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-tab-menu;
+
+.#{$prefix-cls} {
+  transition: all var(--transition-time-02);
+
+  &__item {
+    color: var(--left-menu-text-color);
+    transition: all var(--transition-time-02);
+
+    &:hover {
+      color: var(--left-menu-text-active-color);
+      // background-color: var(--left-menu-bg-active-color);
+    }
+  }
+
+  &--collapse {
+    color: var(--left-menu-text-color);
+    background-color: var(--left-menu-bg-light-color);
+  }
+
+  .is-active {
+    color: var(--left-menu-text-active-color);
+    background-color: var(--left-menu-bg-active-color);
+  }
+}
+</style>
diff --git a/src/layout/components/TabMenu/src/helper.ts b/src/layout/components/TabMenu/src/helper.ts
new file mode 100644
index 000000000..cce39323d
--- /dev/null
+++ b/src/layout/components/TabMenu/src/helper.ts
@@ -0,0 +1,51 @@
+import { getAllParentPath } from '@/layout/components/Menu/src/helper'
+import type { RouteMeta } from 'vue-router'
+import { isUrl } from '@/utils/is'
+import { cloneDeep } from 'lodash-es'
+
+export type TabMapTypes = {
+  [key: string]: string[]
+}
+
+export const tabPathMap = reactive<TabMapTypes>({})
+
+export const initTabMap = (routes: AppRouteRecordRaw[]) => {
+  for (const v of routes) {
+    const meta = (v.meta ?? {}) as RouteMeta
+    if (!meta?.hidden) {
+      tabPathMap[v.path] = []
+    }
+  }
+}
+
+export const filterMenusPath = (
+  routes: AppRouteRecordRaw[],
+  allRoutes: AppRouteRecordRaw[]
+): AppRouteRecordRaw[] => {
+  const res: AppRouteRecordRaw[] = []
+  for (const v of routes) {
+    let data: Nullable<AppRouteRecordRaw> = null
+    const meta = (v.meta ?? {}) as RouteMeta
+    if (!meta.hidden || meta.canTo) {
+      const allParentPath = getAllParentPath<AppRouteRecordRaw>(allRoutes, v.path)
+
+      const fullPath = isUrl(v.path) ? v.path : allParentPath.join('/')
+
+      data = cloneDeep(v)
+      data.path = fullPath
+      if (v.children && data) {
+        data.children = filterMenusPath(v.children, allRoutes)
+      }
+
+      if (data) {
+        res.push(data)
+      }
+
+      if (allParentPath.length && Reflect.has(tabPathMap, allParentPath[0])) {
+        tabPathMap[allParentPath[0]].push(fullPath)
+      }
+    }
+  }
+
+  return res
+}
diff --git a/src/layout/components/TagsView/index.ts b/src/layout/components/TagsView/index.ts
new file mode 100644
index 000000000..30e604a8f
--- /dev/null
+++ b/src/layout/components/TagsView/index.ts
@@ -0,0 +1,3 @@
+import TagsView from './src/TagsView.vue'
+
+export { TagsView }
diff --git a/src/layout/components/TagsView/src/TagsView.vue b/src/layout/components/TagsView/src/TagsView.vue
new file mode 100644
index 000000000..7db0cf6f3
--- /dev/null
+++ b/src/layout/components/TagsView/src/TagsView.vue
@@ -0,0 +1,585 @@
+<script lang="ts" setup>
+import { onMounted, watch, computed, unref, ref, nextTick } from 'vue'
+import { useRouter } from 'vue-router'
+import type { RouteLocationNormalizedLoaded, RouterLinkProps } from 'vue-router'
+import { usePermissionStore } from '@/store/modules/permission'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import { useAppStore } from '@/store/modules/app'
+import { useI18n } from '@/hooks/web/useI18n'
+import { filterAffixTags } from './helper'
+import { ContextMenu, ContextMenuExpose } from '@/layout/components/ContextMenu'
+import { useDesign } from '@/hooks/web/useDesign'
+import { useTemplateRefsList } from '@vueuse/core'
+import { ElScrollbar } from 'element-plus'
+import { useScrollTo } from '@/hooks/event/useScrollTo'
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('tags-view')
+
+const { t } = useI18n()
+
+const { currentRoute, push, replace } = useRouter()
+
+const permissionStore = usePermissionStore()
+
+const routers = computed(() => permissionStore.getRouters)
+
+const tagsViewStore = useTagsViewStore()
+
+const visitedViews = computed(() => tagsViewStore.getVisitedViews)
+
+const affixTagArr = ref<RouteLocationNormalizedLoaded[]>([])
+
+const appStore = useAppStore()
+
+const tagsViewIcon = computed(() => appStore.getTagsViewIcon)
+
+const isDark = computed(() => appStore.getIsDark)
+
+// 初始化tag
+const initTags = () => {
+  affixTagArr.value = filterAffixTags(unref(routers))
+  for (const tag of unref(affixTagArr)) {
+    // Must have tag name
+    if (tag.name) {
+      tagsViewStore.addVisitedView(tag)
+    }
+  }
+}
+
+const selectedTag = ref<RouteLocationNormalizedLoaded>()
+
+// 新增tag
+const addTags = () => {
+  const { name } = unref(currentRoute)
+  if (name) {
+    selectedTag.value = unref(currentRoute)
+    tagsViewStore.addView(unref(currentRoute))
+  }
+  return false
+}
+
+// 关闭选中的tag
+const closeSelectedTag = (view: RouteLocationNormalizedLoaded) => {
+  if (view?.meta?.affix) return
+  tagsViewStore.delView(view)
+  if (isActive(view)) {
+    toLastView()
+  }
+}
+
+// 关闭全部
+const closeAllTags = () => {
+  tagsViewStore.delAllViews()
+  toLastView()
+}
+
+// 关闭其它
+const closeOthersTags = () => {
+  tagsViewStore.delOthersViews(unref(selectedTag) as RouteLocationNormalizedLoaded)
+}
+
+// 重新加载
+const refreshSelectedTag = async (view?: RouteLocationNormalizedLoaded) => {
+  if (!view) return
+  tagsViewStore.delCachedView()
+  const { path, query } = view
+  await nextTick()
+  replace({
+    path: '/redirect' + path,
+    query: query
+  })
+}
+
+// 关闭左侧
+const closeLeftTags = () => {
+  tagsViewStore.delLeftViews(unref(selectedTag) as RouteLocationNormalizedLoaded)
+}
+
+// 关闭右侧
+const closeRightTags = () => {
+  tagsViewStore.delRightViews(unref(selectedTag) as RouteLocationNormalizedLoaded)
+}
+
+// 跳转到最后一个
+const toLastView = () => {
+  const visitedViews = tagsViewStore.getVisitedViews
+  const latestView = visitedViews.slice(-1)[0]
+  if (latestView) {
+    push(latestView)
+  } else {
+    if (
+      unref(currentRoute).path === permissionStore.getAddRouters[0].path ||
+      unref(currentRoute).path === permissionStore.getAddRouters[0].redirect
+    ) {
+      addTags()
+      return
+    }
+    // TODO: You can set another route
+    push('/')
+  }
+}
+
+// 滚动到选中的tag
+const moveToCurrentTag = async () => {
+  await nextTick()
+  for (const v of unref(visitedViews)) {
+    if (v.fullPath === unref(currentRoute).path) {
+      moveToTarget(v)
+      if (v.fullPath !== unref(currentRoute).fullPath) {
+        tagsViewStore.updateVisitedView(unref(currentRoute))
+      }
+
+      break
+    }
+  }
+}
+
+const tagLinksRefs = useTemplateRefsList<RouterLinkProps>()
+
+const moveToTarget = (currentTag: RouteLocationNormalizedLoaded) => {
+  const wrap$ = unref(scrollbarRef)?.wrapRef
+  let firstTag: Nullable<RouterLinkProps> = null
+  let lastTag: Nullable<RouterLinkProps> = null
+
+  const tagList = unref(tagLinksRefs)
+  // find first tag and last tag
+  if (tagList.length > 0) {
+    firstTag = tagList[0]
+    lastTag = tagList[tagList.length - 1]
+  }
+  if ((firstTag?.to as RouteLocationNormalizedLoaded).fullPath === currentTag.fullPath) {
+    // 直接滚动到0的位置
+    const { start } = useScrollTo({
+      el: wrap$!,
+      position: 'scrollLeft',
+      to: 0,
+      duration: 500
+    })
+    start()
+  } else if ((lastTag?.to as RouteLocationNormalizedLoaded).fullPath === currentTag.fullPath) {
+    // 滚动到最后的位置
+    const { start } = useScrollTo({
+      el: wrap$!,
+      position: 'scrollLeft',
+      to: wrap$!.scrollWidth - wrap$!.offsetWidth,
+      duration: 500
+    })
+    start()
+  } else {
+    // find preTag and nextTag
+    const currentIndex: number = tagList.findIndex(
+      (item) => (item?.to as RouteLocationNormalizedLoaded).fullPath === currentTag.fullPath
+    )
+    const tgsRefs = document.getElementsByClassName(`${prefixCls}__item`)
+
+    const prevTag = tgsRefs[currentIndex - 1] as HTMLElement
+    const nextTag = tgsRefs[currentIndex + 1] as HTMLElement
+
+    // the tag's offsetLeft after of nextTag
+    const afterNextTagOffsetLeft = nextTag.offsetLeft + nextTag.offsetWidth + 4
+
+    // the tag's offsetLeft before of prevTag
+    const beforePrevTagOffsetLeft = prevTag.offsetLeft - 4
+
+    if (afterNextTagOffsetLeft > unref(scrollLeftNumber) + wrap$!.offsetWidth) {
+      const { start } = useScrollTo({
+        el: wrap$!,
+        position: 'scrollLeft',
+        to: afterNextTagOffsetLeft - wrap$!.offsetWidth,
+        duration: 500
+      })
+      start()
+    } else if (beforePrevTagOffsetLeft < unref(scrollLeftNumber)) {
+      const { start } = useScrollTo({
+        el: wrap$!,
+        position: 'scrollLeft',
+        to: beforePrevTagOffsetLeft,
+        duration: 500
+      })
+      start()
+    }
+  }
+}
+
+// 是否是当前tag
+const isActive = (route: RouteLocationNormalizedLoaded): boolean => {
+  return route.path === unref(currentRoute).path
+}
+
+// 所有右键菜单组件的元素
+const itemRefs = useTemplateRefsList<ComponentRef<typeof ContextMenu & ContextMenuExpose>>()
+
+// 右键菜单装填改变的时候
+const visibleChange = (visible: boolean, tagItem: RouteLocationNormalizedLoaded) => {
+  if (visible) {
+    for (const v of unref(itemRefs)) {
+      const elDropdownMenuRef = v.elDropdownMenuRef
+      if (tagItem.fullPath !== v.tagItem.fullPath) {
+        elDropdownMenuRef?.handleClose()
+      }
+    }
+  }
+}
+
+// elscroll 实例
+const scrollbarRef = ref<ComponentRef<typeof ElScrollbar>>()
+
+// 保存滚动位置
+const scrollLeftNumber = ref(0)
+
+const scroll = ({ scrollLeft }) => {
+  scrollLeftNumber.value = scrollLeft as number
+}
+
+// 移动到某个位置
+const move = (to: number) => {
+  const wrap$ = unref(scrollbarRef)?.wrapRef
+  const { start } = useScrollTo({
+    el: wrap$!,
+    position: 'scrollLeft',
+    to: unref(scrollLeftNumber) + to,
+    duration: 500
+  })
+  start()
+}
+
+onMounted(() => {
+  initTags()
+  addTags()
+})
+
+watch(
+  () => currentRoute.value,
+  () => {
+    addTags()
+    moveToCurrentTag()
+  }
+)
+</script>
+
+<template>
+  <div
+    :id="prefixCls"
+    :class="prefixCls"
+    class="relative w-full flex bg-[#fff] dark:bg-[var(--el-bg-color)]"
+  >
+    <span
+      :class="`${prefixCls}__tool ${prefixCls}__tool--first`"
+      class="h-[var(--tags-view-height)] w-[var(--tags-view-height)] flex cursor-pointer items-center justify-center"
+      @click="move(-200)"
+    >
+      <Icon
+        icon="ep:d-arrow-left"
+        color="var(--el-text-color-placeholder)"
+        :hover-color="isDark ? '#fff' : 'var(--el-color-black)'"
+      />
+    </span>
+    <div class="flex-1 overflow-hidden">
+      <ElScrollbar ref="scrollbarRef" class="h-full" @scroll="scroll">
+        <div class="h-full flex">
+          <ContextMenu
+            :ref="itemRefs.set"
+            :schema="[
+              {
+                icon: 'ep:refresh',
+                label: t('common.reload'),
+                disabled: selectedTag?.fullPath !== item.fullPath,
+                command: () => {
+                  refreshSelectedTag(item)
+                }
+              },
+              {
+                icon: 'ep:close',
+                label: t('common.closeTab'),
+                disabled: !!visitedViews?.length && selectedTag?.meta.affix,
+                command: () => {
+                  closeSelectedTag(item)
+                }
+              },
+              {
+                divided: true,
+                icon: 'ep:d-arrow-left',
+                label: t('common.closeTheLeftTab'),
+                disabled:
+                  !!visitedViews?.length &&
+                  (item.fullPath === visitedViews[0].fullPath ||
+                    selectedTag?.fullPath !== item.fullPath),
+                command: () => {
+                  closeLeftTags()
+                }
+              },
+              {
+                icon: 'ep:d-arrow-right',
+                label: t('common.closeTheRightTab'),
+                disabled:
+                  !!visitedViews?.length &&
+                  (item.fullPath === visitedViews[visitedViews.length - 1].fullPath ||
+                    selectedTag?.fullPath !== item.fullPath),
+                command: () => {
+                  closeRightTags()
+                }
+              },
+              {
+                divided: true,
+                icon: 'ep:discount',
+                label: t('common.closeOther'),
+                disabled: selectedTag?.fullPath !== item.fullPath,
+                command: () => {
+                  closeOthersTags()
+                }
+              },
+              {
+                icon: 'ep:minus',
+                label: t('common.closeAll'),
+                command: () => {
+                  closeAllTags()
+                }
+              }
+            ]"
+            v-for="item in visitedViews"
+            :key="item.fullPath"
+            :tag-item="item"
+            :class="[
+              `${prefixCls}__item`,
+              item?.meta?.affix ? `${prefixCls}__item--affix` : '',
+              {
+                'is-active': isActive(item)
+              }
+            ]"
+            @visible-change="visibleChange"
+          >
+            <div>
+              <router-link :ref="tagLinksRefs.set" :to="{ ...item }" custom v-slot="{ navigate }">
+                <div
+                  @click="navigate"
+                  class="h-full flex items-center justify-center whitespace-nowrap pl-15px"
+                >
+                  <Icon
+                    v-if="
+                      item?.matched &&
+                      item?.matched[1] &&
+                      item?.matched[1]?.meta?.icon &&
+                      tagsViewIcon
+                    "
+                    :icon="item?.matched[1]?.meta?.icon"
+                    :size="12"
+                    class="mr-5px"
+                  />
+                  {{ t(item?.meta?.title as string) }}
+                  <Icon
+                    :class="`${prefixCls}__item--close`"
+                    color="#333"
+                    icon="ep:close"
+                    :size="12"
+                    @click.prevent.stop="closeSelectedTag(item)"
+                  />
+                </div>
+              </router-link>
+            </div>
+          </ContextMenu>
+        </div>
+      </ElScrollbar>
+    </div>
+    <span
+      :class="`${prefixCls}__tool`"
+      class="h-[var(--tags-view-height)] w-[var(--tags-view-height)] flex cursor-pointer items-center justify-center"
+      @click="move(200)"
+    >
+      <Icon
+        icon="ep:d-arrow-right"
+        color="var(--el-text-color-placeholder)"
+        :hover-color="isDark ? '#fff' : 'var(--el-color-black)'"
+      />
+    </span>
+    <span
+      :class="`${prefixCls}__tool`"
+      class="h-[var(--tags-view-height)] w-[var(--tags-view-height)] flex cursor-pointer items-center justify-center"
+      @click="refreshSelectedTag(selectedTag)"
+    >
+      <Icon
+        icon="ep:refresh-right"
+        color="var(--el-text-color-placeholder)"
+        :hover-color="isDark ? '#fff' : 'var(--el-color-black)'"
+      />
+    </span>
+    <ContextMenu
+      trigger="click"
+      :schema="[
+        {
+          icon: 'ep:refresh',
+          label: t('common.reload'),
+          command: () => {
+            refreshSelectedTag(selectedTag)
+          }
+        },
+        {
+          icon: 'ep:close',
+          label: t('common.closeTab'),
+          disabled: !!visitedViews?.length && selectedTag?.meta.affix,
+          command: () => {
+            closeSelectedTag(selectedTag!)
+          }
+        },
+        {
+          divided: true,
+          icon: 'ep:d-arrow-left',
+          label: t('common.closeTheLeftTab'),
+          disabled: !!visitedViews?.length && selectedTag?.fullPath === visitedViews[0].fullPath,
+          command: () => {
+            closeLeftTags()
+          }
+        },
+        {
+          icon: 'ep:d-arrow-right',
+          label: t('common.closeTheRightTab'),
+          disabled:
+            !!visitedViews?.length &&
+            selectedTag?.fullPath === visitedViews[visitedViews.length - 1].fullPath,
+          command: () => {
+            closeRightTags()
+          }
+        },
+        {
+          divided: true,
+          icon: 'ep:discount',
+          label: t('common.closeOther'),
+          command: () => {
+            closeOthersTags()
+          }
+        },
+        {
+          icon: 'ep:minus',
+          label: t('common.closeAll'),
+          command: () => {
+            closeAllTags()
+          }
+        }
+      ]"
+    >
+      <span
+        :class="`${prefixCls}__tool`"
+        class="block h-[var(--tags-view-height)] w-[var(--tags-view-height)] flex cursor-pointer items-center justify-center"
+      >
+        <Icon
+          icon="ep:menu"
+          color="var(--el-text-color-placeholder)"
+          :hover-color="isDark ? '#fff' : 'var(--el-color-black)'"
+        />
+      </span>
+    </ContextMenu>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-tags-view;
+
+.#{$prefix-cls} {
+  :deep(.#{$elNamespace}-scrollbar__view) {
+    height: 100%;
+  }
+
+  &__tool {
+    position: relative;
+
+    &::before {
+      position: absolute;
+      top: 1px;
+      left: 0;
+      width: 100%;
+      height: calc(100% - 1px);
+      border-left: 1px solid var(--el-border-color);
+      content: '';
+    }
+
+    &--first {
+      &::before {
+        position: absolute;
+        top: 1px;
+        left: 0;
+        width: 100%;
+        height: calc(100% - 1px);
+        border-right: 1px solid var(--el-border-color);
+        border-left: none;
+        content: '';
+      }
+    }
+  }
+
+  &__item {
+    position: relative;
+    top: 2px;
+    height: calc(100% - 6px);
+    padding-right: 25px;
+    margin-left: 4px;
+    font-size: 12px;
+    cursor: pointer;
+    border: 1px solid #d9d9d9;
+    border-radius: 2px;
+
+    &--close {
+      position: absolute;
+      top: 50%;
+      right: 5px;
+      display: none;
+      transform: translate(0, -50%);
+    }
+    &:not(.#{$prefix-cls}__item--affix):hover {
+      .#{$prefix-cls}__item--close {
+        display: block;
+      }
+    }
+  }
+
+  &__item:not(.is-active) {
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+
+  &__item.is-active {
+    color: var(--el-color-white);
+    background-color: var(--el-color-primary);
+    border: 1px solid var(--el-color-primary);
+    .#{$prefix-cls}__item--close {
+      :deep(span) {
+        color: var(--el-color-white) !important;
+      }
+    }
+  }
+}
+
+.dark {
+  .#{$prefix-cls} {
+    &__tool {
+      &--first {
+        &::after {
+          display: none;
+        }
+      }
+    }
+
+    &__item {
+      border: 1px solid var(--el-border-color);
+    }
+
+    &__item:not(.is-active) {
+      &:hover {
+        color: var(--el-color-primary);
+      }
+    }
+
+    &__item.is-active {
+      color: var(--el-color-white);
+      background-color: var(--el-color-primary);
+      border: 1px solid var(--el-color-primary);
+      .#{$prefix-cls}__item--close {
+        :deep(span) {
+          color: var(--el-color-white) !important;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/layout/components/TagsView/src/helper.ts b/src/layout/components/TagsView/src/helper.ts
new file mode 100644
index 000000000..22f6a5074
--- /dev/null
+++ b/src/layout/components/TagsView/src/helper.ts
@@ -0,0 +1,21 @@
+import type { RouteMeta, RouteLocationNormalizedLoaded } from 'vue-router'
+import { pathResolve } from '@/utils/routerHelper'
+
+export const filterAffixTags = (routes: AppRouteRecordRaw[], parentPath = '') => {
+  let tags: RouteLocationNormalizedLoaded[] = []
+  routes.forEach((route) => {
+    const meta = route.meta as RouteMeta
+    const tagPath = pathResolve(parentPath, route.path)
+    if (meta?.affix) {
+      tags.push({ ...route, path: tagPath, fullPath: tagPath } as RouteLocationNormalizedLoaded)
+    }
+    if (route.children) {
+      const tempTags: RouteLocationNormalizedLoaded[] = filterAffixTags(route.children, tagPath)
+      if (tempTags.length >= 1) {
+        tags = [...tags, ...tempTags]
+      }
+    }
+  })
+
+  return tags
+}
diff --git a/src/layout/components/ThemeSwitch/index.ts b/src/layout/components/ThemeSwitch/index.ts
new file mode 100644
index 000000000..823a27651
--- /dev/null
+++ b/src/layout/components/ThemeSwitch/index.ts
@@ -0,0 +1,3 @@
+import ThemeSwitch from './src/ThemeSwitch.vue'
+
+export { ThemeSwitch }
diff --git a/src/layout/components/ThemeSwitch/src/ThemeSwitch.vue b/src/layout/components/ThemeSwitch/src/ThemeSwitch.vue
new file mode 100644
index 000000000..39a8cfd7d
--- /dev/null
+++ b/src/layout/components/ThemeSwitch/src/ThemeSwitch.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup>
+import { useAppStore } from '@/store/modules/app'
+import { useIcon } from '@/hooks/web/useIcon'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'ThemeSwitch' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('theme-switch')
+
+const Sun = useIcon({ icon: 'emojione-monotone:sun', color: '#fde047' })
+
+const CrescentMoon = useIcon({ icon: 'emojione-monotone:crescent-moon', color: '#fde047' })
+
+const appStore = useAppStore()
+
+// 初始化获取是否是暗黑主题
+const isDark = ref(appStore.getIsDark)
+
+// 设置switch的背景颜色
+const blackColor = 'var(--el-color-black)'
+
+const themeChange = (val: boolean) => {
+  appStore.setIsDark(val)
+}
+</script>
+
+<template>
+  <ElSwitch
+    v-model="isDark"
+    :active-color="blackColor"
+    :active-icon="Sun"
+    :border-color="blackColor"
+    :class="prefixCls"
+    :inactive-color="blackColor"
+    :inactive-icon="CrescentMoon"
+    inline-prompt
+    @change="themeChange"
+  />
+</template>
+<style lang="scss" scoped>
+:deep(.el-switch__core .el-switch__inner .is-icon) {
+  overflow: visible;
+}
+</style>
diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue
new file mode 100644
index 000000000..22d7a457c
--- /dev/null
+++ b/src/layout/components/ToolHeader.vue
@@ -0,0 +1,96 @@
+<script lang="tsx">
+import { defineComponent, computed } from 'vue'
+import { Message } from '@/layout/components//Message'
+import { Collapse } from '@/layout/components/Collapse'
+import { UserInfo } from '@/layout/components/UserInfo'
+import { Screenfull } from '@/layout/components/Screenfull'
+import { Breadcrumb } from '@/layout/components/Breadcrumb'
+import { SizeDropdown } from '@/layout/components/SizeDropdown'
+import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
+import { useAppStore } from '@/store/modules/app'
+import { useDesign } from '@/hooks/web/useDesign'
+import RouterSearch from '@/components/RouterSearch/index.vue'
+
+// 头部工具
+const { getPrefixCls, variables } = useDesign()
+
+const prefixCls = getPrefixCls('tool-header')
+
+const appStore = useAppStore()
+
+// 面包屑
+const breadcrumb = computed(() => appStore.getBreadcrumb)
+
+// 折叠图标
+const hamburger = computed(() => appStore.getHamburger)
+
+// 全屏图标
+const screenfull = computed(() => appStore.getScreenfull)
+
+// 搜索图片
+const search = computed(() => appStore.search)
+
+// 尺寸图标
+const size = computed(() => appStore.getSize)
+
+// 布局
+const layout = computed(() => appStore.getLayout)
+
+// 多语言图标
+const locale = computed(() => appStore.getLocale)
+
+// 消息图标
+const message = computed(() => appStore.getMessage)
+
+export default defineComponent({
+  name: 'ToolHeader',
+  setup() {
+    return () => (
+      <div
+        id={`${variables.namespace}-tool-header`}
+        class={[
+          prefixCls,
+          'h-[var(--top-tool-height)] relative px-[var(--top-tool-p-x)] flex items-center justify-between',
+          'dark:bg-[var(--el-bg-color)]'
+        ]}
+      >
+        {layout.value !== 'top' ? (
+          <div class="h-full flex items-center">
+            {hamburger.value && layout.value !== 'cutMenu' ? (
+              <Collapse class="custom-hover" color="var(--top-header-text-color)"></Collapse>
+            ) : undefined}
+            {breadcrumb.value ? <Breadcrumb class="lt-md:hidden"></Breadcrumb> : undefined}
+          </div>
+        ) : undefined}
+        <div class="h-full flex items-center">
+          {search.value ? (<RouterSearch isModal={false} />) : undefined}
+          {screenfull.value ? (
+            <Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull>
+          ) : undefined}
+          {size.value ? (
+            <SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown>
+          ) : undefined}
+          {locale.value ? (
+            <LocaleDropdown
+              class="custom-hover"
+              color="var(--top-header-text-color)"
+            ></LocaleDropdown>
+          ) : undefined}
+          {message.value ? (
+            <Message class="custom-hover" color="var(--top-header-text-color)"></Message>
+          ) : undefined}
+          <UserInfo></UserInfo>
+        </div>
+      </div>
+    )
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-tool-header;
+
+.#{$prefix-cls} {
+  transition: left var(--transition-time-02);
+}
+</style>
diff --git a/src/layout/components/UserInfo/index.ts b/src/layout/components/UserInfo/index.ts
new file mode 100644
index 000000000..c3a34aba4
--- /dev/null
+++ b/src/layout/components/UserInfo/index.ts
@@ -0,0 +1,3 @@
+import UserInfo from './src/UserInfo.vue'
+
+export { UserInfo }
diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue
new file mode 100644
index 000000000..3c03ea7d2
--- /dev/null
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup>
+import { ElMessageBox } from 'element-plus'
+
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { useDesign } from '@/hooks/web/useDesign'
+import avatarImg from '@/assets/imgs/avatar.gif'
+import { useUserStore } from '@/store/modules/user'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+
+defineOptions({ name: 'UserInfo' })
+
+const { t } = useI18n()
+
+const { wsCache } = useCache()
+
+const { push, replace } = useRouter()
+
+const userStore = useUserStore()
+
+const tagsViewStore = useTagsViewStore()
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('user-info')
+
+const user = wsCache.get(CACHE_KEY.USER)
+
+const avatar = user.user.avatar ? user.user.avatar : avatarImg
+
+const userName = user.user.nickname ? user.user.nickname : 'Admin'
+
+const loginOut = () => {
+  ElMessageBox.confirm(t('common.loginOutMessage'), t('common.reminder'), {
+    confirmButtonText: t('common.ok'),
+    cancelButtonText: t('common.cancel'),
+    type: 'warning'
+  })
+    .then(async () => {
+      await userStore.loginOut()
+      tagsViewStore.delAllViews()
+      replace('/login?redirect=/index')
+    })
+    .catch(() => {})
+}
+const toProfile = async () => {
+  push('/user/profile')
+}
+const toDocument = () => {
+  window.open('https://doc.iocoder.cn/')
+}
+</script>
+
+<template>
+  <ElDropdown class="custom-hover" :class="prefixCls" trigger="click">
+    <div class="flex items-center">
+      <ElAvatar :src="avatar" alt="" class="w-[calc(var(--logo-height)-25px)] rounded-[50%]" />
+      <span class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden">
+        {{ userName }}
+      </span>
+    </div>
+    <template #dropdown>
+      <ElDropdownMenu>
+        <ElDropdownItem>
+          <Icon icon="ep:tools" />
+          <div @click="toProfile">{{ t('common.profile') }}</div>
+        </ElDropdownItem>
+        <!-- <ElDropdownItem>
+          <Icon icon="ep:menu" />
+          <div @click="toDocument">{{ t('common.document') }}</div>
+        </ElDropdownItem> -->
+        <ElDropdownItem divided @click="loginOut">
+          <Icon icon="ep:switch-button" />
+          <div>{{ t('common.loginOut') }}</div>
+        </ElDropdownItem>
+      </ElDropdownMenu>
+    </template>
+  </ElDropdown>
+</template>
diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx
new file mode 100644
index 000000000..46a1e60eb
--- /dev/null
+++ b/src/layout/components/useRenderLayout.tsx
@@ -0,0 +1,306 @@
+import { computed } from 'vue'
+import { useAppStore } from '@/store/modules/app'
+import { Menu } from '@/layout/components/Menu'
+import { TabMenu } from '@/layout/components/TabMenu'
+import { TagsView } from '@/layout/components/TagsView'
+import { Logo } from '@/layout/components/Logo'
+import AppView from './AppView.vue'
+import ToolHeader from './ToolHeader.vue'
+import { ElScrollbar } from 'element-plus'
+import { useDesign } from '@/hooks/web/useDesign'
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('layout')
+
+const appStore = useAppStore()
+
+const pageLoading = computed(() => appStore.getPageLoading)
+
+// 标签页
+const tagsView = computed(() => appStore.getTagsView)
+
+// 菜单折叠
+const collapse = computed(() => appStore.getCollapse)
+
+// logo
+const logo = computed(() => appStore.logo)
+
+// 固定头部
+const fixedHeader = computed(() => appStore.getFixedHeader)
+
+// 是否是移动端
+const mobile = computed(() => appStore.getMobile)
+
+// 固定菜单
+const fixedMenu = computed(() => appStore.getFixedMenu)
+
+export const useRenderLayout = () => {
+  const renderClassic = () => {
+    return (
+      <>
+        <div
+          class={[
+            'absolute top-0 left-0 h-full layout-border__right',
+            { '!fixed z-3000': mobile.value }
+          ]}
+        >
+          {logo.value ? (
+            <Logo
+              class={[
+                'bg-[var(--left-menu-bg-color)] relative',
+                {
+                  '!pl-0': mobile.value && collapse.value,
+                  'w-[var(--left-menu-min-width)]': appStore.getCollapse,
+                  'w-[var(--left-menu-max-width)]': !appStore.getCollapse
+                }
+              ]}
+              style="transition: all var(--transition-time-02);"
+            ></Logo>
+          ) : undefined}
+          <Menu class={[{ '!h-[calc(100%-var(--logo-height))]': logo.value }]}></Menu>
+        </div>
+        <div
+          class={[
+            `${prefixCls}-content`,
+            'absolute top-0 h-[100%]',
+            {
+              'w-[calc(100%-var(--left-menu-min-width))] left-[var(--left-menu-min-width)]':
+                collapse.value && !mobile.value && !mobile.value,
+              'w-[calc(100%-var(--left-menu-max-width))] left-[var(--left-menu-max-width)]':
+                !collapse.value && !mobile.value && !mobile.value,
+              'fixed !w-full !left-0': mobile.value
+            }
+          ]}
+          style="transition: all var(--transition-time-02);"
+        >
+          <ElScrollbar
+            v-loading={pageLoading.value}
+            class={[
+              `${prefixCls}-content-scrollbar`,
+              {
+                '!h-[calc(100%-var(--top-tool-height)-var(--tags-view-height))] mt-[calc(var(--top-tool-height)+var(--tags-view-height))]':
+                  fixedHeader.value
+              }
+            ]}
+          >
+            <div
+              class={[
+                {
+                  'fixed top-0 left-0 z-10': fixedHeader.value,
+                  'w-[calc(100%-var(--left-menu-min-width))] !left-[var(--left-menu-min-width)]':
+                    collapse.value && fixedHeader.value && !mobile.value,
+                  'w-[calc(100%-var(--left-menu-max-width))] !left-[var(--left-menu-max-width)]':
+                    !collapse.value && fixedHeader.value && !mobile.value,
+                  '!w-full !left-0': mobile.value
+                }
+              ]}
+              style="transition: all var(--transition-time-02);"
+            >
+              <ToolHeader
+                class={[
+                  'bg-[var(--top-header-bg-color)]',
+                  {
+                    'layout-border__bottom': !tagsView.value
+                  }
+                ]}
+              ></ToolHeader>
+
+              {tagsView.value ? (
+                <TagsView class="layout-border__bottom layout-border__top"></TagsView>
+              ) : undefined}
+            </div>
+
+            <AppView></AppView>
+          </ElScrollbar>
+        </div>
+      </>
+    )
+  }
+
+  const renderTopLeft = () => {
+    return (
+      <>
+        <div class="flex items-center bg-[var(--top-header-bg-color)] relative layout-border__bottom dark:bg-[var(--el-bg-color)]">
+          {logo.value ? <Logo class="custom-hover"></Logo> : undefined}
+
+          <ToolHeader class="flex-1"></ToolHeader>
+        </div>
+        <div class="absolute top-[var(--logo-height)+1px] left-0 w-full h-[calc(100%-1px-var(--logo-height))] flex">
+          <Menu class="!h-full relative layout-border__right"></Menu>
+          <div
+            class={[
+              `${prefixCls}-content`,
+              'h-[100%]',
+              {
+                'w-[calc(100%-var(--left-menu-min-width))] left-[var(--left-menu-min-width)]':
+                  collapse.value,
+                'w-[calc(100%-var(--left-menu-max-width))] left-[var(--left-menu-max-width)]':
+                  !collapse.value
+              }
+            ]}
+            style="transition: all var(--transition-time-02);"
+          >
+            <ElScrollbar
+              v-loading={pageLoading.value}
+              class={[
+                `${prefixCls}-content-scrollbar`,
+                {
+                  '!h-[calc(100%-var(--tags-view-height))] mt-[calc(var(--tags-view-height))]':
+                    fixedHeader.value && tagsView.value
+                }
+              ]}
+            >
+              {tagsView.value ? (
+                <TagsView
+                  class={[
+                    'layout-border__bottom absolute',
+                    {
+                      '!fixed top-0 left-0 z-10': fixedHeader.value,
+                      'w-[calc(100%-var(--left-menu-min-width))] !left-[var(--left-menu-min-width)] mt-[calc(var(--logo-height)+1px)]':
+                        collapse.value && fixedHeader.value,
+                      'w-[calc(100%-var(--left-menu-max-width))] !left-[var(--left-menu-max-width)] mt-[calc(var(--logo-height)+1px)]':
+                        !collapse.value && fixedHeader.value
+                    }
+                  ]}
+                  style="transition: width var(--transition-time-02), left var(--transition-time-02);"
+                ></TagsView>
+              ) : undefined}
+
+              <AppView></AppView>
+            </ElScrollbar>
+          </div>
+        </div>
+      </>
+    )
+  }
+
+  const renderTop = () => {
+    return (
+      <>
+        <div
+          class={[
+            'flex items-center justify-between bg-[var(--top-header-bg-color)] relative',
+            {
+              'layout-border__bottom': !tagsView.value
+            }
+          ]}
+        >
+          {logo.value ? <Logo class="custom-hover"></Logo> : undefined}
+          <Menu class="flex-1 px-10px h-[var(--top-tool-height)]"></Menu>
+          <ToolHeader></ToolHeader>
+        </div>
+        <div
+          class={[
+            `${prefixCls}-content`,
+            'w-full',
+            {
+              'h-[calc(100%-var(--app-footer-height))]': !fixedHeader.value,
+              'h-[calc(100%-var(--tags-view-height)-var(--app-footer-height))]': fixedHeader.value
+            }
+          ]}
+        >
+          <ElScrollbar
+            v-loading={pageLoading.value}
+            class={[
+              `${prefixCls}-content-scrollbar`,
+              {
+                'mt-[var(--tags-view-height)] !pb-[calc(var(--tags-view-height)+var(--app-footer-height))]':
+                  fixedHeader.value,
+                'pb-[var(--app-footer-height)]': !fixedHeader.value
+              }
+            ]}
+          >
+            {tagsView.value ? (
+              <TagsView
+                class={[
+                  'layout-border__bottom layout-border__top relative',
+                  {
+                    '!fixed w-full top-[calc(var(--top-tool-height)+1px)] left-0': fixedHeader.value
+                  }
+                ]}
+                style="transition: width var(--transition-time-02), left var(--transition-time-02);"
+              ></TagsView>
+            ) : undefined}
+
+            <AppView></AppView>
+          </ElScrollbar>
+        </div>
+      </>
+    )
+  }
+
+  const renderCutMenu = () => {
+    return (
+      <>
+        <div class="flex items-center bg-[var(--top-header-bg-color)] relative layout-border__bottom">
+          {logo.value ? <Logo class="custom-hover !pr-15px"></Logo> : undefined}
+
+          <ToolHeader class="flex-1"></ToolHeader>
+        </div>
+        <div class="absolute top-[var(--logo-height)] left-0 w-[calc(100%-2px)] h-[calc(100%-var(--logo-height))] flex">
+          <TabMenu></TabMenu>
+          <div
+            class={[
+              `${prefixCls}-content`,
+              'h-[100%]',
+              {
+                'w-[calc(100%-var(--tab-menu-min-width))] left-[var(--tab-menu-min-width)]':
+                  collapse.value && !fixedMenu.value,
+                'w-[calc(100%-var(--tab-menu-max-width))] left-[var(--tab-menu-max-width)]':
+                  !collapse.value && !fixedMenu.value,
+                'w-[calc(100%-var(--tab-menu-min-width)-var(--left-menu-max-width))] ml-[var(--left-menu-max-width)]':
+                  collapse.value && fixedMenu.value,
+                'w-[calc(100%-var(--tab-menu-max-width)-var(--left-menu-max-width))] ml-[var(--left-menu-max-width)]':
+                  !collapse.value && fixedMenu.value
+              }
+            ]}
+            style="transition: all var(--transition-time-02);"
+          >
+            <ElScrollbar
+              v-loading={pageLoading.value}
+              class={[
+                `${prefixCls}-content-scrollbar`,
+                {
+                  '!h-[calc(100%-var(--tags-view-height))] mt-[calc(var(--tags-view-height))]':
+                    fixedHeader.value && tagsView.value
+                }
+              ]}
+            >
+              {tagsView.value ? (
+                <TagsView
+                  class={[
+                    'relative layout-border__bottom layout-border__top',
+                    {
+                      '!fixed top-0 left-0 z-10': fixedHeader.value,
+                      'w-[calc(100%-var(--tab-menu-min-width))] !left-[var(--tab-menu-min-width)] mt-[var(--logo-height)]':
+                        collapse.value && fixedHeader.value,
+                      'w-[calc(100%-var(--tab-menu-max-width))] !left-[var(--tab-menu-max-width)] mt-[var(--logo-height)]':
+                        !collapse.value && fixedHeader.value,
+                      '!fixed top-0 !left-[var(--tab-menu-min-width)+var(--left-menu-max-width)] z-10':
+                        fixedHeader.value && fixedMenu.value,
+                      'w-[calc(100%-var(--tab-menu-min-width)-var(--left-menu-max-width))] !left-[var(--tab-menu-min-width)+var(--left-menu-max-width)] mt-[var(--logo-height)]':
+                        collapse.value && fixedHeader.value && fixedMenu.value,
+                      'w-[calc(100%-var(--tab-menu-max-width)-var(--left-menu-max-width))] !left-[var(--tab-menu-max-width)+var(--left-menu-max-width)] mt-[var(--logo-height)]':
+                        !collapse.value && fixedHeader.value && fixedMenu.value
+                    }
+                  ]}
+                  style="transition: width var(--transition-time-02), left var(--transition-time-02);"
+                ></TagsView>
+              ) : undefined}
+
+              <AppView></AppView>
+            </ElScrollbar>
+          </div>
+        </div>
+      </>
+    )
+  }
+
+  return {
+    renderClassic,
+    renderTopLeft,
+    renderTop,
+    renderCutMenu
+  }
+}
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
new file mode 100644
index 000000000..22c41afaa
--- /dev/null
+++ b/src/locales/en-US.ts
@@ -0,0 +1,461 @@
+export default {
+  common: {
+    inputText: 'Please input',
+    selectText: 'Please select',
+    startTimeText: 'Start time',
+    endTimeText: 'End time',
+    login: 'Login',
+    required: 'This is required',
+    loginOut: 'Login out',
+    document: 'Document',
+    profile: 'User Center',
+    reminder: 'Reminder',
+    loginOutMessage: 'Exit the system?',
+    back: 'Back',
+    ok: 'OK',
+    save: 'Save',
+    cancel: 'Cancel',
+    close: 'Close',
+    reload: 'Reload current',
+    success: 'Success',
+    closeTab: 'Close current',
+    closeTheLeftTab: 'Close left',
+    closeTheRightTab: 'Close right',
+    closeOther: 'Close other',
+    closeAll: 'Close all',
+    prevLabel: 'Prev',
+    nextLabel: 'Next',
+    skipLabel: 'Jump',
+    doneLabel: 'End',
+    menu: 'Menu',
+    menuDes: 'Menu bar rendered in routed structure',
+    collapse: 'Collapse',
+    collapseDes: 'Expand and zoom the menu bar',
+    tagsView: 'Tags view',
+    tagsViewDes: 'Used to record routing history',
+    tool: 'Tool',
+    toolDes: 'Used to set up custom systems',
+    query: 'Query',
+    reset: 'Reset',
+    shrink: 'Put away',
+    expand: 'Expand',
+    confirmTitle: 'System Hint',
+    exportMessage: 'Whether to confirm export data item?',
+    importMessage: 'Whether to confirm import data item?',
+    createSuccess: 'Create Success',
+    updateSuccess: 'Update Success',
+    delMessage: 'Delete the selected data?',
+    delDataMessage: 'Delete the data?',
+    delNoData: 'Please select the data to delete',
+    delSuccess: 'Deleted successfully',
+    index: 'Index',
+    status: 'Status',
+    createTime: 'Create Time',
+    updateTime: 'Update Time',
+    copy: 'Copy',
+    copySuccess: 'Copy Success',
+    copyError: 'Copy Error',
+    closeSuccess: 'Close Success',
+    reAddSuccess: 'ReAdd Success',
+    submitSuccess: 'Submit Success',
+    agreeSuccess: 'Agree Success',
+    refusedSuccess: 'Refused Success',
+    handleSuccess: 'Handle Success',
+    confirmColse: 'Confirm Close?',
+    confirmReAdd: 'Confirm ReAdd?',
+    confirmAgree: 'Confirm Agree?',
+    confirmRefused: 'Confirm Refused?',
+    confirmHandle: 'Confirm Handle?',
+    confirmSubmit: 'Confirm Submit?',
+  },
+  error: {
+    noPermission: `Sorry, you don't have permission to access this page.`,
+    pageError: 'Sorry, the page you visited does not exist.',
+    networkError: 'Sorry, the server reported an error.',
+    returnToHome: 'Return to home'
+  },
+  permission: {
+    hasPermission: `Please set the operation permission label value`,
+    hasRole: `Please set the role permission tag value`
+  },
+  setting: {
+    projectSetting: 'Project setting',
+    theme: 'Theme',
+    layout: 'Layout',
+    systemTheme: 'System theme',
+    menuTheme: 'Menu theme',
+    interfaceDisplay: 'Interface display',
+    breadcrumb: 'Breadcrumb',
+    breadcrumbIcon: 'Breadcrumb icon',
+    collapseMenu: 'Collapse menu',
+    hamburgerIcon: 'Hamburger icon',
+    screenfullIcon: 'Screenfull icon',
+    sizeIcon: 'Size icon',
+    localeIcon: 'Locale icon',
+    messageIcon: 'Message icon',
+    tagsView: 'Tags view',
+    logo: 'Logo',
+    greyMode: 'Grey mode',
+    fixedHeader: 'Fixed header',
+    headerTheme: 'Header theme',
+    cutMenu: 'Cut Menu',
+    copy: 'Copy',
+    clearAndReset: 'Clear cache and reset',
+    copySuccess: 'Copy success',
+    copyFailed: 'Copy failed',
+    footer: 'Footer',
+    uniqueOpened: 'Unique opened',
+    tagsViewIcon: 'Tags view icon',
+    reExperienced: 'Please exit the login experience again',
+    fixedMenu: 'Fixed menu'
+  },
+  size: {
+    default: 'Default',
+    large: 'Large',
+    small: 'Small'
+  },
+  login: {
+    welcome: 'Welcome to the system',
+    message: 'Backstage management system',
+    tenantname: 'TenantName',
+    username: 'Username',
+    password: 'Password',
+    code: 'verification code',
+    login: 'Sign in',
+    relogin: 'Sign in again',
+    otherLogin: 'Sign in with',
+    register: 'Register',
+    checkPassword: 'Confirm password',
+    remember: 'Remember me',
+    hasUser: 'Existing account? Go to login',
+    forgetPassword: 'Forget password?',
+    tenantNamePlaceholder: 'Please Enter Tenant Name',
+    usernamePlaceholder: 'Please Enter Username',
+    passwordPlaceholder: 'Please Enter Password',
+    codePlaceholder: 'Please Enter Verification Code',
+    mobileTitle: 'Mobile sign in',
+    mobileNumber: 'Mobile Number',
+    mobileNumberPlaceholder: 'Plaease Enter Mobile Number',
+    backLogin: 'back',
+    getSmsCode: 'Get SMS Code',
+    btnMobile: 'Mobile sign in',
+    btnQRCode: 'QR code sign in',
+    qrcode: 'Scan the QR code to log in',
+    btnRegister: 'Sign up',
+    SmsSendMsg: 'code has been sent'
+  },
+  captcha: {
+    verification: 'Please complete security verification',
+    slide: 'Swipe right to complete verification',
+    point: 'Please click',
+    success: 'Verification succeeded',
+    fail: 'verification failed'
+  },
+  router: {
+    login: 'Login',
+    home: 'Home',
+    analysis: 'Analysis',
+    workplace: 'Workplace'
+  },
+  analysis: {
+    newUser: 'New user',
+    unreadInformation: 'Unread information',
+    transactionAmount: 'Transaction amount',
+    totalShopping: 'Total Shopping',
+    monthlySales: 'Monthly sales',
+    userAccessSource: 'User access source',
+    january: 'January',
+    february: 'February',
+    march: 'March',
+    april: 'April',
+    may: 'May',
+    june: 'June',
+    july: 'July',
+    august: 'August',
+    september: 'September',
+    october: 'October',
+    november: 'November',
+    december: 'December',
+    estimate: 'Estimate',
+    actual: 'Actual',
+    directAccess: 'Airect access',
+    mailMarketing: 'Mail marketing',
+    allianceAdvertising: 'Alliance advertising',
+    videoAdvertising: 'Video advertising',
+    searchEngines: 'Search engines',
+    weeklyUserActivity: 'Weekly user activity',
+    activeQuantity: 'Active quantity',
+    monday: 'Monday',
+    tuesday: 'Tuesday',
+    wednesday: 'Wednesday',
+    thursday: 'Thursday',
+    friday: 'Friday',
+    saturday: 'Saturday',
+    sunday: 'Sunday'
+  },
+  workplace: {
+    welcome: 'Hello',
+    happyDay: 'Wish you happy every day!',
+    toady: `It's sunny today`,
+    notice: 'Announcement',
+    project: 'Project',
+    access: 'Project access',
+    toDo: 'To do',
+    introduction: 'A serious introduction',
+    shortcutOperation: 'Quick entry',
+    operation: 'Operation',
+    index: 'Index',
+    personal: 'Personal',
+    team: 'Team',
+    quote: 'Quote',
+    contribution: 'Contribution',
+    hot: 'Hot',
+    yield: 'Yield',
+    dynamic: 'Dynamic',
+    push: 'push',
+    follow: 'Follow'
+  },
+  form: {
+    input: 'Input',
+    inputNumber: 'InputNumber',
+    default: 'Default',
+    icon: 'Icon',
+    mixed: 'Mixed',
+    textarea: 'Textarea',
+    slot: 'Slot',
+    position: 'Position',
+    autocomplete: 'Autocomplete',
+    select: 'Select',
+    selectGroup: 'Select Group',
+    selectV2: 'SelectV2',
+    cascader: 'Cascader',
+    switch: 'Switch',
+    rate: 'Rate',
+    colorPicker: 'Color Picker',
+    transfer: 'Transfer',
+    render: 'Render',
+    radio: 'Radio',
+    button: 'Button',
+    checkbox: 'Checkbox',
+    slider: 'Slider',
+    datePicker: 'Date Picker',
+    shortcuts: 'Shortcuts',
+    today: 'Today',
+    yesterday: 'Yesterday',
+    aWeekAgo: 'A week ago',
+    week: 'Week',
+    year: 'Year',
+    month: 'Month',
+    dates: 'Dates',
+    daterange: 'Date Range',
+    monthrange: 'Month Range',
+    dateTimePicker: 'DateTimePicker',
+    dateTimerange: 'Datetime Range',
+    timePicker: 'Time Picker',
+    timeSelect: 'Time Select',
+    inputPassword: 'input Password',
+    passwordStrength: 'Password Strength',
+    operate: 'operate',
+    change: 'Change',
+    restore: 'Restore',
+    disabled: 'Disabled',
+    disablement: 'Disablement',
+    delete: 'Delete',
+    add: 'Add',
+    setValue: 'Set value',
+    resetValue: 'Reset value',
+    set: 'Set',
+    subitem: 'Subitem',
+    formValidation: 'Form validation',
+    verifyReset: 'Verify reset',
+    remark: 'Remark'
+  },
+  watermark: {
+    watermark: 'Watermark'
+  },
+  table: {
+    table: 'Table',
+    index: 'Index',
+    title: 'Title',
+    author: 'Author',
+    createTime: 'Create time',
+    action: 'Action',
+    pagination: 'pagination',
+    reserveIndex: 'Reserve index',
+    restoreIndex: 'Restore index',
+    showSelections: 'Show selections',
+    hiddenSelections: 'Restore selections',
+    showExpandedRows: 'Show expanded rows',
+    hiddenExpandedRows: 'Hidden expanded rows',
+    header: 'Header'
+  },
+  action: {
+    create: 'Create',
+    add: 'Add',
+    del: 'Delete',
+    delete: 'Delete',
+    edit: 'Edit',
+    update: 'Update',
+    preview: 'Preview',
+    more: 'More',
+    sync: 'Sync',
+    save: 'Save',
+    detail: 'Detail',
+    export: 'Export',
+    import: 'Import',
+    generate: 'Generate',
+    logout: 'Login Out',
+    test: 'Test',
+    typeCreate: 'Dict Type Create',
+    typeUpdate: 'Dict Type Eidt',
+    dataCreate: 'Dict Data Create',
+    dataUpdate: 'Dict Data Eidt',
+    fileUpload: 'File Upload',
+    createLabel: 'create label',
+    viewDetail:'Detailed list'
+  },
+  dialog: {
+    dialog: 'Dialog',
+    open: 'Open',
+    close: 'Close'
+  },
+  sys: {
+    api: {
+      operationFailed: 'Operation failed',
+      errorTip: 'Error Tip',
+      errorMessage: 'The operation failed, the system is abnormal!',
+      timeoutMessage: 'Login timed out, please log in again!',
+      apiTimeoutMessage: 'The interface request timed out, please refresh the page and try again!',
+      apiRequestFailed: 'The interface request failed, please try again later!',
+      networkException: 'network anomaly',
+      networkExceptionMsg:
+        'Please check if your network connection is normal! The network is abnormal',
+
+      errMsg401: 'The user does not have permission (token, user name, password error)!',
+      errMsg403: 'The user is authorized, but access is forbidden!',
+      errMsg404: 'Network request error, the resource was not found!',
+      errMsg405: 'Network request error, request method not allowed!',
+      errMsg408: 'Network request timed out!',
+      errMsg500: 'Server error, please contact the administrator!',
+      errMsg501: 'The network is not implemented!',
+      errMsg502: 'Network Error!',
+      errMsg503: 'The service is unavailable, the server is temporarily overloaded or maintained!',
+      errMsg504: 'Network timeout!',
+      errMsg505: 'The http version does not support the request!',
+      errMsg901: 'Demo mode, no write operations are possible!'
+    },
+    app: {
+      logoutTip: 'Reminder',
+      logoutMessage: 'Confirm to exit the system?',
+      menuLoading: 'Menu loading...'
+    },
+    exception: {
+      backLogin: 'Back Login',
+      backHome: 'Back Home',
+      subTitle403: "Sorry, you don't have access to this page.",
+      subTitle404: 'Sorry, the page you visited does not exist.',
+      subTitle500: 'Sorry, the server is reporting an error.',
+      noDataTitle: 'No data on the current page.',
+      networkErrorTitle: 'Network Error',
+      networkErrorSubTitle:
+        'Sorry, Your network connection has been disconnected, please check your network!'
+    },
+    lock: {
+      unlock: 'Click to unlock',
+      alert: 'Lock screen password error',
+      backToLogin: 'Back to login',
+      entry: 'Enter the system',
+      placeholder: 'Please enter the lock screen password or user password'
+    },
+    login: {
+      backSignIn: 'Back sign in',
+      mobileSignInFormTitle: 'Mobile sign in',
+      qrSignInFormTitle: 'Qr code sign in',
+      signInFormTitle: 'Sign in',
+      signUpFormTitle: 'Sign up',
+      forgetFormTitle: 'Reset password',
+
+      signInTitle: 'Backstage management system',
+      signInDesc: 'Enter your personal details and get started!',
+      policy: 'I agree to the xxx Privacy Policy',
+      scanSign: `scanning the code to complete the login`,
+
+      loginButton: 'Sign in',
+      registerButton: 'Sign up',
+      rememberMe: 'Remember me',
+      forgetPassword: 'Forget Password?',
+      otherSignIn: 'Sign in with',
+
+      // notify
+      loginSuccessTitle: 'Login successful',
+      loginSuccessDesc: 'Welcome back',
+
+      // placeholder
+      accountPlaceholder: 'Please input username',
+      passwordPlaceholder: 'Please input password',
+      smsPlaceholder: 'Please input sms code',
+      mobilePlaceholder: 'Please input mobile',
+      policyPlaceholder: 'Register after checking',
+      diffPwd: 'The two passwords are inconsistent',
+
+      userName: 'Username',
+      password: 'Password',
+      confirmPassword: 'Confirm Password',
+      email: 'Email',
+      smsCode: 'SMS code',
+      mobile: 'Mobile'
+    }
+  },
+  profile: {
+    user: {
+      title: 'Personal Information',
+      username: 'User Name',
+      nickname: 'Nick Name',
+      mobile: 'Phone Number',
+      email: 'User Mail',
+      dept: 'Department',
+      posts: 'Position',
+      roles: 'Own Role',
+      sex: 'Sex',
+      man: 'Man',
+      woman: 'Woman',
+      createTime: 'Created Date'
+    },
+    info: {
+      title: 'Basic Information',
+      basicInfo: 'Basic Information',
+      resetPwd: 'Reset Password',
+      userSocial: 'Social Information'
+    },
+    rules: {
+      nickname: 'Please Enter User Nickname',
+      mail: 'Please Input The Email Address',
+      truemail: 'Please Input The Correct Email Address',
+      phone: 'Please Enter The Phone Number',
+      truephone: 'Please Enter The Correct Phone Number'
+    },
+    password: {
+      oldPassword: 'Old PassWord',
+      newPassword: 'New Password',
+      confirmPassword: 'Confirm Password',
+      oldPwdMsg: 'Please Enter Old Password',
+      newPwdMsg: 'Please Enter New Password',
+      cfPwdMsg: 'Please Enter Confirm Password',
+      diffPwd: 'The Passwords Entered Twice No Match'
+    }
+  },
+  cropper: {
+    selectImage: 'Select Image',
+    uploadSuccess: 'Uploaded success!',
+    modalTitle: 'Avatar upload',
+    okText: 'Confirm and upload',
+    btn_reset: 'Reset',
+    btn_rotate_left: 'Counterclockwise rotation',
+    btn_rotate_right: 'Clockwise rotation',
+    btn_scale_x: 'Flip horizontal',
+    btn_scale_y: 'Flip vertical',
+    btn_zoom_in: 'Zoom in',
+    btn_zoom_out: 'Zoom out',
+    preview: 'Preivew'
+  }
+}
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
new file mode 100644
index 000000000..7ab623b0b
--- /dev/null
+++ b/src/locales/zh-CN.ts
@@ -0,0 +1,454 @@
+export default {
+  common: {
+    inputText: '请输入',
+    selectText: '请选择',
+    startTimeText: '开始时间',
+    endTimeText: '结束时间',
+    login: '登录',
+    required: '该项为必填项',
+    loginOut: '退出系统',
+    document: '项目文档',
+    profile: '个人中心',
+    reminder: '温馨提示',
+    loginOutMessage: '是否退出本系统？',
+    back: '返回',
+    ok: '确定',
+    save: '保存',
+    cancel: '取消',
+    close: '关闭',
+    reload: '重新加载',
+    success: '成功',
+    closeTab: '关闭标签页',
+    closeTheLeftTab: '关闭左侧标签页',
+    closeTheRightTab: '关闭右侧标签页',
+    closeOther: '关闭其他标签页',
+    closeAll: '关闭全部标签页',
+    prevLabel: '上一步',
+    nextLabel: '下一步',
+    skipLabel: '跳过',
+    doneLabel: '结束',
+    menu: '菜单',
+    menuDes: '以路由的结构渲染的菜单栏',
+    collapse: '展开缩收',
+    collapseDes: '展开和缩放菜单栏',
+    tagsView: '标签页',
+    tagsViewDes: '用于记录路由历史记录',
+    tool: '工具',
+    toolDes: '用于设置定制系统',
+    query: '查询',
+    reset: '重置',
+    shrink: '收起',
+    expand: '展开',
+    confirmTitle: '系统提示',
+    exportMessage: '是否确认导出数据项？',
+    importMessage: '是否确认导入数据项？',
+    createSuccess: '新增成功',
+    updateSuccess: '修改成功',
+    delMessage: '是否删除所选中数据？',
+    delDataMessage: '是否删除数据？',
+    delNoData: '请选择需要删除的数据',
+    delSuccess: '删除成功',
+    index: '序号',
+    status: '状态',
+    createTime: '创建时间',
+    updateTime: '更新时间',
+    copy: '复制',
+    copySuccess: '复制成功',
+    copyError: '复制失败',
+    closeSuccess: '关闭成功',
+    reAddSuccess: '重新添加成功',
+    submitSuccess: '提交成功',
+    agreeSuccess: '审批通过成功',
+    refusedSuccess: '审批驳回成功',
+    handleSuccess: '执行成功',
+    confirmColse: '确认关闭吗？',
+    confirmReAdd: '确认重新添加吗？',
+    confirmAgree: '确认审批通过吗？',
+    confirmRefused: '确认审批驳回吗？',
+    confirmHandle: '确认处理吗？',
+    confirmSubmit: '确认提交吗？',
+  },
+  error: {
+    noPermission: `抱歉，您无权访问此页面。`,
+    pageError: '抱歉，您访问的页面不存在。',
+    networkError: '抱歉，服务器报告错误。',
+    returnToHome: '返回首页'
+  },
+  permission: {
+    hasPermission: `请设置操作权限标签值`,
+    hasRole: `请设置角色权限标签值`
+  },
+  setting: {
+    projectSetting: '项目配置',
+    theme: '主题',
+    layout: '布局',
+    systemTheme: '系统主题',
+    menuTheme: '菜单主题',
+    interfaceDisplay: '界面显示',
+    breadcrumb: '面包屑',
+    breadcrumbIcon: '面包屑图标',
+    collapseMenu: '折叠菜单',
+    hamburgerIcon: '折叠图标',
+    screenfullIcon: '全屏图标',
+    sizeIcon: '尺寸图标',
+    localeIcon: '多语言图标',
+    messageIcon: '消息图标',
+    tagsView: '标签页',
+    logo: '标志',
+    greyMode: '灰色模式',
+    fixedHeader: '固定头部',
+    headerTheme: '头部主题',
+    cutMenu: '切割菜单',
+    copy: '拷贝',
+    clearAndReset: '清除缓存并且重置',
+    copySuccess: '拷贝成功',
+    copyFailed: '拷贝失败',
+    footer: '页脚',
+    uniqueOpened: '菜单手风琴',
+    tagsViewIcon: '标签页图标',
+    reExperienced: '请重新退出登录体验',
+    fixedMenu: '固定菜单'
+  },
+  size: {
+    default: '默认',
+    large: '大',
+    small: '小'
+  },
+  login: {
+    welcome: '欢迎使用本系统',
+    message: '',
+    tenantname: '租户名称',
+    username: '用户名',
+    password: '密码',
+    code: '验证码',
+    login: '登录',
+    relogin: '重新登录',
+    otherLogin: '其他登录方式',
+    register: '注册',
+    checkPassword: '确认密码',
+    remember: '记住我',
+    hasUser: '已有账号？去登录',
+    forgetPassword: '忘记密码?',
+    tenantNamePlaceholder: '请输入租户名称',
+    usernamePlaceholder: '请输入用户名',
+    passwordPlaceholder: '请输入密码',
+    codePlaceholder: '请输入验证码',
+    mobileTitle: '手机登录',
+    mobileNumber: '手机号码',
+    mobileNumberPlaceholder: '请输入手机号码',
+    backLogin: '返回',
+    getSmsCode: '获取验证码',
+    btnMobile: '手机登录',
+    btnQRCode: '二维码登录',
+    qrcode: '扫描二维码登录',
+    btnRegister: '注册',
+    SmsSendMsg: '验证码已发送'
+  },
+  captcha: {
+    verification: '请完成安全验证',
+    slide: '向右滑动完成验证',
+    point: '请依次点击',
+    success: '验证成功',
+    fail: '验证失败'
+  },
+  router: {
+    login: '登录',
+    home: '首页',
+    analysis: '分析页',
+    workplace: '工作台'
+  },
+  analysis: {
+    newUser: '新增用户',
+    unreadInformation: '未读消息',
+    transactionAmount: '成交金额',
+    totalShopping: '购物总量',
+    monthlySales: '每月销售额',
+    userAccessSource: '用户访问来源',
+    january: '一月',
+    february: '二月',
+    march: '三月',
+    april: '四月',
+    may: '五月',
+    june: '六月',
+    july: '七月',
+    august: '八月',
+    september: '九月',
+    october: '十月',
+    november: '十一月',
+    december: '十二月',
+    estimate: '预计',
+    actual: '实际',
+    directAccess: '直接访问',
+    mailMarketing: '邮件营销',
+    allianceAdvertising: '联盟广告',
+    videoAdvertising: '视频广告',
+    searchEngines: '搜索引擎',
+    weeklyUserActivity: '每周用户活跃量',
+    activeQuantity: '活跃量',
+    monday: '周一',
+    tuesday: '周二',
+    wednesday: '周三',
+    thursday: '周四',
+    friday: '周五',
+    saturday: '周六',
+    sunday: '周日'
+  },
+  workplace: {
+    welcome: '你好',
+    happyDay: '祝你开心每一天!',
+    toady: '今日晴',
+    notice: '通知公告',
+    project: '项目数',
+    access: '项目访问',
+    toDo: '待办',
+    introduction: '一个正经的简介',
+    shortcutOperation: '快捷入口',
+    operation: '操作',
+    index: '指数',
+    personal: '个人',
+    team: '团队',
+    quote: '引用',
+    contribution: '贡献',
+    hot: '热度',
+    yield: '产量',
+    dynamic: '动态',
+    push: '推送',
+    follow: '关注'
+  },
+  form: {
+    input: '输入框',
+    inputNumber: '数字输入框',
+    default: '默认',
+    icon: '图标',
+    mixed: '复合型',
+    textarea: '多行文本',
+    slot: '插槽',
+    position: '位置',
+    autocomplete: '自动补全',
+    select: '选择器',
+    selectGroup: '选项分组',
+    selectV2: '虚拟列表选择器',
+    cascader: '级联选择器',
+    switch: '开关',
+    rate: '评分',
+    colorPicker: '颜色选择器',
+    transfer: '穿梭框',
+    render: '渲染器',
+    radio: '单选框',
+    button: '按钮',
+    checkbox: '多选框',
+    slider: '滑块',
+    datePicker: '日期选择器',
+    shortcuts: '快捷选项',
+    today: '今天',
+    yesterday: '昨天',
+    aWeekAgo: '一周前',
+    week: '周',
+    year: '年',
+    month: '月',
+    dates: '日期',
+    daterange: '日期范围',
+    monthrange: '月份范围',
+    dateTimePicker: '日期时间选择器',
+    dateTimerange: '日期时间范围',
+    timePicker: '时间选择器',
+    timeSelect: '时间选择',
+    inputPassword: '密码输入框',
+    passwordStrength: '密码强度',
+    operate: '操作',
+    change: '更改',
+    restore: '还原',
+    disabled: '禁用',
+    disablement: '解除禁用',
+    delete: '删除',
+    add: '添加',
+    setValue: '设置值',
+    resetValue: '重置值',
+    set: '设置',
+    subitem: '子项',
+    formValidation: '表单验证',
+    verifyReset: '验证重置',
+    remark: '备注'
+  },
+  watermark: {
+    watermark: '水印'
+  },
+  table: {
+    table: '表格',
+    index: '序号',
+    title: '标题',
+    author: '作者',
+    createTime: '创建时间',
+    action: '操作',
+    pagination: '分页',
+    reserveIndex: '叠加序号',
+    restoreIndex: '还原序号',
+    showSelections: '显示多选',
+    hiddenSelections: '隐藏多选',
+    showExpandedRows: '显示展开行',
+    hiddenExpandedRows: '隐藏展开行',
+    header: '头部'
+  },
+  action: {
+    create: '新增',
+    add: '新增',
+    del: '删除',
+    delete: '删除',
+    edit: '编辑',
+    update: '编辑',
+    preview: '预览',
+    more: '更多',
+    sync: '同步',
+    save: '保存',
+    detail: '详情',
+    export: '导出',
+    import: '导入',
+    generate: '生成',
+    logout: '强制退出',
+    test: '测试',
+    typeCreate: '字典类型新增',
+    typeUpdate: '字典类型编辑',
+    dataCreate: '字典数据新增',
+    dataUpdate: '字典数据编辑',
+    createLabel: '创建标签',
+    viewDetail:'明细列表'
+  },
+  dialog: {
+    dialog: '弹窗',
+    open: '打开',
+    close: '关闭'
+  },
+  sys: {
+    api: {
+      operationFailed: '操作失败',
+      errorTip: '错误提示',
+      errorMessage: '操作失败,系统异常!',
+      timeoutMessage: '登录超时,请重新登录!',
+      apiTimeoutMessage: '接口请求超时,请刷新页面重试!',
+      apiRequestFailed: '请求出错，请稍候重试',
+      networkException: '网络异常',
+      networkExceptionMsg: '网络异常，请检查您的网络连接是否正常!',
+      errMsg401: '用户没有权限（令牌、用户名、密码错误）!',
+      errMsg403: '用户得到授权，但是访问是被禁止的。!',
+      errMsg404: '网络请求错误,未找到该资源!',
+      errMsg405: '网络请求错误,请求方法未允许!',
+      errMsg408: '网络请求超时!',
+      errMsg500: '服务器错误,请联系管理员!',
+      errMsg501: '网络未实现!',
+      errMsg502: '网络错误!',
+      errMsg503: '服务不可用，服务器暂时过载或维护!',
+      errMsg504: '网络超时!',
+      errMsg505: 'http版本不支持该请求!',
+      errMsg901: '演示模式，无法进行写操作!'
+    },
+    app: {
+      logoutTip: '温馨提醒',
+      logoutMessage: '是否确认退出系统?',
+      menuLoading: '菜单加载中...'
+    },
+    exception: {
+      backLogin: '返回登录',
+      backHome: '返回首页',
+      subTitle403: '抱歉，您无权访问此页面。',
+      subTitle404: '抱歉，您访问的页面不存在。',
+      subTitle500: '抱歉，服务器报告错误。',
+      noDataTitle: '当前页无数据',
+      networkErrorTitle: '网络错误',
+      networkErrorSubTitle: '抱歉，您的网络连接已断开，请检查您的网络！'
+    },
+    lock: {
+      unlock: '点击解锁',
+      alert: '锁屏密码错误',
+      backToLogin: '返回登录',
+      entry: '进入系统',
+      placeholder: '请输入锁屏密码或者用户密码'
+    },
+    login: {
+      backSignIn: '返回',
+      signInFormTitle: '登录',
+      ssoFormTitle: '三方授权',
+      mobileSignInFormTitle: '手机登录',
+      qrSignInFormTitle: '二维码登录',
+      signUpFormTitle: '注册',
+      forgetFormTitle: '重置密码',
+      signInTitle: '',
+      signInDesc: '输入您的个人详细信息开始使用！',
+      policy: '我同意xxx隐私政策',
+      scanSign: `扫码后点击"确认"，即可完成登录`,
+      loginButton: '登录',
+      registerButton: '注册',
+      rememberMe: '记住我',
+      forgetPassword: '忘记密码?',
+      otherSignIn: '其他登录方式',
+      // notify
+      loginSuccessTitle: '登录成功',
+      loginSuccessDesc: '欢迎回来',
+      // placeholder
+      accountPlaceholder: '请输入账号',
+      passwordPlaceholder: '请输入密码',
+      smsPlaceholder: '请输入验证码',
+      mobilePlaceholder: '请输入手机号码',
+      policyPlaceholder: '勾选后才能注册',
+      diffPwd: '两次输入密码不一致',
+      userName: '账号',
+      password: '密码',
+      confirmPassword: '确认密码',
+      email: '邮箱',
+      smsCode: '短信验证码',
+      mobile: '手机号码'
+    }
+  },
+  profile: {
+    user: {
+      title: '个人信息',
+      username: '用户名称',
+      nickname: '用户昵称',
+      mobile: '手机号码',
+      email: '用户邮箱',
+      dept: '所属部门',
+      posts: '所属岗位',
+      roles: '所属角色',
+      sex: '性别',
+      man: '男',
+      woman: '女',
+      createTime: '创建日期'
+    },
+    info: {
+      title: '基本信息',
+      basicInfo: '基本资料',
+      resetPwd: '修改密码',
+      userSocial: '社交信息'
+    },
+    rules: {
+      nickname: '请输入用户昵称',
+      mail: '请输入邮箱地址',
+      truemail: '请输入正确的邮箱地址',
+      phone: '请输入正确的手机号码',
+      truephone: '请输入正确的手机号码'
+    },
+    password: {
+      oldPassword: '旧密码',
+      newPassword: '新密码',
+      confirmPassword: '确认密码',
+      oldPwdMsg: '请输入旧密码',
+      newPwdMsg: '请输入新密码',
+      cfPwdMsg: '请输入确认密码',
+      pwdRules: '长度在 6 到 20 个字符',
+      diffPwd: '两次输入密码不一致'
+    }
+  },
+  cropper: {
+    selectImage: '选择图片',
+    uploadSuccess: '上传成功',
+    modalTitle: '头像上传',
+    okText: '确认并上传',
+    btn_reset: '重置',
+    btn_rotate_left: '逆时针旋转',
+    btn_rotate_right: '顺时针旋转',
+    btn_scale_x: '水平翻转',
+    btn_scale_y: '垂直翻转',
+    btn_zoom_in: '放大',
+    btn_zoom_out: '缩小',
+    preview: '预览'
+  }
+}
diff --git a/src/main.ts b/src/main.ts
new file mode 100644
index 000000000..5ba59e543
--- /dev/null
+++ b/src/main.ts
@@ -0,0 +1,76 @@
+// 引入unocss css
+import '@/plugins/unocss'
+
+// 导入全局的svg图标
+import '@/plugins/svgIcon'
+
+// 初始化多语言
+import { setupI18n } from '@/plugins/vueI18n'
+
+// 引入状态管理
+import { setupStore } from '@/store'
+
+// 全局组件
+import { setupGlobCom } from '@/components'
+
+// 引入 element-plus
+import { setupElementPlus } from '@/plugins/elementPlus'
+
+// 引入 form-create
+import { setupFormCreate } from '@/plugins/formCreate'
+
+// 引入全局样式
+import '@/styles/index.scss'
+
+// 引入动画
+import '@/plugins/animate.css'
+
+// 路由
+import router, { setupRouter } from '@/router'
+
+// 权限
+import { setupAuth } from '@/directives'
+
+import { createApp } from 'vue'
+
+import App from './App.vue'
+
+import './permission'
+
+import '@/plugins/tongji' // 百度统计
+import Logger from '@/utils/Logger'
+
+import VueDOMPurifyHTML from 'vue-dompurify-html' // 解决v-html 的安全隐患
+
+import DataVVue3 from '@kjgl77/datav-vue3'
+
+// 创建实例
+const setupAll = async () => {
+  const app = createApp(App)
+
+  await setupI18n(app)
+
+  setupStore(app)
+
+  setupGlobCom(app)
+
+  setupElementPlus(app)
+
+  setupFormCreate(app)
+
+  setupRouter(app)
+
+  setupAuth(app)
+
+  await router.isReady()
+
+  app.use(VueDOMPurifyHTML)
+  app.use(DataVVue3)
+
+  app.mount('#app')
+  app.config.warnHandler = () => null;
+}
+
+setupAll()
+
+Logger.prettyPrimary(`欢迎使用`, import.meta.env.VITE_APP_TITLE)
diff --git a/src/permission.ts b/src/permission.ts
new file mode 100644
index 000000000..0698dc880
--- /dev/null
+++ b/src/permission.ts
@@ -0,0 +1,70 @@
+import router from './router'
+import type { RouteRecordRaw } from 'vue-router'
+import { isRelogin } from '@/config/axios/service'
+import { getAccessToken } from '@/utils/auth'
+import { useTitle } from '@/hooks/web/useTitle'
+import { useNProgress } from '@/hooks/web/useNProgress'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { useDictStoreWithOut } from '@/store/modules/dict'
+import { useUserStoreWithOut } from '@/store/modules/user'
+import { usePermissionStoreWithOut } from '@/store/modules/permission'
+
+const { start, done } = useNProgress()
+
+const { loadStart, loadDone } = usePageLoading()
+// 路由不重定向白名单
+const whiteList = [
+  '/login',
+  '/social-login',
+  '/auth-redirect',
+  '/bind',
+  '/register',
+  '/oauthLogin/gitee'
+]
+
+// 路由加载前
+router.beforeEach(async (to, from, next) => {
+  start()
+  loadStart()
+  if (getAccessToken()) {
+    if (to.path === '/login') {
+      next({ path: '/' })
+    } else {
+      // 获取所有字典
+      const dictStore = useDictStoreWithOut()
+      const userStore = useUserStoreWithOut()
+      const permissionStore = usePermissionStoreWithOut()
+      if (!dictStore.getIsSetDict) {
+        await dictStore.setDictMap()
+      }
+      if (!userStore.getIsSetUser) {
+        isRelogin.show = true
+        await userStore.setUserInfoAction()
+        isRelogin.show = false
+        // 后端过滤菜单
+        await permissionStore.generateRoutes()
+        permissionStore.getAddRouters.forEach((route) => {
+          router.addRoute(route as unknown as RouteRecordRaw) // 动态添加可访问路由表
+        })
+        const redirectPath = from.query.redirect || to.path
+        const redirect = decodeURIComponent(redirectPath as string)
+        const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
+        next(nextData)
+      } else {
+        next()
+      }
+    }
+  } else {
+    if (whiteList.indexOf(to.path) !== -1) {
+      next()
+    } else {
+      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+    }
+  }
+})
+
+router.afterEach((to) => {
+  useTitle(to?.meta?.title as string)
+  done() // 结束Progress
+  loadDone()
+})
diff --git a/src/plugins/animate.css/index.ts b/src/plugins/animate.css/index.ts
new file mode 100644
index 000000000..3e9345131
--- /dev/null
+++ b/src/plugins/animate.css/index.ts
@@ -0,0 +1 @@
+import 'animate.css'
diff --git a/src/plugins/echarts/index.ts b/src/plugins/echarts/index.ts
new file mode 100644
index 000000000..bfccbb481
--- /dev/null
+++ b/src/plugins/echarts/index.ts
@@ -0,0 +1,45 @@
+import * as echarts from 'echarts/core'
+
+import {
+  BarChart,
+  LineChart,
+  PieChart,
+  MapChart,
+  PictorialBarChart,
+  RadarChart,
+  GaugeChart
+} from 'echarts/charts'
+
+import {
+  TitleComponent,
+  TooltipComponent,
+  GridComponent,
+  PolarComponent,
+  AriaComponent,
+  ParallelComponent,
+  LegendComponent,
+  ToolboxComponent
+} from 'echarts/components'
+
+import { CanvasRenderer } from 'echarts/renderers'
+
+echarts.use([
+  LegendComponent,
+  TitleComponent,
+  TooltipComponent,
+  ToolboxComponent,
+  GridComponent,
+  PolarComponent,
+  AriaComponent,
+  ParallelComponent,
+  BarChart,
+  LineChart,
+  PieChart,
+  MapChart,
+  CanvasRenderer,
+  PictorialBarChart,
+  RadarChart,
+  GaugeChart
+])
+
+export default echarts
diff --git a/src/plugins/elementPlus/index.ts b/src/plugins/elementPlus/index.ts
new file mode 100644
index 000000000..0ae2a8b20
--- /dev/null
+++ b/src/plugins/elementPlus/index.ts
@@ -0,0 +1,17 @@
+import type { App } from 'vue'
+// 需要全局引入一些组件，如ElScrollbar，不然一些下拉项样式有问题
+import { ElLoading, ElScrollbar, ElButton } from 'element-plus'
+
+const plugins = [ElLoading]
+
+const components = [ElScrollbar, ElButton]
+
+export const setupElementPlus = (app: App<Element>) => {
+  plugins.forEach((plugin) => {
+    app.use(plugin)
+  })
+
+  components.forEach((component) => {
+    app.component(component.name, component)
+  })
+}
diff --git a/src/plugins/formCreate/index.ts b/src/plugins/formCreate/index.ts
new file mode 100644
index 000000000..a6cb8213f
--- /dev/null
+++ b/src/plugins/formCreate/index.ts
@@ -0,0 +1,43 @@
+import type { App } from 'vue'
+// 👇使用 form-create 需额外全局引入 element plus 组件
+import {
+  ElAside,
+  ElPopconfirm,
+  ElHeader,
+  ElMain,
+  ElContainer,
+  ElDivider,
+  ElTransfer,
+  ElAlert,
+  ElTabs,
+  ElTable,
+  ElTableColumn,
+  ElTabPane
+} from 'element-plus'
+
+import formCreate from '@form-create/element-ui'
+import install from '@form-create/element-ui/auto-import'
+
+const components = [
+  ElAside,
+  ElPopconfirm,
+  ElHeader,
+  ElMain,
+  ElContainer,
+  ElDivider,
+  ElTransfer,
+  ElAlert,
+  ElTabs,
+  ElTable,
+  ElTableColumn,
+  ElTabPane
+]
+
+// 参考 http://www.form-create.com/v3/element-ui/auto-import.html 文档
+export const setupFormCreate = (app: App<Element>) => {
+  components.forEach((component) => {
+    app.component(component.name, component)
+  })
+  formCreate.use(install)
+  app.use(formCreate)
+}
diff --git a/src/plugins/svgIcon/index.ts b/src/plugins/svgIcon/index.ts
new file mode 100644
index 000000000..b5b7f70d5
--- /dev/null
+++ b/src/plugins/svgIcon/index.ts
@@ -0,0 +1,3 @@
+import 'virtual:svg-icons-register'
+
+import '@purge-icons/generated'
diff --git a/src/plugins/tongji/index.ts b/src/plugins/tongji/index.ts
new file mode 100644
index 000000000..ec261a16e
--- /dev/null
+++ b/src/plugins/tongji/index.ts
@@ -0,0 +1,23 @@
+import router from '@/router'
+
+// 用于 router push
+window._hmt = window._hmt || []
+// HM_ID
+const HM_ID = import.meta.env.VITE_APP_BAIDU_CODE
+;(function () {
+  // 有值的时候，才开启
+  if (!HM_ID) {
+    return
+  }
+  const hm = document.createElement('script')
+  hm.src = 'https://hm.baidu.com/hm.js?' + HM_ID
+  const s = document.getElementsByTagName('script')[0]
+  s.parentNode.insertBefore(hm, s)
+})()
+
+router.afterEach(function (to) {
+  if (!HM_ID) {
+    return
+  }
+  _hmt.push(['_trackPageview', to.fullPath])
+})
diff --git a/src/plugins/unocss/index.ts b/src/plugins/unocss/index.ts
new file mode 100644
index 000000000..d366b5a2f
--- /dev/null
+++ b/src/plugins/unocss/index.ts
@@ -0,0 +1 @@
+import 'virtual:uno.css'
diff --git a/src/plugins/vueI18n/helper.ts b/src/plugins/vueI18n/helper.ts
new file mode 100644
index 000000000..da6bc8c90
--- /dev/null
+++ b/src/plugins/vueI18n/helper.ts
@@ -0,0 +1,3 @@
+export const setHtmlPageLang = (locale: LocaleType) => {
+  document.querySelector('html')?.setAttribute('lang', locale)
+}
diff --git a/src/plugins/vueI18n/index.ts b/src/plugins/vueI18n/index.ts
new file mode 100644
index 000000000..f845b13f7
--- /dev/null
+++ b/src/plugins/vueI18n/index.ts
@@ -0,0 +1,42 @@
+import type { App } from 'vue'
+import { createI18n } from 'vue-i18n'
+import { useLocaleStoreWithOut } from '@/store/modules/locale'
+import type { I18n, I18nOptions } from 'vue-i18n'
+import { setHtmlPageLang } from './helper'
+
+export let i18n: ReturnType<typeof createI18n>
+
+const createI18nOptions = async (): Promise<I18nOptions> => {
+  const localeStore = useLocaleStoreWithOut()
+  const locale = localeStore.getCurrentLocale
+  const localeMap = localeStore.getLocaleMap
+  const defaultLocal = await import(`../../locales/${locale.lang}.ts`)
+  const message = defaultLocal.default ?? {}
+
+  setHtmlPageLang(locale.lang)
+
+  localeStore.setCurrentLocale({
+    lang: locale.lang
+    // elLocale: elLocal
+  })
+
+  return {
+    legacy: false,
+    locale: locale.lang,
+    fallbackLocale: locale.lang,
+    messages: {
+      [locale.lang]: message
+    },
+    availableLocales: localeMap.map((v) => v.lang),
+    sync: true,
+    silentTranslationWarn: true,
+    missingWarn: false,
+    silentFallbackWarn: true
+  }
+}
+
+export const setupI18n = async (app: App<Element>) => {
+  const options = await createI18nOptions()
+  i18n = createI18n(options) as I18n
+  app.use(i18n)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
new file mode 100644
index 000000000..8f66ca31f
--- /dev/null
+++ b/src/router/index.ts
@@ -0,0 +1,28 @@
+import type { App } from 'vue'
+import type { RouteRecordRaw } from 'vue-router'
+import { createRouter, createWebHistory } from 'vue-router'
+import remainingRouter from './modules/remaining'
+
+// 创建路由实例
+const router = createRouter({
+  history: createWebHistory(), // createWebHashHistory URL带#，createWebHistory URL不带#
+  strict: true,
+  routes: remainingRouter as RouteRecordRaw[],
+  scrollBehavior: () => ({ left: 0, top: 0 })
+})
+
+export const resetRouter = (): void => {
+  const resetWhiteNameList = ['Redirect', 'Login', 'NoFind', 'Root']
+  router.getRoutes().forEach((route) => {
+    const { name } = route
+    if (name && !resetWhiteNameList.includes(name as string)) {
+      router.hasRoute(name) && router.removeRoute(name)
+    }
+  })
+}
+
+export const setupRouter = (app: App<Element>) => {
+  app.use(router)
+}
+
+export default router
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
new file mode 100644
index 000000000..ef71f7952
--- /dev/null
+++ b/src/router/modules/remaining.ts
@@ -0,0 +1,370 @@
+import { Layout } from '@/utils/routerHelper'
+
+const { t } = useI18n()
+/**
+ * redirect: noredirect        当设置 noredirect 的时候该路由在面包屑导航中不可被点击
+ * name:'router-name'          设定路由的名字，一定要填写不然使用<keep-alive>时会出现各种问题
+ * meta : {
+ hidden: true              当设置 true 的时候该路由不会再侧边栏出现 如404，login等页面(默认 false)
+
+ alwaysShow: true          当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式，
+ 只有一个时，会将那个子路由当做根路由显示在侧边栏，
+ 若你想不管路由下面的 children 声明的个数都显示你的根路由，
+ 你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，
+ 一直显示根路由(默认 false)
+
+ title: 'title'            设置该路由在侧边栏和面包屑中展示的名字
+
+ icon: 'svg-name'          设置该路由的图标
+
+ noCache: true             如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
+
+ breadcrumb: false         如果设置为false，则不会在breadcrumb面包屑中显示(默认 true)
+
+ affix: true               如果设置为true，则会一直固定在tag项中(默认 false)
+
+ noTagsView: true          如果设置为true，则不会出现在tag中(默认 false)
+
+ activeMenu: '/dashboard'  显示高亮的路由路径
+
+ followAuth: '/dashboard'  跟随哪个路由进行权限过滤
+
+ canTo: true               设置为true即使hidden为true，也依然可以进行路由跳转(默认 false)
+ }
+ **/
+const remainingRouter: AppRouteRecordRaw[] = [
+  {
+    path: '/redirect',
+    component: Layout,
+    name: 'Redirect',
+    children: [
+      {
+        path: '/redirect/:path(.*)',
+        name: 'Redirect',
+        component: () => import('@/views/redirect/redirect.vue'),
+        meta: {}
+      }
+    ],
+    meta: {
+      hidden: true,
+      noTagsView: true
+    }
+  },
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/index',
+    name: 'Home',
+    meta: {},
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/home/index.vue'),
+        name: 'Index',
+        meta: {
+          title: t('router.home'),
+          icon: 'ep:home-filled',
+          noCache: false,
+          affix: true
+        }
+      }
+    ]
+  },
+  {
+    path: '/user',
+    component: Layout,
+    name: 'UserInfo',
+    meta: {
+      hidden: true
+    },
+    children: [
+      {
+        path: 'profile',
+        component: () => import('@/views/profile/index.vue'),
+        name: 'Profile',
+        meta: {
+          canTo: true,
+          hidden: true,
+          noTagsView: false,
+          icon: 'ep:user',
+          title: t('common.profile')
+        }
+      },
+      {
+        path: 'notify-message',
+        component: () => import('@/views/system/notify/my/index.vue'),
+        name: 'MyNotifyMessage',
+        meta: {
+          canTo: true,
+          hidden: true,
+          noTagsView: false,
+          icon: 'ep:message',
+          title: '我的站内信'
+        }
+      }
+    ]
+  },
+
+  {
+    path: '/dict',
+    component: Layout,
+    name: 'dict',
+    meta: {
+      hidden: true
+    },
+    children: [
+      {
+        path: 'type/data/:dictType',
+        component: () => import('@/views/system/dict/data/index.vue'),
+        name: 'SystemDictData',
+        meta: {
+          title: '字典数据',
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          icon: '',
+          activeMenu: '/system/dict'
+        }
+      }
+    ]
+  },
+
+  {
+    path: '/codegen',
+    component: Layout,
+    name: 'CodegenEdit',
+    meta: {
+      hidden: true
+    },
+    children: [
+      {
+        path: 'edit',
+        component: () => import('@/views/infra/codegen/editTable.vue'),
+        name: 'InfraCodegenEditTable',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          icon: 'ep:edit',
+          title: '修改生成配置',
+          activeMenu: 'infra/codegen/index'
+        }
+      }
+    ]
+  },
+  {
+    path: '/job',
+    component: Layout,
+    name: 'JobL',
+    meta: {
+      hidden: true
+    },
+    children: [
+      {
+        path: 'job-log',
+        component: () => import('@/views/infra/job/logger/index.vue'),
+        name: 'InfraJobLog',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          icon: 'ep:edit',
+          title: '调度日志',
+          activeMenu: 'infra/job/index'
+        }
+      }
+    ]
+  },
+  {
+    path: '/login',
+    component: () => import('@/views/login/login.vue'),
+    name: 'Login',
+    meta: {
+      hidden: true,
+      title: t('router.login'),
+      noTagsView: true
+    }
+  },
+  {
+    path: '/sso',
+    component: () => import('@/views/login/login.vue'),
+    name: 'SSOLogin',
+    meta: {
+      hidden: true,
+      title: t('router.login'),
+      noTagsView: true
+    }
+  },
+  {
+    path: '/403',
+    component: () => import('@/views/error/403.vue'),
+    name: 'NoAccess',
+    meta: {
+      hidden: true,
+      title: '403',
+      noTagsView: true
+    }
+  },
+  {
+    path: '/404',
+    component: () => import('@/views/error/404.vue'),
+    name: 'NoFound',
+    meta: {
+      hidden: true,
+      title: '404',
+      noTagsView: true
+    }
+  },
+  {
+    path: '/500',
+    component: () => import('@/views/error/500.vue'),
+    name: 'Error',
+    meta: {
+      hidden: true,
+      title: '500',
+      noTagsView: true
+    }
+  },
+  {
+    path: '/bpm',
+    component: Layout,
+    name: 'bpm',
+    meta: {
+      hidden: true
+    },
+    children: [
+      {
+        path: '/manager/form/edit',
+        component: () => import('@/views/bpm/form/editor/index.vue'),
+        name: 'BpmFormEditor',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          title: '设计流程表单',
+          activeMenu: '/bpm/manager/form'
+        }
+      },
+      {
+        path: '/manager/model/edit',
+        component: () => import('@/views/bpm/model/editor/index.vue'),
+        name: 'BpmModelEditor',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          title: '设计流程',
+          activeMenu: '/bpm/manager/model'
+        }
+      },
+      {
+        path: '/manager/definition',
+        component: () => import('@/views/bpm/definition/index.vue'),
+        name: 'BpmProcessDefinition',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          title: '流程定义',
+          activeMenu: '/bpm/manager/model'
+        }
+      },
+      {
+        path: '/manager/task-assign-rule',
+        component: () => import('@/views/bpm/taskAssignRule/index.vue'),
+        name: 'BpmTaskAssignRuleList',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          title: '任务分配规则'
+        }
+      },
+      {
+        path: '/process-instance/create',
+        component: () => import('@/views/bpm/processInstance/create/index.vue'),
+        name: 'BpmProcessInstanceCreate',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          title: '发起流程',
+          activeMenu: 'bpm/processInstance/create'
+        }
+      },
+      {
+        path: '/process-instance/detail',
+        component: () => import('@/views/bpm/processInstance/detail/index.vue'),
+        name: 'BpmProcessInstanceDetail',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          title: '流程详情',
+          activeMenu: 'bpm/processInstance/detail'
+        }
+      },
+      {
+        path: '/bpm/oa/leave/create',
+        component: () => import('@/views/bpm/oa/leave/create.vue'),
+        name: 'OALeaveCreate',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          title: '发起 OA 请假',
+          activeMenu: '/bpm/oa/leave'
+        }
+      },
+      {
+        path: '/bpm/oa/leave/detail',
+        component: () => import('@/views/bpm/oa/leave/detail.vue'),
+        name: 'OALeaveDetail',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          title: '查看 OA 请假',
+          activeMenu: '/bpm/oa/leave'
+        }
+      }
+    ]
+  },
+  {
+    path: '/wms',
+    component: Layout,
+    name: 'wms',
+    meta: {
+      hidden: true
+    },
+    children: [
+      // {
+      //   path: '/wms/itembasic-manage/itembasic-detail',
+      //   component: () => import('@/views/wms/itembasic/ItembasicDetail.vue'),
+      //   name: 'ItembasicDetail',
+      //   meta: {
+      //     noCache: true,
+      //     hidden: true,
+      //     canTo: true,
+      //     title: '物料详情',
+      //     activeMenu: '/wms/itembasic-manage/itembasic'
+      //   }
+      // },
+      // {
+      //   path: '/wms/itempackaging-manage/itempackaging-detail',
+      //   component: () => import('@/views/wms/itempackaging/ItempackagingDetail.vue'),
+      //   name: 'ItempackagingDetail',
+      //   meta: {
+      //     noCache: true,
+      //     hidden: true,
+      //     canTo: true,
+      //     title: '包装详情',
+      //     activeMenu: '/wms/itempackaging-manage/itempackaging'
+      //   }
+      // }
+      
+    ]
+  },
+]
+
+export default remainingRouter
diff --git a/src/store/index.ts b/src/store/index.ts
new file mode 100644
index 000000000..65964ea8f
--- /dev/null
+++ b/src/store/index.ts
@@ -0,0 +1,10 @@
+import type { App } from 'vue'
+import { createPinia } from 'pinia'
+
+const store = createPinia()
+
+export const setupStore = (app: App<Element>) => {
+  app.use(store)
+}
+
+export { store }
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
new file mode 100644
index 000000000..2663e1280
--- /dev/null
+++ b/src/store/modules/app.ts
@@ -0,0 +1,276 @@
+import { defineStore } from 'pinia'
+import { store } from '../index'
+import { setCssVar, humpToUnderline } from '@/utils'
+import { ElMessage } from 'element-plus'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ElementPlusSize } from '@/types/elementPlus'
+import { LayoutType } from '@/types/layout'
+import { ThemeTypes } from '@/types/theme'
+
+const { wsCache } = useCache()
+
+interface AppState {
+  breadcrumb: boolean
+  breadcrumbIcon: boolean
+  collapse: boolean
+  uniqueOpened: boolean
+  hamburger: boolean
+  screenfull: boolean
+  search: boolean
+  size: boolean
+  locale: boolean
+  message: boolean
+  tagsView: boolean
+  tagsViewIcon: boolean
+  logo: boolean
+  fixedHeader: boolean
+  greyMode: boolean
+  pageLoading: boolean
+  layout: LayoutType
+  title: string
+  userInfo: string
+  isDark: boolean
+  currentSize: ElementPlusSize
+  sizeMap: ElementPlusSize[]
+  mobile: boolean
+  footer: boolean
+  theme: ThemeTypes
+  fixedMenu: boolean
+}
+
+export const useAppStore = defineStore('app', {
+  state: (): AppState => {
+    return {
+      userInfo: 'userInfo', // 登录信息存储字段-建议每个项目换一个字段，避免与其他项目冲突
+      sizeMap: ['default', 'large', 'small'],
+      mobile: false, // 是否是移动端
+      title: import.meta.env.VITE_APP_TITLE, // 标题
+      pageLoading: false, // 路由跳转loading
+
+      breadcrumb: true, // 面包屑
+      breadcrumbIcon: true, // 面包屑图标
+      collapse: false, // 折叠菜单
+      uniqueOpened: true, // 是否只保持一个子菜单的展开
+      hamburger: true, // 折叠图标
+      screenfull: true, // 全屏图标
+      search: true, // 搜索图标
+      size: true, // 尺寸图标
+      locale: true, // 多语言图标
+      message: true, // 消息图标
+      tagsView: true, // 标签页
+      tagsViewIcon: true, // 是否显示标签图标
+      logo: true, // logo
+      fixedHeader: true, // 固定toolheader
+      footer: false, // 显示页脚
+      greyMode: false, // 是否开始灰色模式，用于特殊悼念日
+      fixedMenu: wsCache.get('fixedMenu') || false, // 是否固定菜单
+
+      layout: wsCache.get(CACHE_KEY.LAYOUT) || 'classic', // layout布局
+      isDark: wsCache.get(CACHE_KEY.IS_DARK) || false, // 是否是暗黑模式
+      currentSize: wsCache.get('default') || 'default', // 组件尺寸
+      theme: wsCache.get(CACHE_KEY.THEME) || {
+        // 主题色
+        elColorPrimary: '#409eff',
+        // 左侧菜单边框颜色
+        leftMenuBorderColor: 'inherit',
+        // 左侧菜单背景颜色
+        leftMenuBgColor: '#001529',
+        // 左侧菜单浅色背景颜色
+        leftMenuBgLightColor: '#0f2438',
+        // 左侧菜单选中背景颜色
+        leftMenuBgActiveColor: 'var(--el-color-primary)',
+        // 左侧菜单收起选中背景颜色
+        leftMenuCollapseBgActiveColor: 'var(--el-color-primary)',
+        // 左侧菜单字体颜色
+        leftMenuTextColor: '#bfcbd9',
+        // 左侧菜单选中字体颜色
+        leftMenuTextActiveColor: '#fff',
+        // logo字体颜色
+        logoTitleTextColor: '#fff',
+        // logo边框颜色
+        logoBorderColor: 'inherit',
+        // 头部背景颜色
+        topHeaderBgColor: '#fff',
+        // 头部字体颜色
+        topHeaderTextColor: 'inherit',
+        // 头部悬停颜色
+        topHeaderHoverColor: '#f6f6f6',
+        // 头部边框颜色
+        topToolBorderColor: '#eee'
+      }
+    }
+  },
+  getters: {
+    getBreadcrumb(): boolean {
+      return this.breadcrumb
+    },
+    getBreadcrumbIcon(): boolean {
+      return this.breadcrumbIcon
+    },
+    getCollapse(): boolean {
+      return this.collapse
+    },
+    getUniqueOpened(): boolean {
+      return this.uniqueOpened
+    },
+    getHamburger(): boolean {
+      return this.hamburger
+    },
+    getScreenfull(): boolean {
+      return this.screenfull
+    },
+    getSize(): boolean {
+      return this.size
+    },
+    getLocale(): boolean {
+      return this.locale
+    },
+    getMessage(): boolean {
+      return this.message
+    },
+    getTagsView(): boolean {
+      return this.tagsView
+    },
+    getTagsViewIcon(): boolean {
+      return this.tagsViewIcon
+    },
+    getLogo(): boolean {
+      return this.logo
+    },
+    getFixedHeader(): boolean {
+      return this.fixedHeader
+    },
+    getGreyMode(): boolean {
+      return this.greyMode
+    },
+    getFixedMenu(): boolean {
+      return this.fixedMenu
+    },
+    getPageLoading(): boolean {
+      return this.pageLoading
+    },
+    getLayout(): LayoutType {
+      return this.layout
+    },
+    getTitle(): string {
+      return this.title
+    },
+    getUserInfo(): string {
+      return this.userInfo
+    },
+    getIsDark(): boolean {
+      return this.isDark
+    },
+    getCurrentSize(): ElementPlusSize {
+      return this.currentSize
+    },
+    getSizeMap(): ElementPlusSize[] {
+      return this.sizeMap
+    },
+    getMobile(): boolean {
+      return this.mobile
+    },
+    getTheme(): ThemeTypes {
+      return this.theme
+    },
+    getFooter(): boolean {
+      return this.footer
+    }
+  },
+  actions: {
+    setBreadcrumb(breadcrumb: boolean) {
+      this.breadcrumb = breadcrumb
+    },
+    setBreadcrumbIcon(breadcrumbIcon: boolean) {
+      this.breadcrumbIcon = breadcrumbIcon
+    },
+    setCollapse(collapse: boolean) {
+      this.collapse = collapse
+    },
+    setUniqueOpened(uniqueOpened: boolean) {
+      this.uniqueOpened = uniqueOpened
+    },
+    setHamburger(hamburger: boolean) {
+      this.hamburger = hamburger
+    },
+    setScreenfull(screenfull: boolean) {
+      this.screenfull = screenfull
+    },
+    setSize(size: boolean) {
+      this.size = size
+    },
+    setLocale(locale: boolean) {
+      this.locale = locale
+    },
+    setMessage(message: boolean) {
+      this.message = message
+    },
+    setTagsView(tagsView: boolean) {
+      this.tagsView = tagsView
+    },
+    setTagsViewIcon(tagsViewIcon: boolean) {
+      this.tagsViewIcon = tagsViewIcon
+    },
+    setLogo(logo: boolean) {
+      this.logo = logo
+    },
+    setFixedHeader(fixedHeader: boolean) {
+      this.fixedHeader = fixedHeader
+    },
+    setGreyMode(greyMode: boolean) {
+      this.greyMode = greyMode
+    },
+    setFixedMenu(fixedMenu: boolean) {
+      wsCache.set('fixedMenu', fixedMenu)
+      this.fixedMenu = fixedMenu
+    },
+    setPageLoading(pageLoading: boolean) {
+      this.pageLoading = pageLoading
+    },
+    setLayout(layout: LayoutType) {
+      if (this.mobile && layout !== 'classic') {
+        ElMessage.warning('移动端模式下不支持切换其他布局')
+        return
+      }
+      this.layout = layout
+      wsCache.set(CACHE_KEY.LAYOUT, this.layout)
+    },
+    setTitle(title: string) {
+      this.title = title
+    },
+    setIsDark(isDark: boolean) {
+      this.isDark = isDark
+      if (this.isDark) {
+        document.documentElement.classList.add('dark')
+        document.documentElement.classList.remove('light')
+      } else {
+        document.documentElement.classList.add('light')
+        document.documentElement.classList.remove('dark')
+      }
+      wsCache.set(CACHE_KEY.IS_DARK, this.isDark)
+    },
+    setCurrentSize(currentSize: ElementPlusSize) {
+      this.currentSize = currentSize
+      wsCache.set('currentSize', this.currentSize)
+    },
+    setMobile(mobile: boolean) {
+      this.mobile = mobile
+    },
+    setTheme(theme: ThemeTypes) {
+      this.theme = Object.assign(this.theme, theme)
+      wsCache.set(CACHE_KEY.THEME, this.theme)
+    },
+    setCssVarTheme() {
+      for (const key in this.theme) {
+        setCssVar(`--${humpToUnderline(key)}`, this.theme[key])
+      }
+    },
+    setFooter(footer: boolean) {
+      this.footer = footer
+    }
+  }
+})
+
+export const useAppStoreWithOut = () => {
+  return useAppStore(store)
+}
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
new file mode 100644
index 000000000..822547bf9
--- /dev/null
+++ b/src/store/modules/dict.ts
@@ -0,0 +1,104 @@
+import { defineStore } from 'pinia'
+import { store } from '../index'
+// @ts-ignore
+import { DictDataVO } from '@/api/system/dict/types'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache('sessionStorage')
+import { listSimpleDictData } from '@/api/system/dict/dict.data'
+
+export interface DictValueType {
+  value: any
+  label: string
+  clorType?: string
+  cssClass?: string
+}
+export interface DictTypeType {
+  dictType: string
+  dictValue: DictValueType[]
+}
+export interface DictState {
+  dictMap: Map<string, any>
+  isSetDict: boolean
+}
+
+export const useDictStore = defineStore('dict', {
+  state: (): DictState => ({
+    dictMap: new Map<string, any>(),
+    isSetDict: false
+  }),
+  getters: {
+    getDictMap(): Recordable {
+      const dictMap = wsCache.get(CACHE_KEY.DICT_CACHE)
+      if (dictMap) {
+        this.dictMap = dictMap
+      }
+      return this.dictMap
+    },
+    getIsSetDict(): boolean {
+      return this.isSetDict
+    }
+  },
+  actions: {
+    async setDictMap() {
+      const dictMap = wsCache.get(CACHE_KEY.DICT_CACHE)
+      if (dictMap) {
+        this.dictMap = dictMap
+        this.isSetDict = true
+      } else {
+        const res = await listSimpleDictData()
+        // 设置数据
+        const dictDataMap = new Map<string, any>()
+        res.forEach((dictData: DictDataVO) => {
+          // 获得 dictType 层级
+          const enumValueObj = dictDataMap[dictData.dictType]
+          if (!enumValueObj) {
+            dictDataMap[dictData.dictType] = []
+          }
+          // 处理 dictValue 层级
+          dictDataMap[dictData.dictType].push({
+            value: dictData.value,
+            label: dictData.label,
+            colorType: dictData.colorType,
+            cssClass: dictData.cssClass
+          })
+        })
+        this.dictMap = dictDataMap
+        this.isSetDict = true
+        wsCache.set(CACHE_KEY.DICT_CACHE, dictDataMap, { exp: 60 }) // 60 秒 过期
+      }
+    },
+    getDictByType(type: string) {
+      if (!this.isSetDict) {
+        this.setDictMap()
+      }
+      return this.dictMap[type]
+    },
+    async resetDict() {
+      wsCache.delete(CACHE_KEY.DICT_CACHE)
+      const res = await listSimpleDictData()
+      // 设置数据
+      const dictDataMap = new Map<string, any>()
+      res.forEach((dictData: DictDataVO) => {
+        // 获得 dictType 层级
+        const enumValueObj = dictDataMap[dictData.dictType]
+        if (!enumValueObj) {
+          dictDataMap[dictData.dictType] = []
+        }
+        // 处理 dictValue 层级
+        dictDataMap[dictData.dictType].push({
+          value: dictData.value,
+          label: dictData.label,
+          colorType: dictData.colorType,
+          cssClass: dictData.cssClass
+        })
+      })
+      this.dictMap = dictDataMap
+      this.isSetDict = true
+      wsCache.set(CACHE_KEY.DICT_CACHE, dictDataMap, { exp: 60 }) // 60 秒 过期
+    }
+  }
+})
+
+export const useDictStoreWithOut = () => {
+  return useDictStore(store)
+}
diff --git a/src/store/modules/locale.ts b/src/store/modules/locale.ts
new file mode 100644
index 000000000..c0a020df5
--- /dev/null
+++ b/src/store/modules/locale.ts
@@ -0,0 +1,59 @@
+import { defineStore } from 'pinia'
+import { store } from '../index'
+import zhCn from 'element-plus/es/locale/lang/zh-cn'
+import en from 'element-plus/es/locale/lang/en'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { LocaleDropdownType } from '@/types/localeDropdown'
+
+const { wsCache } = useCache()
+
+const elLocaleMap = {
+  'zh-CN': zhCn,
+  en: en
+}
+interface LocaleState {
+  currentLocale: LocaleDropdownType
+  localeMap: LocaleDropdownType[]
+}
+
+export const useLocaleStore = defineStore('locales', {
+  state: (): LocaleState => {
+    return {
+      currentLocale: {
+        lang: wsCache.get(CACHE_KEY.LANG) || 'zh-CN',
+        elLocale: elLocaleMap[wsCache.get(CACHE_KEY.LANG) || 'zh-CN']
+      },
+      // 多语言
+      localeMap: [
+        {
+          lang: 'zh-CN',
+          name: '简体中文'
+        },
+        {
+          lang: 'en-US',
+          name: 'English'
+        }
+      ]
+    }
+  },
+  getters: {
+    getCurrentLocale(): LocaleDropdownType {
+      return this.currentLocale
+    },
+    getLocaleMap(): LocaleDropdownType[] {
+      return this.localeMap
+    }
+  },
+  actions: {
+    setCurrentLocale(localeMap: LocaleDropdownType) {
+      // this.locale = Object.assign(this.locale, localeMap)
+      this.currentLocale.lang = localeMap?.lang
+      this.currentLocale.elLocale = elLocaleMap[localeMap?.lang]
+      wsCache.set(CACHE_KEY.LANG, localeMap?.lang)
+    }
+  }
+})
+
+export const useLocaleStoreWithOut = () => {
+  return useLocaleStore(store)
+}
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
new file mode 100644
index 000000000..c729cea02
--- /dev/null
+++ b/src/store/modules/permission.ts
@@ -0,0 +1,67 @@
+import { defineStore } from 'pinia'
+import { store } from '../index'
+import { cloneDeep } from 'lodash-es'
+import remainingRouter from '@/router/modules/remaining'
+import { flatMultiLevelRoutes, generateRoute } from '@/utils/routerHelper'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+const { wsCache } = useCache()
+
+export interface PermissionState {
+  routers: AppRouteRecordRaw[]
+  addRouters: AppRouteRecordRaw[]
+  menuTabRouters: AppRouteRecordRaw[]
+}
+
+export const usePermissionStore = defineStore('permission', {
+  state: (): PermissionState => ({
+    routers: [],
+    addRouters: [],
+    menuTabRouters: []
+  }),
+  getters: {
+    getRouters(): AppRouteRecordRaw[] {
+      return this.routers
+    },
+    getAddRouters(): AppRouteRecordRaw[] {
+      return flatMultiLevelRoutes(cloneDeep(this.addRouters))
+    },
+    getMenuTabRouters(): AppRouteRecordRaw[] {
+      return this.menuTabRouters
+    }
+  },
+  actions: {
+    async generateRoutes(): Promise<unknown> {
+      return new Promise<void>(async (resolve) => {
+        // 获得菜单列表，它在登录的时候，setUserInfoAction 方法中已经进行获取
+        let res: AppCustomRouteRecordRaw[] = []
+        if (wsCache.get(CACHE_KEY.ROLE_ROUTERS)) {
+          res = wsCache.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
+        }
+        const routerMap: AppRouteRecordRaw[] = generateRoute(res)
+        // 动态路由，404一定要放到最后面
+        this.addRouters = routerMap.concat([
+          {
+            path: '/:path(.*)*',
+            redirect: '/404',
+            name: '404Page',
+            meta: {
+              hidden: true,
+              breadcrumb: false
+            }
+          }
+        ])
+        // 渲染菜单的所有路由
+        this.routers = cloneDeep(remainingRouter).concat(routerMap)
+        resolve()
+      })
+    },
+    setMenuTabRouters(routers: AppRouteRecordRaw[]): void {
+      this.menuTabRouters = routers
+    }
+  }
+})
+
+export const usePermissionStoreWithOut = () => {
+  return usePermissionStore(store)
+}
diff --git a/src/store/modules/tagsView.ts b/src/store/modules/tagsView.ts
new file mode 100644
index 000000000..a60d0e453
--- /dev/null
+++ b/src/store/modules/tagsView.ts
@@ -0,0 +1,140 @@
+import router from '@/router'
+import type { RouteLocationNormalizedLoaded } from 'vue-router'
+import { getRawRoute } from '@/utils/routerHelper'
+import { defineStore } from 'pinia'
+import { store } from '../index'
+import { findIndex } from '@/utils'
+
+export interface TagsViewState {
+  visitedViews: RouteLocationNormalizedLoaded[]
+  cachedViews: Set<string>
+}
+
+export const useTagsViewStore = defineStore('tagsView', {
+  state: (): TagsViewState => ({
+    visitedViews: [],
+    cachedViews: new Set()
+  }),
+  getters: {
+    getVisitedViews(): RouteLocationNormalizedLoaded[] {
+      return this.visitedViews
+    },
+    getCachedViews(): string[] {
+      return Array.from(this.cachedViews)
+    }
+  },
+  actions: {
+    // 新增缓存和tag
+    addView(view: RouteLocationNormalizedLoaded): void {
+      this.addVisitedView(view)
+      this.addCachedView()
+    },
+    // 新增tag
+    addVisitedView(view: RouteLocationNormalizedLoaded) {
+      if (this.visitedViews.some((v) => v.path === view.path)) return
+      if (view.meta?.noTagsView) return
+      this.visitedViews.push(
+        Object.assign({}, view, {
+          title: view.meta?.title || 'no-name'
+        })
+      )
+    },
+    // 新增缓存
+    addCachedView() {
+      const cacheMap: Set<string> = new Set()
+      for (const v of this.visitedViews) {
+        const item = getRawRoute(v)
+        const needCache = !item.meta?.noCache
+        if (!needCache) {
+          continue
+        }
+        const name = item.name as string
+        cacheMap.add(name)
+      }
+      if (Array.from(this.cachedViews).sort().toString() === Array.from(cacheMap).sort().toString())
+        return
+      this.cachedViews = cacheMap
+    },
+    // 删除某个
+    delView(view: RouteLocationNormalizedLoaded) {
+      this.delVisitedView(view)
+      this.delCachedView()
+    },
+    // 删除tag
+    delVisitedView(view: RouteLocationNormalizedLoaded) {
+      for (const [i, v] of this.visitedViews.entries()) {
+        if (v.path === view.path) {
+          this.visitedViews.splice(i, 1)
+          break
+        }
+      }
+    },
+    // 删除缓存
+    delCachedView() {
+      const route = router.currentRoute.value
+      const index = findIndex<string>(this.getCachedViews, (v) => v === route.name)
+      if (index > -1) {
+        this.cachedViews.delete(this.getCachedViews[index])
+      }
+    },
+    // 删除所有缓存和tag
+    delAllViews() {
+      this.delAllVisitedViews()
+      this.delCachedView()
+    },
+    // 删除所有tag
+    delAllVisitedViews() {
+      // const affixTags = this.visitedViews.filter((tag) => tag.meta.affix)
+      this.visitedViews = []
+    },
+    // 删除其他
+    delOthersViews(view: RouteLocationNormalizedLoaded) {
+      this.delOthersVisitedViews(view)
+      this.addCachedView()
+    },
+    // 删除其他tag
+    delOthersVisitedViews(view: RouteLocationNormalizedLoaded) {
+      this.visitedViews = this.visitedViews.filter((v) => {
+        return v?.meta?.affix || v.path === view.path
+      })
+    },
+    // 删除左侧
+    delLeftViews(view: RouteLocationNormalizedLoaded) {
+      const index = findIndex<RouteLocationNormalizedLoaded>(
+        this.visitedViews,
+        (v) => v.path === view.path
+      )
+      if (index > -1) {
+        this.visitedViews = this.visitedViews.filter((v, i) => {
+          return v?.meta?.affix || v.path === view.path || i > index
+        })
+        this.addCachedView()
+      }
+    },
+    // 删除右侧
+    delRightViews(view: RouteLocationNormalizedLoaded) {
+      const index = findIndex<RouteLocationNormalizedLoaded>(
+        this.visitedViews,
+        (v) => v.path === view.path
+      )
+      if (index > -1) {
+        this.visitedViews = this.visitedViews.filter((v, i) => {
+          return v?.meta?.affix || v.path === view.path || i < index
+        })
+        this.addCachedView()
+      }
+    },
+    updateVisitedView(view: RouteLocationNormalizedLoaded) {
+      for (let v of this.visitedViews) {
+        if (v.path === view.path) {
+          v = Object.assign(v, view)
+          break
+        }
+      }
+    }
+  }
+})
+
+export const useTagsViewStoreWithOut = () => {
+  return useTagsViewStore(store)
+}
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
new file mode 100644
index 000000000..2f54e5e4c
--- /dev/null
+++ b/src/store/modules/user.ts
@@ -0,0 +1,91 @@
+import { store } from '../index'
+import { defineStore } from 'pinia'
+import { getAccessToken, removeToken } from '@/utils/auth'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { getInfo, loginOut } from '@/api/login'
+import { getUserProfile } from '@/api/system/user/profile'
+
+const { wsCache } = useCache()
+
+interface UserVO {
+  id: number
+  avatar: string
+  nickname: string
+}
+interface UserInfoVO {
+  permissions: string[]
+  roles: string[]
+  isSetUser: boolean
+  user: UserVO
+  userSelfInfo:object
+}
+
+export const useUserStore = defineStore('admin-user', {
+  state: (): UserInfoVO => ({
+    permissions: [],
+    roles: [],
+    isSetUser: false,
+    user: {
+      id: 0,
+      avatar: '',
+      nickname: ''
+    },
+    userSelfInfo:{}
+  }),
+  getters: {
+    getPermissions(): string[] {
+      return this.permissions
+    },
+    getRoles(): string[] {
+      return this.roles
+    },
+    getIsSetUser(): boolean {
+      return this.isSetUser
+    },
+    getUser(): UserVO {
+      return this.user
+    },
+     getUserSelfInfo(): UserVO {
+      return this.userSelfInfo
+    }
+  },
+  actions: {
+    async setUserInfoAction() {
+      if (!getAccessToken()) {
+        this.resetState()
+        return null
+      }
+      let userInfo = wsCache.get(CACHE_KEY.USER)
+      if (!userInfo) {
+        userInfo = await getInfo()
+      }
+      this.userSelfInfo = await getUserProfile()
+      this.permissions = userInfo.permissions
+      this.roles = userInfo.roles
+      this.user = userInfo.user
+      this.isSetUser = true
+      wsCache.set(CACHE_KEY.USER, userInfo)
+      wsCache.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus)
+    },
+    async loginOut() {
+      await loginOut()
+      removeToken()
+      wsCache.clear()
+      this.resetState()
+    },
+    resetState() {
+      this.permissions = []
+      this.roles = []
+      this.isSetUser = false
+      this.user = {
+        id: 0,
+        avatar: '',
+        nickname: ''
+      }
+    }
+  }
+})
+
+export const useUserStoreWithOut = () => {
+  return useUserStore(store)
+}
diff --git a/src/styles/global.module.scss b/src/styles/global.module.scss
new file mode 100644
index 000000000..8448a9241
--- /dev/null
+++ b/src/styles/global.module.scss
@@ -0,0 +1,6 @@
+@import './variables.scss';
+// 导出变量
+:export {
+  namespace: $namespace;
+  elNamespace: $elNamespace;
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
new file mode 100644
index 000000000..0952bd07e
--- /dev/null
+++ b/src/styles/index.scss
@@ -0,0 +1,35 @@
+@import './var.css';
+@import 'element-plus/theme-chalk/dark/css-vars.css';
+
+.reset-margin [class*='el-icon'] + span {
+  margin-left: 2px !important;
+}
+
+// 解决抽屉弹出时，body宽度变化的问题
+.el-popup-parent--hidden {
+  width: 100% !important;
+}
+
+// 解决表格内容超过表格总宽度后，横向滚动条前端顶不到表格边缘的问题
+.el-scrollbar__bar {
+  display: flex;
+  justify-content: flex-start;
+}
+
+/* nprogress 适配 element-plus 的主题色 */
+#nprogress {
+  & .bar {
+    background-color: var(--el-color-primary) !important;
+  }
+
+  & .peg {
+    box-shadow:
+      0 0 10px var(--el-color-primary),
+      0 0 5px var(--el-color-primary) !important;
+  }
+
+  & .spinner-icon {
+    border-top-color: var(--el-color-primary);
+    border-left-color: var(--el-color-primary);
+  }
+}
diff --git a/src/styles/theme.scss b/src/styles/theme.scss
new file mode 100644
index 000000000..39b03b3dd
--- /dev/null
+++ b/src/styles/theme.scss
@@ -0,0 +1,6 @@
+// .text-color {
+//   color: var(--el-text-color-regular);
+// }
+// .dark .dark\:text-color {
+//   color: rgba(255, 255, 255, var(--dark-text-color));
+// }
diff --git a/src/styles/var.css b/src/styles/var.css
new file mode 100644
index 000000000..63459ba63
--- /dev/null
+++ b/src/styles/var.css
@@ -0,0 +1,66 @@
+:root {
+  --login-bg-color: #293146;
+
+  --left-menu-max-width: 200px;
+
+  --left-menu-min-width: 64px;
+
+  --left-menu-bg-color: #001529;
+
+  --left-menu-bg-light-color: #0f2438;
+
+  --left-menu-bg-active-color: var(--el-color-primary);
+
+  --left-menu-text-color: #bfcbd9;
+
+  --left-menu-text-active-color: #fff;
+
+  --left-menu-collapse-bg-active-color: var(--el-color-primary);
+  /* left menu end */
+
+  /* logo start */
+  --logo-height: 50px;
+
+  --logo-title-text-color: #fff;
+  /* logo end */
+
+  /* header start */
+  --top-header-bg-color: '#fff';
+
+  --top-header-text-color: 'inherit';
+
+  --top-header-hover-color: #f6f6f6;
+
+  --top-tool-height: var(--logo-height);
+
+  --top-tool-p-x: 0;
+
+  --tags-view-height: 35px;
+  /* header start */
+
+  /* tab menu start */
+  --tab-menu-max-width: 80px;
+
+  --tab-menu-min-width: 30px;
+
+  --tab-menu-collapse-height: 36px;
+  /* tab menu end */
+
+  --app-content-padding: 20px;
+
+  --app-content-bg-color: #f5f7f9;
+
+  --app-footer-height: 50px;
+
+  --transition-time-02: 0.2s;
+}
+
+.dark {
+  --app-content-bg-color: var(--el-bg-color);
+}
+
+html,
+body {
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
new file mode 100644
index 000000000..00b66f1fc
--- /dev/null
+++ b/src/styles/variables.scss
@@ -0,0 +1,4 @@
+// 命名空间
+$namespace: v;
+// el命名空间
+$elNamespace: el;
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
new file mode 100644
index 000000000..8de1f3352
--- /dev/null
+++ b/src/types/components.d.ts
@@ -0,0 +1,56 @@
+export type ComponentName =
+  | 'Radio'
+  | 'RadioButton'
+  | 'Checkbox'
+  | 'CheckboxButton'
+  | 'Input'
+  | 'Autocomplete'
+  | 'InputNumber'
+  | 'Select'
+  | 'Cascader'
+  | 'Switch'
+  | 'Slider'
+  | 'TimePicker'
+  | 'DatePicker'
+  | 'Rate'
+  | 'ColorPicker'
+  | 'Transfer'
+  | 'Divider'
+  | 'TimeSelect'
+  | 'SelectV2'
+  | 'TreeSelect'
+  | 'InputPassword'
+  | 'Editor'
+  | 'UploadImg'
+  | 'UploadImgs'
+  | 'UploadFile'
+
+export type ColProps = {
+  span?: number
+  xs?: number
+  sm?: number
+  md?: number
+  lg?: number
+  xl?: number
+  tag?: string
+}
+
+export type ComponentOptions = {
+  label?: string
+  value?: FormValueType
+  disabled?: boolean
+  key?: string | number
+  children?: ComponentOptions[]
+  options?: ComponentOptions[]
+} & Recordable
+
+export type ComponentOptionsAlias = {
+  labelField?: string
+  valueField?: string
+}
+
+export type ComponentProps = {
+  optionsAlias?: ComponentOptionsAlias
+  options?: ComponentOptions[]
+  optionsSlot?: boolean
+} & Recordable
diff --git a/src/types/configGlobal.d.ts b/src/types/configGlobal.d.ts
new file mode 100644
index 000000000..f6d7b3c39
--- /dev/null
+++ b/src/types/configGlobal.d.ts
@@ -0,0 +1,4 @@
+import { ElementPlusSize } from './elementPlus'
+export interface ConfigGlobalTypes {
+  size?: ElementPlusSize
+}
diff --git a/src/types/contextMenu.d.ts b/src/types/contextMenu.d.ts
new file mode 100644
index 000000000..0738d0e35
--- /dev/null
+++ b/src/types/contextMenu.d.ts
@@ -0,0 +1,7 @@
+export type contextMenuSchema = {
+  disabled?: boolean
+  divided?: boolean
+  icon?: string
+  label: string
+  command?: (item: contextMenuSchema) => void
+}
diff --git a/src/types/descriptions.d.ts b/src/types/descriptions.d.ts
new file mode 100644
index 000000000..35c0b81be
--- /dev/null
+++ b/src/types/descriptions.d.ts
@@ -0,0 +1,13 @@
+export interface DescriptionsSchema {
+  span?: number // 占多少分
+  field: string // 字段名
+  label?: string // label名
+  width?: string | number
+  minWidth?: string | number
+  align?: 'left' | 'center' | 'right'
+  labelAlign?: 'left' | 'center' | 'right'
+  className?: string
+  labelClassName?: string
+  dateFormat?: string // add by 星语：支持时间的格式化
+  dictType?: string // add by 星语：支持 dict 字典数据
+}
diff --git a/src/types/elementPlus.d.ts b/src/types/elementPlus.d.ts
new file mode 100644
index 000000000..2c6b76e77
--- /dev/null
+++ b/src/types/elementPlus.d.ts
@@ -0,0 +1,3 @@
+export type ElementPlusSize = 'default' | 'small' | 'large'
+
+export type ElementPlusInfoType = 'success' | 'info' | 'warning' | 'danger'
diff --git a/src/types/form.d.ts b/src/types/form.d.ts
new file mode 100644
index 000000000..980c8cc6d
--- /dev/null
+++ b/src/types/form.d.ts
@@ -0,0 +1,44 @@
+import type { CSSProperties } from 'vue'
+import { ColProps, ComponentProps, ComponentName } from '@/types/components'
+import type { AxiosPromise } from 'axios'
+
+export type FormSetPropsType = {
+  field: string
+  path: string
+  value: any
+}
+
+export type FormValueType = string | number | string[] | number[] | boolean | undefined | null
+
+export type FormItemProps = {
+  labelWidth?: string | number
+  required?: boolean
+  rules?: Recordable
+  error?: string
+  showMessage?: boolean
+  inlineMessage?: boolean
+  style?: CSSProperties
+}
+
+export type FormSchema = {
+  // 唯一值
+  field: string
+  // 标题
+  label?: string
+  // 提示
+  labelMessage?: string
+  // col组件属性
+  colProps?: ColProps
+  // 表单组件属性，slots对应的是表单组件的插槽，规则：${field}-xxx，具体可以查看element-plus文档
+  componentProps?: { slots?: Recordable } & ComponentProps
+  // formItem组件属性
+  formItemProps?: FormItemProps
+  // 渲染的组件
+  component?: ComponentName
+  // 初始值
+  value?: FormValueType
+  // 是否隐藏
+  hidden?: boolean
+  // 远程加载下拉项
+  api?: <T = any>() => AxiosPromise<T>
+}
diff --git a/src/types/icon.d.ts b/src/types/icon.d.ts
new file mode 100644
index 000000000..d1ffcdb50
--- /dev/null
+++ b/src/types/icon.d.ts
@@ -0,0 +1,5 @@
+export interface IconTypes {
+  size?: number
+  color?: string
+  icon: string
+}
diff --git a/src/types/infoTip.d.ts b/src/types/infoTip.d.ts
new file mode 100644
index 000000000..6eff083dc
--- /dev/null
+++ b/src/types/infoTip.d.ts
@@ -0,0 +1,4 @@
+export interface TipSchema {
+  label: string
+  keys?: string[]
+}
diff --git a/src/types/layout.d.ts b/src/types/layout.d.ts
new file mode 100644
index 000000000..cad3e2af0
--- /dev/null
+++ b/src/types/layout.d.ts
@@ -0,0 +1 @@
+export type LayoutType = 'classic' | 'topLeft' | 'top' | 'cutMenu'
diff --git a/src/types/localeDropdown.d.ts b/src/types/localeDropdown.d.ts
new file mode 100644
index 000000000..c749dce72
--- /dev/null
+++ b/src/types/localeDropdown.d.ts
@@ -0,0 +1,10 @@
+export interface Language {
+  el: Recordable
+  name: string
+}
+
+export interface LocaleDropdownType {
+  lang: LocaleType
+  name?: string
+  elLocale?: Language
+}
diff --git a/src/types/qrcode.d.ts b/src/types/qrcode.d.ts
new file mode 100644
index 000000000..86cdf0b96
--- /dev/null
+++ b/src/types/qrcode.d.ts
@@ -0,0 +1,9 @@
+export interface QrcodeLogo {
+  src?: string
+  logoSize?: number
+  bgColor?: string
+  borderSize?: number
+  crossOrigin?: string
+  borderRadius?: number
+  logoRadius?: number
+}
diff --git a/src/types/table.d.ts b/src/types/table.d.ts
new file mode 100644
index 000000000..9cb4205b4
--- /dev/null
+++ b/src/types/table.d.ts
@@ -0,0 +1,44 @@
+export type TableColumn = {
+  field: string
+  label?: string
+  width?: number | string
+  fixed?: 'left' | 'right'
+  children?: TableColumn[]
+} & Recordable
+
+export type VxeTableColumn = {
+  field: string
+  title?: string
+  children?: TableColumn[]
+} & Recordable
+
+export type TableSlotDefault = {
+  row: Recordable
+  column: TableColumn
+  $index: number
+} & Recordable
+
+export interface Pagination {
+  small?: boolean
+  background?: boolean
+  pageSize?: number
+  defaultPageSize?: number
+  total?: number
+  pageCount?: number
+  pagerCount?: number
+  currentPage?: number
+  defaultCurrentPage?: number
+  layout?: string
+  pageSizes?: number[]
+  popperClass?: string
+  prevText?: string
+  nextText?: string
+  disabled?: boolean
+  hideOnSinglePage?: boolean
+}
+
+export interface TableSetPropsType {
+  field: string
+  path: string
+  value: any
+}
diff --git a/src/types/tableForm.d.ts b/src/types/tableForm.d.ts
new file mode 100644
index 000000000..598deb831
--- /dev/null
+++ b/src/types/tableForm.d.ts
@@ -0,0 +1,44 @@
+import type { CSSProperties } from 'vue'
+import { ColProps, ComponentProps, ComponentName } from '@/types/components'
+import type { AxiosPromise } from 'axios'
+
+export type TableFormSetPropsType = {
+  field: string
+  path: string
+  value: any
+}
+
+export type TableFormValueType = string | number | string[] | number[] | boolean | undefined | null
+
+export type TableFormItemProps = {
+  labelWidth?: string | number
+  required?: boolean
+  rules?: Recordable
+  error?: string
+  showMessage?: boolean
+  inlineMessage?: boolean
+  style?: CSSProperties
+}
+
+export type TableFormSchema = {
+  // 唯一值
+  field: string
+  // 标题
+  label?: string
+  // 提示
+  labelMessage?: string
+  // col组件属性
+  colProps?: ColProps
+  // 表单组件属性，slots对应的是表单组件的插槽，规则：${field}-xxx，具体可以查看element-plus文档
+  componentProps?: { slots?: Recordable } & ComponentProps
+  // formItem组件属性
+  formItemProps?: FormItemProps
+  // 渲染的组件
+  component?: ComponentName
+  // 初始值
+  value?: FormValueType
+  // 是否隐藏
+  hidden?: boolean
+  // 远程加载下拉项
+  api?: <T = any>() => AxiosPromise<T>
+}
diff --git a/src/types/theme.d.ts b/src/types/theme.d.ts
new file mode 100644
index 000000000..ad649b027
--- /dev/null
+++ b/src/types/theme.d.ts
@@ -0,0 +1,16 @@
+export type ThemeTypes = {
+  elColorPrimary?: string
+  leftMenuBorderColor?: string
+  leftMenuBgColor?: string
+  leftMenuBgLightColor?: string
+  leftMenuBgActiveColor?: string
+  leftMenuCollapseBgActiveColor?: string
+  leftMenuTextColor?: string
+  leftMenuTextActiveColor?: string
+  logoTitleTextColor?: string
+  logoBorderColor?: string
+  topHeaderBgColor?: string
+  topHeaderTextColor?: string
+  topHeaderHoverColor?: string
+  topToolBorderColor?: string
+}
diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
new file mode 100644
index 000000000..ca58df215
--- /dev/null
+++ b/src/utils/Logger.ts
@@ -0,0 +1,100 @@
+const isArray = function (obj: any): boolean {
+  return Object.prototype.toString.call(obj) === '[object Array]'
+}
+
+const Logger = () => {}
+
+Logger.typeColor = function (type: string) {
+  let color = ''
+  switch (type) {
+    case 'primary':
+      color = '#2d8cf0'
+      break
+    case 'success':
+      color = '#19be6b'
+      break
+    case 'info':
+      color = '#909399'
+      break
+    case 'warn':
+      color = '#ff9900'
+      break
+    case 'error':
+      color = '#f03f14'
+      break
+    default:
+      color = '#35495E'
+      break
+  }
+  return color
+}
+
+Logger.print = function (type = 'default', text: any, back = false) {
+  if (typeof text === 'object') {
+    // 如果是對象則調用打印對象方式
+    isArray(text) ? console.table(text) : console.dir(text)
+    return
+  }
+  if (back) {
+    // 如果是打印帶背景圖的
+    console.log(
+      `%c ${text} `,
+      `background:${Logger.typeColor(type)}; padding: 2px; border-radius: 4px; color: #fff;`
+    )
+  } else {
+    console.log(
+      `%c ${text} `,
+      `border: 1px solid ${Logger.typeColor(type)};
+        padding: 2px; border-radius: 4px;
+        color: ${Logger.typeColor(type)};`
+    )
+  }
+}
+
+Logger.printBack = function (type = 'primary', text) {
+  this.print(type, text, true)
+}
+
+Logger.pretty = function (type = 'primary', title, text) {
+  if (typeof text === 'object') {
+    console.group('Console Group', title)
+    console.log(
+      `%c ${title}`,
+      `background:${Logger.typeColor(type)};border:1px solid ${Logger.typeColor(type)};
+        padding: 1px; border-radius: 4px; color: #fff;`
+    )
+    isArray(text) ? console.table(text) : console.dir(text)
+    console.groupEnd()
+    return
+  }
+  console.log(
+    `%c ${title} %c ${text} %c`,
+    `background:${Logger.typeColor(type)};border:1px solid ${Logger.typeColor(type)};
+      padding: 1px; border-radius: 4px 0 0 4px; color: #fff;`,
+    `border:1px solid ${Logger.typeColor(type)};
+      padding: 1px; border-radius: 0 4px 4px 0; color: ${Logger.typeColor(type)};`,
+    'background:transparent'
+  )
+}
+
+Logger.prettyPrimary = function (title, ...text) {
+  text.forEach((t) => this.pretty('primary', title, t))
+}
+
+Logger.prettySuccess = function (title, ...text) {
+  text.forEach((t) => this.pretty('success', title, t))
+}
+
+Logger.prettyWarn = function (title, ...text) {
+  text.forEach((t) => this.pretty('warn', title, t))
+}
+
+Logger.prettyError = function (title, ...text) {
+  text.forEach((t) => this.pretty('error', title, t))
+}
+
+Logger.prettyInfo = function (title, ...text) {
+  text.forEach((t) => this.pretty('info', title, t))
+}
+
+export default Logger
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 000000000..7da49b08b
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,92 @@
+import { useCache } from '@/hooks/web/useCache'
+import { TokenType } from '@/api/login/types'
+import { decrypt, encrypt } from '@/utils/jsencrypt'
+
+const { wsCache } = useCache()
+
+const AccessTokenKey = 'ACCESS_TOKEN'
+const RefreshTokenKey = 'REFRESH_TOKEN'
+
+// 获取token
+export const getAccessToken = () => {
+  // 此处与TokenKey相同，此写法解决初始化时Cookies中不存在TokenKey报错
+  return wsCache.get(AccessTokenKey) ? wsCache.get(AccessTokenKey) : wsCache.get('ACCESS_TOKEN')
+}
+
+// 刷新token
+export const getRefreshToken = () => {
+  return wsCache.get(RefreshTokenKey)
+}
+
+// 设置token
+export const setToken = (token: TokenType) => {
+  wsCache.set(RefreshTokenKey, token.refreshToken)
+  wsCache.set(AccessTokenKey, token.accessToken)
+}
+
+// 删除token
+export const removeToken = () => {
+  wsCache.delete(AccessTokenKey)
+  wsCache.delete(RefreshTokenKey)
+}
+
+/** 格式化token（jwt格式） */
+export const formatToken = (token: string): string => {
+  return 'Bearer ' + token
+}
+// ========== 账号相关 ==========
+
+const LoginFormKey = 'LOGINFORM'
+
+export type LoginFormType = {
+  tenantName: string
+  username: string
+  password: string
+  rememberMe: boolean
+}
+
+export const getLoginForm = () => {
+  const loginForm: LoginFormType = wsCache.get(LoginFormKey)
+  if (loginForm) {
+    loginForm.password = decrypt(loginForm.password) as string
+  }
+  return loginForm
+}
+
+export const setLoginForm = (loginForm: LoginFormType) => {
+  loginForm.password = encrypt(loginForm.password) as string
+  wsCache.set(LoginFormKey, loginForm, { exp: 30 * 24 * 60 * 60 })
+}
+
+export const removeLoginForm = () => {
+  wsCache.delete(LoginFormKey)
+}
+
+// ========== 租户相关 ==========
+
+const TenantIdKey = 'TENANT_ID'
+const TenantNameKey = 'TENANT_NAME'
+
+export const getTenantName = () => {
+  return wsCache.get(TenantNameKey)
+}
+
+export const setTenantName = (username: string) => {
+  wsCache.set(TenantNameKey, username, { exp: 30 * 24 * 60 * 60 })
+}
+
+export const removeTenantName = () => {
+  wsCache.delete(TenantNameKey)
+}
+
+export const getTenantId = () => {
+  return wsCache.get(TenantIdKey)
+}
+
+export const setTenantId = (username: string) => {
+  wsCache.set(TenantIdKey, username)
+}
+
+export const removeTenantId = () => {
+  wsCache.delete(TenantIdKey)
+}
diff --git a/src/utils/color.ts b/src/utils/color.ts
new file mode 100644
index 000000000..6888583a7
--- /dev/null
+++ b/src/utils/color.ts
@@ -0,0 +1,153 @@
+/**
+ * 判断是否 十六进制颜色值.
+ * 输入形式可为 #fff000 #f00
+ *
+ * @param   String  color   十六进制颜色值
+ * @return  Boolean
+ */
+export const isHexColor = (color: string) => {
+  const reg = /^#([0-9a-fA-F]{3}|[0-9a-fA-f]{6})$/
+  return reg.test(color)
+}
+
+/**
+ * RGB 颜色值转换为 十六进制颜色值.
+ * r, g, 和 b 需要在 [0, 255] 范围内
+ *
+ * @return  String          类似#ff00ff
+ * @param r
+ * @param g
+ * @param b
+ */
+export const rgbToHex = (r: number, g: number, b: number) => {
+  // tslint:disable-next-line:no-bitwise
+  const hex = ((r << 16) | (g << 8) | b).toString(16)
+  return '#' + new Array(Math.abs(hex.length - 7)).join('0') + hex
+}
+
+/**
+ * Transform a HEX color to its RGB representation
+ * @param {string} hex The color to transform
+ * @returns The RGB representation of the passed color
+ */
+export const hexToRGB = (hex: string, opacity?: number) => {
+  let sHex = hex.toLowerCase()
+  if (isHexColor(hex)) {
+    if (sHex.length === 4) {
+      let sColorNew = '#'
+      for (let i = 1; i < 4; i += 1) {
+        sColorNew += sHex.slice(i, i + 1).concat(sHex.slice(i, i + 1))
+      }
+      sHex = sColorNew
+    }
+    const sColorChange: number[] = []
+    for (let i = 1; i < 7; i += 2) {
+      sColorChange.push(parseInt('0x' + sHex.slice(i, i + 2)))
+    }
+    return opacity
+      ? 'RGBA(' + sColorChange.join(',') + ',' + opacity + ')'
+      : 'RGB(' + sColorChange.join(',') + ')'
+  }
+  return sHex
+}
+
+export const colorIsDark = (color: string) => {
+  if (!isHexColor(color)) return
+  const [r, g, b] = hexToRGB(color)
+    .replace(/(?:\(|\)|rgb|RGB)*/g, '')
+    .split(',')
+    .map((item) => Number(item))
+  return r * 0.299 + g * 0.578 + b * 0.114 < 192
+}
+
+/**
+ * Darkens a HEX color given the passed percentage
+ * @param {string} color The color to process
+ * @param {number} amount The amount to change the color by
+ * @returns {string} The HEX representation of the processed color
+ */
+export const darken = (color: string, amount: number) => {
+  color = color.indexOf('#') >= 0 ? color.substring(1, color.length) : color
+  amount = Math.trunc((255 * amount) / 100)
+  return `#${subtractLight(color.substring(0, 2), amount)}${subtractLight(
+    color.substring(2, 4),
+    amount
+  )}${subtractLight(color.substring(4, 6), amount)}`
+}
+
+/**
+ * Lightens a 6 char HEX color according to the passed percentage
+ * @param {string} color The color to change
+ * @param {number} amount The amount to change the color by
+ * @returns {string} The processed color represented as HEX
+ */
+export const lighten = (color: string, amount: number) => {
+  color = color.indexOf('#') >= 0 ? color.substring(1, color.length) : color
+  amount = Math.trunc((255 * amount) / 100)
+  return `#${addLight(color.substring(0, 2), amount)}${addLight(
+    color.substring(2, 4),
+    amount
+  )}${addLight(color.substring(4, 6), amount)}`
+}
+
+/* Suma el porcentaje indicado a un color (RR, GG o BB) hexadecimal para aclararlo */
+/**
+ * Sums the passed percentage to the R, G or B of a HEX color
+ * @param {string} color The color to change
+ * @param {number} amount The amount to change the color by
+ * @returns {string} The processed part of the color
+ */
+const addLight = (color: string, amount: number) => {
+  const cc = parseInt(color, 16) + amount
+  const c = cc > 255 ? 255 : cc
+  return c.toString(16).length > 1 ? c.toString(16) : `0${c.toString(16)}`
+}
+
+/**
+ * Calculates luminance of an rgb color
+ * @param {number} r red
+ * @param {number} g green
+ * @param {number} b blue
+ */
+const luminanace = (r: number, g: number, b: number) => {
+  const a = [r, g, b].map((v) => {
+    v /= 255
+    return v <= 0.03928 ? v / 12.92 : Math.pow((v + 0.055) / 1.055, 2.4)
+  })
+  return a[0] * 0.2126 + a[1] * 0.7152 + a[2] * 0.0722
+}
+
+/**
+ * Calculates contrast between two rgb colors
+ * @param {string} rgb1 rgb color 1
+ * @param {string} rgb2 rgb color 2
+ */
+const contrast = (rgb1: string[], rgb2: number[]) => {
+  return (
+    (luminanace(~~rgb1[0], ~~rgb1[1], ~~rgb1[2]) + 0.05) /
+    (luminanace(rgb2[0], rgb2[1], rgb2[2]) + 0.05)
+  )
+}
+
+/**
+ * Determines what the best text color is (black or white) based con the contrast with the background
+ * @param hexColor - Last selected color by the user
+ */
+export const calculateBestTextColor = (hexColor: string) => {
+  const rgbColor = hexToRGB(hexColor.substring(1))
+  const contrastWithBlack = contrast(rgbColor.split(','), [0, 0, 0])
+
+  return contrastWithBlack >= 12 ? '#000000' : '#FFFFFF'
+}
+
+/**
+ * Subtracts the indicated percentage to the R, G or B of a HEX color
+ * @param {string} color The color to change
+ * @param {number} amount The amount to change the color by
+ * @returns {string} The processed part of the color
+ */
+const subtractLight = (color: string, amount: number) => {
+  const cc = parseInt(color, 16) - amount
+  const c = cc < 0 ? 0 : cc
+  return c.toString(16).length > 1 ? c.toString(16) : `0${c.toString(16)}`
+}
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
new file mode 100644
index 000000000..2624d9296
--- /dev/null
+++ b/src/utils/constants.ts
@@ -0,0 +1,360 @@
+/**
+ * Created by 闻荫源码
+ *
+ * 枚举类
+ */
+
+// 全局通用状态枚举
+export const CommonStatusEnum = {
+  ENABLE: 0, // 开启
+  DISABLE: 1 // 禁用
+}
+
+/**
+ * 菜单的类型枚举
+ */
+export const SystemMenuTypeEnum = {
+  DIR: 1, // 目录
+  MENU: 2, // 菜单
+  BUTTON: 3 // 按钮
+}
+
+/**
+ * 角色的类型枚举
+ */
+export const SystemRoleTypeEnum = {
+  SYSTEM: 1, // 内置角色
+  CUSTOM: 2 // 自定义角色
+}
+
+/**
+ * 数据权限的范围枚举
+ */
+export const SystemDataScopeEnum = {
+  ALL: 1, // 全部数据权限
+  DEPT_CUSTOM: 2, // 指定部门数据权限
+  DEPT_ONLY: 3, // 部门数据权限
+  DEPT_AND_CHILD: 4, // 部门及以下数据权限
+  DEPT_SELF: 5 // 仅本人数据权限
+}
+
+/**
+ * 代码生成模板类型
+ */
+export const InfraCodegenTemplateTypeEnum = {
+  CRUD: 1, // 基础 CRUD
+  TREE: 2, // 树形 CRUD
+  SUB: 3 // 主子表 CRUD
+}
+
+/**
+ * 任务状态的枚举
+ */
+export const InfraJobStatusEnum = {
+  INIT: 0, // 初始化中
+  NORMAL: 1, // 运行中
+  STOP: 2 // 暂停运行
+}
+
+/**
+ * API 异常数据的处理状态
+ */
+export const InfraApiErrorLogProcessStatusEnum = {
+  INIT: 0, // 未处理
+  DONE: 1, // 已处理
+  IGNORE: 2 // 已忽略
+}
+
+/**
+ * 用户的社交平台的类型枚举
+ */
+export const SystemUserSocialTypeEnum = {
+  DINGTALK: {
+    title: '钉钉',
+    type: 20,
+    source: 'dingtalk',
+    img: 'https://s1.ax1x.com/2022/05/22/OzMDRs.png'
+  },
+  WECHAT_ENTERPRISE: {
+    title: '企业微信',
+    type: 30,
+    source: 'wechat_enterprise',
+    img: 'https://s1.ax1x.com/2022/05/22/OzMrzn.png'
+  }
+}
+
+/**
+ * 支付渠道枚举
+ */
+export const PayChannelEnum = {
+  WX_PUB: {
+    code: 'wx_pub',
+    name: '微信 JSAPI 支付'
+  },
+  WX_LITE: {
+    code: 'wx_lite',
+    name: '微信小程序支付'
+  },
+  WX_APP: {
+    code: 'wx_app',
+    name: '微信 APP 支付'
+  },
+  WX_BAR: {
+    code: 'wx_bar',
+    name: '微信条码支付'
+  },
+  ALIPAY_PC: {
+    code: 'alipay_pc',
+    name: '支付宝 PC 网站支付'
+  },
+  ALIPAY_WAP: {
+    code: 'alipay_wap',
+    name: '支付宝 WAP 网站支付'
+  },
+  ALIPAY_APP: {
+    code: 'alipay_app',
+    name: '支付宝 APP 支付'
+  },
+  ALIPAY_QR: {
+    code: 'alipay_qr',
+    name: '支付宝扫码支付'
+  },
+  ALIPAY_BAR: {
+    code: 'alipay_bar',
+    name: '支付宝条码支付'
+  },
+  MOCK: {
+    code: 'mock',
+    name: '模拟支付'
+  }
+}
+
+/**
+ * 支付的展示模式每局
+ */
+export const PayDisplayModeEnum = {
+  URL: {
+    mode: 'url'
+  },
+  IFRAME: {
+    mode: 'iframe'
+  },
+  FORM: {
+    mode: 'form'
+  },
+  QR_CODE: {
+    mode: 'qr_code'
+  },
+  APP: {
+    mode: 'app'
+  }
+}
+
+/**
+ * 支付类型枚举
+ */
+export const PayType = {
+  WECHAT: 'WECHAT',
+  ALIPAY: 'ALIPAY',
+  MOCK: 'MOCK'
+}
+
+/**
+ * 支付订单状态枚举
+ */
+export const PayOrderStatusEnum = {
+  WAITING: {
+    status: 0,
+    name: '未支付'
+  },
+  SUCCESS: {
+    status: 10,
+    name: '已支付'
+  },
+  CLOSED: {
+    status: 20,
+    name: '未支付'
+  }
+}
+
+/**
+ * 商品 SPU 状态
+ */
+export const ProductSpuStatusEnum = {
+  RECYCLE: {
+    status: -1,
+    name: '回收站'
+  },
+  DISABLE: {
+    status: 0,
+    name: '下架'
+  },
+  ENABLE: {
+    status: 1,
+    name: '上架'
+  }
+}
+
+/**
+ * 优惠劵模板的有限期类型的枚举
+ */
+export const CouponTemplateValidityTypeEnum = {
+  DATE: {
+    type: 1,
+    name: '固定日期可用'
+  },
+  TERM: {
+    type: 2,
+    name: '领取之后可用'
+  }
+}
+
+/**
+ * 优惠劵模板的领取方式的枚举
+ */
+export const CouponTemplateTakeTypeEnum = {
+  USER: {
+    type: 1,
+    name: '直接领取'
+  },
+  ADMIN: {
+    type: 2,
+    name: '指定发放'
+  },
+  REGISTER: {
+    type: 3,
+    name: '新人券'
+  }
+}
+
+/**
+ * 营销的商品范围枚举
+ */
+export const PromotionProductScopeEnum = {
+  ALL: {
+    scope: 1,
+    name: '通用劵'
+  },
+  SPU: {
+    scope: 2,
+    name: '商品劵'
+  },
+  CATEGORY: {
+    scope: 3,
+    name: '品类劵'
+  }
+}
+
+/**
+ * 营销的条件类型枚举
+ */
+export const PromotionConditionTypeEnum = {
+  PRICE: {
+    type: 10,
+    name: '满 N 元'
+  },
+  COUNT: {
+    type: 20,
+    name: '满 N 件'
+  }
+}
+
+/**
+ * 优惠类型枚举
+ */
+export const PromotionDiscountTypeEnum = {
+  PRICE: {
+    type: 1,
+    name: '满减'
+  },
+  PERCENT: {
+    type: 2,
+    name: '折扣'
+  }
+}
+
+/**
+ * 分销关系绑定模式枚举
+ */
+export const BrokerageBindModeEnum = {
+  ANYTIME: {
+    mode: 0,
+    name: '没有推广人'
+  },
+  REGISTER: {
+    mode: 1,
+    name: '新用户'
+  }
+}
+/**
+ * 分佣模式枚举
+ */
+export const BrokerageEnabledConditionEnum = {
+  ALL: {
+    condition: 0,
+    name: '人人分销'
+  },
+  ADMIN: {
+    condition: 1,
+    name: '指定分销'
+  }
+}
+/**
+ * 佣金记录业务类型枚举
+ */
+export const BrokerageRecordBizTypeEnum = {
+  ORDER: {
+    type: 1,
+    name: '获得推广佣金'
+  },
+  WITHDRAW: {
+    type: 2,
+    name: '提现申请'
+  }
+}
+/**
+ * 佣金提现状态枚举
+ */
+export const BrokerageWithdrawStatusEnum = {
+  AUDITING: {
+    status: 0,
+    name: '审核中'
+  },
+  AUDIT_SUCCESS: {
+    status: 10,
+    name: '审核通过'
+  },
+  AUDIT_FAIL: {
+    status: 20,
+    name: '审核不通过'
+  },
+  WITHDRAW_SUCCESS: {
+    status: 11,
+    name: '提现成功'
+  },
+  WITHDRAW_FAIL: {
+    status: 21,
+    name: '提现失败'
+  }
+}
+/**
+ * 佣金提现类型枚举
+ */
+export const BrokerageWithdrawTypeEnum = {
+  WALLET: {
+    type: 1,
+    name: '钱包'
+  },
+  BANK: {
+    type: 2,
+    name: '银行卡'
+  },
+  WECHAT: {
+    type: 3,
+    name: '微信'
+  },
+  ALIPAY: {
+    type: 4,
+    name: '支付宝'
+  }
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
new file mode 100644
index 000000000..e40305070
--- /dev/null
+++ b/src/utils/dict.ts
@@ -0,0 +1,282 @@
+/**
+ * 数据字典工具类
+ */
+import { useDictStoreWithOut } from '@/store/modules/dict'
+import { ElementPlusInfoType } from '@/types/elementPlus'
+
+const dictStore = useDictStoreWithOut()
+
+/**
+ * 获取 dictType 对应的数据字典数组
+ *
+ * @param dictType 数据类型
+ * @returns {*|Array} 数据字典数组
+ */
+export interface DictDataType {
+  dictType: string
+  label: string
+  value: string | number | boolean
+  colorType: ElementPlusInfoType | ''
+  cssClass: string
+}
+
+export const getDictOptions = (dictType: string) => {
+  return dictStore.getDictByType(dictType) || []
+}
+
+export const getIntDictOptions = (dictType: string) => {
+  const dictOption: DictDataType[] = []
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  dictOptions.forEach((dict: DictDataType) => {
+    dictOption.push({
+      ...dict,
+      value: parseInt(dict.value + '')
+    })
+  })
+  return dictOption
+}
+
+export const getStrDictOptions = (dictType: string) => {
+  const dictOption: DictDataType[] = []
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  dictOptions.forEach((dict: DictDataType) => {
+    dictOption.push({
+      ...dict,
+      value: dict.value + ''
+    })
+  })
+  return dictOption
+}
+
+export const getBoolDictOptions = (dictType: string) => {
+  const dictOption: DictDataType[] = []
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  dictOptions.forEach((dict: DictDataType) => {
+    dictOption.push({
+      ...dict,
+      value: dict.value + '' === 'true'
+    })
+  })
+  return dictOption
+}
+
+/**
+ * 获取指定字典类型的指定值对应的字典对象
+ * @param dictType 字典类型
+ * @param value 字典值
+ * @return DictDataType 字典对象
+ */
+export const getDictObj = (dictType: string, value: any): DictDataType | undefined => {
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  for (const dict of dictOptions) {
+    if (dict.value === value + '') {
+      return dict
+    }
+  }
+}
+
+/**
+ * 获得字典数据的文本展示
+ *
+ * @param dictType 字典类型
+ * @param value 字典数据的值
+ * @return 字典名称
+ */
+export const getDictLabel = (dictType: string, value: any): string => {
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  const dictLabel = ref('')
+  dictOptions.forEach((dict: DictDataType) => {
+    if (dict.value === value + '') {
+      dictLabel.value = dict.label
+    }
+  })
+  return dictLabel.value
+}
+
+export enum DICT_TYPE {
+  USER_TYPE = 'user_type',
+  COMMON_STATUS = 'common_status',
+  SYSTEM_TENANT_PACKAGE_ID = 'system_tenant_package_id',
+  TERMINAL = 'terminal', // 终端
+
+  // ========== SYSTEM 模块 ==========
+  SYSTEM_USER_SEX = 'system_user_sex',
+  SYSTEM_MENU_TYPE = 'system_menu_type',
+  SYSTEM_ROLE_TYPE = 'system_role_type',
+  SYSTEM_DATA_SCOPE = 'system_data_scope',
+  SYSTEM_NOTICE_TYPE = 'system_notice_type',
+  SYSTEM_OPERATE_TYPE = 'system_operate_type',
+  SYSTEM_LOGIN_TYPE = 'system_login_type',
+  SYSTEM_LOGIN_RESULT = 'system_login_result',
+  SYSTEM_SMS_CHANNEL_CODE = 'system_sms_channel_code',
+  SYSTEM_SMS_TEMPLATE_TYPE = 'system_sms_template_type',
+  SYSTEM_SMS_SEND_STATUS = 'system_sms_send_status',
+  SYSTEM_SMS_RECEIVE_STATUS = 'system_sms_receive_status',
+  SYSTEM_ERROR_CODE_TYPE = 'system_error_code_type',
+  SYSTEM_OAUTH2_GRANT_TYPE = 'system_oauth2_grant_type',
+  SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status',
+  SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type',
+
+  // ========== INFRA 模块 ==========
+  INFRA_BOOLEAN_STRING = 'infra_boolean_string',
+  INFRA_JOB_STATUS = 'infra_job_status',
+  INFRA_JOB_LOG_STATUS = 'infra_job_log_status',
+  INFRA_API_ERROR_LOG_PROCESS_STATUS = 'infra_api_error_log_process_status',
+  INFRA_CONFIG_TYPE = 'infra_config_type',
+  INFRA_CODEGEN_TEMPLATE_TYPE = 'infra_codegen_template_type',
+  INFRA_CODEGEN_FRONT_TYPE = 'infra_codegen_front_type',
+  INFRA_CODEGEN_SCENE = 'infra_codegen_scene',
+  INFRA_FILE_STORAGE = 'infra_file_storage',
+
+  // ========== BPM 模块 ==========
+  BPM_MODEL_CATEGORY = 'bpm_model_category',
+  BPM_MODEL_FORM_TYPE = 'bpm_model_form_type',
+  BPM_TASK_ASSIGN_RULE_TYPE = 'bpm_task_assign_rule_type',
+  BPM_PROCESS_INSTANCE_STATUS = 'bpm_process_instance_status',
+  BPM_PROCESS_INSTANCE_RESULT = 'bpm_process_instance_result',
+  BPM_TASK_ASSIGN_SCRIPT = 'bpm_task_assign_script',
+  BPM_OA_LEAVE_TYPE = 'bpm_oa_leave_type',
+
+  // ========== PAY 模块 ==========
+  PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型
+  PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态
+  PAY_REFUND_STATUS = 'pay_refund_status', // 退款订单状态
+  PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态
+  PAY_NOTIFY_TYPE = 'pay_notify_type', // 商户支付回调状态
+
+  // ========== MP 模块 ==========
+  MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match', // 自动回复请求匹配类型
+  MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型
+
+  // ========== MALL - 会员模块 ==========
+  MEMBER_POINT_BIZ_TYPE = 'member_point_biz_type', // 积分的业务类型
+  MEMBER_EXPERIENCE_BIZ_TYPE = 'member_experience_biz_type', // 会员经验业务类型
+
+  // ========== MALL - 商品模块 ==========
+  PRODUCT_UNIT = 'product_unit', // 商品单位
+  PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态
+
+  // ========== MALL - 交易模块 ==========
+  EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode', //快递的计费方式
+  TRADE_AFTER_SALE_STATUS = 'trade_after_sale_status', // 售后 - 状态
+  TRADE_AFTER_SALE_WAY = 'trade_after_sale_way', // 售后 - 方式
+  TRADE_AFTER_SALE_TYPE = 'trade_after_sale_type', // 售后 - 类型
+  TRADE_ORDER_TYPE = 'trade_order_type', // 订单 - 类型
+  TRADE_ORDER_STATUS = 'trade_order_status', // 订单 - 状态
+  TRADE_ORDER_ITEM_AFTER_SALE_STATUS = 'trade_order_item_after_sale_status', // 订单项 - 售后状态
+  TRADE_DELIVERY_TYPE = 'trade_delivery_type', // 配送方式
+  BROKERAGE_ENABLED_CONDITION = 'brokerage_enabled_condition', // 分佣模式
+  BROKERAGE_BIND_MODE = 'brokerage_bind_mode', // 分销关系绑定模式
+  BROKERAGE_BANK_NAME = 'brokerage_bank_name', // 佣金提现银行
+  BROKERAGE_WITHDRAW_TYPE = 'brokerage_withdraw_type', // 佣金提现类型
+  BROKERAGE_RECORD_BIZ_TYPE = 'brokerage_record_biz_type', // 佣金业务类型
+  BROKERAGE_RECORD_STATUS = 'brokerage_record_status', // 佣金状态
+  BROKERAGE_WITHDRAW_STATUS = 'brokerage_withdraw_status', // 佣金提现状态
+
+  // ========== MALL - 营销模块 ==========
+  PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型
+  PROMOTION_PRODUCT_SCOPE = 'promotion_product_scope', // 营销的商品范围
+  PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE = 'promotion_coupon_template_validity_type', // 优惠劵模板的有限期类型
+  PROMOTION_COUPON_STATUS = 'promotion_coupon_status', // 优惠劵的状态
+  PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type', // 优惠劵的领取方式
+  PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status', // 优惠活动的状态
+  PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举
+
+  // ========== 业务 - WMS ==========
+  ITEM_STATUS = 'item_status', // 物料状态
+  ITEM_TYPE = 'item_type', // 物料类型
+  UOM = 'uom', // 计量单位
+  ABC_CLASS = 'abc_class', // ABC类
+  TRUE_FALSE = 'true_false', // 是否
+  ITEM_GROUP = 'item_group', // 物料分组
+  ITEM_CATEGORY = 'Item_category', // 物料种类
+  ITEM_COLOR = 'item_color', // 物料颜色
+  ITEM_CONFIGURATION = 'item_configuration', // 物料配置
+  EQ_LEVEL = 'eq_level', // 质量等级
+  CURRENCY = 'currency', // 货币
+  BASIC_CURRENCY = 'basic_currency', // 货币
+  SUPPLIER_TYPE = 'supplier_type', // 供应商类型
+  CUSTOMER_TYPE = 'customer_type', // 客户类型
+  OWNER_TYPE = 'owner_type', // 货主类型
+  CARRIER_TYPE = 'carrier_type', // 承运商类型
+  INSPECT_TYPE = 'inspect_type', // 检验类型
+  NEXT_ACTION = 'next_action', // 下一步检验动作
+  SAMPLE_METHOD = 'sample_method', // 抽检方式
+  WAREHOUSE_TYPE = 'warehouse_type', // 仓库类型
+  DOCK_TYPE = 'dock_type', // 月台类型
+  AREA_TYPE = 'area_type', // 库区类型
+  INVENTORY_STATUS = 'inventory_status', // 库存状态
+  ERP_LOCATION = 'erp_location', // ERP库位
+  LOCATION_TYPE = 'location_type', // 库位类型
+  WORKSHOP_TYPE = 'workshop_type', // 车间类型
+  PRODUCTION_LINE_TYPE = 'production_line_type', // 生产线类型
+  WORK_STATION_TYPE = 'work_station_type', // 工位类型
+  PROCESS_TYPE = 'process_type', // 工序类型
+  LOCATION_SCOPE_TYPE = 'location_scope_type', // 库位维度
+  STORAGE_TYPE = 'storage_type', // 存储类型
+  ITEM_SCOPE_TYPE = 'item_scope_type', // 物料维度
+  BATCH_TYPE = 'batch_type', // 批次类型
+  BATCH_DIRECTION = 'batch_direction', // 批次方向
+  MANAGEMENT_MODE = 'management_mode', // 管理模式
+  DOCUMENT_TYPE = 'document_type', // 单据分类
+  REQEUST_MODE = 'reqeust_mode', // 申请模式
+  TIME_UNIT = 'time_unit', // 时间单位
+  COUNT_TYPE = 'count_type', // 盘点类型
+  COUNT_SCOPE_TYPE = 'count_scope_type', // 盘点范围类型
+  BARCODE_PREFIX = 'barcode_prefix', // 条码前缀
+  SETTLEMENT_TYPE = 'settlement_type', // 结算类型
+  FROZEN_REASON = 'frozen_reason', // 冻结原因
+  INVENTORY_ACTION = 'inventory_action', // 库存动作
+  CONTAINER_TYPE = 'container_type', // 器具类型
+  CONTAINER_CONTENT_TYPE = 'container_content_type', // 器具内容类型
+  RESET_PERIOD = 'reset_period', // 重置周期
+  INTERFACE_TYPE = 'interface_type', // 接口类型
+  PURCHASE_ORDER_TYPE = 'purchase_order_type', // 采购订单类型
+  PURCHASE_ORDER_STATUS = 'purchase_order_status', // 采购订单状态
+  PURCHASE_ORDER_DETAIL_STATUS = 'purchase_order_detail_status', // 采购订单明细状态
+  SALE_ORDER_TYPE = 'sale_order_type', // 销售订单类型
+  SALE_ORDER_STATUS = 'sale_order_status', // 销售订单状态
+  SALE_ORDER_DETAIL_STATUS = 'sale_order_detail_status', // 销售订单明细状态
+  WORK_ORDER_TYPE = 'work_order_type', // 生产订单类型
+  WORK_ORDER_STATUS = 'work_order_status', // 生产订单状态
+  WORK_ORDER_DETAIL_STATUS = 'work_order_detail_status', // 生产订单明细状态
+  PURCHASE_PLAN_STATUS = 'purchase_plan_status', // 要货计划状态
+  PURCHASE_PLAN_DETAIL_STATUS = 'purchase_plan_detail_status', // 要货计划明细状态
+  PLAN_STATUS = 'plan_status', // 计划状态
+  PRODUCTION_PLAN_DETAIL_STATUS = 'production_plan_detail_status', // 计划明细状态
+  // PREPARE_TO_ISSUE_PLAN_STATUS = 'prepare_to_issue_plan_status', // 备料计划状态
+  // PREPARE_TO_ISSUE_PLAN_DETAIL_STATUS = 'prepare_to_issue_plan_detail_status', // 备料计划明细状态
+  // DELIVER_PLAN_STATUS = 'deliver_plan_status', // 发货计划状态
+  // DELIVER_DETAIL_STATUS = 'deliver_detail_status', // 发货计划明细状态
+  // PREPARE_TO_DELIVER_PLAN_STATUS = 'prepare_to_deliver_plan_status', // 备货计划状态
+  // PREPARE_TO_DELIVER_PLAN_DETAIL_STATUS = 'prepare_to_deliver_plan_detail_status', // 备货计划明细状态
+  COUNT_PLAN_STATUS = 'count_plan_status', // 盘点计划状态
+  COUNT_DIMENSION = 'count_dimension', // 盘点维度
+  REQUEST_STATUS = 'request_status', // 申请状态
+  UNPLANNED_RECEIPT_REASON = 'unplanned_receipt_reason', // 计划外入库原因
+  UNPLANNED_ISSUE_REASON = 'unplanned_issue_reason', // 计划外出库原因
+  SCRAP_REASON = 'scrap_reason', // 报废出库原因
+  COUNT_STAGE = 'count_stage', // 盘点阶段
+  JOB_STATUS = 'job_status', // 任务状态
+  RECORD_STATUS = 'record_status', // 记录状态
+  PURCHASE_RETURN_REASON = 'purchase_return_reason', // 采购退货原因
+  INSPECT_FAILED_REASON = 'inspect_failed_reason', // 检验不合格原因
+  INSPECT_RESULT = 'inspect_result', // 检验结果
+  STRATEGY_TYPE = 'strategy_type', // 策略类型
+  STRATEGY_PARAM_OPEARTOR = 'strategy_param_opeartor', // 策略参数操作符
+  DATA_TYPE = 'data_type', // 数据类型
+  PACK_UNIT = 'pack_unit', // 包装单位
+  DETAIL_STATUS = 'detail_status', // 明细状态
+  TRANSFER_MODE = 'transfer_mode', // 运输方式
+  LABEL_TYPE = 'label_type', // 标签类型
+  LABEL_STATUS = 'label_status', // 标签状态
+  BIND_TYPE = 'bind_type', // 器具绑定类型
+  CONTAINER_STATUS = 'container_status', // 容器状态
+  PREDICT_TIME_TYPE = 'predict_time_type', // 预测时间类型
+  PACK_UNIT_TYPE = 'pack_unit_type', // 包装规格类型
+  TRANSFER_REASON = 'transfer_reason', // 调拨出入库原因
+  PURCHASERECEIPT_SOURCE_TYPE="purchasereceipt_source_type",//采购收货数据来源
+  PLAN_PRODUCTION_TYPE = "plan_production_type", // 生产计划类型
+  DELIVER_TYPE="deliver_type",//发货类型
+  BILL_TYPE="bill_type", // 发票类型
+}
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
new file mode 100644
index 000000000..0b59fdb7b
--- /dev/null
+++ b/src/utils/disposition/defaultButtons.ts
@@ -0,0 +1,771 @@
+// 页面基础按钮样式
+/**
+ * 如果需要更改配置，格式如：defaultExportBtn({label:'自定义'})
+ * @param {*} option 
+ * @returns 
+ */
+
+// 新增按钮
+export function defaultAddBtn(option:any) {
+    return __defaultBtnOption(option,{
+      label: '新增',
+      name: 'add',
+      hide: false,
+      type: 'primary',
+      icon: 'ep:plus',
+      color: '',
+      hasPermi: ''
+    })
+}
+
+// 导入按钮
+export function defaultImportBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '导入',
+    name: 'import',
+    hide: false,
+    type: 'warning',
+    icon: 'ep:upload',
+    color: '',
+    hasPermi: ''
+  })
+}
+
+// 导出按钮
+export function defaultExportBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '导出',
+    name: 'export',
+    hide: false,
+    type: 'success',
+    icon: 'ep:download',
+    color: '',
+    hasPermi: ''
+  })
+}
+
+// 字段设置
+// export function defaultFieldSettingBtn(option:any) {
+//     // todo:监听已经配置过的字段按钮更改状态特殊显示
+//     const routeName = route.name
+//     let _local = localStorage.getItem('tableColumns_' + this.$store.getters.name.userName + '_' + routeName)
+//     let _type = ''
+//     let _num = 0
+//     if(_local){
+//         JSON.parse(_local).forEach((item: any) => {
+//             if(item.istrue == true){
+//                 _num ++
+//             }
+//         });
+//         if(_num >= JSON.parse(_local).length){
+//             _type = ''
+//         }else{
+//             _type= 'warning'
+//         }
+//     }
+//     return __defaultBtnOption(option,{
+//         type: _type,
+//         plain: true,
+//         icon: "el-icon-setting",
+//         label: "字段设置",
+//         name: "field",
+//         size: "small",
+//         float: 'right',
+//         class: "rowDropNotHideItem"
+//     })
+// }
+
+// 刷新按钮
+export function defaultFreshBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '刷新',
+    name: 'refresh',
+    hide: false,
+    type: 'primary',
+    icon: 'ep:refresh',
+    color: '',
+    float:'right',
+    hasPermi: ''
+  })
+}
+
+// 重置按钮
+export function defaultResetBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '重置',
+    name: 'reset',
+    hide: false,
+    type: 'info',
+    icon: '',
+    color: '',
+    float:'right',
+    hasPermi: ''
+  })
+}
+
+// 字段设置
+export function defaultSetBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '设置',
+    name: 'set',
+    hide: false,
+    type: 'info',
+    icon: 'ep:setting',
+    color: '',
+    float:'right',
+    hasPermi: ''
+  })
+}
+
+// 筛选按钮
+export function defaultFilterBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '筛选',
+    name: 'filtrate',
+    hide: false,
+    type: 'info',
+    icon: 'ep:operation',
+    color: '',
+    float:'right',
+    hasPermi: ''
+  })
+}
+
+// 筛选——查询按钮
+export function defaultSearchBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '搜索',
+    name: 'search',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    float:'right',
+    hasPermi: ''
+  })
+}
+
+// 筛选——重置按钮
+export function defaultSearchResetBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '重置',
+    name: 'searchReset',
+    hide: false,
+    type: 'info',
+    icon: '',
+    color: '',
+    float:'right',
+    hasPermi: ''
+  })
+}
+
+// form表单-保存按钮
+export function formSaveBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '保存',
+    name: 'save',
+    hide: false,
+    type: 'primary',
+    icon: 'ep:select',
+    color: '',
+    float:'right',
+    hasPermi: ''
+  })
+}
+
+// form表单-关闭按钮
+export function formCloseBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '关闭',
+    name: 'close',
+    hide: false,
+    icon: 'ep:close',
+    color: '',
+    float:'right',
+    hasPermi: ''
+  })
+}
+
+// drawer抽屉头部-编辑按钮
+export function drawerEditBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '编辑',
+    name: 'edit',
+    hide: false,
+    type: 'warning',
+    icon: 'ep:editPen',
+    color: '',
+    hasPermi: ''
+  })
+}
+
+// drawer抽屉头部-删除按钮
+export function drawerDeleteBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '删除',
+    name: 'delete',
+    hide: false,
+    type: 'danger',
+    icon: 'ep:delete',
+    color: '',
+    hasPermi: ''
+  })
+}
+
+// 主列表-详情按钮
+// export function mainListDetailBtn(option:any) {
+//   return __defaultBtnOption(option,{
+//     label: '详情',
+//     name: 'detail',
+//     hide: false,
+//     type: 'primary',
+//     color: '',
+//     link: true, // 文本展现按钮
+//     hasPermi: ''
+//   })
+// }
+
+// 主列表-编辑按钮
+export function mainListEditBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '编辑',
+    name: 'edit',
+    hide: false,
+    type: 'warning',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-删除按钮
+export function mainListDeleteBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '删除',
+    name: 'delete',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-绑定
+export function mainListBindBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '绑定',
+    name: 'bind',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-申请流程-关闭按钮
+export function mainListCloseBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '关闭',
+    name: 'mainClose',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-申请流程-重新添加按钮
+export function mainListReAddBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '重新添加',
+    name: 'mainReAdd',
+    hide: false,
+    type: 'warning',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-申请流程-提交审批按钮
+export function mainListSubmitBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '提交审批',
+    name: 'mainSubmit',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-申请流程-驳回按钮
+export function mainListTurnDownBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '驳回',
+    name: 'mainTurnDown',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-申请流程-审批通过按钮
+export function mainListApproveBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '审批通过',
+    name: 'mainApprove',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-申请流程-处理按钮
+export function mainListHandleBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '处理',
+    name: 'mainHandle',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-订单流程-发布按钮
+export function mainListOrderPubBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '发布',
+    name: 'mainOrderPub',
+    hide: false,
+    type: 'success',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-订单流程-关闭按钮
+export function mainListOrderCloBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '关闭',
+    name: 'mainOrderClo',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-订单流程-打开按钮
+export function mainListOrderOpeBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '打开',
+    name: 'mainOrderOpe',
+    hide: false,
+    type: 'warning',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-订单流程-下架按钮
+export function mainListOrderWitBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '下架',
+    name: 'mainOrderWit',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-计划流程-打开按钮
+export function mainListPlanOpeBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '打开',
+    name: 'mainPlanOpe',
+    hide: false,
+    type: 'warning',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-计划流程-关闭按钮
+export function mainListPlanCloBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '关闭',
+    name: 'mainPlanClo',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-计划流程-提交审批按钮
+export function mainListPlanSubBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '提交审批',
+    name: 'mainPlanSub',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-计划流程-驳回按钮
+export function mainListPlanTurBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '驳回',
+    name: 'mainPlanTur',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-计划流程-重置按钮
+export function mainListPlanResBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '重置',
+    name: 'mainPlanRes',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-计划流程-审批通过按钮
+export function mainListPlanAppBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '审批通过',
+    name: 'mainPlanApp',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-计划流程-发布按钮
+export function mainListPlanPubBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '发布',
+    name: 'mainPlanPub',
+    hide: false,
+    type: 'success',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-计划流程-执行按钮
+export function mainListPlanComBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '执行',
+    name: 'mainPlanCom',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-要货计划流程-修改按钮
+export function mainListPurchasePlanModBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '修改',
+    name: 'mainPurPlanMod',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-要货计划流程-下架按钮
+export function mainListPurchasePlanWitBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '下架',
+    name: 'mainPurPlanWit',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-要货计划流程-不接受按钮
+export function mainListPurchasePlanRejBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '不接受',
+    name: 'mainPurPlanRej',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-要货计划流程-接受按钮
+export function mainListPurchasePlanAccBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '接受',
+    name: 'mainPurPlanAcc',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-要货计划流程-发布按钮
+export function mainListPurchasePlanPubBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '发布',
+    name: 'mainPurPlanPub',
+    hide: false,
+    type: 'success',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-要货计划流程-关闭按钮
+export function mainListPurchasePlanCloBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '关闭',
+    name: 'mainPurPlanClo',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-要货计划流程-打开按钮
+export function mainListPurchasePlanOpeBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '打开',
+    name: 'mainPurPlanOpe',
+    hide: false,
+    type: 'warning',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-任务流程-承接按钮
+export function mainListJobAccBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '承接',
+    name: 'mainJobAcc',
+    hide: false,
+    type: 'success',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-任务流程-关闭按钮
+export function mainListJobCloBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '关闭',
+    name: 'mainJobClo',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-任务流程-放弃按钮
+export function mainListJobAbaBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '放弃',
+    name: 'mainJobAba',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-任务流程-执行按钮
+export function mainListJobExeBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '执行',
+    name: 'mainJobExe',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-打印
+export function mainListPointBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '打印标签',
+    name: 'point',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-生成采购收货申请
+export function mainListGenerateApplicationBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '生成采购收货申请',
+    name: 'generateApplication',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-打印
+export function mainListDocumentPrintBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '单据打印',
+    name: 'documentPrint',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-生成到货检验申请
+export function mainInspectRequestBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '生成到货检验申请',
+    name: 'inspectRequest',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-生成采购上架申请
+export function mainPutawayRequestBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '生成采购上架申请',
+    name: 'putawayRequest',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-生成盘点调整申请
+export function mainCountAdjustRequesttBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '生成盘点调整申请',
+    name: 'countAdjustRequest',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-重盘
+export function mainReCountBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '重盘',
+    name: 'mainReCount',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-监盘
+export function mainSuperviseCountBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '监盘',
+    name: 'mainSuperviseCount',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-解冻
+export function mainThawRequesttBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '解冻',
+    name: 'mainThaw',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 默认按钮规则
+function __defaultBtnOption(option:any,specific:any){
+  return {
+      type:option && option.type ? option.type : specific.type,
+      disabled:option && option.disabled ? option.disabled : specific.disabled,
+      plain:option && option.plain ? option.plain : specific.plain,
+      icon:option && option.icon ? option.icon : specific.icon,
+      label:option && option.label ? option.label : specific.label,
+      name:option && option.name ? option.name : specific.name,
+      size:option && option.size ? option.size : specific.size,
+      float:option && option.float ? option.float : (specific.float || null),
+      url:option && option.url ? option.url : (specific.url || null),
+      background:option && option.background ? option.background : (specific.background || null),
+      class:option && option.class ? option.class : specific.class,
+      color:option && option.color ? option.color : specific.color,
+      hide:option && option.hide ? option.hide : specific.hide,
+      link:option && option.link ? option.link : specific.link,
+      hasPermi:option && option.hasPermi ? option.hasPermi : specific.hasPermi,
+      ...option
+  }
+}
+
diff --git a/src/utils/disposition/formFields.ts b/src/utils/disposition/formFields.ts
new file mode 100644
index 000000000..941ce69fa
--- /dev/null
+++ b/src/utils/disposition/formFields.ts
@@ -0,0 +1,1954 @@
+/**
+ * @returns {Array}  基础物料信息
+ */
+ export const ItemBasic =  [
+    { label: "物料代码", prop: 'code' },
+    { label: "物料名称", prop: "name" },
+    { label: "描述1", prop: "desc1" },
+    { label: "描述2", prop: "desc2" },
+    { type: "filter", label: "状态", prop: "status", filters: "itemStatus" },
+    { label: "计量单位", prop: 'basicUom' },
+    { type: "filter", label: "ABC类", prop: 'abcClass', filters: "abcClass" },
+    { type: "filter", label: "制造件", prop: "canMake", filters: "whetherOrNot" },
+    { type: "filter", label: "采购件", prop: "canBuy", filters: "whetherOrNot" },
+    { label: "产品类", prop: 'productLine' },
+    { label: "有效值", prop: "validity" },
+    { type: "filter", label: "有效期", prop: "validityUnit", filters: "validityUnit" },
+    // { type: "filter", label: "管理类型", prop: "manageType", filters: "manageType" },
+    { label: "类型", prop: 'type' },
+    { label: "种类", prop: 'category' },
+    { label: "分组", prop: 'group' },
+    { label: "颜色", prop: 'color' },
+    { label: "配置", prop: 'configuration' },
+    { label: "项目", prop: 'project' },
+    { label: "版本", prop: 'version' },
+    { label: "工程变更", prop: 'eco' },
+    { label: "E-LEVEL等级", prop: 'elevel' },
+    { type: "filter", label: "是否虚拟物料", prop: "isPhantom", filters: "whetherOrNot" },
+    { type: "filter", label: "是否是下线结算件", prop: "isOfflineSettlement", filters: "whetherOrNot" },
+    { type: "filter", label: "是否自动回冲", prop: "isAutoBackFlush", filters: "whetherOrNot" },
+    { label: "特性", prop: 'characteristic' },
+    { label: "管理类型", prop: 'remark' },
+  ]
+
+/**
+ * @returns {Array}  物料质量信息
+ */
+ export const ItemQuality =  [
+    {  label: "itemCode", prop: "itemCode" },
+    { label: "物料名称", prop: 'name' },
+    { label: "供应商代码", prop: 'supplierCode' },
+    { type: "filter", label: "检验类型", prop: 'inspectType', filters: "inspectType" },
+    { label: "检验周期-按到货频次", prop: 'inspFrequency' },
+    { label: "检验周期天数", prop: 'inspFreqDays' },
+    { type: "filter", label: "按批次选择抽检数量", prop: 'sampleByBatch', filters: "whetherOrNot" },
+    { label: "抽检数量", prop: 'sampleQty' },
+    { type: "filter", label: "状态", prop: "status", filters: "openToClose" },
+    { label: "检验百分比", prop: 'samplePercent' },
+    { type: "filter", label: "是否是破坏性检验", prop: 'destructive', filters: "whetherOrNot" },
+    { type: "filter", label: "退货方法", prop: 'returnMethod', filters: "returnMethodType" },
+    { label: "描述", prop: "description" },
+  ]
+
+/**
+ * @returns {Array}  物料分类信息
+ */
+ export const ItemCategory =  [
+      { label: "itemCode", prop: 'itemCode', },
+      { label: "分类编号", prop: "categoryCode", },
+      { label: "分类值", prop: "value", },
+      { label: "备注", prop: 'remark', },
+  ]
+
+/**
+ * @returns {Array}  物料包装
+ */
+ export const ItemPack =  [
+    { label: "包装代码", prop: 'packCode', },
+    { label: "包装名称", prop: "packName" },
+    { label: '物料代码', prop: "itemCode", },
+    { label: "是否标准包装", type: "filter", prop: 'isStdPack', filters: "whetherOrNot" },
+    { label: '标包编号', prop: "stdPackCode", },
+    { label: "包装数量",type: "object",  prop: "packQty", showProp: "qty" },
+    { label: "物料单位",type: "object", prop: "packQty", showProp: "uom" },
+    { label: "转换率", prop: "conversionRate", },
+    { label: "备注", prop: 'remark', colSpan: 12 },
+  ]
+  
+/**
+ * @returns {Array}  物料质检标准
+ */
+ export const AQL =  [
+    { label: "itemCode", prop: "itemCode", },
+    { label: "供应商代码", prop: "supplierCode", },
+    { label: "数量上限", prop: 'ceilingQty', },
+    { label: "数量下限", prop: "floorQty", },
+    { type: "filter", label: "使用百分比", prop: 'isUsePercent', filters: "whetherOrNot" },
+    { label: "抽检百分比", prop: 'samplePercent', },
+    { label: "抽检数量", prop: 'sampleQty', },
+    { label: "备注", prop: "remark", },
+  ]
+
+/**
+ * @returns {Array}  物料清单
+ */
+ export const Bom =  [
+    { label: "父物料号", prop: "product", },
+    { label: "子物料号", prop: 'component', },
+    { type: "object", label: "子物料用量", prop: 'perQty', showProp: "qty", },
+    { type: "object", label: "子物料用量单位", prop: 'perQty', showProp: "uom", },
+    // { type: "rangeDateTime", label: "时间窗口", prop: "timeRange", startDate: "beginTime", endDate: "endTime", colSpan: 24 },
+    { type: "objectDateTime", label: "开始时间", prop: "timeRange", showProp: "beginTime", },
+    { type: "objectDateTime", label: "结束时间", prop: "timeRange", showProp: "endTime", },
+    { label: "ERP工序", prop: "erpOp", },
+    { label: "制造工序", prop: "mfgOp", },
+    { label: "层级", prop: "layer" },
+    // { type: "input", label: "层级", valueType: Number, prop: "layer",  },
+    { type: "filter", label: "配送方式", prop: "distributionType", filters: "distributionType" },
+    { type: "filter", label: "取整方式", prop: "truncType", filters: "truncType" },
+    { type: "filter", label: "计划拆分规则", prop: "plannedSplitRule", filters: "plannedSplitRule" },
+    { label: "备注", prop: 'remark', },
+  ]
+
+/**
+ * @returns {Array}  客户
+ */
+ export const Customer =  [
+    { label: "客户代码", prop: "code", },
+    { label: "客户名称", prop: 'name', },
+    { label: "国家", prop: "country", },
+    { label: "城市", prop: "city", },
+    { label: "地址", prop: "address", },
+    { label: "联系人", prop: "contacts", },
+    { label: "电话", prop: "phone", },
+    { label: "传真", prop: "fax", },
+    { label: "邮编", prop: "postID", },
+    { label: "货币", prop: "currency", },
+    { label: "备注", prop: 'remark', },
+  ]
+
+/**
+ * @returns {Array}  客户物料
+ */
+ export const CustomerItem =  [
+    { label: "客户代码", prop: 'customerCode', },
+    { label: "itemCode", prop: "itemCode", },
+    { label: "客户物料代码", prop: "customerItemCode", },
+    { label: "版本", prop: "version", },
+    { type: "objectDateTime", label: "开始时间", prop: "timeRange", showProp: "beginTime" },
+    { type: "objectDateTime", label: "结束时间", prop: "timeRange", showProp: "endTime" },
+    { label: "备注", prop: 'remark', },
+  ]
+
+/**
+ * @returns {Array}  客户地址
+ */
+ export const CustomerAddress =  [
+    { label: "客户地址代码", prop: "code", },
+    { label: "客户地址名称", prop: 'name', },
+    { label: "客户代码", prop: 'customerCode', },
+    { label: "库位编号", prop: 'locationCode', },
+    { label: "城市", prop: "city", },
+    { label: "地址", prop: "address", },
+    { label: "联系人", prop: "contact", },
+    { label: "描述", prop: "desc", },
+    { label: "备注", prop: 'remark', },
+  ]
+
+/**
+ * @returns {Array}  项目
+ */
+ export const Project =  [
+    { label: "客户代码", prop: "customerCode"},
+    { label: "项目代码", prop: "code"},
+    { label: "项目名称", prop: 'name'},
+    { type: "objectDateTime", label: "开始时间", prop: "timeRange", showProp: "beginTime", colSpan: 12 },
+    { type: "objectDateTime", label: "结束时间", prop: "timeRange", showProp: "endTime", colSpan: 12 },
+    { label: "描述", prop: "description", },
+    { label: "备注", prop: 'remark', },
+  ]
+
+/**
+ * @returns {Array}  供应商
+ */
+ export const Supplier =  [
+    { label: "供应商代码", prop: "code"},
+    { label: "供应商名称", prop: "name"},
+    { type: "filter",label: "状态", prop: "isActive", filters: "openToCloseBit"},
+    { type: "filter",label: "类型", prop: "type", filters: "supplierType"},
+    { label: "国家", prop: "country"},
+    { label: "城市", prop: "city"},
+    { label: "地址", prop: "address"},
+    { label: "联系人", prop: 'contacts'},
+    { label: "电话", prop: 'phone'},
+    { label: "传真", prop: 'fax'},
+    { label: "邮编", prop: 'postID'},
+    { label: "银行", prop: 'bank'},
+    { label: "货币", prop: 'currency'},
+    { label: "备注", prop: 'remark'},
+  ]
+
+/**
+ * @returns {Array}  供应商物料
+ */
+ export const SupplierItem =  [
+  { label: "供应商代码", prop: 'supplierCode' },
+  { label: "itemCode", prop: "itemCode" },
+  { label: "供应商物料代码", prop: "supplierItemCode" },
+  { label: "供应商物料名称", prop: "itemName" },
+  { label: "每托数量", prop: "qtyPerPallet" },
+  { type: "object", label: "包装数量", prop: "supplierPackQty", showProp: "qty" },
+  { type: "object", label: "包装单位", prop: "supplierPackQty", showProp: "uom" },
+  { label: "版本", prop: "version" },
+  { label: "备注", prop: 'remark' },
+  ]
+
+/**
+ * @returns {Array}  供应商时间窗口
+ */
+ export const SupplierTime =  [
+  { label: "供应商代码", prop: 'supplierCode', },
+  { label: "供应商名称", prop: 'supplierName', },
+  { label: "时间窗口", prop: "timeSlot", },
+  { label: "当前时间", prop: "week", },
+  { label: "备注", prop: 'remark', },
+  ]
+
+/**
+ * @returns {Array}  分类
+ */
+ export const Category =  [
+  { label: "分类编号", prop: "code" },
+  { label: "分类名称", prop: 'name' },
+  { label: "描述", prop: "description" },
+  { label: "备注", prop: 'remark' }
+  ]
+
+/**
+ * @returns {Array}  计量单位
+ */
+ export const Uom =  [
+  { label: "计量单位编号", prop: "code", },
+  { label: "计量单位名称", prop: 'name', },
+  { type: "filter", label: "类型", prop: "type", filters: "uomType", },
+  { label: "描述", prop: "description", },
+  { label: "备注", prop: 'remark', },
+  ]
+
+/**
+ * @returns {Array}  收货口
+ */
+ export const Dock =  [
+    { label: "收货口编号", prop: "code" },
+    { label: "默认库位编号", prop: "defaultLocationCode" },
+    { label: "收货口名称", prop: 'name' },
+    { label: "描述", prop: "description" },
+    { label: "备注", prop: 'remark' }
+  ]
+
+/**
+ * @returns {Array}  库区
+ */
+ export const Area =  [
+    { label: "库区代码", prop: "code", },
+    { label: "库区名称", prop: 'name', },
+    { type: "filter", label: "是否功能区", prop: "isFunctional", filters: "whetherOrNot" },
+    { type: "filter", label: "类型", prop: "areaType", filters: "areaType" },
+    { label: "描述", prop: "description", },
+    { label: "备注", prop: 'remark', },
+  ]
+
+/**
+ * @returns {Array}  库位组
+ */
+ export const LocationGroup =  [
+  { label: "库区代码", prop: "areaCode", },
+  { type: "filter", label: "类型", prop: "groupType", filters: "locationType", },
+  { type: "filter", label: "状态", prop: "defaultInventoryStatus", filters: "inventoryStage", },
+  { label: "备货优先级", prop: "pickPriority", },
+  { label: "编号", prop: "code", },
+  { label: "名称", prop: 'name', },
+  { label: "描述", prop: "description", },
+  { label: "溢流库位组", prop: "overflowLocationGroup", },
+  { type: "objectFilter", label: "是否混物料", prop: "locSwitch", showProp: "enableMixItem", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否机会盘点", prop: "locSwitch", showProp: "enableOpportunityCount", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否领料", prop: "locSwitch", showProp: "enablePick", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否发出", prop: "locSwitch", showProp: "enableShip", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", filters: "whetherOrNot", },
+  { label: "备注", prop: 'remark', },
+  ]
+
+/**
+ * @returns {Array}  工位组
+ */
+ export const WorkGroup =  [
+    { label: "工作组代码", prop: "code" },
+    { label: "工作组名称", prop: 'name' },
+    { label: "描述", prop: "description" },
+    { label: "仓库代码", prop: "warehouseCode" },
+    { label: "备注", prop: 'remark' }
+  ]
+/**
+ * @returns {Array}  库位
+ */
+ export const Location =  [
+  { label: "库位代码", prop: "code", },
+  { label: "库位名称", prop: "name", },
+  { label: "库区代码", prop: "areaCode", },
+  { label: "库位组代码", prop: "locationGroupCode", },
+  { label: "工作组代码", prop: "workGroupCode", },
+  { type: "object", label: "库位数量", prop: "qty", showProp: "qty", },
+  { type: "object", label: "库位数量单位", prop: "qty", showProp: "uom", },
+  { type: "filter", label: "类型", prop: "type", filters: "locationType", },
+  { label: "行号", prop: "rowCode", },
+  { label: "列号", prop: "columnCode", },
+  { type: "filter", label: "默认库存状态", prop: "defaultInventoryStatus", filters: "inventoryStage", },
+  { label: "备货优先级", prop: "pickPriority", },
+  { label: "备货顺序", prop: "pickOrder", },
+  { label: "货架号", prop: "shelfCode", },
+  { label: "ERP系统库位编号", prop: "erpLocationCode", },
+  { type: "objectFilter", label: "是否混物料", prop: "locSwitch", showProp: "enableMixItem", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否盘点", prop: "locSwitch", showProp: "enableOpportunityCount", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否领料", prop: "locSwitch", showProp: "enablePick", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否发出", prop: "locSwitch", showProp: "enableShip", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否拆箱", prop: "locSwitch", showProp: "enableSplitBox", filters: "whetherOrNot", },
+  { type: "objectFilter", label: "是否拆托", prop: "locSwitch", showProp: "enableSplitPallet", filters: "whetherOrNot", },
+  { label: "描述", prop: "description", },
+  { label: "备注", prop: 'remark', },
+  ]
+
+  /**
+ * @returns {Array} ERP库位
+ */
+ export const ERPLocation = [
+  { label: "ERP库位代码", prop: "code" },
+  { label: "ERP库位名称", prop: "name" },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { type: "filter", label: "类型", prop: "type", filters: "locationType" },
+]
+
+/**
+ * @returns {Array}  库位零件关系
+ */
+ export const ItemStoreRelation =  [
+  { label: "itemCode", prop: "itemCode", options: "itemBasic" },
+  { type: "filter", label: "储存关系类型", prop: "storeRelationType", filters: "storeRelationType", },
+  { type: "filter", label: "是否可用", prop: "enabled", filters: "whetherOrNot", },
+  { type: "filter", label: "是否定制位置", prop: "isFixed", filters: "whetherOrNot", },
+  { label: "主存储容量", prop: "umQty", },
+  { label: "主存储单位", prop: "storeUM", },
+  { label: "次要存储容量", prop: "altUmQty", },
+  { label: "次要存储单位", prop: "altUm", },
+  { type: "filter", label: "存储单位", prop: "pramaryUM", filters: "pramaryUm" },
+  { label: "值", prop: "storeValue", },
+  { label: "备注", prop: 'remark', },
+  ]
+
+/**
+ * @returns {Array}  库位可用容量
+ */
+ export const InventoryLocationCapacity =  [
+  { label: "可用容量(%)", prop: "availableCapacity", },
+  { type: "filter", label: "是否无穷大", prop: "isInfinity", filters: "whetherOrNot" },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: 'remark', },
+  ]
+
+  /**
+ * @returns {Array}   物料安全库存
+ */
+ export const ItemSafetyStock = [
+  { label: "物料代码", prop: "itemCode", },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { type: "filter", label: "存储关系类型", prop: "storeRelationType", filters: "storeRelationType", },
+  { label: "值", prop: "storeValue" },
+  { label: "最大库存", prop: "maxStock" },
+  { label: "最小库存", prop: "minStock" },
+  { label: "安全库存", prop: "safetyStock" },
+  { label: "补料点", prop: "feedLine" },
+  { label: "补料数量", prop: "feedQty" },
+  { label: "补料单位", prop: "feedUM" },
+]
+
+/**
+ * @returns {Array}   物料安全库存
+ */
+ export const ItemSafetyStockQuery = [
+  {
+    label: "物料代码",
+    prop: "itemCode",
+    fixed: "left",
+    type: "name",
+  },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { type: "filter", label: "存储关系类型", prop: "storeRelationType", filters: "storeRelationType", },
+  { label: "值", prop: "storeValue" },
+  { label: "最大库存", prop: "maxStock" },
+  { label: "最小库存", prop: "minStock" },
+  { label: "安全库存", prop: "safetyStock" },
+  { label: "补料点", prop: "feedLine" },
+  { label: "补料数量", prop: "feedQty" },
+  { label: "补料单位", prop: "feedUM" },
+]
+
+/**
+ * @returns {Array}  车间
+ */
+ export const Workshop =  [
+  { label: "车间代码", prop: "code" },
+  { label: "车间名称", prop: 'name' },
+  { label: "描述", prop: "description" },
+  { label: "备注", prop: 'remark' },
+  ]
+
+/**
+ * @returns {Array}  生产线
+ */
+ export const ProductionLine =  [
+  { label: "生产线代码", prop: "code" },
+  { label: "生产线名称", prop: 'name' },
+  { label: "类型", prop: "type" },
+  { label: "车间代码", prop: "workshopCode" },
+  { label: "成品库位", prop: "productLocation" },
+  { label: "描述", prop: "description" },
+  { label: "备注", prop: 'remark' }
+  ]
+/**
+ * @returns {Array}  生产线零件关系
+ */
+ export const ProdLineItem =  [
+  { label: "物料代码", prop: "itemCode", },
+  { label: "生产线编号", prop: "prodLineCode", },
+  { label: "生产线名称", prop: "prodLineName", },
+  { label: "车间代码", prop: "workshopCode", },
+  { label: "原料库位", prop: "rawLocation" },
+  { label: "成品ERP库位", prop: "productErpLocationCode" },
+  { label: "备注", prop: "remark", },
+  ]
+/**
+ * @returns {Array}  班组
+ */
+ export const Team =  [
+  { label: "班组代码", prop: "code" },
+  { label: "班组名称", prop: 'name' },
+  { label: "成员", prop: "members" },
+  { label: "描述", prop: "description" },
+  { label: "备注", prop: 'remark' },
+  ]
+/**
+ * @returns {Array}  班次
+ */
+ export const Shift =  [
+  { type: "input", label: "班次代码", prop: "code", },
+  { type: "input", label: "班次名称", prop: "name", },
+  { type: "filter", label: "结束到下一天", prop: "endAtNextDay", filters: "whetherOrNot", },
+  { label: "描述", prop: "description", },
+  { type: "objectDateTime", label: "开始时间", prop: "timeRange", showProp: "beginTime", },
+  { type: "objectDateTime", label: "结束时间", prop: "timeRange", showProp: "endTime", },
+  { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  日历
+ */
+ export const Calendar =  [
+  { label: "模块", prop: "module", },
+  { type: "filter", label: "状态", prop: "status", filters: "calendarStatus" },
+  { label: "编号", prop: "code", },
+  { label: "名称", prop: 'name', },
+  { label: "描述", prop: "description", },
+  { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  配置
+ */
+ export const Configuration =  [
+  { label: "键", prop: "key", },
+  { label: "值", prop: "value", },
+  { label: "描述", prop: "description", },
+  { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  采购订单
+ */
+ export const PurchaseOrder =  [
+  { label: "采购订单号", prop: 'number' },
+  { label: "供应商编号", prop: "supplierCode", },
+  { label: "仓库", prop: "warehouseCode", },
+  { label: "订单类型", prop: "poType", },
+  { label: "订单状态", prop: "status", },
+  { type: "filter", label: "是否寄存订单", prop: "isConsignment", filters: "whetherOrNot" },
+  { type: "dateTime", label: "订单日期", prop: "orderDate", },
+  { type: "dateTime", label: "截止日期", prop: "dueDate", },
+  { label: "版本", prop: "version", },
+  { label: "税率", prop: "taxRate", },
+  { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  销售订单
+ */
+ export const SaleOrder =  [
+  { label: "销售订单号", prop: "number", },
+  { label: "客户代码", prop: "customerCode", },
+  // { label: "父物料号", prop: "product", },
+  // { label: "子物料号", prop: 'component', },
+  { label: "版本", prop: "version", },
+  { label: "工序", prop: "op", },
+  { label: "层级", prop: "layer", },
+  { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  供应商发货通知
+ */
+ export const SupplierAsn =  [
+  { label: "要货计划单号", prop: "rpNumber" },
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "状态", prop: "status", type: "filter", filters: "supplierStatus"  },
+  { type: "object", label: "客户名称", prop: 'contacts',showProp: 'name' },
+  { label: "车牌号", prop: "truckNumber" },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { label: "收货口代码", prop: "dockCode" },
+  { label: "发货日期", prop: 'shipDate', type:'dateTime' },
+  { label: "到货日期", prop: 'dueDate', type:'dateTime'  },
+  { label: "时间窗口", prop: 'timeWindow' },
+  { label: "公司", prop: 'company' },
+  { label: "创建时间", prop: 'createTime', type:'dateTime' },
+  ]
+/**
+ * @returns {Array}  客户发货通知
+ */
+ export const CustomerAsn =  [
+  { label: "编号", prop: "id", },
+  { label: "父物料号", prop: "product", },
+  { label: "子物料号", prop: 'component', },
+  { label: "版本", prop: "version", },
+  { label: "工序", prop: "op", },
+  { label: "层级", prop: "layer", },
+  { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  到货通知
+ */
+ export const ArriveNotice =  [
+   { label: "仓库", prop: "warehouseCode" },
+   { label: "收货口", prop: "dockCode" },
+   { label: "到货单号", prop: "number" },
+   { type: "dateTime", label: "到货时间", prop: "arriveTime" },
+   { label: "发货单号", prop: "asnNumber" },
+   { label: "要货计划单号", prop: "rpNumber" },
+   { label: "订单号", prop: "poNumber" },
+   { label: "供应商编号", prop: "supplierCode" },
+   { label: "状态", type: "filter", filters: "arriveNoticeStatus", prop: "status", },
+   { type: "dateTime", label: "创建时间", prop: "createTime" },
+   { label: "备注", prop: "remark" },
+  ]
+  /**
+ * @returns {Array}   采购收货记录
+ */
+ export const PurchaseReceiptNote =  [
+  { label: "编号", prop: "id", },
+  { label: "供应商单号", prop: "supplierCode", },
+  { label: "到货单号", prop: 'arriveNoticeNumber', },
+  { label: "发货单号", prop: "asnNumber", },
+  { label: "收货单号", prop: "number", },
+  { label: "要货计划单号", prop: "rpNumber", },
+  { type: "dateTime", label: "收货时间", prop: "receiveTime", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: 'remark', },
+]
+  /**
+ * @returns {Array}   收货异常记录
+ */
+ export const ReceiptAbnormalNote =  [
+  { label: "收货单号", prop: 'receiptNumber', },
+  { label: "发货单号", prop: "asnNumber", },
+  { label: "供应商编号", prop: 'supplierCode', },
+  { label: "箱标签", prop: 'packingCode', },
+  { label: "托标签", prop: 'containerCode',},
+  { label: "异常类型", prop: 'abnormalType',  },
+  { label: "itemCode", prop: 'itemCode',},
+  { label: "批次编号", prop: 'batchCode',},
+  { label: "备注", prop: 'remark', },
+]
+  /**
+ * @returns {Array}   采购退货记录
+ */
+ export const PurchaseReturnNote =  [
+  { label: "退货单号", prop: "number", },
+  { label: "供应商单号", prop: "supplierCode", },
+  // { label: "到货单号", prop: 'arriveNumber', },
+  // { label: "发货单号", prop: "asnNumber", },
+  // { label: "收货单号", prop: "receiptNumber", },
+  // { label: "要货计划单号", prop: "rpNumber", },
+  // { label: "收货时间", prop: "receiveTime", },
+  { type: "dateTime", label: "退货时间", prop: "returnTime", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: 'remark', },
+]
+  /**
+ * @returns {Array}   上架记录
+ */
+ export const PutawayNote =  [
+  { label: "编号", prop: "id", },
+  { label: "上架记录单号", prop: "number", },
+  { label: "任务ID", prop: 'jobNumber',},
+  // { label: "供应商编号", prop: 'supplierCode',},
+  // { label: "操作员", prop: 'worker',},
+  // { label: "检验单号", prop: 'inspectNumber',},
+  // { label: "收费单号", prop: 'receiptNumber',},
+  // { label: "到货单号", prop: 'arriveNoticeNumber',},
+  // { label: "发货单号", prop: 'asnNumber',},
+  // { label: "要货计划单号", prop: 'rpNumber',},
+  // { label: "完工收货单号", prop: 'productReceiptNumber',},
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: "remark", },
+]
+  /**
+ * @returns {Array}   要料申请
+ */
+ export const MaterialRequest =  [
+  { label: "编号", prop: "id", },
+  { label: "要料申请单号", prop: "number", },
+  { label: "车间", prop: "workshop", },
+  { label: "任务状态", type: "filter", filters: "requestStatus", prop: "status", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: 'remark', },
+]
+  /**
+ * @returns {Array}   发料记录
+ */
+ export const IssueNote =  [
+  { label: "编号", prop: "id", },
+  { label: "发料记录单号", prop: "number", },
+  { label: "任务ID", prop: 'jobNumber',},
+  { label: "操作员", prop: 'worker',},
+  { label: "车间", prop: 'workshop',},
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: "remark", },
+]
+  /**
+ * @returns {Array}   计划外入库记录
+ */
+ export const UnplannedReceiptNote =  [
+  { type: "input", label: "编号", prop: "id" },
+  // { label: "计划外入库单号", prop: "unplannedReceiptNumber", },
+  { label: "流水单号", prop: "seqNo" },
+  // { label: "备注", prop: 'remark', },
+]
+  /**
+ * @returns {Array}   计划外出库记录
+ */
+ export const UnplannedIssueNote =  [
+  { type: "input", label: "编号", prop: "id" },
+  // { label: "计划外出库单号", prop: "unplannedIssueNumber", },
+  { label: "流水单号", prop: "seqNo" },
+  // { label: "备注", prop: 'remark', },
+]
+  /**
+ * @returns {Array}   隔离记录
+ */
+ export const IsolationNote =  [
+  { label: "编号", prop: "id", },
+  { label: "隔离记录单号", prop: "number", },
+  { label: "任务ID", prop: "jobNumber",},
+  { label: "操作员", prop: "worker",},
+  { label: "备注", prop: 'remark', },
+]
+  /**
+ * @returns {Array}   工单号维护
+ */
+  export const WorkOrder =  [
+    { label: "工单号", prop: "workNumberValue" },
+    { type: "filter", label: "类型", prop: "workOrderType", filters: "workOrderType" },
+    { type: "filter", label: "状态", prop: "status", filters: "workOrderStatus" },
+    { label: "描述", prop: "description" },
+    { label: "备注", prop: 'remark' },
+  ]
+  /**
+ * @returns {Array}   报废记录
+ */
+ export const ScrapNote =  [
+  { label: "编号", prop: "id", },
+  { label: "报废记录单号", prop: "number",},
+  // { label: "部门", prop: 'department' },
+  { label: "工单号", prop: 'workOrder' },
+  // { label: "流水号", prop: 'seqNo' },
+  { label: "操作员", prop: "worker",},
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  发货计划
+ */
+ export const DeliverPlan = [
+  { label: "编号", prop: "id", },
+  { label: "客户", prop: "customer", },
+  // { label: "项目", prop: "project", },
+  // { label: "销售订单号", prop: "soNumber", },
+  { type: "dateTime", label: "计划日期", prop: "planDate", },
+  { type: "dateTime", label: "计划时间", prop: "planTime", },
+  { label: "发货计划单号", prop: "number", },
+  { type: "filter", filters: "DeliverPlanStatus", label: "状态", prop: "status", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { type: "filter", label: "发货方式", prop: "shipVia", filters: "DeliverPlanTransport" },
+  { type: "filter", label: "运输方式", prop: "modeOfTransport", filters: "DeliverPlanTransport" },
+  { type: "filter", label: "承运商", prop: "carrier", filters: "DeliverPlanFreightTJ" },
+  // { label: "承运商参考", prop: "carrierShipmentRef" },
+  { label: "车辆", prop: "vehicleID" },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  发货申请
+ */
+ export const DeliverRequest = [
+  { label: "编号", prop: "id", },
+  { label: "发货申请单号", prop: "number", },
+  { label: "客户", prop: "customer", },
+  { label: "任务状态", type: "filter", filters: "requestStatus", prop: "status", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  发货记录
+ */
+export const DeliverNote = [
+  { label: "编号", prop: "id", },
+  { label: "发货记录单号", prop: "number", },
+  { label: "任务ID", prop: 'jobNumber', },
+  { label: "操作员", prop: 'worker',},
+  { label: "客户", prop: 'customer',},
+  { label: "客户地址", prop: 'customerAddressCode',},
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: "remark", },
+]
+
+/**
+ * @returns {Array}  仓库管理-发运管理-发货记录（天津）
+ */
+ export const WareHouseTransferNote = [
+  { label: "ID", prop: "id", },
+  { label: "调拨发货单号", prop: "number", },
+  { label: "操作员", prop: "worker", },
+  { label: "任务ID", prop: "jobNumber", },
+  { label: "供应商编号", prop: "supplierCode", },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  发货任务（天津）
+ */
+ export const Shipments = [
+  { label: "发货任务编号", prop: "number", },
+  { label: "器具类型", prop: "position", filters: "InstrumentsLXStatus" , type: "filter" },
+  { label: "器具数量", prop: 'containerQty', },
+  { label: "操作员", prop: 'worker',},
+  { label: "客户", prop: 'customer',},
+  { label: "客户地址", prop: 'customerAddressCode',},
+  { label: "项目", prop: "projectCode", },
+  { label: "计划时间", prop: "planTime", },
+  { label: "备注", prop: "remark", },
+]
+
+/**
+ * @returns {Array}  器具查询（天津）
+ */
+ export const Instruments = [
+  {label: "器具编号",prop: "containerCode"},
+  { label: "排序号", prop: "seqNo"},
+  { type: "filter", label: "状态", prop: "businessStatus", filters: "instrumentsStatus" },
+  { label: "成品库位编号", prop: "locationCode"},
+  { type: "filter", label: "类型", prop: "type", filters: "InstrumentsLXStatus" },
+  { label: "产品数量", prop: "capacity"},
+  { label: "项目编号", prop: "projectCode"},
+  { label: "备注", prop: 'remark' }
+]
+
+/**
+ * @returns {Array}  收货记录（天津）
+ */
+ export const ReceivingRecords = [
+  { label: "ID", prop: "id", },
+  { label: "收货记录单号", prop: "number"},
+  { label: "生产线编码", prop: "prodLine" },
+  { label: "成品库位编码", prop: "locationCode" },
+  { label: "原料库位编码", prop: "rawLocation" },
+  { label: "收货时间", prop: "completeTime", type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+]
+
+/**
+ * @returns {Array}  发货记录（天津）
+ */
+ export const DeliveryRecord = [
+  { label: "ID", prop: "id", },
+  { label: "发货记录单号", prop: "number"},
+  { label: "任务编号", prop: "jobNumber" },
+  { label: "操作员", prop: "worker" },
+  { label: "客户", prop: "customer" },
+  { label: "客户地址", prop: "customerAddressCode"},
+  { label: "项目", prop: "projectCode" },
+  { label: "发货日期", prop: "deliverTime", type: "dateTime" },
+  { label: "备注", prop: "remark" }
+]
+
+/**
+ * @returns {Array}  仓库管理-发运管理-回收记录（天津）
+ */
+ export const JisProductRecycleNote = [
+  {
+    label: "回收单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: "300px"
+  },
+  { label: "生产计划单号", prop: "productionPlanNumber"},
+  { label: "操作员", prop: "worker" },
+  { label: "仓库", prop: "warehouseCode"},
+  { label: "收货库位", prop: "locationCode"},
+  { label: "原料库位", prop: "rawLocation"},
+  { label: "生产线", prop: "prodLine"},
+  { label: "车间", prop: "workshop"},
+  { label: "班次", prop: "shift"},
+  { label: "回收时间", prop: "recycleTime", type: "dateTime"},
+  { label: "备注", prop: 'remark' }
+]
+/**
+ * @returns {Array}  仓库管理-发运管理-退库记录（天津）
+ */
+ export const JisProductReturnNote = [
+  {
+    label: "退库单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: "300px"
+  },
+  { label: "发货任务编号", prop: "jobNumber" },
+  { label: "客户", prop: "customer"},
+  { label: "从库位", prop: "fromLocationCode"},
+  { label: "到库位", prop: "toLocationCode"},
+  { label: "从仓库", prop: "fromWarehouseCode"},
+  { label: "到仓库", prop: "toWarehouseCode"},
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: "createTime", type: "dateTime"},
+  { label: "备注", prop: 'remark' }
+]
+/**
+ * @returns {Array}  仓库管理-发运管理-库存调整记录（天津）
+ */
+ export const JisProductTransferNote = [
+  {
+    label: "库存调整单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: "300px"
+  },
+  { label: "从库位", prop: "fromLocationCode"},
+  { label: "到库位", prop: "toLocationCode"},
+  { label: "从仓库", prop: "fromWarehouseCode"},
+  { label: "到仓库", prop: "toWarehouseCode"},
+  { label: "操作员", prop: "worker"},
+  { label: "创建时间", prop: "createTime", type: "dateTime"},
+]
+/**
+ * @returns {Array}  盘点计划
+ */
+ export const CountPlan = [
+  { label: "盘点计划单号", prop: "number", },
+  // { type: "filter", filters: "checkType", label: "类型", prop: "type", },
+  // { type: "filter", filters: "checkStage", label: "阶段", prop: "stage", },
+  { type: "filter", filters: "CheckPlanStatus", label: "状态", prop: "status", },
+  { label: "描述", prop: "descrpiton", },
+  { type: "dateTime", label: "开始时间", prop: "beginTime", },
+  { type: "dateTime", label: "结束时间", prop: "endTime", },
+  { label: "地点", prop: "company", },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  调整库存
+ */
+ export const CountPlanAdjust = [
+  { label: "盘点报告单号", prop: "number", },
+  { label: "盘点计划单号", prop: "countPlanNumber", },
+  { type: "filter", filters: "CheckPlanStatus", label: "状态", prop: "status", },
+  // { type: "filter", filters: "stageType", label: "阶段", prop: "stage", },
+  { type: "dateTime", label: "开始时间", prop: "beginTime", },
+  { type: "dateTime", label: "结束时间", prop: "endTime", },
+
+]
+
+/**
+ * @returns {Array}  盘点记录
+ */
+ export const CountNote = [
+  { label: "盘点报告单号", prop: "number", },
+  { type: "input", label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  盘点差异调整记录
+ */
+ export const CountAdjustNote = [
+  { label: "盘点差异调整记录单号", prop: "number", },
+  { label: "盘点记录单号", prop: 'countNoteNumber', },
+  { label: "盘点计划单号", prop: 'countPlanNumber', },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: "remark", },
+]
+
+/**
+ * @returns {Array}  库存余额
+ */
+ export const InventoryBalance = [
+  { label: "itemCode", prop: 'itemCode' },
+  { type: "object", label: "物料名称", prop: "item", showProp: "name" },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+  { label: "库位代码", prop: "locationCode" },
+  { type: "filter", label: "库存状态", prop: "status", filters: "inventoryStage" },
+  { label: "批次", prop: 'lot' },
+  { label: "箱标签", prop: 'packingCode' },
+  { label: "托盘标签", prop: 'containerCode' },
+  { type: "object", label: "库存数量", prop: "qty", showProp: "qty" },
+  { type: "object", label: "计量单位", prop: "qty", showProp: "uom" },
+  { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+  { type: "object", label: "库区", prop: "location", showProp: "area", },
+  { type: "object", label: "库位组", prop: "location", showProp: "group", },
+  { type: "dateTime", label: "入库时间", prop: "putInTime", },
+  { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate" },
+  { type: "objectDateTime", label: "过期日期", prop: "batch", showProp: "expireDate" },
+  { type: "dateTime", label: "上次盘点时间", prop: "lastCountTime", },
+  { label: "上次盘点单号", prop: "lastCountPlanNumber", },
+  { label: "上次盘点标签号", prop: "lastCountLabel", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { type: "filter", label: "是否可用", prop: "isActive", filters: "whetherOrNot", },
+]
+
+/**
+* @returns {Array}   ERP库存余额
+*/
+export const ERPInventoryBalance = [
+  { label: "itemCode", prop: "itemCode" },
+  { label: "库位代码", prop: "locationCode", },
+  { label: "库存状态", prop: "status", },
+  { label: "批次", prop: "lot", },
+  { type: "object", label: "库存数量", prop: "qty", showProp: "qty", },
+  { type: "object", label: "计量单位", prop: "qty", showProp: "uom", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { type: "dateTime", label: "最后修改时间", prop: "lastModificationTime", },
+]
+
+/**
+ * @returns {Array}  库存事务
+ */
+ export const InventoryTransaction = [
+  { label: "事务编号", prop: "transNumber" },
+  { type: "filter", filters: "TransType", label: "事务分类", prop: "transType" },
+  { type: "filter", filters: "TransSubType", label: "事务类型", prop: "transSubType" },
+  { type: "filter", filters: "transInOutStatus", label: "出库/入库", prop: "transInOut" },
+  { type: "object", label: "事务数量", prop: "qty", showProp: "qty" },
+  { label: "批次", prop: "lot" },
+  { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch" },
+  { label: "箱标签", prop: "packingCode" },
+  { label: "托标签", prop: "containerCode" },
+  { label: "itemCode", prop: "itemCode", },
+  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "计量单位", prop: "qty", showProp: "uom" },
+  { type: "filter", filters: "inventoryStage", label: "库存状态", prop: "inventoryStatus" },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { type: "dateTime", label: "事务日期", prop: "transTime" },
+  { type: "dateTime", label: "生效日期", prop: "activeDate" },
+  { label: "操作员", prop: "worker" },
+  { label: "任务编号", prop: "jobNumber" },
+  { label: "单据编号", prop: "docNumber" },
+  { type: "dateTime", label: "上次修改时间", prop: "lastModificationTime" },
+  { label: "库位代码", prop: "locationCode" },
+  { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate" },
+  { label: "管理类型", prop: "manageType" }
+]
+
+/**
+ * @returns {Array}  库存快照
+ */
+ export const InventorySnapshot = [
+  { label: "父物料号", prop: "product", },
+  { label: "子物料号", prop: 'component',},
+  { label: "版本", prop: "version", },
+  { label: "工序", prop: "op", },
+  { label: "层级", prop: "layer", },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  库存转移日志
+ */
+ export const InventoryTransferLog = [
+  { label: "库存转移编号", prop: "transferNumber", },
+  { label: "操作员", prop: "worker", },
+  { label: "箱标签", prop: "toPackingCode", },
+  { label: "从库位代码", prop: "fromLocationCode", },
+  { label: "到库位代码", prop: "toLocationCode", },
+  { label: "从托盘标签", prop: "fromContainerCode", },
+  { label: "到托盘标签", prop: "toContainerCode", },
+  { type: "filter", filters: "TransType", label: "事务类型", prop: "transType", },
+  { type: "filter", filters: "TransSubType", label: "事务替代类型", prop: "transSubType", },
+  { label: "从事务编号", prop: "formTransNumber", },
+  { label: "到事务编号", prop: "toTransNumber", },
+  { type: "filter", filters: "inventoryStage", label: "从状态", prop: "fromStatus", },
+  { type: "filter", filters: "inventoryStage", label: "到状态", prop: "toStatus", },
+  { label: "itemCode", prop: "itemCode" },
+  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
+  { type: "object", label: "到货单位", prop: "qty", showProp: "uom", },
+  { label: "批次", prop: 'lot', },
+  { type: "object", label: "从批次", prop: "fromBatch", showProp: "supplierBatch", },
+  { type: "object", label: "到批次", prop: "toBatch", showProp: "supplierBatch", },
+  { label: "备注", prop: 'remark', },
+  { type: "dateTime", label: "事务时间", prop: "transferTime", },
+  { type: "dateTime", label: "生效日期", prop: "activeDate", },
+]
+
+/**
+ * @returns {Array}  库存转移记录
+ */
+export const InventoryTransferNote = [
+  {
+    label: "库存转移编号", prop: "number" },
+  { type: "dateTime", label: "创建时间", prop: "createTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "备注", prop: 'remark' },
+]
+
+/**
+ * @returns {Array}  转合格
+ */
+export const InventoryTransferLogHegeZBuHeGe = [
+  { label: "库存转移编号", prop: "transferNumber", },
+  { label: "操作员", prop: "worker", },
+  { label: "箱标签", prop: "toPackingCode", },
+  { label: "从库位代码", prop: "fromLocationCode", },
+  { label: "到库位代码", prop: "toLocationCode", },
+  { label: "从托盘标签", prop: "fromContainerCode", },
+  { label: "到托盘标签", prop: "toContainerCode", },
+  { type: "filter", filters: "TransType", label: "事务类型", prop: "transType", },
+  { type: "filter", filters: "TransSubType", label: "事务替代类型", prop: "transSubType", },
+  { label: "从事务编号", prop: "formTransNumber", },
+  { label: "到事务编号", prop: "toTransNumber", },
+  { type: "filter", filters: "requestStatus", label: "从状态", prop: "fromStatus", },
+  { type: "filter", filters: "requestStatus", label: "到状态", prop: "toStatus", },
+  { label: "itemCode", prop: "itemCode" },
+  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
+  { type: "object", label: "到货单位", prop: "qty", showProp: "uom", },
+  { label: "批次", prop: 'lot', },
+  { type: "object", label: "从批次", prop: "fromBatch", showProp: "supplierBatch", },
+  { type: "object", label: "到批次", prop: "toBatch", showProp: "supplierBatch", },
+  { label: "备注", prop: 'remark', },
+  { type: "dateTime", label: "事务时间", prop: "transferTime", },
+  { type: "dateTime", label: "生效日期", prop: "activeDate", },
+]
+
+/**
+ * @returns {Array}  已占用库存
+ */
+ export const InventoryOccupied = [
+  { label: "itemCode", prop: "itemCode" },
+  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "任务编号", prop: "jobNumber" },
+  { label: "箱标签", prop: "packingCode", },
+  { label: "托标签", prop: "containerCode", },
+  { label: "库位代码", prop: "locationCode", },
+  { type: "object", label: "占用数量", prop: "qty", showProp: "qty", },
+  { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+  { type: "object", label: "仓库编号", prop: "location", showProp: "warehouse" },
+  { type: "object", label: "库位组编号", prop: "location", showProp: "group" },
+  { type: "object", label: "库区代码", prop: "location", showProp: "area" },
+  { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+  { type: "filter", filters: "taskStatus", label: "状态", prop: "status", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  预填充库存
+ */
+ export const InventoryPredictable = [
+  { label: "itemCode", prop: "itemCode", },
+  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "任务编号", prop: "jobNumber" },
+  { label: "箱标签", prop: "packingCode", },
+  { label: "托标签", prop: "containerCode", },
+  { label: "库位代码", prop: "locationCode", },
+  { type: "object", label: "占用数量", prop: "qty", showProp: "qty", },
+  { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+  { type: "object", label: "仓库编号", prop: "location", showProp: "warehouse" },
+  { type: "object", label: "库位组编号", prop: "location", showProp: "group" },
+  { type: "object", label: "库区代码", prop: "location", showProp: "area" },
+  { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+  { type: "filter", filters: "taskStatus", label: "状态", prop: "status", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  生产计划
+ */
+ export const ProductionPlan = [
+  { label: "生产计划单号", prop: "number", },
+  { label: "生产线", prop: "prodLine", },
+  { label: "车间", prop: "workshop", },
+  { label: "班组", prop: "team", },
+  { label: "班次", prop: "shift", },
+  { type: "filter", filters: "ProductionPlanStatus", label: "状态", prop: "status", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { type: "dateTime", label: "计划日期", prop: "planDate", },
+]
+
+/**
+ * @returns {Array}  备料计划
+ */
+ export const PreparationPlan = [
+  { label: "生产计划单号", prop: "productionPlanNumber", },
+  { label: "生产线", prop: "prodLine", },
+  { label: "车间", prop: "workshop", },
+  { label: "班次", prop: "shift", },
+  { label: "班组", prop: "team", },
+  { label: "状态", type: "filter", filters: "requestStatus", prop: "status", },
+  { type: "dateTime", label: "计划时间", prop: "planTime", },
+]
+
+/**
+ * @returns {Array}  退料
+ */
+ export const MaterialReturn = [
+  { label: "库存转移编号", prop: "transferNumber", },
+  { label: "操作员", prop: "worker", },
+  { label: "箱标签", prop: "toPackingCode", },
+  { label: "从库位代码", prop: "fromLocationCode", },
+  { label: "到库位代码", prop: "toLocationCode", },
+  { label: "从托盘标签", prop: "fromContainerCode", },
+  { label: "到托盘标签", prop: "toContainerCode", },
+  { type: "filter", filters: "TransType", label: "事务类型", prop: "transType", },
+  { type: "filter", filters: "TransSubType", label: "事务替代类型", prop: "transSubType", },
+  { label: "从事务编号", prop: "formTransNumber", },
+  { label: "到事务编号", prop: "toTransNumber", },
+  { type: "filter", filters: "requestStatus", label: "从状态", prop: "fromStatus", },
+  { type: "filter", filters: "requestStatus", label: "到状态", prop: "toStatus", },
+  { label: "itemCode", prop: "itemCode" },
+  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
+  { type: "object", label: "到货单位", prop: "qty", showProp: "uom", },
+  { label: "批次", prop: 'lot', },
+  { type: "object", label: "从批次", prop: "fromBatch", showProp: "supplierBatch", },
+  { type: "object", label: "到批次", prop: "toBatch", showProp: "supplierBatch", },
+  { label: "备注", prop: 'remark', },
+  { type: "dateTime", label: "事务时间", prop: "transferTime", },
+  { type: "dateTime", label: "生效日期", prop: "activeDate", },
+]
+
+/**
+ * @returns {Array}  完工收货记录
+ */
+ export const ProductReceiptNote = [
+  { label: "完工收货记录单号", prop: "number", },
+  { label: "生产计划单号", prop: 'productionPlanNumber', },
+  { type: "dateTime", label: "完工时间", prop: 'completeTime', },
+  { label: "车间", prop: 'workShop', },
+  { label: "操作员", prop: 'worker',},
+  { label: "公司", prop: "company", },
+]
+
+/**
+ * @returns {Array}  下线结算记录
+ */
+ export const OfflineSettlementNote = [
+  // { label: "编号", prop: "id", },
+  { label: "下线结算记录单号", prop: "number", },
+  { label: "业务单号", prop: 'productReceiptNumber', },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: "remark", },
+]
+
+/**
+ * @returns {Array}  追溯记录
+ */
+ export const TracebackNote = [
+  // { label: "编号", prop: "id", },
+  { label: "追溯单号", prop: "number" },
+  { label: "物料代码", prop: "itemCode" },
+  { label: "物料名称", type: "object", prop: "item", showProp: "name" },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+  { label: "箱标签", prop: "packingCode" },
+  { type: "object", label: "产品数量", prop: "qty", showProp: "qty" },
+  { type: "object", label: "单位", prop: "qty", showProp: "uom" },
+  { label: "批次", prop: "lot" },
+  
+  { label: "车间", prop: "workshop", },
+  { label: "生产线", prop: "prodLine", },
+  { label: "班次", prop: "shift", },
+  { label: "库位编号", prop: "locationCode" },
+  // { type: "dateTime", label: "库位编号", prop: "completeTime" },
+  // { type: "object", label: "产品批次", prop: "batch", showProp: "supplierBatch", },
+  { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  成品回收记录
+ */
+ export const ProductRecycleNote = [
+  { label: "成品回收单号", prop: "number", },
+  { type: "dateTime", label: "回收时间", prop: 'recycleTime', },
+  { label: "车间", prop: 'workshop', },
+  { label: "班次", prop: 'shift', },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: "remark", },
+]
+
+/**
+ * @returns {Array}  退库记录
+ */
+ export const StockReturnNote = [
+  { label: "退库记录单号", prop: "number", },
+  { type: "dateTime", label: "退料时间", prop: 'returnTime', },
+  { label: "车间", prop: 'workshop', },
+  { label: "任务ID", prop: 'jobNumber',},
+  { label: "操作员", prop: 'worker',},
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: "remark", },
+]
+
+/**
+ * @returns {Array}  客户退货记录
+ */
+ export const CustomerReturnNote = [
+  { label: "编号", prop: "id", },
+  { label: "退货记录单号", prop: "number", },
+  { type: "dateTime", label: "退货时间", prop: 'returnTime', },
+  { label: "客户", prop: 'customer', },
+  { label: "任务ID", prop: 'jobNumber',},
+  { label: "操作员", prop: 'worker',},
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: "remark", },
+]
+
+/**
+ * @returns {Array}   返修记录
+ */
+export const ReworkNote =  [
+  {
+    label: "工单号",
+    prop: "number",
+    fixed: "left",
+  },
+  { label: "物料代码", prop: 'itemCode' },
+  // { label: "部门", prop: 'department' },
+  // { label: "工单号", prop: 'workOrder' },
+  // { label: "流水号", prop: 'seqNo' },
+  { label: "目标物料代码", prop: 'toItemCode' },
+  { label: "目标物料名称", prop: 'toItemName' },
+  { label: "目标物料描述1", prop: 'toItemDesc1' },
+  { label: "目标物料描述2", prop: 'toItemDesc2' },
+  { label: "目标数量", prop: 'toQtyQty' },
+  { label: "目标单位", prop: 'toQtyUom' },
+  { label: "目标库位", prop: 'toLocationCode' },
+  { label: "目标批次", prop: 'toLot' },
+  { label: "生产线", prop: 'prodLine' },
+  { label: "库位", prop: 'locationCode' },
+  { label: "仓库", prop: 'warehouseCode' },
+  { label: "操作员", prop: 'worker' },
+  { type: "dateTime", label: "创建时间", prop: "createTime",},
+  { label: "备注", prop: "remark",},
+]
+
+/**
+ * @returns {Array}  报检单
+ */
+ export const InspectNotice = [
+  { label: "检验单号", prop: "number", },
+  { label: "操作员", prop: "worker", },
+  { label: "收货单号", prop: "receiptNumber", },
+  { label: "到货单号", prop: "arriveNoticeNumber", },
+  { label: "发货单号", prop: "asnNumber", },
+  { label: "要货计划单号", prop: "rpNumber", },
+  { label: "订单号", prop: "poNumber", },
+  { label: "供应商编号", prop: "supplierCode", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  检验记录
+ */
+ export const InspectNote = [
+  { label: "检验单号", prop: "number", },
+  { label: "收货记录单号", prop: "receiptNumber", },
+  { label: "到货单号", prop: "arriveNoticeNumber", },
+  { label: "发货单号", prop: "asnNumber", },
+  { label: "要货计划单号", prop: "rpNumber", },
+  { label: "供应商代码", prop: "supplierCode", },
+  { label: "操作员", prop: "worker", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+]
+
+/**
+ * @returns {Array}  质量异常记录
+ */
+ export const InspectAbnormalNote = [
+  { label: "编号", prop: "id", },
+  { label: "质量异常记录单号", prop: "number", },
+  { label: "操作员", prop: "worker", },
+  { label: "检验单号", prop: 'inspectNumber', },
+  { label: "收货单号", prop: 'receiptNumber', },
+  { label: "供应商编号", prop: 'supplierCode', },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: "remark", },
+]
+
+/**
+ * @returns {Array}  采购收货任务
+ */
+ export const PurchaseReceiptJob = [
+  { label: "收货任务编号", prop: "number", },
+  { label: "到货单号", prop: "arriveNoticeNumber", },
+  { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", },
+  { label: "要货计划单号", prop: "rpNumber", },
+  // { label: "采购订单号", prop: "poNumber", },
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "供应商名称", prop: "supplierName" },
+  { label: "时间窗口", prop: "timeWindow" },
+  { label: "承接者用户名", prop: "acceptUserName", },
+  { type: "dateTime", label: "承接者时间", prop: "acceptTime", },
+  { label: "完成者用户名", prop: "completeUserName", },
+  { type: "dateTime", label: "完成时间", prop: "completeTime", },
+  { label: "操作员", prop: "worker", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  // { label: "承接者用户名", prop: "acceptUserName", },
+  // { type: "dateTime", label: "承接者时间", prop: "acceptTime", },
+  // { label: "完成者用户名", prop: "completeUserName", },
+  // { type: "dateTime", label: "完成时间", prop: "completeTime", },
+  // { label: "到货单号", prop: "arriveNoticeNumber", },
+  // { label: "要货计划单号", prop: "rpNumber", },
+  // { label: "订单号", prop: "poNumber", },
+  // { label: "供应商编号", prop: "supplierCode" },
+  // { label: "供应商名称", prop: "supplierName" },
+  // { label: "时间窗口", prop: "timeWindow" },
+  // { label: "上游任务编号", prop: "upStreamJobNumber",},
+  // { label: "工作组", prop: "workGroupCode",},
+  // { type: "filter", filters: "taskType", label: "任务类型", prop: "jobType", },
+  // { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", },
+  // { type: "dateTime", label: "创建时间", prop: "createTime", },
+  // { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  采购退货任务
+ */
+ export const PurchaseReturnJob = [
+  { label: "任务编号", prop: "number", },
+  { label: "承接者用户名", prop: "acceptUserName", },
+  { type: "dateTime", label: "承接者时间", prop: "acceptTime", },
+  { label: "完成者用户名", prop: "completeUserName", },
+  { type: "dateTime", label: "完成时间", prop: "completeTime", },
+  { type: "filter", filters: "taskType", label: "任务类型", prop: "jobType", },
+  { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", },
+  { label: "到货单号", prop: "arriveNoticeNumber", },
+  { label: "收货单号", prop: "purchaseReceiptNumber", },
+  { label: "发货单号", prop: "asnNumber", },
+  { label: "订单号", prop: "poNumber", },
+  { label: "供应商编码", prop: "supplierCode", },
+  { label: "工作组", prop: 'workGroupCode', },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  上架任务
+ */
+ export const PutawayJob = [
+  { label: "任务编号", prop: "number", },
+  { label: "到货单号", prop: "arriveNoticeNumber", },
+  { label: "完工收货单号", prop: "productReceiptNumber", },
+  // { label: "收货单号", prop: "receiptNumber", },
+  { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", },
+  // { label: "要货计划单号", prop: "rpNumber", },
+  // { label: "发货单号", prop: "asnNumber", },
+  // { label: "承接者用户名", prop: "acceptUserName", },
+  // { label: "完成者用户名", prop: "completeUserName", },
+  // { label: "供应商代码", prop: "supplierCode" },
+  // { label: "供应商名称", prop: "supplierName" },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { type: "dateTime", label: "承接者时间", prop: "acceptTime", },
+  { type: "dateTime", label: "完成时间", prop: "completeTime", },
+
+  // { label: "承接者用户名", prop: "acceptUserName", },
+  // { type: "dateTime", label: "承接者时间", prop: "acceptTime", },
+  // { label: "完成者用户名", prop: "completeUserName", },
+  // { type: "dateTime", label: "完成时间", prop: "completeTime", },
+  // { type: "filter", filters: "taskType", label: "任务类型", prop: "jobType", },
+  // { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", },
+  // { type: "dateTime", label: "创建时间", prop: "createTime", },
+  // { label: "到货单号", prop: "arriveNoticeNumber", },
+  // { label: "收货单号", prop: "receiptNumber", },
+  // { label: "发货单号", prop: "asnNumber", },
+  // { label: "完工收货单号", prop: "productReceiptNumber", },
+  // { label: "要货计划单号", prop: "rpNumber", },
+  // { label: "备注", prop: 'remark', },
+]
+
+
+/**
+ * @returns {Array}  检验任务
+ */
+ export const InspectJob = [
+  { label: "任务编号", prop: "number", },
+  { label: "到货单号", prop: "arriveNoticeNumber", },
+  { label: "检验单号", prop: "inspectNumber", },
+  { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", },
+  { label: "承接者用户名", prop: "acceptUserName", },
+  { label: "完成者用户名", prop: "completeUserName", },
+  { type: "dateTime", label: "承接者时间", prop: "acceptTime", },
+  { type: "dateTime", label: "完成时间", prop: "completeTime", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+
+  // { label: "承接者用户名", prop: "acceptUserName", },
+  // { type: "dateTime", label: "承接者时间", prop: "acceptTime", },
+  // { label: "完成者用户名", prop: "completeUserName", },
+  // { type: "dateTime", label: "完成时间", prop: "completeTime", },
+  // { type: "filter", filters: "taskType", label: "任务类型", prop: "jobType", },
+  // { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", },
+  // { type: "dateTime", label: "创建时间", prop: "createTime", },
+  // { label: "到货单号", prop: "arriveNoticeNumber", },
+  // { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  发料任务
+ */
+ export const IssueJob = [
+  { label: "任务编号", prop: "number", },
+  { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", },
+  { label: "要货单号", prop: "materialRequestNumber", },
+  { label: "承接者用户名", prop: "acceptUserName", },
+  { label: "完成者用户名", prop: "completeUserName", },
+  { type: "dateTime", label: "承接者时间", prop: "acceptTime", },
+  { type: "dateTime", label: "完成时间", prop: "completeTime", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+
+  // { type: "filter", filters: "taskType", label: "任务类型", prop: "jobType", },
+  // { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", },
+  // { label: "承接者用户名", prop: "acceptUserName", },
+  // { type: "dateTime", label: "承接者时间", prop: "acceptTime", },
+  // { label: "完成者用户名", prop: "completeUserName", },
+  // { type: "dateTime", label: "完成时间", prop: "completeTime", },
+  // { label: "工作组", prop: "workGroupCode", },
+  // { label: "生产线", prop: "prodLine", },
+  // { label: "车间", prop: "workshop", },
+  // { label: "要货单号", prop: "materialRequestNumber", },
+  // { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  完工收货任务
+ */
+ export const ProductReceiveJob = [
+  { label: "任务编号", prop: "number", },
+  { label: "承接者用户名", prop: "acceptUserName", },
+  { type: "dateTime", label: "承接者时间", prop: "acceptTime", },
+  { label: "完成者用户名", prop: "completeUserName", },
+  { type: "dateTime", label: "完成时间", prop: "completeTime", },
+  { type: "filter", filters: "taskType", label: "任务类型", prop: "jobType", },
+  { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", },
+  { type: "dateTime", label: "创建时间", prop: "createTime", },
+  { label: "生产计划单号", prop: "productionPlanNumber", },
+  { label: "车间", prop: "workshop", },
+  { label: "班次", prop: "shift", },
+  { label: "工作组", prop: "workGroupCode", },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  发货任务
+ */
+ export const DeliverJob = [
+  { label: "任务编号", prop: "number", },
+  { label: "发货计划单号", prop: "deliverPlanNumber" },
+  { type: "dateTime", label: "发货计划时间", prop: "deliverPlanTime" },
+  { label: "承接者用户名", prop: "acceptUserName", },
+  { type: "dateTime", label: "承接者时间", prop: "acceptTime", },
+  { label: "完成者用户名", prop: "completeUserName", },
+  { type: "dateTime", label: "完成时间", prop: "completeTime", },
+  { type: "filter", filters: "taskStatus", label: "任务状态", prop: "jobStatus", },
+  { type: "filter", filters: "taskType", label: "任务类型", prop: "jobType", },
+  { label: "发货请求单号", prop: "deliverRequestNumber", },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  校验任务
+ */
+ export const CheckJob = [
+  { label: "任务编号", prop: "number", },
+  { label: "承接者用户名", prop: "acceptUserName", },
+  { type: "dateTime", label: "承接者时间", prop: "acceptTime", },
+  { label: "完成者用户名", prop: "completeUserName", },
+  { type: "dateTime", label: "完成时间", prop: "completeTime", },
+  { type: "filter", filters: "taskStatus", label: "任务状态", prop: "jobStatus", },
+  { type: "filter", filters: "taskType", label: "任务类型", prop: "jobType", },
+  { label: "到货单号", prop: "arriveNoticeNumber", },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  盘点任务
+ */
+ export const CountJob = [
+  { label: "任务编号", prop: "number", },
+  { label: "承接者用户名", prop: "acceptUserName", },
+  { type: "dateTime", label: "承接者时间", prop: "acceptTime", },
+  { label: "完成者用户名", prop: "completeUserName", },
+  { type: "dateTime", label: "完成时间", prop: "completeTime", },
+  { type: "filter", filters: "taskStatus", label: "任务状态", prop: "jobStatus", },
+  { type: "filter", filters: "taskType", label: "任务类型", prop: "jobType", },
+  // { type: "filter", filters: "checkStage", label: "阶段", prop: "countStage", },
+  { type: "dateTime", label: "承接时间", prop: "acceptTime", },
+  { label: "到货单号", prop: "arriveNoticeNumber", },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  消息管理-消息类型
+ */
+ export const MessageType = [
+  { label: "消息类别代码", prop: "messageTypeCode" },
+  { label: "消息类别名称", prop: "messageTypeName" },
+  { label: "备注", prop: 'remark' }
+]
+
+/**
+ * @returns {Array}  供应商考核看板-供应商考核记录
+ */
+ export const SupplierAssessmentNote = [
+  {
+    label: "供应商代码",
+    prop: "supplierCode",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "供应商名称", prop: "supplierName" },
+  { label: "ASN单号", prop: 'asnNumber' },
+  { label: "ASN发货时间", prop: 'asnShippingTime', type:'dateTime' },
+  { type: "filter", label: "考核内容", prop: "reason", filters: "reasonStatus" },
+  { label: "扣分分数", prop: 'scope' },
+  { label: "扣分时间", prop: 'evaluationTime', type:'dateTime' },
+  { label: "备注", prop: 'remark' },
+]
+
+/**
+ * @returns {Array}  供应商考核看板-汇总报表
+ */
+ export const SupplierAssessmentReportForm = [
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "供应商名称", prop: "supplierName" },
+  { label: "扣分总数", prop: 'summaryOfScores' },
+  { label: "扣分次数", prop: 'countOfScores' },
+  { label: "送货总数", prop: 'countOfAsn' },
+  { label: "出错率", prop: 'errorRate' },
+]
+
+/**
+ * @returns {Array}  JIS信息查询
+ */
+ export const JISMessageQuery = [
+  {
+    label: "单据号",
+    prop: "number",
+    fixed: "left",
+  },
+  { label: "产品号", prop: "productNo" },
+  { label: "项目号", prop: 'program' },
+  { label: "位置", prop: 'position' },
+  { label: "FATA", prop: 'fata' },
+  { label: "配置号", prop: 'configuration' },
+  { label: "器具号", prop: 'containerCode' },
+  { label: "完工单号", prop: 'receiptNumber' },
+]
+
+/**
+ * @returns {Array}  鸿翔外库jis发货
+ */
+ export const OuterJisDeliverNote = [
+  { label: "单据号", prop: "number" },
+  { label: "发货单号", prop: "deliverNumber" },
+  { label: "仓库", prop: 'warehouseCode' },
+  { label: "操作员", prop: 'worker' },
+  { label: "创建时间", prop: 'createTime', type:'dateTime' },
+]
+
+/**
+ * @returns {Array}  发货记录
+ */
+export const OuterPillarDeliverNote = [
+  { label: "单据号", prop: "number" },
+  { label: "发货单号", prop: "deliverNumber" },
+  { label: "仓库", prop: 'warehouseCode' },
+  { label: "操作员", prop: 'worker' },
+  { label: "创建时间", prop: 'createTime', type:'dateTime' },
+]
+
+/**
+ * @returns {Array}  鸿翔外库jis换件
+ */
+ export const OuterJisReplaceNote = [
+  {
+    label: "单据号",
+    prop: "number",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "项目号", prop: "projectCode" },
+  { label: "位置", prop: 'position' },
+  { label: "配置号", prop: 'l7Part' },
+  { label: "物料描述", prop: 'itemName' },
+  { label: "备品生产号", prop: 'sparesNumber' },
+  { label: "备品批次", prop: 'sparesLot' },
+  { label: "目标生产号", prop: 'targetNumber' },
+  { label: "目标批次", prop: 'targetLot' },
+  { label: "备品批次", prop: 'sparesLot' },
+  { label: "说明", prop: 'description' },
+  { label: "换件用户", prop: 'replacePeople' },
+  { label: "换件时间", prop: 'replaceDate', type:'dateTime' },
+  { label: "创建时间", prop: 'createTime', type:'dateTime' },
+  { label: "操作员", prop: 'worker' },
+]
+
+
+/**
+ * @returns {Array}  鸿翔外库jis计划外入库
+ */
+ export const OuterJisUnplannedReceiptNote = [
+  {
+    label: "单据号",
+    prop: "number",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "计划外入库单号", prop: "outerUnplannedReceiptNumber" },
+  { label: "仓库", prop: 'warehouseCode' },
+  { label: "创建时间", prop: 'createTime', type:'dateTime' },
+]
+
+/**
+ * @returns {Array}  鸿翔外库jis计划外出库
+ */
+ export const OuterJisUnplannedIssueNote = [
+  {
+    label: "单据号",
+    prop: "number",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "计划外出库单号", prop: "outerUnplannedIssueNumber" },
+  { label: "仓库", prop: 'warehouseCode' },
+  { label: "创建时间", prop: 'createTime', type:'dateTime' },
+]
+
+/**
+ * @returns {Array}  消息收货日志
+ */
+ export const MessageReceiveAppService = [
+  {
+    label: "id",
+    prop: "id",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "创建时间", prop: "createTime", showProp: true },
+  { label: "creatorId", prop: "creatorId", showProp: true },
+  { label: "跟踪编号", prop: "traceId", showProp: true },
+  { label: "errorCode", prop: "errorCode", showProp: true },
+  { label: "电报文件名称", prop: "messageFileName", showProp: true },
+  { label: "文件类型", prop: "messageFileType", showProp: true },
+  { type: "filter", label: "状态", prop: "receiveStatus", filters: "receiveStatus" },
+  { label: "receiveTime", prop: "receiveTime", showProp: true },
+  { label: "lastUpdateTime", prop: "lastUpdateTime", showProp: true },
+  { label: "errorCount", prop: "errorCount", showProp: true },
+  { label: "operateType", prop: "operateType", showProp: true },
+  { label: "报文内容JSON", prop: "messageContent", showProp: true },
+  { label: "errorMessage", prop: "errorMessage", showProp: true },
+]
+
+/**
+ * @returns {Array}  Part接口日志
+ */
+ export const PartAppService = [
+  {
+    label: "跟踪编号",
+    prop: "traceId",
+  },
+  { label: "公司", prop: "company" },
+  { label: "工厂", prop: 'site' },
+  { label: "物料号", prop: 'code' },
+  { label: "物流名称", prop: 'name' },
+  { label: "描述1", prop: 'desc1' },
+  { label: "描述2", prop: 'desc2' },
+  { label: "物料状态", prop: 'status' },
+  { label: "允许制造", prop: 'canMake' },
+  { label: "允许采购", prop: 'canBuy' },
+  { label: "计量单位", prop: 'um' },
+  { label: "ABC类", prop: 'abcClass' },
+  { label: "产品类", prop: 'prodKind' },
+  { label: "零件类型", prop: 'partType' },
+  { label: "零件种类", prop: 'partCatalog' },
+  { label: "零件分组", prop: 'partGroup' },
+  { label: "虚零件", prop: 'isPhantom' },
+  { label: "颜色", prop: 'color' },
+  { label: "配置", prop: 'config' },
+  { label: "项目", prop: 'project' },
+  { label: "版本", prop: 'version' },
+  { label: "工程变更通知单", prop: 'eco' },
+  { label: "标包计量单位", prop: 'stdPackUm' },
+  { label: "包装数量", prop: 'packQty' },
+  { label: "替代计量单位", prop: 'extPackUm' },
+  { label: "替代包装数量", prop: 'extPackQty' },
+  { label: "备注", prop: 'remark' },
+]
+
+/**
+ * @returns {Array}  WMS&QAD接口日志
+ */
+ export const OutgoingDataAppService = [
+  {
+    label: "id",
+    prop: "id",
+  },
+  { label: "创建时间", prop: "createTime", type:'dateTime', showProp: true },
+  { label: "数据编号", prop: "number", showProp: true },
+  { label: "数据类型", prop: "dataType", showProp: true },
+  { label: "生效日期", prop: "effectiveDate", type:'dateTime', showProp: true },
+  { label: "status", prop: "status", showProp: true },
+  { label: "errorCode", prop: "errorCode", showProp: true },
+  { label: "来源系统", prop: "source", showProp: true },
+  { label: "写入时间", prop: "writeTime", type:'dateTime', showProp: true },
+  { label: "写入者", prop: "writer", showProp: true },
+  { label: "错误信息", prop: "errorMessage", showProp: true },
+  { label: "数据内容", prop: "dataContent", showProp: true },
+]
+
+/**
+ * @returns {Array}  WMS&QAD接口历史日志
+ */
+ export const OutgoingDataHistoryAppService = [
+  {
+    label: "id",
+    prop: "id",
+  },
+  { label: "创建时间", prop: "createTime", type:'dateTime', showProp: true },
+  { label: "creatorId", prop: "creatorId", showProp: true },
+  { label: "数据编号", prop: "number", showProp: true },
+  { label: "数据类型", prop: "dataType", showProp: true },
+  { label: "生效日期", prop: "effectiveDate", type:'dateTime', showProp: true },
+  { type: "filter", label: "状态", prop: "status", filters: "OutgoingDataHistoryAppStatus" },
+  { type: "filter", label: "是否错误", prop: "errorCode", filters: "errorCodeStatus" },
+  { label: "错误代码", prop: "errorCode", showProp: true },
+  { label: "来源系统", prop: "source", showProp: true },
+  { label: "写入时间", prop: "writeTime", type:'dateTime', showProp: true },
+  { label: "写入者", prop: "writer", showProp: true },
+  { label: "错误信息", prop: "errorMessage", showProp: true },
+  { label: "数据内容", prop: "dataContent", showProp: true },
+]
+
+/**
+ * @returns {Array}  Bom接口日志
+ */
+ export const BomAppService = [
+  {
+    label: "id",
+    prop: "id",
+  },
+  { label: "创建时间", prop: "createTime", type:'dateTime', showProp: true },
+  { label: "creatorId", prop: 'creatorId', showProp: true },
+  { label: "跟踪编号", prop: 'traceId', showProp: true },
+  { label: "errorCode", prop: 'errorCode', showProp: true },
+  { label: "errorMessage", prop: 'errorMessage', showProp: true },
+  { label: "公司", prop: 'company', showProp: true },
+  { label: "父物料号", prop: 'parentCode', showProp: true },
+  { label: "子物料号", prop: 'componentCode', showProp: true },
+  { label: "用量", prop: 'perQty', showProp: true },
+  { label: "参考号", prop: 'reference', showProp: true },
+  { label: "开始日期", prop: 'startDate', type:'dateTime', showProp: true },
+  { label: "结束日期", prop: 'endDate', type:'dateTime', showProp: true },
+  { label: "类型", prop: 'type', showProp: true },
+  { label: "工序", prop: 'op', showProp: true },
+  { label: "废品率", prop: 'scrapPct', showProp: true },
+  { label: "序号", prop: 'seqNumber', showProp: true },
+  { label: "分组", prop: 'optionGroup', showProp: true },
+  { label: "工序", prop: 'process', showProp: true },
+  { label: "备注", prop: 'remark', showProp: true },
+]
+
+/**
+ * @returns {Array}  单块门板-发货记录
+ */
+export const SingleDoorPanelDeliverNote = [
+  { label: "发货记录单号", prop: "number", },
+  { label: "操作员", prop: 'worker' },
+  { label: "仓库", prop: 'warehouseCode' },
+  { label: "任务ID", prop: 'jobNumber' },
+  { label: "客户", prop: 'customer' },
+  { label: "客户地址代码", prop: 'customerAddressCode' },
+  { label: "项目号", prop: "projectCode" },
+  { label: "发货时间", prop: "deliverTime", type: "dateTime" },
+  { label: "到货时间", prop: "arrivalTime", type: "dateTime" },
+  { label: "项目名称", prop: "projectName" },
+  { label: "客户名称", prop: "customerName" },
+  { label: "客户联系人", prop: "customerContact" },
+  { label: "客户电话", prop: "customerPhone" },
+  { label: "包装箱容量/箱", prop: "totalPackCapacity" },
+  { label: "客户地址", prop: "customerAddress" },
+  { label: "发货人姓名", prop: "deliverPeopleName" },
+  { label: "备注", prop: "remark" },
+]
+
+/**
+ * @returns {Array}  单块门板-完工收货记录
+ */
+export const SingleDoorPanelProductReceiptNote = [
+  { label: "完工收货单号", prop: "number", },
+  { label: "生产计划单号", prop: 'productionPlanNumber' },
+  { label: "任务ID", prop: 'jobNumber' },
+  { type: "dateTime", label: "完工时间", prop: 'completeTime' },
+  { label: "车间", prop: 'workshop' },
+  { label: "生产线", prop: 'prodLine' },
+  { label: "收货库位", prop: 'locationCode' },
+  { label: "原料库位", prop: 'rawLocation' },
+  { label: "仓库", prop: 'warehouseCode' },
+  { label: "操作员", prop: 'worker' },
+]
+
+/**
+ * @returns {Array}   单块门板-完工调整记录
+ */
+export const SingleDoorPanelProductAdjust =  [
+  { label: "完工调整单号", prop: "number" },
+  { label: "产品号", prop: 'productNo',},
+  { label: "项目号", prop: 'projectCode',},
+  { label: "位置", prop: 'position',},
+  { label: "箱码", prop: 'packingCode',},
+  { label: "配置码", prop: 'itemCode',},
+  { label: "操作员", prop: 'worker',},
+  { label: "任务ID", prop: 'jobNumber',},
+  { label: "生产线", prop: 'prodLine',},
+  { label: "批次", prop: 'lot',},
+  { label: "原料库位", prop: 'rawLocation',},
+  { label: "成品库位", prop: 'productLocation',},
+]
+
+/**
+ * @returns {Array}  单块门板-库移记录
+ */
+export const SingleDoorPanelProductTransferNote = [
+  { label: "转移发货单号", prop: "number", },
+  { label: "来源库位", prop: "fromLocationCode", },
+  { label: "目标库位", prop: "toLocationCode", },
+  { label: "来源仓库", prop: "fromWarehouseCode", },
+  { label: "目标仓库", prop: "toWarehouseCode", },
+  { label: "操作员", prop: "worker", },
+  { label: "任务ID", prop: "jobNumber", },
+  // { label: "供应商编号", prop: "supplierCode", },
+  { label: "备注", prop: "remark",},
+]
+
+/**
+ * @returns {Array}   单块门板-客户退货记录
+ */
+export const SingleDoorPanelCustomerReturnNote =  [
+  { label: "客户退货单号", prop: "number" },
+  { label: "收货库位", prop: 'locationCode' },
+  { label: "退货时间", prop: "returnTime", type: "dateTime" },
+  { label: "操作员", prop: 'worker' },
+  { label: "仓库", prop: 'warehouseCode' },
+  // { label: "任务ID", prop: 'jobNumber' },
+  { label: "备注", prop: "remark" },
+]
+
+/**
+ * @returns {Array}  调拨发货记录
+ */
+export const PillarDeliverNote = [
+  { label: "ID", prop: "id", },
+  { label: "调拨发货单号", prop: "number", },
+  { label: "仓库", prop: "warehouseCode", },
+  { label: "操作员", prop: "worker", },
+  { label: "客户", prop: "customer", },
+  { label: "客户地址", prop: "customerAddressCode", },
+  { label: "销售订单号", prop: "soNumber", },
+  { label: "发货方式", prop: "shipVia", },
+  { label: "运输方式", prop: "modeOfTransport", },
+  { label: "承运商", prop: "carrier", },
+  { label: "承运商参考", prop: "carrierShipmentRef", },
+  { label: "车辆", prop: "vehicleID", },
+  { label: "备注", prop: "remark",},
+]
+
+/**
+ * @returns {Array}   标签信息
+ */
+export const labelInfo =  [
+  { label: "箱码", prop: "packingCode" },
+  { label: "物料代码", prop: "itemCode" },
+  { label: "物料名称", prop: "item", showProp: 'name', type:'object' },
+  { label: "物料描述1", prop: "item", showProp: 'desc1', type:'object' },
+  { label: "物料描述2", prop: "item", showProp: 'desc2', type:'object' },
+  { label: "批次", prop: "lot" },
+  { label: "数量", prop: "qty", showProp: 'qty', type:'object' },
+  { label: "单位", prop: "qty", showProp: 'uom', type:'object' },
+  { label: "包装数量", prop: "planQty", showProp: 'qty', type:'object' },
+  { label: "完整条码文本", prop: "fullBarcodeString" },
+  { label: "供应商代码", prop: 'supplierCode' },
+  { label: "供应商名称", prop: 'supplierName' },
+  { label: "采购单号", prop: "asnNumber" },
+  { label: "发货单号", prop: "deliverNumber" },
+  { label: "生产线", prop: "prodLine" },
+  { label: "生产计划编号", prop: "productionPlanNumber" },
+  { label: "完工时间", prop: 'completeTime', type: "dateTime" },
+  { label: "流水号", prop: "lsh" },
+  { label: "客户物料号", prop: "customerItemCode" },
+]
diff --git a/src/utils/disposition/tableDetailsColumns.ts b/src/utils/disposition/tableDetailsColumns.ts
new file mode 100644
index 000000000..7db984905
--- /dev/null
+++ b/src/utils/disposition/tableDetailsColumns.ts
@@ -0,0 +1,1431 @@
+/**
+ * @returns {Array}  采购订单
+ */
+ export const PurchaseOrder =  [
+    { label: "itemCode", prop: "itemCode", fixed: "left" },
+    { type:"object", label: "物料名称", prop: "item", showProp:"name", },
+    { type:"object", label: "物料描述1", prop: "item", showProp:"desc1", },
+    { type:"object", label: "物料描述2", prop: "item", showProp:"desc2", },
+    { label: "订单号", prop: "number", },
+    { label: "订单行", prop: "poLine", },
+    { type:"object", label: "数量", prop: "qty", showProp:"qty", },
+    { type:"object", label: "单位", prop: "qty", showProp:"uom", },
+    { type:"object", label: "包装数量", prop: "stdPack", showProp:"packQty", },
+    { type:"object", label: "包装规格", prop: "stdPack", showProp:"packUom", },
+    { label: "转换率", prop: 'convertRate', },
+    { type: "filter", label: "是否寄存订单", prop: "isConsignment", filters: "whetherOrNot" },
+    { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  销售订单
+ */
+ export const SaleOrder =  [
+      { label: "销售订单号", prop: "number", fixed: "left",},
+      { label: "订单行", prop: "soLine", },
+      { label: "itemCode", prop: "itemCode", },
+      { type:"object", label: "物料名称", prop: "item", showProp:"name", },
+      { type:"object", label: "物料描述1", prop: "item", showProp:"desc1", },
+      { type:"object", label: "物料描述2", prop: "item", showProp:"desc2", },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  供应商发货通知
+ */
+ export const SupplierAsn =  [
+    { label: "订单号", prop: "poNumber", fixed: "left", width: "200px" },
+    { label: "订单行", prop: "poLine", width: "200px" },
+    { label: "箱标签", prop: "packingCode", width: "200px" },
+    { label: "itemCode", prop: "itemCode", width: "200px" },
+    { type: "object", label: "物料名称", prop: "item", showProp: "name", width: "200px" },
+    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", width: "200px" },
+    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", width: "200px" },
+    // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", width: "200px" },
+    { type: "object", label: "发货数量", prop: "qty", showProp: "qty", width: "200px" },
+    { type: "object", label: "计量单位", prop: "qty", showProp: "uom", width: "200px" },
+    { label: "托标签", prop: "containerCode", width: "200px" },
+    { label: "批次", prop: "lot", width: "200px" },
+    { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", width: "200px" },
+    { label: "E-LEVEL等级", prop: "itemEqLevel", width: "200px" },
+    { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", width: "200px" },
+    { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", width: "200px" },
+    { type: "object", label: "标包计量单位", prop: "stdPack", showProp: "packUom", width: "200px" },
+  ]
+/**
+ * @returns {Array}  客户发货通知
+ */
+ export const CustomerAsn =  [
+    { label: "订单号", prop: "poNumber", fixed: "left", },
+    { label: "订单行", prop: "poLine", },
+    { label: "箱标签", prop: "packingCode", },
+    { label: "itemCode", prop: "itemCode", },
+    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "发货数量", prop: "qty", showProp: "qty", },
+    { type: "object", label: "计量单位", prop: "qty", showProp: "uom", },
+    { label: "托标签", prop: "containerCode", },
+    { label: "批次", prop: "lot", },
+    { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+    { type: "object", label: "生产日期", prop: "batch", showProp: "produceDate", },
+    { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
+    { type: "object", label: "标包计量单位", prop: "stdPack", showProp: "packUom", },
+  ]
+/**
+ * @returns {Array}  到货通知
+ */
+ export const ArriveNotice =  [
+    { label: "itemCode", prop: "itemCode",fixed:"left", },
+    { type: "object", label: "物料名称",  prop: "item", showProp: "name", },
+    { type: "object", valueType: Number, label: "到货数量",  prop: "qty", showProp: "qty", },
+    { type: "object", valueType: Number, label: "包装数量",  prop: "stdPack", showProp: "packQty", },
+    { label: "每托数量",  prop: "qtyPerPallet", },
+    { type: "object", label: "计量单位", prop: "qty", showProp: "uom", },
+    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { label: "批次", prop: "lot", },
+    { type: "objectDateTime", label: "生产日期",  prop: "batch", showProp: "produceDate", },
+    { type: "object", label: "供应商批次",  prop: "batch", showProp: "supplierBatch", },
+    { label: "订单号", prop: "poNumber", },
+    { label: "订单行", prop: "poLine", },
+    { label: "箱标签", prop: "packingCode", },
+    { label: "托标签", prop: "containerCode", },
+    { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  采购收货记录
+ */
+ export const PurchaseReceiptNote =  [
+      { label: "itemCode", prop: "itemCode",fixed: "left", },
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
+      { type: "object", label: "收货数量", prop: "qty", showProp: "qty", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
+      { label: "订单号", prop: "poNumber", },
+      { label: "订单行", prop: "poLine", },
+      { label: "箱标签", prop: "packingCode", },
+      { label: "托标签", prop: "containerCode", },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
+      { label: "E-LEVEL等级", prop: "labelEqLevel" },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  收购异常记录
+ */
+ export const ReceiptAbnormalNote =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left", },
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
+      { type: "object", label: "收货数量", prop: "qty", showProp: "qty", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  采购退货记录
+ */
+ export const PurchaseReturnNote =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left", },
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "箱标签", prop: "packingCode"},
+      { label: "退货库位", prop: "locationCode"},
+      { label: "发货单号", prop: "asnNumber" },
+      { type: "object", label: "退货数量", prop: "qty", showProp: "qty", },
+      { label: "批次", prop: "lot" },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
+      // { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
+      // { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  上架记录
+ */
+ export const PutawayNote =  [
+     { label: "itemCode", prop: "itemCode", fixed: "left", },
+      { label: "箱标签", prop: "toPackingCode", },
+      { type: "object", valueType: Number, label: "上架数量", prop: "qty", showProp: "qty", },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "备料单位", prop: "qty", showProp: "uom", },
+      { label: "目标库位", prop: "toLocationCode", },
+      { label: "来源库位", prop: "fromLocationCode", },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  要料申请
+ */
+ export const MaterialRequest =  [
+    { label: "itemCode", prop: "itemCode",fixed: "left", },
+    { type: "object", valueType: Number, label: "要料数量", prop: "qty", showProp: "qty", },
+    { type: "object", label: "要料单位", prop: "qty", showProp: "uom", },
+    { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
+    { type: "object", label: "计量单位", prop: "stdPack", showProp: "packQty", },
+    { label: "请求库位", prop: "requestLocationCode", },
+    { label: "目标库位", prop: "toLocationCode",  },
+    { type: "dateTime", label: "过期日期", prop: "expiredTime", },
+    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  发料记录
+ */
+ export const IssueNote =  [
+      { label: "itemCode", prop: "itemCode",fixed: "left", },
+      // { label: "箱标签", type: "input", prop: "packingCode", },
+      { type: "object", valueType: Number, label: "发料数量", prop: "qty", showProp: "qty", },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "发料单位", prop: "qty", showProp: "uom", },
+      { label: "请求库位", prop: "fromRequestLocationCode", },
+      { label: "目标库位", prop: "toLocationCode", },
+      { label: "来源库位", prop: "fromLocationCode", },
+      { type: "dateTime", label: "发料时间", prop: "issueTime", },
+      { type: "dateTime", label: "过期时间", prop: "expiredTime", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "生产线", prop: "prodLine", },
+      { label: "工作中心", prop: "workCenter", },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  计划外入库记录
+ */
+ export const UnplannedReceiptNote =  [
+      { label: "itemCode", prop: "itemCode",fixed: "left", },
+      // { label: "箱标签", type: "input", prop: "packingCode", },
+      { type: "object", valueType: Number, label: "入库数量", prop: "qty", showProp: "qty", },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "入库单位", prop: "qty", showProp: "uom", },
+      { label: "库位编号", prop: "locationCode", },
+      { label: "箱标签", prop: "packingCode", },
+      { label: "托标签", prop: "containerCode", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+      { label: "供应商代码", prop: 'supplierCode', },
+      { label: "原因代码", prop: 'reasonCode', },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  计划外出库记录
+ */
+ export const UnplannedIssueNote =  [
+    { label: "itemCode", prop: "itemCode",fixed: "left", },
+    // { label: "箱标签", type: "input", prop: "packingCode", },
+    { type: "object", valueType: Number, label: "出库数量", prop: "qty", showProp: "qty", },
+    { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
+    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+    { type: "object", label: "出库单位", prop: "qty", showProp: "uom", },
+    { label: "库位编号", prop: "locationCode", },
+    { label: "箱标签", prop: "packingCode", },
+    { label: "托标签", prop: "containerCode", },
+    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+    { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+    { label: "供应商代码", prop: 'supplierCode', },
+    { label: "原因代码", prop: 'reasonCode', },
+    { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  隔离记录
+ */
+ export const IsolationNote =  [
+    { label: "itemCode", prop: "itemCode",fixed: "left", },
+    // { label: "箱标签", type: "input", prop: "packingCode", },
+    { type: "object", valueType: Number, label: "隔离数量", prop: "qty", showProp: "qty", },
+    { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
+    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+    { type: "object", label: "隔离单位", prop: "qty", showProp: "uom", },
+    { label: "来源库位", prop: "fromLocationCode", },
+    { label: "目标库位", prop: "toLocationCode", },
+    { label: "来源箱标签", prop: "fromPackingCode", },
+    { label: "目标箱标签", prop: "toPackingCode", },
+    { label: "来源托标签", prop: "fromContainerCode", },
+    { label: "来源托标签", prop: "toContainerCode", },
+    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+    { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+    { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  报废记录
+ */
+ export const ScrapNote =  [
+    { label: "itemCode", prop: "itemCode",fixed: "left", },
+    // { label: "箱标签", type: "input", prop: "packingCode", },
+    { type: "object", valueType: Number, label: "报废数量", prop: "qty", showProp: "qty", },
+    { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
+    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+    { type: "object", label: "报废单位", prop: "qty", showProp: "uom", },
+    { label: "来源库位", prop: "fromLocationCode", },
+    { label: "目标库位", prop: "toLocationCode", },
+    { label: "来源箱标签", prop: "fromPackingCode", },
+    { label: "目标箱标签", prop: "toPackingCode", },
+    { label: "来源托标签", prop: "fromContainerCode", },
+    { label: "来源托标签", prop: "toContainerCode", },
+    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+    { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+    { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  发货计划
+ */
+ export const DeliverPlan =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
+      { type: "object", label: "发货数量", prop: "qty", showProp: "qty", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "项目", prop: "project", },
+      { label: "销售订单号", prop: "soNumber", },
+      { label: "订单行", prop: "soLine", },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  发货申请
+ */
+ export const DeliverRequest =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { type: "object", label: "发货数量", prop: "qty", showProp: "qty", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { label: "目标库位", prop: "toLocationCode", },
+      { type: "dateTime", label: "过期时间", prop: "expiredTime", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  发货记录
+ */
+ export const DeliverNote =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      // { label: "箱标签", type: "input", prop: "packingCode", },
+      { type: "object", valueType: Number, label: "发货数量", prop: "qty", showProp: "qty", },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "发货单位", prop: "qty", showProp: "uom", },
+      { label: "目标库位", prop: "toLocationCode", },
+      { label: "来源库位", prop: "fromLocationCode", },
+      { type: "dateTime", label: "发货时间", prop: "deliverTime", },
+      { type: "dateTime", label: "过期时间", prop: "expiredTime", },
+      { label: "来源箱标签", prop: "fromPackingCode", },
+      { label: "目标箱标签", prop: "toPackingCode", },
+      { label: "来源托标签", prop: "fromContainerCode", },
+      { label: "目标托标签", prop: "toContainerCode", },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  盘点计划
+ */
+ export const CountPlan =  [
+    { label: "itemCode", prop: "itemCode", fixed: "left", },
+    // { type: "filter", filters: "checkStage", label: "阶段", prop: "stage",},
+    // {  label: "最终盘点数量", prop: "finalCountQty", },
+    // { type: "object", label: "最终盘点数量单位", prop: "finalCountQty", showProp: "uom", },
+    // { label: "盘点差异数量", prop: "diffQty" },
+    { type: "object", label: "库存数量", prop: "inventoryQty", showProp: "qty", },
+    { type: "object", label: "库存数量单位", prop: "inventoryQty", showProp: "uom", },
+    { type: "filter", label: "库存状态", prop: "inventoryStatus", filters: "inventoryStage", },
+    { label: "库位", prop: "locationCode", },
+    { type: "filter", label: "明细状态", prop: "detailStatus", filters: "DetailStatus", },
+    // { type: "object", label: "初盘数量", prop: "firstCount", showProp: "qty", },
+    // { type: "objectDateTime", label: "初盘时间", prop: "firstCount", showProp: "time", },
+    // { type: "object", label: "重盘数量", prop: "repeatCount", showProp: "qty", },
+    // { type: "objectDateTime", label: "重盘时间", prop: "repeatCount", showProp: "time", },
+    // { type: "object", label: "监盘数量", prop: "auditCount", showProp: "qty", },
+    // { type: "objectDateTime", label: "监盘时间", prop: "auditCount", showProp: "time", },
+    { label: "箱标签", prop: "packingCode", },
+    { label: "托盘标签", prop: "palletLabel", },
+    // { label: "盘点标签", prop: "countLabel", },
+    { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+    // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+    { label: "批次", prop: "lot", },
+    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { label: "备注", prop: 'remark', },
+  ]
+
+  /**
+ * @returns {Array}  调整库存
+ */
+ export const CountPlanAdjust =  [
+  { label: "盘点计划单号", prop: "countPlanNumber", fixed: "left", },
+  // { type: "filter", filters: "stageType", label: "阶段", prop: "stage",},
+  { label: "itemCode", prop: "itemCode", },
+  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "盘点数量", prop: "finalCountQty" },
+  { label: "盘点差异数量", prop: "diffQty" },
+  { type: "filter", label: "明细状态", prop: "detailStatus", filters: "DetailStatus", },
+  { type: "object", label: "库存数量", prop: "inventoryQty", showProp: "qty", },
+  // { type: "object", label: "初盘数量", prop: "firstCount", showProp: "qty", },
+  // { type: "objectDateTime", label: "初盘时间", prop: "firstCount", showProp: "time", },
+  // { type: "object", label: "重盘数量", prop: "repeatCount", showProp: "qty", },
+  // { type: "objectDateTime", label: "重盘时间", prop: "repeatCount", showProp: "time", },
+  // { type: "object", label: "监盘数量", prop: "auditCount", showProp: "qty", },
+  // { type: "objectDateTime", label: "监盘时间", prop: "auditCount", showProp: "time", },
+  // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+  { label: "批次", prop: "lot", },
+  // { label: "盘点标签", prop: "containerCode", },
+  { label: "箱标签", prop: "packingCode", },
+  { label: "库位编号", prop: "locationCode", },
+  { type: "object", label: "库存单位", prop: "inventoryQty", showProp: "uom", },
+  //{ label: "公司", prop: "company", },
+  { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  盘点记录
+ */
+ export const CountNote =  [
+      { label: "盘点计划单号", prop: "countPlanNumber", fixed: "left", },
+      // { type: "filter", filters: "checkStage", label: "阶段", prop: "stage",},
+      { label: "itemCode", prop: "itemCode", },
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "盘点数量", prop: "finalCountQty" },
+      { label: "盘点差异数量", prop: "diffQty" },
+      { type: "filter", label: "明细状态", prop: "detailStatus", filters: "DetailStatus", },
+      { type: "object", label: "库存数量", prop: "inventoryQty", showProp: "qty", },
+      // { type: "object", label: "初盘数量", prop: "firstCount", showProp: "qty", },
+      // { type: "objectDateTime", label: "初盘时间", prop: "firstCount", showProp: "time", },
+      // { type: "object", label: "重盘数量", prop: "repeatCount", showProp: "qty", },
+      // { type: "objectDateTime", label: "重盘时间", prop: "repeatCount", showProp: "time", },
+      // { type: "object", label: "监盘数量", prop: "auditCount", showProp: "qty", },
+      // { type: "objectDateTime", label: "监盘时间", prop: "auditCount", showProp: "time", },
+      // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { label: "批次", prop: "lot", },
+      // { label: "盘点标签", prop: "containerCode", },
+      { label: "箱标签", prop: "packingCode", },
+      { label: "库位编号", prop: "locationCode", },
+      { type: "object", label: "库存单位", prop: "inventoryQty", showProp: "uom", },
+      //{ label: "公司", prop: "company", },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  盘点差异调整记录
+ */
+ export const CountAdjustNote =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left", },
+      // { type: "filter", filters: "checkStage", label: "阶段", prop: "stage",},
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", width: "300px" },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", width: "300px" },
+      { label: "库位编号", prop: "locationCode", width: "200px" },
+      // { type: "object", valueType: Number, label: "发货数量", prop: "InventoryQty", showProp: "qty", width: "100px" },
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", width: "150px" },
+      // { type: "object", label: "发货单位", prop: "InventoryQty", showProp: "uom", width: "100px" },
+      { label: "盘点差异数量", prop: "diffQty" },
+      // { type: "filter", label: "明细状态", prop: "detailStatus", filters: "DetailStatus", width: "100px" },
+      { label: "批次", prop: "lot", width: "100px" },
+      { label: "库位编号", prop: "locationCode", width: "100px" },
+      { label: "盘点数量", prop: "countQty", width: "100px" },
+      { label: "调整数量", prop: "adjustQty", width: "100px" },
+      { label: "箱标签", prop: "packingCode", },
+      { label: "托标签", prop: "containerCode", },
+      // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+      { label: "原因编号", prop: "reasonCode", },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  生产计划
+ */
+ export const ProductionPlan =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { type: "object", label: "物料名称", prop: "item", showProp: "name",},
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", valueType: Number, label: "计划数量", prop: "planQty", showProp: "qty", },
+      // { label: "合格数量", prop: "goodQty", },
+      // { label: "不合格数量", prop: "noGoodQty", },
+      { type: "object", label: "计划单位", prop: "planQty", showProp: "uom", },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "object", label: "生产日期", prop: "batch", showProp: "produceDate", },
+      { label: "Bom版本", prop: "bomVersion", },
+      // { type: "input",  label: "", prop: "bomVersion", },
+      { label: "备注", prop: "remark", },
+  ]
+/**
+ * @returns {Array}  备料计划
+ */
+ export const PreparationPlan =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "备料数量", prop: "qty", showProp: "qty", },
+      { type: "object", label: "备料单位", prop: "qty", showProp: "uom", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "qty", },
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "uom", },
+      { label: "目标库位", prop: "toLocationCode", },
+      { label: "工作中心", prop: "workStation", },
+      { type: "dateTime", label: "最晚时间", prop: "latestTime", },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  完工收货记录
+ */
+ export const ProductReceiptNote =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", width: "150px" },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", width: "300px" },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", width: "300px" },
+      { label: "库位编号", prop: "locationCode", },
+      { label: "原料库位", prop: "rawLocation", width: "100px" },
+      { type: "object", valueType: Number, label: "完工收货数量", prop: "qty", showProp: "qty", width: "100px" },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", width: "100px" },
+      { type: "object", label: "完工收货单位", prop: "qty", showProp: "uom", width: "100px" },
+      { label: "箱标签", prop: "packingCode", },
+      { label: "托标签", prop: "containerCode", },
+      { label: "批次", prop: "lot", width: "100px" },
+      { label: "生产线", prop: "prodLine", width: "100px" },
+      { label: "Bom版本", prop: "bomVersion", width: "100px" },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+      { label: "原因编号", prop: "reasonCode", width: "100px" },
+      { label: "备注", prop: 'remark', width: "300px" },
+  ]
+/**
+ * @returns {Array}  下线结算记录
+ */
+ export const OfflineSettlementNote =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { type: "object", label: "物料名称", prop: "item", showProp: "name",},
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", valueType: Number, label: "下线结算数量", prop: "qty", showProp: "qty", },
+      { type: "object", label: "下线结算单位", prop: "qty", showProp: "uom", },
+      { label: "库位编号", prop: "locationCode", },
+      { label: "箱标签", prop: "packingCode", },
+      { label: "托标签", prop: "containerCode", },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      // { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+      // { type: "dateTime", label: "生产日期", prop: "createTime" },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  追溯记录
+ */
+ export const TracebackNote =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { type: "object", label: "物料名称", prop: "item", showProp: "name",},
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", valueType: Number, label: "消耗数量", prop: "rawQty", showProp: "qty", },
+      { type: "object", label: "包装规格", prop: "rawQty", showProp: "uom", },
+      { label: "来源库位代码", prop: "rawLocation", },
+      { label: "箱标签", prop: "packingCode", },
+      { label: "托标签", prop: "rawContainerCode", },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      // { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+      // { type: "dateTime", label: "生产日期", prop: "createTime", },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  成品回收记录
+ */
+ export const ProductRecycleNote =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "库位编号", prop: "locationCode", },
+      { label: "原料库位编号", prop: "rawLocation", },
+      { type: "object", valueType: Number, label: "成品回收数量", prop: "qty", showProp: "qty", },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
+      { label: "批次", prop: "lot", },
+      { type: "object", label: "成品回收单位", prop: "qty", showProp: "uom", },
+      { label: "箱标签", prop: "packingCode", },
+      { label: "托标签", prop: "containerCode", },
+      { label: "生产线", prop: "prodLine", },
+      { label: "Bom版本", prop: "bomVersion", },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  退库记录
+ */
+ export const StockReturnNote =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", valueType: Number, label: "退库数量", prop: "qty", showProp: "qty", },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "退库单位", prop: "qty", showProp: "uom", },
+      { label: "来源库位", prop: "fromLocationCode", },
+      { label: "目标库位", prop: "toLocationCode", },
+      { label: "来源箱标签", prop: "fromPackingCode", },
+      { label: "目标箱标签", prop: "toPackingCode", },
+      { label: "来源托标签", prop: "fromContainerCode", },
+      { label: "目标托标签", prop: "toContainerCode", },
+      { label: "生产线", prop: "prodLine", },
+      { label: "工作中心", prop: "workCenter", },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  客户退库记录
+ */
+ export const CustomerReturnNote =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", valueType: Number, label: "退货数量", prop: "qty", showProp: "qty", },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "退货单位", prop: "qty", showProp: "uom", },
+      { label: "来源库位", prop: "fromLocationCode", },
+      { label: "目标库位", prop: "toLocationCode", },
+      { label: "来源箱标签", prop: "fromPackingCode", },
+      { label: "目标箱标签", prop: "toPackingCode", },
+      { label: "来源托标签", prop: "fromContainerCode", },
+      { label: "目标托标签", prop: "toContainerCode", },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+      { label: "备注", prop: 'remark', },
+  ]
+  /**
+ * @returns {Array}   调拨发货
+ */
+ export const WareHouseTransferNote =  [
+  { label: "物料编号", prop: "itemCode", fixed: "left",},
+  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "数量", prop: "qty", showProp: "qty", },
+  { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
+  { label: "目标库位", prop: "toLocationCode", },
+  { label: "来源库位", prop: "fromLocationCode", },
+  { label: "目标仓库", prop: "toWarehouseCode", },
+  { label: "来源仓库", prop: "fromWarehouseCode", },
+  { type: "filter", filters: "requestStatus", label: "从状态", prop: "fromStatus",},
+  { type: "filter", filters: "requestStatus", label: "到状态", prop: "toStatus",},
+  { label: "原因", prop: "reason",},
+]
+
+/**
+ * @returns {Array}   返修记录
+ */
+  export const ReworkNote =  [
+    { label: "工单号", prop: "number", fixed: "left" },
+    { label: "物料代码", prop: 'itemCode' },
+    { label: "物料名称", prop: 'item', showProp: 'name', type: "object" },
+    { label: "描述1", prop: 'item', showProp: 'desc1', type: "object" },
+    { label: "描述1", prop: 'item', showProp: 'desc1', type: "object" },
+    { label: "批次", prop: 'lot' },
+    { label: "箱标签", prop: 'packingCode' },
+    { label: "单位", prop: 'qty', showProp: 'uom', type: "object" },
+    { label: "数量", prop: 'qty', showProp: 'qty', type: "object" },
+    { label: "库位代码", prop: 'locationCode' },
+    { label: "仓库", prop: 'warehouseCode' },
+    { label: "操作员", prop: 'worker' },
+    { label: "任务ID", prop: 'jobNumber',},
+    { type: "dateTime", label: "创建时间", prop: "createTime",},
+    { label: "备注", prop: "remark",},
+  ]
+
+/**
+ * @returns {Array}  报检单
+ */
+ export const InspectNotice =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "箱标签", prop: "packingCode",},
+      { label: "托标签", prop: "containerCode",},
+      { label: "批次", prop: "lot" },
+      { label: "库位代码", prop: "locationCode",},
+      // { label: "抽检百分比", prop: "samplePercent",},
+      // { label: "检验数量", prop: "inspectQty",},
+      { type: "object", label: "收货数量", prop: "receiveQty", showProp: "qty", },
+      { type: "object", label: "收货单位", prop: "receiveQty", showProp: "uom",},
+      { type: "filter", filters: "inspectType", label: "检验类型", prop: "inspectType",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom",},
+      { label: "订单号", prop: "poNumber",},
+      // { label: "订单行", prop: "poLine",},
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+  ]
+/**
+ * @returns {Array}  检验记录
+ */
+ export const InspectNote =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "检验数量", prop: "inspectQty",},
+      { label: "合格数量", prop: "goodQty",},
+      { label: "不合格数量", prop: "failedQty",},
+      { label: "不合格原因", prop: "failedReason",},
+      { label: "破坏数量", prop: "crackQty",},
+      { type: "object", label: "收货数量", prop: "receiveQty", showProp: "qty", },
+      { type: "object", label: "收货单位", prop: "receiveQty", showProp: "uom",},
+      { type: "filter", filters: "taskType", label: "检验类型", prop: "inspectType",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom",},
+      { label: "库位代码", prop: "locationCode",},
+      { label: "箱标签", prop: "packingCode",},
+      { label: "托标签", prop: "containerCode",},
+      { label: "批次", prop: "lot", },
+      { label: "订单号", prop: "poNumber",},
+      { label: "订单行", prop: "poLine",},
+      { label: "备注", prop: 'remark', },
+  ]
+/**
+ * @returns {Array}  质量异常记录
+ */
+ export const InspectAbnormalNote =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "质量异常数量", prop: "qty", showProp: "qty", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "质量异常单位", prop: "qty", showProp: "uom", },
+      { label: "异常类型", prop: "abnormalType", },
+      { label: "箱标签", prop: "packingCode",},
+      { label: "托标签", prop: "containerCode",},
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+      { label: "备注", prop: 'remark', },
+  ]
+  /**
+ * @returns {Array}   采购收货任务
+ */
+ export const PurchaseReceiptJob =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "实际收货数量", prop: "handledQty", showProp: "qty", },
+      { type: "object", label: "推荐收货数量", prop: "recommendQty", showProp: "qty", },
+      { type: "object", label: "收货单位", prop: "recommendQty", showProp: "uom",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom",},
+      { label: "实际库位", prop: "handledLocationCode",},
+      { label: "推荐库位", prop: "recommendLocationCode",},
+      { label: "实际箱标签", prop: "handledPackingCode", },
+      { label: "推荐箱标签", prop: "recommendPackingCode",},
+      { label: "实际托标签", prop: "handledContainerCode",},
+      { label: "推荐托标签", prop: "recommendContainerCode",},
+      { type: "object", label: "实际供应商批次", prop: "handledBatch", showProp: "supplierBatch",},
+      { type: "object", label: "推荐供应商批次", prop: "recommendBatch", showProp: "supplierBatch",},
+      { label: "订单号", prop: "poNumber",},
+      { label: "订单行", prop: "poLine",},
+      { label: "E-LEVEL等级", prop: "labelEqLevel" },
+      // { label: "备注", prop: 'remark', },
+      // { type: "input", label: "目标库位", prop: "toLocation",},
+]
+  /**
+ * @returns {Array}   采购退货任务
+ */
+ export const PurchaseReturnJob =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { label: "实际箱标签", prop: "handledPackingCode", },
+      { label: "推荐箱标签", prop: "recommendPackingCode",},
+      { type: "object", label: "实际收货数量", prop: "handledQty", showProp: "qty", },
+      { type: "object", label: "推荐收货数量", prop: "recommendQty", showProp: "qty", },
+      { type: "object", label: "收货单位", prop: "recommendQty", showProp: "uom",},
+      { label: "实际库位", prop: "handledLocationCode",},
+      // { type: "input", label: "目标库位", prop: "toLocation",},
+      { label: "推荐库位", prop: "recommendLocationCode",},
+      { label: "实际托标签", prop: "handledContainerCode",},
+      { label: "推荐托标签", prop: "recommendContainerCode",},
+      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
+      { type: "object", label: "实际供应商批次", prop: "handledBatch", showProp: "supplierBatch",},
+      { type: "object", label: "推荐供应商批次", prop: "recommendBatch", showProp: "supplierBatch",},
+      { label: "订单号", prop: "poNumber",},
+      { label: "订单行", prop: "poLine",},
+      { label: "备注", prop: 'remark', },
+]
+  /**
+ * @returns {Array}   上架任务
+ */
+ export const PutawayJob =  [
+      { label: "itemCode", prop: "itemCode",  fixed: "left",}, 
+      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "实际箱标签", prop: "handledPackingCode",},
+      { label: "推荐箱标签", prop: "recommendPackingCode",},
+      { label: "实际托标签", prop: "handledContainerCode",},
+      { label: "推荐托标签", prop: "recommendContainerCode",},
+      { type: "object", label: "实际上架数量", prop: "handledQty", showProp: "qty", },
+      { type: "object", label: "推荐上架数量", prop: "recommendQty", showProp: "qty", },
+      { label: "实际库位", prop: "handledLocationCode",},
+      { label: "推荐库位", prop: "recommendLocationCode",},
+      // { type: "object", label: "实际供应商批次", prop: "handledBatch", showProp: "supplierBatch",},
+      // { type: "object", label: "推荐供应商批次", prop: "recommendBatch", showProp: "supplierBatch",},
+      { label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status", },
+      { type: "object", label: "收货单位", prop: "recommendQty", showProp: "uom",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
+      { label: "订单号", prop: "poNumber",},
+      { label: "订单行", prop: "poLine",},
+      // { label: "从库位", prop: "fromLocationCode",},
+      // { type: "input", label: "目标库位", prop: "toLocation",},
+      // { type: "object", label: "实际收货数量", prop: "handledQty", showProp: "qty", },
+      // { type: "object", label: "推荐收货数量", prop: "recommendQty", showProp: "qty", },
+      // { label: "备注", prop: 'remark', },
+]
+  /**
+ * @returns {Array}   检验任务
+ */
+ export const InspectJob =  [
+      { label: "itemCode", prop: "itemCode",  fixed:"left", }, 
+      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "实际箱标签",prop: "handledPackingCode",},
+      { label: "推荐箱标签", prop: "recommendPackingCode",},
+      { label: "实际托标签", prop: "handledContainerCode",},
+      { label: "推荐托标签", prop: "recommendContainerCode",},
+      { type: "filter", filters: "inspectType", label: "检验类型", prop: "inspectType",},
+      { type: "object", label: "收货数量", prop: "receiveQty", showProp: "qty", },
+      { label: "检验数量", prop: "inspectQty",},
+      { label: "合格数量", prop: "goodQty",},
+      { label: "不合格数量", prop: "failedQty",},
+      { label: "最终不合格数量", prop: "notPassedQty",},
+      { label: "破坏数量", prop: "crackQty",},
+      { type: "object", label: "收货单位", prop: "receiveQty", showProp: "uom",},
+      { label: "实际库位", prop: "handledLocationCode",},
+      { label: "推荐库位", prop: "recommendLocationCode",},
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch",},
+      { label: "备注", prop: 'remark', },
+      // { type: "object", label: "收货单位", prop: "receiveQty", showProp: "uom",},
+      // { label: "箱标签", prop: "packingCode",},
+      // { label: "托标签", prop: "handledContainerCode",},
+      // { label: "不合格原因", prop: "failedReason",},
+      // { type: "object", label: "到货数量", prop: "handledQty", showProp: "qty",},
+      // { type: "object", label: "到货单位", prop: "handledQty", showProp: "uom",},
+      // { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      // { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
+      // { label: "订单号", prop: "poNumber",},
+      // { label: "订单行", prop: "poLine",},
+      
+]
+  /**
+ * @returns {Array}   发料任务
+ */
+ export const IssueJob =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "实际箱标签", prop: "handledPackingCode",},
+      { label: "推荐箱标签", prop: "recommendPackingCode",},
+      { label: "请求库位", prop: "fromRequestLocationCode", },
+      { type: "object", label: "实际数量", prop: "handledQty", showProp: "qty", },
+      { type: "object", label: "实际单位", prop: "handledQty", showProp: "uom",},
+      { type: "object", label: "推荐数量", prop: "recommendQty", showProp: "qty", },
+      { type: "object", label: "推荐单位", prop: "recommendQty", showProp: "uom",},
+      { label: "实际库位", prop: "handledLocationCode",},
+      { label: "到库位", prop: "toLocationCode",},
+      { label: "推荐库位", prop: "recommendLocationCode",},
+      { label: "实际批次", prop: "handledLot",},
+      { label: "推荐批次", prop: "recommendLot",},
+      // { type: "object", label: "实际批次", prop: "handledBatch", showProp: "supplierBatch",},
+      { type: "objectDateTime", label: "实际生产日期", prop: "handledBatch", showProp: "produceDate",},
+      // { type: "object", label: "推荐批次", prop: "recommendBatch", showProp: "supplierBatch",},
+      { type: "objectDateTime", label: "推荐生产日期", prop: "recommendBatch", showProp: "produceDate",},
+      // { label: "箱标签", prop: "packingCode",},
+      { label: "托标签", prop: "containerCode",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
+      { label: "订单号", prop: "poNumber",},
+      { label: "订单行", prop: "poLine",},
+      { label: "备注", prop: 'remark', },
+]
+  /**
+ * @returns {Array}   收料任务
+ */
+ export const IssueAcceptJob =  [
+     { label: "实际箱标签", prop: "handledPackingCode", fixed: "left",},
+      { label: "itemCode", prop: "itemCode",},
+      { label: "推荐箱标签", prop: "recommendPackingCode",},
+      { type: "object", label: "实际库位数量", prop: "handledQty", showProp: "qty", },
+      { type: "object", label: "实际库位单位", prop: "handledQty", showProp: "uom",},
+      { label: "实际库位", prop: "handledLocationCode",},
+      { label: "目标库位", prop: "toLocation",},
+      { label: "推荐库位", prop: "recommendLocationCode",},
+      { label: "托标签", prop: "containerCode",},
+      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      // { type: "object", label: "到货数量", prop: "handledQty", showProp: "qty",},
+      // { type: "object", label: "到货单位", prop: "handledQty", showProp: "uom",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
+      { type: "object", label: "批次", prop: "batch", showProp: "supplierBatch",},
+      { label: "订单号", prop: "poNumber",},
+      { label: "订单行", prop: "poLine",},
+      { label: "备注", prop: 'remark', },
+]
+  /**
+ * @returns {Array}   完工收货任务
+ */
+ export const ProductReceiveJob =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { label: "箱标签",  prop: "packingCode",},
+      { type: "object", label: "收货数量", prop: "handledQty", showProp: "qty", },
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+      { label: "实际库位", prop: "handledLocationCode",},
+      // { label: "目标库位", prop: "toLocation",},
+      { label: "推荐库位", prop: "recommendLocationCode",},
+      { type: "object", label: "收货单位", prop: "handledQty", showProp: "uom",},
+      // { label: "箱标签", prop: "packingCode",},
+      { label: "托标签", prop: "containerCode",},
+      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      // { type: "object", label: "到货数量", prop: "handledQty", showProp: "qty",},
+      // { type: "object", label: "到货单位", prop: "handledQty", showProp: "uom",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
+      { label: "订单号", prop: "poNumber",},
+      { label: "订单行", prop: "poLine",},
+      { label: "备注", prop: 'remark', },
+]
+  /**
+ * @returns {Array}   发货任务
+ */
+ export const DeliverJob =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { label: "实际箱标签",  prop: "handledPackingCode", },
+      { label: "推荐箱标签", prop: "recommendPackingCode",},
+      { type: "object", label: "实际数量", prop: "handledQty", showProp: "qty", },
+      { type: "object", label: "实际单位", prop: "handledQty", showProp: "uom",},
+      { type: "object", label: "推荐数量", prop: "recommendQty", showProp: "qty", },
+      // { type: "object", label: "推荐单位", prop: "recomendQty", showProp: "uom",},
+      // { label: "实际库位", prop: "handledLocationCode",},
+      // { label: "推荐库位", prop: "recommendLocationCode",},
+      { label: "从库位", prop: "fromLocationCode",},
+      { type: "object", label: "实际批次", prop: "handledBatch", showProp: "supplierBatch", },
+      { type: "objectDateTime", label: "实际日期", prop: "handledBatch", showProp: "produceDate",},
+      { type: "object", label: "推荐批次", prop: "recommendBatch", showProp: "supplierBatch", },
+      { type: "object", label: "推荐日期", prop: "recommendBatch", showProp: "produceDate",},
+      { label: "托标签", prop: "containerCode",},
+      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      // { type: "object", label: "到货数量", prop: "handledQty", showProp: "qty",},
+      // { type: "object", label: "到货单位", prop: "handledQty", showProp: "uom",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
+      { label: "备注", prop: 'remark', },
+]
+  /**
+ * @returns {Array}   校验任务
+ */
+ export const CheckJob =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { label: "实际箱标签", prop: "packingCode",},
+      { type: "object", label: "库存数量", prop: "inventoryQty", showProp: "qty", },
+      { type: "object", label: "库存单位", prop: "inventoryQty", showProp: "uom",},
+      { label: "实际库位", prop: "locationCode",},
+      { label: "托标签", prop: "containerCode",},
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch",},
+      { label: "订单号", prop: "poNumber",},
+      { label: "订单行", prop: "poLine",},
+      { label: "备注", prop: 'remark', },
+]
+  /**
+ * @returns {Array}   盘点任务
+ */
+ export const CountJob =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { label: "箱标签", prop: "packingCode",},
+      { type: "object", label: "实际数量", prop: "countQty", showProp: "qty", },
+      { type: "object", label: "实际单位", prop: "countQty", showProp: "uom",},
+      { type: "object", label: "库存数量", prop: "inventoryQty", showProp: "qty", },
+      { type: "object", label: "库存单位", prop: "inventoryQty", showProp: "uom",},
+      { label: "库位编号", prop: "locationCode",},
+      { type: "filter", label: "库存状态", prop: "status", filters:"inventoryStage"},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
+      { label: "托标签", prop: "containerCode",},
+      //{ label: "物料代码", prop: "itemCode",},
+      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch",},
+      { label: "批次", prop: "lot", },
+      { label: "备注", prop: 'remark', },
+]
+
+/**
+ * @returns {Array}  仓库管理-发运管理-发货任务（天津）
+ */
+ export const Shipments = [
+  {label: "器具编号",prop: "containerCode", width: "300px"},
+  { label: "产品数量", prop: "itemQty" },
+  { label: "来源库位", prop: "fromLocationCode"},
+  { label: "目标库位", prop: "toLocationCode"},
+  // { type: "filter", label: "发货状态", prop: "status", filters: "ShipmentsTjStatus",},
+  { label: "备注", prop: 'remark' }
+]
+
+/**
+ * @returns {Array}  仓库管理-发运管理-器具查询（天津）
+ */
+ export const Instruments = [
+  {label: "器具编号",prop: "containerCode"},
+  { label: "序号", prop: "seqNo" },
+  { label: "生产线编码", prop: "productNo"},
+  { label: "项目号", prop: "projectCode", },
+  { label: "配置码", prop: "itemCode" },
+  { label: "批次", prop: "lot"},
+  { label: "箱码", prop: "packingCode" },
+  { label: "位置", prop: "position" },
+  { label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status", },
+  { label: "备注", prop: 'remark' }
+]
+
+/**
+ * @returns {Array}  仓库管理-发运管理-收货记录（天津）
+ */
+export const ReceivingRecords = [
+  { label: "序号", prop: "seqNo" },
+  { label: "配置码", prop: "itemCode" },
+  {label: "器具编号",prop: "containerCode", width: "300px"},
+  { type: "object", label: "名称", prop: "item", showProp: "name" },
+  { label: "生产线编码", prop: "prodLine"},
+  { label: "生产码", prop: "productNo", },
+  { label: "项目号", prop: "projectCode", },
+  { label: "批次", prop: "lot"},
+  { label: "收货库位", prop: "locationCode" },
+]
+
+/**
+ * @returns {Array}  仓库管理-发运管理-发货记录（天津）
+ */
+ export const DeliveryRecord = [
+  {label: "器具编号",prop: "toContainerCode", width: "300px"},
+  // { label: "序号", prop: "seqNo" },
+  { label: "配置码", prop: "itemCode" },
+  { type: "object", label: "名称", prop: "item", showProp: "name" },
+  { label: "生产码", prop: "productNo", },
+  { label: "项目号", prop: "projectCode", },
+  { label: "批次", prop: "toLot"},
+  { label: "来源库位", prop: "fromLocationCode" },
+  { label: "目标库位", prop: "toLocationCode" },
+  { label: "备注", prop: 'remark' }
+]
+
+/**
+ * @returns {Array}  仓库管理-发运管理-回收记录（天津）
+ */
+ export const JisProductRecycleNote = [
+  { label: "itemCode", prop: "itemCode", fixed: "left",},
+  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "数量", prop: "qty", showProp: "qty", },
+  { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
+  { label: "箱标签", prop: "packingCode"},
+  { label: "托标签", prop: "containerCode"},
+  { label: "仓库", prop: "warehouseCode"},
+  { label: "库位", prop: "locationCode"},
+  { label: "批次", prop: "lot"},
+  { label: "生产计划单号", prop: "productionPlanNumber"},
+  { label: "产品号", prop: "productNo" },
+  { label: "项目号", prop: "projectCode" },
+  { label: "原料库位", prop: "rawLocation"},
+  { label: "生产线", prop: "prodLine"},
+]
+/**
+ * @returns {Array}  仓库管理-发运管理-退库记录（天津）
+ */
+ export const JisProductReturnNote = [
+  { label: "itemCode", prop: "itemCode", fixed: "left",},
+  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "数量", prop: "qty", showProp: "qty", },
+  // { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
+  { label: "产品号", prop: "productNo" },
+  { label: "项目号", prop: "projectCode" },
+  { label: "原因", prop: "reason" },
+]
+/**
+ * @returns {Array}  仓库管理-发运管理-库存转移记录（天津）
+ */
+ export const JisProductTransferNote = [
+  { label: "itemCode", prop: "itemCode", fixed: "left",},
+  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "数量", prop: "qty", showProp: "qty", },
+  { label: "批次", prop: "lot" },
+  { label: "产品号", prop: "productNo" },
+  { label: "项目号", prop: "projectCode" },
+  { label: "原因", prop: "reason" },
+]
+/**
+ * @returns {Array}  供应商考核看板-汇总报表
+ */
+ export const SupplierAssessmentReportForm = [
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "供应商名称", prop: "supplierName" },
+  { label: "ASN单号", prop: 'asnNumber' },
+  { label: "ASN发货时间", prop: 'asnShippingTime', type:'dateTime' },
+  // { label: "考核内容", prop: 'reason' },
+  { type: "filter", label: "考核内容", prop: "reason", filters: "reasonStatus" },
+  { label: "扣分分数", prop: 'scope' },
+  { label: "扣分时间", prop: 'evaluationTime', type:'dateTime' },
+  { label: "备注", prop: 'remark' },
+]
+
+/**
+ * @returns {Array}  JIS信息查询
+ */
+ export const JISMessageQuery = [
+  { label: "物料代码", prop: "itemCode", },
+  { label: "物料名称",type: "object",  prop: "item", showProp: "name" },
+  { label: "物料描述",type: "object", prop: "item", showProp: "desc1" },
+  { label: "产品号", prop: "productNo" },
+  { label: "项目号", prop: 'program' },
+  { label: "位置", prop: 'position' },
+  { label: "FATA", prop: 'fata' },
+  { label: "配置号", prop: 'configuration' },
+  { label: "L7零件", prop: 'l7Part' },
+  { type: "filter", label: "是否自动回冲", prop: "isAutoBackFlush", filters: "whetherOrNot" },
+  { label: "数量", prop: 'qty' },
+]
+
+/**
+ * @returns {Array}  鸿翔外库jis发货
+ */
+ export const OuterJisDeliverNote = [
+  { label: "单据号", prop: "number" },
+  { label: "物料代码", prop: "itemCode" },
+  { label: "发货单号", prop: 'deliverNumber' },
+  { label: "生产号", prop: 'productionNumber' },
+  { label: "REV", prop: 'rev' },
+  { label: "配置号", prop: 'l7Part' },
+  { label: "流水号", prop: 'serialNumber' },
+  { label: "物料描述", prop: 'itemName' },
+  { label: "位置", prop: 'position' },
+  { label: "数量", prop: 'qty' },
+  { label: "站别名", prop: 'siteNickName' },
+  { label: "发货用户", prop: 'deliverPeople' },
+  { label: "发货时间", prop: 'deliverDate', type:'dateTime' },
+  { label: "收货方", prop: 'shipToOrDock' },
+  { label: "发货方式", prop: 'shipVia' },
+  { label: "运输方式", prop: 'modeOfTransport' },
+  { label: "承运商", prop: 'carrier' },
+  { label: "承运商参考", prop: 'carrierShipmentRef' },
+  { label: "车辆", prop: 'vehicleID' },
+  { label: "销售订单号", prop: 'order' },
+  { label: "销售订单行", prop: 'line' },
+  { label: "车型年份", prop: 'modelYear' },
+  { label: "客户地址编码", prop: 'customerAddressCode' },
+]
+
+/**
+ * @returns {Array}  发货记录
+ */
+export const OuterPillarDeliverNote = [
+  { label: "单据号", prop: "number" },
+  { label: "物料代码", prop: "itemCode" },
+  { label: "发货单号", prop: 'deliverNumber' },
+  // { label: "生产号", prop: 'productionNumber' },
+  // { label: "REV", prop: 'rev' },
+  // { label: "配置号", prop: 'l7Part' },
+  // { label: "流水号", prop: 'serialNumber' },
+  { label: "物料描述1", prop: 'item', showProp:'desc1', type: "object" },
+  { label: "物料描述2", prop: 'item', showProp:'desc2', type: "object" },
+  { label: "来源库位", prop: 'locationCode' },
+  { label: "发货数量", prop: 'qty', showProp: 'qty', type: 'object' },
+  // { label: "位置", prop: 'position' },
+  // { label: "数量", prop: 'qty' },
+  // { label: "站别名", prop: 'siteNickName' },
+  // { label: "发货用户", prop: 'deliverPeople' },
+  { label: "发货时间", prop: 'deliverDate', type:'dateTime' },
+  { label: "收货方", prop: 'shipToOrDock' },
+  { label: "发货方式", prop: 'shipVia' },
+  { label: "运输方式", prop: 'modeOfTransport' },
+  { label: "承运商", prop: 'carrier' },
+  { label: "承运商参考", prop: 'carrierShipmentRef' },
+  { label: "车辆", prop: 'vehicleID' },
+  { label: "销售订单号", prop: 'order' },
+  { label: "销售订单行", prop: 'line' },
+  // { label: "车型年份", prop: 'modelYear' },
+  { label: "客户地址编码", prop: 'customerAddressCode' },
+]
+
+/**
+ * @returns {Array}  鸿翔外库jis计划外入库
+ */
+ export const OuterJisUnplannedReceiptNote = [
+  { label: "单据号", prop: "number" },
+  { label: "物料代码", prop: "itemCode" },
+  { label: "物料描述", prop: 'itemName' },
+  { label: "计划外入库单号", prop: 'outerUnplannedReceiptNumber' },
+  { label: "单据类型", prop: 'documentType' },
+  { label: "生产号", prop: 'productionNumber' },
+  { label: "REV", prop: 'rev' },
+  { label: "配置号", prop: 'l7Part' },
+  { label: "条码", prop: 'barCode' },
+  { label: "批次", prop: 'lot' },
+  { label: "数量", prop: 'qty' },
+  { label: "库位", prop: 'locationCode' },
+  { label: "用户", prop: 'unplannedReceiptPeople' },
+  { label: "用户姓名", prop: 'unplannedReceiptPeopleName' },
+  { label: "计划外入库时间", prop: 'unplannedReceiptDate', type:'dateTime' },
+]
+
+
+
+/**
+ * @returns {Array}  鸿翔外库jis计划外出库
+ */
+ export const OuterJisUnplannedIssueNote = [
+  { label: "单据号", prop: "number" },
+  { label: "物料代码", prop: "itemCode" },
+  { label: "物料描述", prop: 'itemName' },
+  { label: "计划外出库单号", prop: 'outerUnplannedIssueNumber' },
+  { label: "单据类型", prop: 'documentType' },
+  { label: "生产号", prop: 'productionNumber' },
+  { label: "REV", prop: 'rev' },
+  { label: "配置号", prop: 'l7Part' },
+  { label: "条码", prop: 'barCode' },
+  { label: "批次", prop: 'lot' },
+  { label: "数量", prop: 'qty' },
+  { label: "库位", prop: 'locationCode' },
+  { label: "用户", prop: 'unplannedIssuePeople' },
+  { label: "用户姓名", prop: 'unplannedIssuePeopleName' },
+  { label: "计划外出库时间", prop: 'unplannedIssueDate', type:'dateTime' },
+]
+
+/**
+ * @returns {Array}  单块门板-发货记录
+ */
+export const SingleDoorPanelDeliverNote =  [
+  { label: "itemCode", prop: "itemCode", fixed: "left" },
+  { type: "object", label: "物料名称", prop: "item", showProp: "name" },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+  { label: "目标批次", prop: "toLot" },
+  { label: "来源批次", prop: "fromLot" },
+  { label: "来源箱标签", prop: "fromPackingCode" },
+  { label: "目标箱标签", prop: "toPackingCode" },
+  { label: "来源托标签", prop: "fromContainerCode" },
+  { label: "来源托标签", prop: "toContainerCode" },
+  { type: "object", label: "发货数量", prop: "qty", showProp: "qty" },
+  { type: "object", label: "发货单位", prop: "qty", showProp: "uom" },
+  { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty" },
+  { label: "目标库位", prop: "toLocationCode" },
+  { label: "来源库位", prop: "fromLocationCode" },
+  { label: "目标仓库", prop: "toWarehouseCode" },
+  { label: "来源仓库", prop: "fromWarehouseCode" },
+  { type: "dateTime", label: "发货时间", prop: "deliverTime" },
+  { type: "dateTime", label: "过期时间", prop: "expiredTime" },
+  { label: "产品号", prop: "productNo" },
+  { label: "项目号", prop: "projectCode" },
+  { label: "位置", prop: "position" },
+  { label: "包装箱容量/箱", prop: "packCapacity" },
+  { label: "上线类型", prop: "onlineType" },
+  { label: "阶段", prop: "stage" },
+  { label: "用途", prop: "usedFor" },
+  { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch" },
+  { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate" },
+  { label: "备注", prop: 'remark' },
+]
+
+/**
+ * @returns {Array}  单块门板-完工收货记录
+ */
+export const SingleDoorPanelProductReceiptNote =  [
+  { label: "itemCode", prop: "itemCode", fixed: "left" },
+  { type: "object", label: "物料名称", prop: "item", showProp: "name" },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+  { label: "批次", prop: "lot" },
+  { label: "箱标签", prop: "packingCode" },
+  { label: "托标签", prop: "containerCode" },
+  { type: "object", label: "完工收货数量", prop: "qty", showProp: "qty" },
+  { type: "object", label: "完工单位", prop: "qty", showProp: "uom" },
+  { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty" },
+  { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom" },
+  { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch" },
+  { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate" },
+  { label: "库位", prop: "locationCode" },
+  { label: "原料库位", prop: "rawLocation" },
+  { label: "生产线", prop: "prodLine" },
+  { label: "Bom版本", prop: "bomVersion" },
+  { label: "产品号", prop: "productNo" },
+  { label: "项目号", prop: "projectCode" },
+  { label: "位置", prop: "position" },
+  { label: "仓库", prop: "warehouseCode", },
+  { label: "备注", prop: 'remark' },
+]
+
+/**
+ * @returns {Array}   单块门板-完工调整记录
+ */
+export const SingleDoorPanelProductAdjust =  [
+  { label: "完工调整单号", prop: "number" },
+  { label: "物料代码", prop: 'itemCode',},
+  { label: "批次", prop: 'lot',},
+  { label: "箱标签", prop: 'packingCode',},
+  { label: "托标签", prop: 'containerCode',},
+  { label: "仓库代码", prop: 'warehouseCode',},
+  { label: "数量", prop: 'qty', showProp: 'qty', type: 'object'},
+  { label: "单位", prop: 'qty', showProp: 'uom', type: 'object'},
+  { label: "包装数量", prop: 'stdPack', showProp: 'packQty', type: 'object'},
+  { label: "包装规格", prop: 'stdPack', showProp: 'packUom', type: 'object'},
+  { label: "库位代码", prop: 'locationCode',},
+]
+
+  /**
+ * @returns {Array}   单块门板-库移记录
+ */
+  export const SingleDoorPanelProductTransferNote =  [
+    { label: "物料编号", prop: "itemCode", fixed: "left" },
+    { type: "object", label: "物料名称", prop: "item", showProp: "name" },
+    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
+    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+    { label: "批次", prop: "lot" },
+    { label: "箱标签", prop: "packingCode" },
+    { label: "托标签", prop: "containerCode" },
+    { type: "object", label: "数量", prop: "qty", showProp: "qty" },
+    { type: "object", label: "单位", prop: "qty", showProp: "uom" },
+    { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty" },
+    { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom" },
+    { label: "目标仓库", prop: "toWarehouseCode" },
+    { label: "来源仓库", prop: "fromWarehouseCode" },
+    { label: "产品号", prop: "productNo" },
+    { label: "项目号", prop: "projectCode" },
+    { label: "位置", prop: "position" },
+    { label: "原因", prop: "reason" },
+  ]
+
+  /**
+ * @returns {Array}   单块门板-客户退货记录
+ */
+export const SingleDoorPanelCustomerReturnNote =  [
+  { label: "客户退货单号", prop: "number" },
+  { label: "物料代码", prop: 'itemCode' },
+  { label: "批次", prop: 'lot' },
+  { label: "箱标签", prop: 'packingCode' },
+  { label: "托标签", prop: 'containerCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "数量", prop: 'qty', showProp: 'qty', type: 'object' },
+  { label: "单位", prop: 'qty', showProp: 'uom', type: 'object' },
+  { label: "包装数量", prop: 'stdPack', showProp: 'packQty', type: 'object' },
+  { label: "包装规格", prop: 'stdPack', showProp: 'packUom', type: 'object' },
+  { label: "库位代码", prop: 'locationCode' },
+  // { label: "生产线", prop: 'prodLine' },
+  // { label: "Bom版本", prop: "bomVersion" },
+  { label: "产品号", prop: "productNo" },
+  { label: "项目号", prop: "projectCode" },
+  { label: "位置", prop: "position" },
+]
+
+ /**
+ * @returns {Array}   调拨发货记录
+ */
+ export const PillarDeliverNote =  [
+  { label: "物料编号", prop: "itemCode", fixed: "left",},
+  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "数量", prop: "qty", showProp: "qty", },
+  { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
+  { label: "目标批次", prop: "toLot", },
+  { label: "来源批次", prop: "fromLot", },
+  { label: "目标库位", prop: "toLocationCode", },
+  { label: "来源库位", prop: "fromLocationCode", },
+  { label: "目标仓库", prop: "toWarehouseCode", },
+  { label: "来源仓库", prop: "fromWarehouseCode", },
+  { type: "filter", filters: "requestStatus", label: "从状态", prop: "fromStatus",},
+  { type: "filter", filters: "requestStatus", label: "到状态", prop: "toStatus",},
+  { label: "发货时间", prop: "deliverTime", type: "dateTime" },
+  { label: "过期时间", prop: "expiredTime", type: "dateTime" },
+  { label: "销售订单号", prop: "soNumber", },
+  { label: "订单行", prop: "soLine", },
+  { label: "原因", prop: "reason",},
+]
+
+/**
+ * @returns {Array}  库存转移日志
+ */
+export const InventoryTransferNote = [
+  { label: "转移编号", prop: "number", },
+  { label: "从箱标签", prop: "fromPackingCode", },
+  { label: "到箱标签", prop: "toPackingCode", },
+  { label: "从库位代码", prop: "fromLocationCode", },
+  { label: "到库位代码", prop: "toLocationCode", },
+  { label: "从托盘标签", prop: "fromContainerCode", },
+  { label: "到托盘标签", prop: "toContainerCode", },
+  { type: "filter", filters: "inventoryStage", label: "从状态", prop: "fromStatus", },
+  { type: "filter", filters: "inventoryStage", label: "到状态", prop: "toStatus", },
+  { label: "itemCode", prop: "itemCode" },
+  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
+  { type: "object", label: "到货单位", prop: "qty", showProp: "uom", },
+  { label: "从批次", prop: "fromLot" },
+  { label: "到批次", prop: "toLot" },
+  { label: "备注", prop: 'remark', },
+  // { type: "filter", filters: "TransType", label: "事务类型", prop: "transType", },
+  // { type: "filter", filters: "TransSubType", label: "事务替代类型", prop: "transSubType", },
+  // { label: "从事务编号", prop: "formTransNumber", },
+  // { label: "到事务编号", prop: "toTransNumber", },
+  // { type: "dateTime", label: "事务时间", prop: "transferTime", },
+  // { type: "dateTime", label: "生效日期", prop: "activeDate", },
+]
diff --git a/src/utils/disposition/tableSummaryColumns.ts b/src/utils/disposition/tableSummaryColumns.ts
new file mode 100644
index 000000000..98d55dc91
--- /dev/null
+++ b/src/utils/disposition/tableSummaryColumns.ts
@@ -0,0 +1,100 @@
+  /**
+ * @returns {Array}   检验任务
+ */
+ export const InspectJob =  [
+      { label: "itemCode", prop: "itemCode",  fixed:"left", }, 
+      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "filter", filters: "inspectType", label: "检验类型", prop: "inspectType",},
+      { label: "检验数量", prop: "inspectQty",},
+      { label: "合格数量", prop: "goodQty",},
+      { label: "不合格数量", prop: "failedQty",},
+      { label: "最终不合格数量", prop: "notPassedQty",},
+      { label: "不合格原因", prop: "failedReason",},
+      { label: "破坏数量", prop: "crackQty",},
+      { type: "object", label: "收货数量", prop: "receiveQty", showProp: "qty", },
+      { type: "object", label: "收货单位", prop: "receiveQty", showProp: "uom",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
+      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch",},
+      { label: "订单号", prop: "poNumber",},
+      { label: "订单行", prop: "poLine",},
+      // { label: "itemCode", prop: "itemCode",},
+      // { type: "filter", filters: "inspectType", label: "检验类型", prop: "inspectType",},
+      // { label: "检验数量", prop: "inspectQty",},
+      // { label: "合格数量", prop: "goodQty",},
+      // { label: "不合格数量", prop: "failedQty",},
+      // { label: "最终不合格数量", prop: "notPassedQty",},
+      // { label: "实际库位", prop: "handledLocationCode",},
+      // { label: "推荐库位", prop: "recommendLocationCode",},
+      // { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+      // { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      // { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch",},
+      // { label: "备注", prop: 'remark', },
+]
+ 
+/**
+ * @returns {Array}  报检单
+ */
+ export const InspectNotice =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "批次", prop: "lot" },
+      { label: "抽检百分比", prop: "samplePercent",},
+      { label: "检验数量", prop: "inspectQty",},
+      { type: "object", label: "收货数量", prop: "receiveQty", showProp: "qty", },
+      { type: "object", label: "收货单位", prop: "receiveQty", showProp: "uom",},
+      // { type: "filter", filters: "inspectType", label: "检验类型", prop: "inspectType",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
+      // { label: "订单号", prop: "poNumber",},
+      // { label: "订单行", prop: "poLine",},
+      // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+      { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
+  ]
+
+  /**
+ * @returns {Array}  检验记录
+ */
+ export const InspectNote =  [
+      { label: "itemCode", prop: "itemCode", fixed: "left",},
+      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "检验数量", prop: "inspectQty",},
+      { label: "合格数量", prop: "goodQty",},
+      { label: "不合格数量", prop: "failedQty",},
+      { label: "破坏数量", prop: "crackQty",},
+      { type: "object", label: "收货数量", prop: "receiveQty", showProp: "qty", },
+      { type: "object", label: "收货单位", prop: "receiveQty", showProp: "uom",},
+      { type: "filter", filters: "taskType", label: "检验类型", prop: "inspectType",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom",},
+      { label: "批次", prop: "lot", },
+  ]
+  
+  /**
+ * @returns {Array}  检验记录
+ */
+  export const PurchaseReceiptNote =  [
+     { label: "itemCode", prop: "itemCode",fixed: "left", },
+     { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+     { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
+     { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+     { label: "总数", prop: "summary" },
+     { type: "object", label: "收货数量", prop: "qty", showProp: "qty", },
+     { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
+     { label: "订单号", prop: "poNumber", },
+     { label: "订单行", prop: "poLine", },
+     { label: "箱标签", prop: "packingCode", },
+     { label: "托标签", prop: "containerCode", },
+     { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
+     { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
+     { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
+     { label: "E-LEVEL等级", prop: "labelEqLevel" },
+     { label: "备注", prop: 'remark', },
+ ]
\ No newline at end of file
diff --git a/src/utils/disposition/tabsList.ts b/src/utils/disposition/tabsList.ts
new file mode 100644
index 000000000..77e9c47c6
--- /dev/null
+++ b/src/utils/disposition/tabsList.ts
@@ -0,0 +1,40 @@
+// 页面tabs标签
+export const ItemBasicTabsList = [{
+  label: "供应商物料",
+  prop: 'SupplierItems',
+},
+{
+  label: "客户物料",
+  prop: 'CustomerItems',
+},
+{
+  label: "采购订单",
+  prop: 'PurchaseOrder',
+},
+{
+  label: "要货计划",
+  prop: 'PurchasingPlan',
+},
+{
+  label: "库存余额",
+  prop: 'InventoryBalance',
+},
+{
+  label: "预计入库存",
+  prop: 'ExpectedIn',
+},{
+  label: "预计出库存",
+  prop: 'ExpectedOut',
+},
+
+]
+export const PurchasereceiptRequestTabsList = [{
+    label: "收货明细",
+    prop: 'receiptDetail',
+  },
+  {
+    label: "缺货明细",
+    prop: 'scarceGoodsDetail',
+  }
+]
+
diff --git a/src/utils/domUtils.ts b/src/utils/domUtils.ts
new file mode 100644
index 000000000..dbc1989cb
--- /dev/null
+++ b/src/utils/domUtils.ts
@@ -0,0 +1,289 @@
+import { isServer } from './is'
+const ieVersion = isServer ? 0 : Number((document as any).documentMode)
+const SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g
+const MOZ_HACK_REGEXP = /^moz([A-Z])/
+
+export interface ViewportOffsetResult {
+  left: number
+  top: number
+  right: number
+  bottom: number
+  rightIncludeBody: number
+  bottomIncludeBody: number
+}
+
+/* istanbul ignore next */
+const trim = function (string: string) {
+  return (string || '').replace(/^[\s\uFEFF]+|[\s\uFEFF]+$/g, '')
+}
+
+/* istanbul ignore next */
+const camelCase = function (name: string) {
+  return name
+    .replace(SPECIAL_CHARS_REGEXP, function (_, __, letter, offset) {
+      return offset ? letter.toUpperCase() : letter
+    })
+    .replace(MOZ_HACK_REGEXP, 'Moz$1')
+}
+
+/* istanbul ignore next */
+export function hasClass(el: Element, cls: string) {
+  if (!el || !cls) return false
+  if (cls.indexOf(' ') !== -1) {
+    throw new Error('className should not contain space.')
+  }
+  if (el.classList) {
+    return el.classList.contains(cls)
+  } else {
+    return (' ' + el.className + ' ').indexOf(' ' + cls + ' ') > -1
+  }
+}
+
+/* istanbul ignore next */
+export function addClass(el: Element, cls: string) {
+  if (!el) return
+  let curClass = el.className
+  const classes = (cls || '').split(' ')
+
+  for (let i = 0, j = classes.length; i < j; i++) {
+    const clsName = classes[i]
+    if (!clsName) continue
+
+    if (el.classList) {
+      el.classList.add(clsName)
+    } else if (!hasClass(el, clsName)) {
+      curClass += ' ' + clsName
+    }
+  }
+  if (!el.classList) {
+    el.className = curClass
+  }
+}
+
+/* istanbul ignore next */
+export function removeClass(el: Element, cls: string) {
+  if (!el || !cls) return
+  const classes = cls.split(' ')
+  let curClass = ' ' + el.className + ' '
+
+  for (let i = 0, j = classes.length; i < j; i++) {
+    const clsName = classes[i]
+    if (!clsName) continue
+
+    if (el.classList) {
+      el.classList.remove(clsName)
+    } else if (hasClass(el, clsName)) {
+      curClass = curClass.replace(' ' + clsName + ' ', ' ')
+    }
+  }
+  if (!el.classList) {
+    el.className = trim(curClass)
+  }
+}
+
+export function getBoundingClientRect(element: Element): DOMRect | number {
+  if (!element || !element.getBoundingClientRect) {
+    return 0
+  }
+  return element.getBoundingClientRect()
+}
+
+/**
+ * 获取当前元素的left、top偏移
+ *   left：元素最左侧距离文档左侧的距离
+ *   top:元素最顶端距离文档顶端的距离
+ *   right:元素最右侧距离文档右侧的距离
+ *   bottom：元素最底端距离文档底端的距离
+ *   rightIncludeBody：元素最左侧距离文档右侧的距离
+ *   bottomIncludeBody：元素最底端距离文档最底部的距离
+ *
+ * @description:
+ */
+export function getViewportOffset(element: Element): ViewportOffsetResult {
+  const doc = document.documentElement
+
+  const docScrollLeft = doc.scrollLeft
+  const docScrollTop = doc.scrollTop
+  const docClientLeft = doc.clientLeft
+  const docClientTop = doc.clientTop
+
+  const pageXOffset = window.pageXOffset
+  const pageYOffset = window.pageYOffset
+
+  const box = getBoundingClientRect(element)
+
+  const { left: retLeft, top: rectTop, width: rectWidth, height: rectHeight } = box as DOMRect
+
+  const scrollLeft = (pageXOffset || docScrollLeft) - (docClientLeft || 0)
+  const scrollTop = (pageYOffset || docScrollTop) - (docClientTop || 0)
+  const offsetLeft = retLeft + pageXOffset
+  const offsetTop = rectTop + pageYOffset
+
+  const left = offsetLeft - scrollLeft
+  const top = offsetTop - scrollTop
+
+  const clientWidth = window.document.documentElement.clientWidth
+  const clientHeight = window.document.documentElement.clientHeight
+  return {
+    left: left,
+    top: top,
+    right: clientWidth - rectWidth - left,
+    bottom: clientHeight - rectHeight - top,
+    rightIncludeBody: clientWidth - left,
+    bottomIncludeBody: clientHeight - top
+  }
+}
+
+/* istanbul ignore next */
+export const on = function (
+  element: HTMLElement | Document | Window,
+  event: string,
+  handler: EventListenerOrEventListenerObject
+): void {
+  if (element && event && handler) {
+    element.addEventListener(event, handler, false)
+  }
+}
+
+/* istanbul ignore next */
+export const off = function (
+  element: HTMLElement | Document | Window,
+  event: string,
+  handler: any
+): void {
+  if (element && event && handler) {
+    element.removeEventListener(event, handler, false)
+  }
+}
+
+/* istanbul ignore next */
+export const once = function (el: HTMLElement, event: string, fn: EventListener): void {
+  const listener = function (this: any, ...args: unknown[]) {
+    if (fn) {
+      // @ts-ignore
+      fn.apply(this, args)
+    }
+    off(el, event, listener)
+  }
+  on(el, event, listener)
+}
+
+/* istanbul ignore next */
+export const getStyle =
+  ieVersion < 9
+    ? function (element: Element | any, styleName: string) {
+        if (isServer) return
+        if (!element || !styleName) return null
+        styleName = camelCase(styleName)
+        if (styleName === 'float') {
+          styleName = 'styleFloat'
+        }
+        try {
+          switch (styleName) {
+            case 'opacity':
+              try {
+                return element.filters.item('alpha').opacity / 100
+              } catch (e) {
+                return 1.0
+              }
+            default:
+              return element.style[styleName] || element.currentStyle
+                ? element.currentStyle[styleName]
+                : null
+          }
+        } catch (e) {
+          return element.style[styleName]
+        }
+      }
+    : function (element: Element | any, styleName: string) {
+        if (isServer) return
+        if (!element || !styleName) return null
+        styleName = camelCase(styleName)
+        if (styleName === 'float') {
+          styleName = 'cssFloat'
+        }
+        try {
+          const computed = (document as any).defaultView.getComputedStyle(element, '')
+          return element.style[styleName] || computed ? computed[styleName] : null
+        } catch (e) {
+          return element.style[styleName]
+        }
+      }
+
+/* istanbul ignore next */
+export function setStyle(element: Element | any, styleName: any, value: any) {
+  if (!element || !styleName) return
+
+  if (typeof styleName === 'object') {
+    for (const prop in styleName) {
+      if (Object.prototype.hasOwnProperty.call(styleName, prop)) {
+        setStyle(element, prop, styleName[prop])
+      }
+    }
+  } else {
+    styleName = camelCase(styleName)
+    if (styleName === 'opacity' && ieVersion < 9) {
+      element.style.filter = isNaN(value) ? '' : 'alpha(opacity=' + value * 100 + ')'
+    } else {
+      element.style[styleName] = value
+    }
+  }
+}
+
+/* istanbul ignore next */
+export const isScroll = (el: Element, vertical: any) => {
+  if (isServer) return
+
+  const determinedDirection = vertical !== null || vertical !== undefined
+  const overflow = determinedDirection
+    ? vertical
+      ? getStyle(el, 'overflow-y')
+      : getStyle(el, 'overflow-x')
+    : getStyle(el, 'overflow')
+
+  return overflow.match(/(scroll|auto)/)
+}
+
+/* istanbul ignore next */
+export const getScrollContainer = (el: Element, vertical?: any) => {
+  if (isServer) return
+
+  let parent: any = el
+  while (parent) {
+    if ([window, document, document.documentElement].includes(parent)) {
+      return window
+    }
+    if (isScroll(parent, vertical)) {
+      return parent
+    }
+    parent = parent.parentNode
+  }
+
+  return parent
+}
+
+/* istanbul ignore next */
+export const isInContainer = (el: Element, container: any) => {
+  if (isServer || !el || !container) return false
+
+  const elRect = el.getBoundingClientRect()
+  let containerRect
+
+  if ([window, document, document.documentElement, null, undefined].includes(container)) {
+    containerRect = {
+      top: 0,
+      right: window.innerWidth,
+      bottom: window.innerHeight,
+      left: 0
+    }
+  } else {
+    containerRect = container.getBoundingClientRect()
+  }
+
+  return (
+    elRect.top < containerRect.bottom &&
+    elRect.bottom > containerRect.top &&
+    elRect.right > containerRect.left &&
+    elRect.left < containerRect.right
+  )
+}
diff --git a/src/utils/download.ts b/src/utils/download.ts
new file mode 100644
index 000000000..ab2001494
--- /dev/null
+++ b/src/utils/download.ts
@@ -0,0 +1,38 @@
+const download0 = (data: Blob, fileName: string, mineType: string) => {
+  // 创建 blob
+  const blob = new Blob([data], { type: mineType })
+  // 创建 href 超链接，点击进行下载
+  window.URL = window.URL || window.webkitURL
+  const href = URL.createObjectURL(blob)
+  const downA = document.createElement('a')
+  downA.href = href
+  downA.download = fileName
+  downA.click()
+  // 销毁超连接
+  window.URL.revokeObjectURL(href)
+}
+
+const download = {
+  // 下载 Excel 方法
+  excel: (data: Blob, fileName: string) => {
+    download0(data, fileName, 'application/vnd.ms-excel')
+  },
+  // 下载 Word 方法
+  word: (data: Blob, fileName: string) => {
+    download0(data, fileName, 'application/msword')
+  },
+  // 下载 Zip 方法
+  zip: (data: Blob, fileName: string) => {
+    download0(data, fileName, 'application/zip')
+  },
+  // 下载 Html 方法
+  html: (data: Blob, fileName: string) => {
+    download0(data, fileName, 'text/html')
+  },
+  // 下载 Markdown 方法
+  markdown: (data: Blob, fileName: string) => {
+    download0(data, fileName, 'text/markdown')
+  }
+}
+
+export default download
diff --git a/src/utils/filt.ts b/src/utils/filt.ts
new file mode 100644
index 000000000..b1a7b2c7c
--- /dev/null
+++ b/src/utils/filt.ts
@@ -0,0 +1,157 @@
+export const openWindow = (
+  url: string,
+  opt?: {
+    target?: '_self' | '_blank' | string
+    noopener?: boolean
+    noreferrer?: boolean
+  }
+) => {
+  const { target = '__blank', noopener = true, noreferrer = true } = opt || {}
+  const feature: string[] = []
+
+  noopener && feature.push('noopener=yes')
+  noreferrer && feature.push('noreferrer=yes')
+
+  window.open(url, target, feature.join(','))
+}
+
+/**
+ * @description: base64 to blob
+ */
+export const dataURLtoBlob = (base64Buf: string): Blob => {
+  const arr = base64Buf.split(',')
+  const typeItem = arr[0]
+  const mime = typeItem.match(/:(.*?);/)![1]
+  const bstr = window.atob(arr[1])
+  let n = bstr.length
+  const u8arr = new Uint8Array(n)
+  while (n--) {
+    u8arr[n] = bstr.charCodeAt(n)
+  }
+  return new Blob([u8arr], { type: mime })
+}
+
+/**
+ * img url to base64
+ * @param url
+ */
+export const urlToBase64 = (url: string, mineType?: string): Promise<string> => {
+  return new Promise((resolve, reject) => {
+    let canvas = document.createElement('CANVAS') as Nullable<HTMLCanvasElement>
+    const ctx = canvas!.getContext('2d')
+
+    const img = new Image()
+    img.crossOrigin = ''
+    img.onload = function () {
+      if (!canvas || !ctx) {
+        return reject()
+      }
+      canvas.height = img.height
+      canvas.width = img.width
+      ctx.drawImage(img, 0, 0)
+      const dataURL = canvas.toDataURL(mineType || 'image/png')
+      canvas = null
+      resolve(dataURL)
+    }
+    img.src = url
+  })
+}
+
+/**
+ * Download online pictures
+ * @param url
+ * @param filename
+ * @param mime
+ * @param bom
+ */
+export const downloadByOnlineUrl = (
+  url: string,
+  filename: string,
+  mime?: string,
+  bom?: BlobPart
+) => {
+  urlToBase64(url).then((base64) => {
+    downloadByBase64(base64, filename, mime, bom)
+  })
+}
+
+/**
+ * Download pictures based on base64
+ * @param buf
+ * @param filename
+ * @param mime
+ * @param bom
+ */
+export const downloadByBase64 = (buf: string, filename: string, mime?: string, bom?: BlobPart) => {
+  const base64Buf = dataURLtoBlob(buf)
+  downloadByData(base64Buf, filename, mime, bom)
+}
+
+/**
+ * Download according to the background interface file stream
+ * @param {*} data
+ * @param {*} filename
+ * @param {*} mime
+ * @param {*} bom
+ */
+export const downloadByData = (data: BlobPart, filename: string, mime?: string, bom?: BlobPart) => {
+  const blobData = typeof bom !== 'undefined' ? [bom, data] : [data]
+  const blob = new Blob(blobData, { type: mime || 'application/octet-stream' })
+
+  const blobURL = window.URL.createObjectURL(blob)
+  const tempLink = document.createElement('a')
+  tempLink.style.display = 'none'
+  tempLink.href = blobURL
+  tempLink.setAttribute('download', filename)
+  if (typeof tempLink.download === 'undefined') {
+    tempLink.setAttribute('target', '_blank')
+  }
+  document.body.appendChild(tempLink)
+  tempLink.click()
+  document.body.removeChild(tempLink)
+  window.URL.revokeObjectURL(blobURL)
+}
+
+/**
+ * Download file according to file address
+ * @param {*} sUrl
+ */
+export const downloadByUrl = ({
+  url,
+  target = '_blank',
+  fileName
+}: {
+  url: string
+  target?: '_self' | '_blank'
+  fileName?: string
+}): boolean => {
+  const isChrome = window.navigator.userAgent.toLowerCase().indexOf('chrome') > -1
+  const isSafari = window.navigator.userAgent.toLowerCase().indexOf('safari') > -1
+
+  if (/(iP)/g.test(window.navigator.userAgent)) {
+    console.error('Your browser does not support download!')
+    return false
+  }
+  if (isChrome || isSafari) {
+    const link = document.createElement('a')
+    link.href = url
+    link.target = target
+
+    if (link.download !== undefined) {
+      link.download = fileName || url.substring(url.lastIndexOf('/') + 1, url.length)
+    }
+
+    if (document.createEvent) {
+      const e = document.createEvent('MouseEvents')
+      e.initEvent('click', true, true)
+      link.dispatchEvent(e)
+      return true
+    }
+  }
+  if (url.indexOf('?') === -1) {
+    url += '?download'
+  }
+
+  openWindow(url, { target })
+  return true
+}
diff --git a/src/utils/formCreate.ts b/src/utils/formCreate.ts
new file mode 100644
index 000000000..6d7dbc7ff
--- /dev/null
+++ b/src/utils/formCreate.ts
@@ -0,0 +1,54 @@
+/**
+ * 针对 https://github.com/xaboy/form-create-designer 封装的工具类
+ */
+
+// 编码表单 Conf
+export const encodeConf = (designerRef: object) => {
+  // @ts-ignore
+  return JSON.stringify(designerRef.value.getOption())
+}
+
+// 编码表单 Fields
+export const encodeFields = (designerRef: object) => {
+  // @ts-ignore
+  const rule = designerRef.value.getRule()
+  const fields: string[] = []
+  rule.forEach((item) => {
+    fields.push(JSON.stringify(item))
+  })
+  return fields
+}
+
+// 解码表单 Fields
+export const decodeFields = (fields: string[]) => {
+  const rule: object[] = []
+  fields.forEach((item) => {
+    rule.push(JSON.parse(item))
+  })
+  return rule
+}
+
+// 设置表单的 Conf 和 Fields
+export const setConfAndFields = (designerRef: object, conf: string, fields: string) => {
+  // @ts-ignore
+  designerRef.value.setOption(JSON.parse(conf))
+  // @ts-ignore
+  designerRef.value.setRule(decodeFields(fields))
+}
+
+// 设置表单的 Conf 和 Fields
+export const setConfAndFields2 = (
+  detailPreview: object,
+  conf: string,
+  fields: string,
+  value?: object
+) => {
+  // @ts-ignore
+  detailPreview.value.option = JSON.parse(conf)
+  // @ts-ignore
+  detailPreview.value.rule = decodeFields(fields)
+  if (value) {
+    // @ts-ignore
+    detailPreview.value.value = value
+  }
+}
diff --git a/src/utils/formRules.ts b/src/utils/formRules.ts
new file mode 100644
index 000000000..2989867fc
--- /dev/null
+++ b/src/utils/formRules.ts
@@ -0,0 +1,7 @@
+const { t } = useI18n()
+
+// 必填项
+export const required = {
+  required: true,
+  message: t('common.required')
+}
diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts
new file mode 100644
index 000000000..e2b0e59a5
--- /dev/null
+++ b/src/utils/formatTime.ts
@@ -0,0 +1,232 @@
+import dayjs from 'dayjs'
+
+/**
+ * 时间日期转换
+ * @param date 当前时间，new Date() 格式
+ * @param format 需要转换的时间格式字符串
+ * @description format 字符串随意，如 `YYYY-mm、YYYY-mm-dd`
+ * @description format 季度："YYYY-mm-dd HH:MM:SS QQQQ"
+ * @description format 星期："YYYY-mm-dd HH:MM:SS WWW"
+ * @description format 几周："YYYY-mm-dd HH:MM:SS ZZZ"
+ * @description format 季度 + 星期 + 几周："YYYY-mm-dd HH:MM:SS WWW QQQQ ZZZ"
+ * @returns 返回拼接后的时间字符串
+ */
+export function formatDate(date: Date | number, format?: string): string {
+  // 日期不存在，则返回空
+  if (!date) {
+    return ''
+  }
+  // 日期存在，则进行格式化
+  if (format === undefined) {
+    format = 'YYYY-MM-DD HH:mm:ss'
+  }
+  return dayjs(date).format(format)
+}
+
+/**
+ * 获取当前的日期+时间
+ */
+export function getNowDateTime() {
+  return dayjs()
+}
+
+/**
+ * 获取当前日期是第几周
+ * @param dateTime 当前传入的日期值
+ * @returns 返回第几周数字值
+ */
+export function getWeek(dateTime: Date): number {
+  const temptTime = new Date(dateTime.getTime())
+  // 周几
+  const weekday = temptTime.getDay() || 7
+  // 周1+5天=周六
+  temptTime.setDate(temptTime.getDate() - weekday + 1 + 5)
+  let firstDay = new Date(temptTime.getFullYear(), 0, 1)
+  const dayOfWeek = firstDay.getDay()
+  let spendDay = 1
+  if (dayOfWeek != 0) spendDay = 7 - dayOfWeek + 1
+  firstDay = new Date(temptTime.getFullYear(), 0, 1 + spendDay)
+  const d = Math.ceil((temptTime.valueOf() - firstDay.valueOf()) / 86400000)
+  return Math.ceil(d / 7)
+}
+
+/**
+ * 将时间转换为 `几秒前`、`几分钟前`、`几小时前`、`几天前`
+ * @param param 当前时间，new Date() 格式或者字符串时间格式
+ * @param format 需要转换的时间格式字符串
+ * @description param 10秒：  10 * 1000
+ * @description param 1分：   60 * 1000
+ * @description param 1小时： 60 * 60 * 1000
+ * @description param 24小时：60 * 60 * 24 * 1000
+ * @description param 3天：   60 * 60* 24 * 1000 * 3
+ * @returns 返回拼接后的时间字符串
+ */
+export function formatPast(param: string | Date, format = 'YYYY-mm-dd HH:MM:SS'): string {
+  // 传入格式处理、存储转换值
+  let t: any, s: number
+  // 获取js 时间戳
+  let time: number = new Date().getTime()
+  // 是否是对象
+  typeof param === 'string' || 'object' ? (t = new Date(param).getTime()) : (t = param)
+  // 当前时间戳 - 传入时间戳
+  time = Number.parseInt(`${time - t}`)
+  if (time < 10000) {
+    // 10秒内
+    return '刚刚'
+  } else if (time < 60000 && time >= 10000) {
+    // 超过10秒少于1分钟内
+    s = Math.floor(time / 1000)
+    return `${s}秒前`
+  } else if (time < 3600000 && time >= 60000) {
+    // 超过1分钟少于1小时
+    s = Math.floor(time / 60000)
+    return `${s}分钟前`
+  } else if (time < 86400000 && time >= 3600000) {
+    // 超过1小时少于24小时
+    s = Math.floor(time / 3600000)
+    return `${s}小时前`
+  } else if (time < 259200000 && time >= 86400000) {
+    // 超过1天少于3天内
+    s = Math.floor(time / 86400000)
+    return `${s}天前`
+  } else {
+    // 超过3天
+    const date = typeof param === 'string' || 'object' ? new Date(param) : param
+    return formatDate(date, format)
+  }
+}
+
+/**
+ * 时间问候语
+ * @param param 当前时间，new Date() 格式
+ * @description param 调用 `formatAxis(new Date())` 输出 `上午好`
+ * @returns 返回拼接后的时间字符串
+ */
+export function formatAxis(param: Date): string {
+  const hour: number = new Date(param).getHours()
+  if (hour < 6) return '凌晨好'
+  else if (hour < 9) return '早上好'
+  else if (hour < 12) return '上午好'
+  else if (hour < 14) return '中午好'
+  else if (hour < 17) return '下午好'
+  else if (hour < 19) return '傍晚好'
+  else if (hour < 22) return '晚上好'
+  else return '夜里好'
+}
+
+/**
+ * 将毫秒，转换成时间字符串。例如说，xx 分钟
+ *
+ * @param ms 毫秒
+ * @returns {string} 字符串
+ */
+export function formatPast2(ms) {
+  const day = Math.floor(ms / (24 * 60 * 60 * 1000))
+  const hour = Math.floor(ms / (60 * 60 * 1000) - day * 24)
+  const minute = Math.floor(ms / (60 * 1000) - day * 24 * 60 - hour * 60)
+  const second = Math.floor(ms / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60)
+  if (day > 0) {
+    return day + '天' + hour + '小时' + minute + '分钟'
+  }
+  if (hour > 0) {
+    return hour + '小时' + minute + '分钟'
+  }
+  if (minute > 0) {
+    return minute + '分钟'
+  }
+  if (second > 0) {
+    return second + '秒'
+  } else {
+    return 0 + '秒'
+  }
+}
+
+/**
+ * element plus 的时间 Formatter 实现，使用 YYYY-MM-DD HH:mm:ss 格式
+ *
+ * @param row 行数据
+ * @param column 字段
+ * @param cellValue 字段值
+ */
+// @ts-ignore
+export const dateFormatter = (row, column, cellValue) => {
+  if (!cellValue) {
+    return
+  }
+  return formatDate(cellValue)
+}
+// 获取时间戳
+export const formatGetTime = (row, column, cellValue) => {
+  console.log(cellValue.getTime())
+  // if (!cellValue) {
+  //   return
+  // }
+  // const time = new Date(cellValue).getTime()
+  // return time
+}
+
+/**
+ * element plus 的时间 Formatter 实现，使用 YYYY-MM-DD 格式
+ *
+ * @param row 行数据
+ * @param column 字段
+ * @param cellValue 字段值
+ */
+// @ts-ignore
+export const dateFormatter2 = (row, column, cellValue) => {
+  if (!cellValue) {
+    return
+  }
+  return formatDate(cellValue, 'YYYY-MM-DD')
+}
+
+/**
+ * 设置起始日期，时间为00:00:00
+ * @param param 传入日期
+ * @returns 带时间00:00:00的日期
+ */
+export function beginOfDay(param: Date) {
+  return new Date(param.getFullYear(), param.getMonth(), param.getDate(), 0, 0, 0)
+}
+
+/**
+ * 设置结束日期，时间为23:59:59
+ * @param param 传入日期
+ * @returns 带时间23:59:59的日期
+ */
+export function endOfDay(param: Date) {
+  return new Date(param.getFullYear(), param.getMonth(), param.getDate(), 23, 59, 59)
+}
+
+/**
+ * 计算两个日期间隔天数
+ * @param param1 日期1
+ * @param param2 日期2
+ */
+export function betweenDay(param1: Date, param2: Date) {
+  param1 = convertDate(param1)
+  param2 = convertDate(param2)
+  // 计算差值
+  return Math.floor((param2.getTime() - param1.getTime()) / (24 * 3600 * 1000))
+}
+
+/**
+ * 日期计算
+ * @param param1 日期
+ * @param param2 添加的时间
+ */
+export function addTime(param1: Date, param2: number) {
+  param1 = convertDate(param1)
+  return new Date(param1.getTime() + param2)
+}
+
+/**
+ * 日期转换
+ * @param param 日期
+ */
+export function convertDate(param: Date | string) {
+  if (typeof param === 'string') {
+    return new Date(param)
+  }
+  return param
+}
diff --git a/src/utils/formatter.ts b/src/utils/formatter.ts
new file mode 100644
index 000000000..7c6e39ffa
--- /dev/null
+++ b/src/utils/formatter.ts
@@ -0,0 +1,12 @@
+import { fenToYuan } from '@/utils'
+import { TableColumnCtx } from 'element-plus'
+
+// 格式化金额【分转元】
+export const fenToYuanFormat = (
+  row: any,
+  column: TableColumnCtx<any>,
+  cellValue: any,
+  index: number
+) => {
+  return `￥${fenToYuan(cellValue)}`
+}
diff --git a/src/utils/index.ts b/src/utils/index.ts
new file mode 100644
index 000000000..0c00c2550
--- /dev/null
+++ b/src/utils/index.ts
@@ -0,0 +1,245 @@
+/**
+ *
+ * @param component 需要注册的组件
+ * @param alias 组件别名
+ * @returns any
+ */
+export const withInstall = <T>(component: T, alias?: string) => {
+  const comp = component as any
+  comp.install = (app: any) => {
+    app.component(comp.name || comp.displayName, component)
+    if (alias) {
+      app.config.globalProperties[alias] = component
+    }
+  }
+  return component as T & Plugin
+}
+
+/**
+ * @param str 需要转下划线的驼峰字符串
+ * @returns 字符串下划线
+ */
+export const humpToUnderline = (str: string): string => {
+  return str.replace(/([A-Z])/g, '-$1').toLowerCase()
+}
+
+/**
+ * @param str 需要转驼峰的下划线字符串
+ * @returns 字符串驼峰
+ */
+export const underlineToHump = (str: string): string => {
+  if (!str) return ''
+  return str.replace(/\-(\w)/g, (_, letter: string) => {
+    return letter.toUpperCase()
+  })
+}
+
+export const setCssVar = (prop: string, val: any, dom = document.documentElement) => {
+  dom.style.setProperty(prop, val)
+}
+
+/**
+ * 查找数组对象的某个下标
+ * @param {Array} ary 查找的数组
+ * @param {Functon} fn 判断的方法
+ */
+// eslint-disable-next-line
+export const findIndex = <T = Recordable>(ary: Array<T>, fn: Fn): number => {
+  if (ary.findIndex) {
+    return ary.findIndex(fn)
+  }
+  let index = -1
+  ary.some((item: T, i: number, ary: Array<T>) => {
+    const ret: T = fn(item, i, ary)
+    if (ret) {
+      index = i
+      return ret
+    }
+  })
+  return index
+}
+
+export const trim = (str: string) => {
+  return str.replace(/(^\s*)|(\s*$)/g, '')
+}
+
+/**
+ * @param {Date | number | string} time 需要转换的时间
+ * @param {String} fmt 需要转换的格式 如 yyyy-MM-dd、yyyy-MM-dd HH:mm:ss
+ */
+export const formatTime = (time: Date | number | string, fmt: string) => {
+  if (!time) return ''
+  else {
+    const date = new Date(time)
+    const o = {
+      'M+': date.getMonth() + 1,
+      'd+': date.getDate(),
+      'H+': date.getHours(),
+      'm+': date.getMinutes(),
+      's+': date.getSeconds(),
+      'q+': Math.floor((date.getMonth() + 3) / 3),
+      S: date.getMilliseconds()
+    }
+    if (/(y+)/.test(fmt)) {
+      fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+    }
+    for (const k in o) {
+      if (new RegExp('(' + k + ')').test(fmt)) {
+        fmt = fmt.replace(
+          RegExp.$1,
+          RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
+        )
+      }
+    }
+    return fmt
+  }
+}
+
+/**
+ * 生成随机字符串
+ */
+export const toAnyString = () => {
+  const str: string = 'xxxxx-xxxxx-4xxxx-yxxxx-xxxxx'.replace(/[xy]/g, (c: string) => {
+    const r: number = (Math.random() * 16) | 0
+    const v: number = c === 'x' ? r : (r & 0x3) | 0x8
+    return v.toString()
+  })
+  return str
+}
+
+export const generateUUID = () => {
+  if (typeof crypto === 'object') {
+    if (typeof crypto.randomUUID === 'function') {
+      return crypto.randomUUID()
+    }
+    if (typeof crypto.getRandomValues === 'function' && typeof Uint8Array === 'function') {
+      const callback = (c: any) => {
+        const num = Number(c)
+        return (num ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (num / 4)))).toString(
+          16
+        )
+      }
+      return '10000000-1000-4000-8000-100000000000'.replace(/[018]/g, callback)
+    }
+  }
+  let timestamp = new Date().getTime()
+  let performanceNow =
+    (typeof performance !== 'undefined' && performance.now && performance.now() * 1000) || 0
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
+    let random = Math.random() * 16
+    if (timestamp > 0) {
+      random = (timestamp + random) % 16 | 0
+      timestamp = Math.floor(timestamp / 16)
+    } else {
+      random = (performanceNow + random) % 16 | 0
+      performanceNow = Math.floor(performanceNow / 16)
+    }
+    return (c === 'x' ? random : (random & 0x3) | 0x8).toString(16)
+  })
+}
+
+/**
+ * element plus 的文件大小 Formatter 实现
+ *
+ * @param row 行数据
+ * @param column 字段
+ * @param cellValue 字段值
+ */
+// @ts-ignore
+export const fileSizeFormatter = (row, column, cellValue) => {
+  const fileSize = cellValue
+  const unitArr = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
+  const srcSize = parseFloat(fileSize)
+  const index = Math.floor(Math.log(srcSize) / Math.log(1024))
+  const size = srcSize / Math.pow(1024, index)
+  const sizeStr = size.toFixed(2) //保留的小数位数
+  return sizeStr + ' ' + unitArr[index]
+}
+
+/**
+ * 将值复制到目标对象，且以目标对象属性为准，例：target: {a:1} source:{a:2,b:3} 结果为：{a:2}
+ * @param target 目标对象
+ * @param source 源对象
+ */
+export const copyValueToTarget = (target, source) => {
+  const newObj = Object.assign({}, target, source)
+  // 删除多余属性
+  Object.keys(newObj).forEach((key) => {
+    // 如果不是target中的属性则删除
+    if (Object.keys(target).indexOf(key) === -1) {
+      delete newObj[key]
+    }
+  })
+  // 更新目标对象值
+  Object.assign(target, newObj)
+}
+
+/**
+ * 将一个整数转换为分数保留两位小数
+ * @param num
+ */
+export const formatToFraction = (num: number | string | undefined): number => {
+  if (typeof num === 'undefined') return 0
+  const parsedNumber = typeof num === 'string' ? parseFloat(num) : num
+  return parseFloat((parsedNumber / 100).toFixed(2))
+}
+
+/**
+ * 将一个数转换为 1.00 这样
+ * 数据呈现的时候使用
+ *
+ * @param num 整数
+ */
+export const floatToFixed2 = (num: number | string | undefined): string => {
+  let str = '0.00'
+  if (typeof num === 'undefined') {
+    return str
+  }
+  const f = formatToFraction(num)
+  const decimalPart = f.toString().split('.')[1]
+  const len = decimalPart ? decimalPart.length : 0
+  switch (len) {
+    case 0:
+      str = f.toString() + '.00'
+      break
+    case 1:
+      str = f.toString() + '0'
+      break
+  }
+  return str
+}
+
+/**
+ * 将一个分数转换为整数
+ * @param num
+ */
+export const convertToInteger = (num: number | string | undefined): number => {
+  if (typeof num === 'undefined') return 0
+  const parsedNumber = typeof num === 'string' ? parseFloat(num) : num
+  // TODO 分转元后还有小数则四舍五入
+  return Math.round(parsedNumber * 100)
+}
+
+/**
+ * 元转分
+ */
+export const yuanToFen = (amount: string | number): number => {
+  return Math.round(Number(amount) * 100)
+}
+
+/**
+ * 分转元
+ */
+export const fenToYuan = (amount: string | number): number => {
+  return Number((Number(amount) / 100).toFixed(2))
+}
+
+// el-button 点击后强制失去焦点（颜色不恢复问题处理） 调用位置：绑定在el-button的点击事件
+export function clearButtonBlurHandle (e:any) {
+  if(!e || JSON.stringify(e) == '{}' || !e.target)return
+  let target = e.target;
+  if(target.nodeName == 'SPAN' || target.nodeName == 'I'){
+      target = e.target.parentNode;
+  }
+  target.blur();
+}
\ No newline at end of file
diff --git a/src/utils/is.ts b/src/utils/is.ts
new file mode 100644
index 000000000..375298593
--- /dev/null
+++ b/src/utils/is.ts
@@ -0,0 +1,105 @@
+// copy to vben-admin
+
+const toString = Object.prototype.toString
+
+export const is = (val: unknown, type: string) => {
+  return toString.call(val) === `[object ${type}]`
+}
+
+export const isDef = <T = unknown>(val?: T): val is T => {
+  return typeof val !== 'undefined'
+}
+
+export const isUnDef = <T = unknown>(val?: T): val is T => {
+  return !isDef(val)
+}
+
+export const isObject = (val: any): val is Record<any, any> => {
+  return val !== null && is(val, 'Object')
+}
+
+export const isEmpty = <T = unknown>(val: T): val is T => {
+  if (isArray(val) || isString(val)) {
+    return val.length === 0
+  }
+
+  if (val instanceof Map || val instanceof Set) {
+    return val.size === 0
+  }
+
+  if (isObject(val)) {
+    return Object.keys(val).length === 0
+  }
+
+  return false
+}
+
+export const isDate = (val: unknown): val is Date => {
+  return is(val, 'Date')
+}
+
+export const isNull = (val: unknown): val is null => {
+  return val === null
+}
+
+export const isNullAndUnDef = (val: unknown): val is null | undefined => {
+  return isUnDef(val) && isNull(val)
+}
+
+export const isNullOrUnDef = (val: unknown): val is null | undefined => {
+  return isUnDef(val) || isNull(val)
+}
+
+export const isNumber = (val: unknown): val is number => {
+  return is(val, 'Number')
+}
+
+export const isPromise = <T = any>(val: unknown): val is Promise<T> => {
+  return is(val, 'Promise') && isObject(val) && isFunction(val.then) && isFunction(val.catch)
+}
+
+export const isString = (val: unknown): val is string => {
+  return is(val, 'String')
+}
+
+export const isFunction = (val: unknown): val is Function => {
+  return typeof val === 'function'
+}
+
+export const isBoolean = (val: unknown): val is boolean => {
+  return is(val, 'Boolean')
+}
+
+export const isRegExp = (val: unknown): val is RegExp => {
+  return is(val, 'RegExp')
+}
+
+export const isArray = (val: any): val is Array<any> => {
+  return val && Array.isArray(val)
+}
+
+export const isWindow = (val: any): val is Window => {
+  return typeof window !== 'undefined' && is(val, 'Window')
+}
+
+export const isElement = (val: unknown): val is Element => {
+  return isObject(val) && !!val.tagName
+}
+
+export const isMap = (val: unknown): val is Map<any, any> => {
+  return is(val, 'Map')
+}
+
+export const isServer = typeof window === 'undefined'
+
+export const isClient = !isServer
+
+export const isUrl = (path: string): boolean => {
+  const reg =
+    /(((^https?:(?:\/\/)?)(?:[-:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&%@.\w_]*)#?(?:[\w]*))?)$/
+  return reg.test(path)
+}
+
+export const isDark = (): boolean => {
+  return window.matchMedia('(prefers-color-scheme: dark)').matches
+}
diff --git a/src/utils/jsencrypt.ts b/src/utils/jsencrypt.ts
new file mode 100644
index 000000000..374d5f646
--- /dev/null
+++ b/src/utils/jsencrypt.ts
@@ -0,0 +1,31 @@
+import { JSEncrypt } from 'jsencrypt'
+
+// 密钥对生成 http://web.chacuo.net/netrsakeypair
+
+const publicKey =
+  'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdH\n' +
+  'nzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
+
+const privateKey =
+  'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY\n' +
+  '7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n' +
+  'PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n' +
+  'kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n' +
+  'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n' +
+  'DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n' +
+  'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' +
+  'UP8iWi1Qw0Y='
+
+// 加密
+export const encrypt = (txt: string) => {
+  const encryptor = new JSEncrypt()
+  encryptor.setPublicKey(publicKey) // 设置公钥
+  return encryptor.encrypt(txt) // 对数据进行加密
+}
+
+// 解密
+export const decrypt = (txt: string) => {
+  const encryptor = new JSEncrypt()
+  encryptor.setPrivateKey(privateKey) // 设置私钥
+  return encryptor.decrypt(txt) // 对数据进行解密
+}
diff --git a/src/utils/permission.ts b/src/utils/permission.ts
new file mode 100644
index 000000000..a63ee6286
--- /dev/null
+++ b/src/utils/permission.ts
@@ -0,0 +1,45 @@
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * 字符权限校验
+ * @param {Array} value 校验值
+ * @returns {Boolean}
+ */
+export function checkPermi(value: string[]) {
+  if (value && value instanceof Array && value.length > 0) {
+    const { wsCache } = useCache()
+    const permissionDatas = value
+    const all_permission = '*:*:*'
+    const permissions = wsCache.get(CACHE_KEY.USER).permissions
+    const hasPermission = permissions.some((permission) => {
+      return all_permission === permission || permissionDatas.includes(permission)
+    })
+    return !!hasPermission
+  } else {
+    console.error(t('permission.hasPermission'))
+    return false
+  }
+}
+
+/**
+ * 角色权限校验
+ * @param {string[]} value 校验值
+ * @returns {Boolean}
+ */
+export function checkRole(value: string[]) {
+  if (value && value instanceof Array && value.length > 0) {
+    const { wsCache } = useCache()
+    const permissionRoles = value
+    const super_admin = 'admin'
+    const roles = wsCache.get(CACHE_KEY.USER).roles
+    const hasRole = roles.some((role) => {
+      return super_admin === role || permissionRoles.includes(role)
+    })
+    return !!hasRole
+  } else {
+    console.error(t('permission.hasRole'))
+    return false
+  }
+}
diff --git a/src/utils/propTypes.ts b/src/utils/propTypes.ts
new file mode 100644
index 000000000..fb8f84e70
--- /dev/null
+++ b/src/utils/propTypes.ts
@@ -0,0 +1,28 @@
+import { createTypes, VueTypesInterface, VueTypeValidableDef } from 'vue-types'
+import { CSSProperties } from 'vue'
+
+// 自定义扩展vue-types
+type PropTypes = VueTypesInterface & {
+  readonly style: VueTypeValidableDef<CSSProperties>
+}
+
+const propTypes = createTypes({
+  func: undefined,
+  bool: undefined,
+  string: undefined,
+  number: undefined,
+  object: undefined,
+  integer: undefined
+}) as PropTypes
+
+// 需要自定义扩展的类型
+// see: https://dwightjack.github.io/vue-types/advanced/extending-vue-types.html#the-extend-method
+// propTypes.extend([
+//   {
+//     name: 'style',
+//     getter: true,
+//     type: [String, Object],
+//     default: undefined
+//   }
+// ])
+export { propTypes }
diff --git a/src/utils/routerHelper.ts b/src/utils/routerHelper.ts
new file mode 100644
index 000000000..a68256535
--- /dev/null
+++ b/src/utils/routerHelper.ts
@@ -0,0 +1,238 @@
+import type { RouteLocationNormalized, Router, RouteRecordNormalized } from 'vue-router'
+import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'
+import { isUrl } from '@/utils/is'
+import { cloneDeep, omit } from 'lodash-es'
+
+const modules = import.meta.glob('../views/**/*.{vue,tsx}')
+/**
+ * 注册一个异步组件
+ * @param componentPath 例:/bpm/oa/leave/detail
+ */
+export const registerComponent = (componentPath: string) => {
+  for (const item in modules) {
+    if (item.includes(componentPath)) {
+      // 使用异步组件的方式来动态加载组件
+      // @ts-ignore
+      return defineAsyncComponent(modules[item])
+    }
+  }
+}
+/* Layout */
+export const Layout = () => import('@/layout/Layout.vue')
+
+export const getParentLayout = () => {
+  return () =>
+    new Promise((resolve) => {
+      resolve({
+        name: 'ParentLayout'
+      })
+    })
+}
+
+// 按照路由中meta下的rank等级升序来排序路由
+export const ascending = (arr: any[]) => {
+  arr.forEach((v) => {
+    if (v?.meta?.rank === null) v.meta.rank = undefined
+    if (v?.meta?.rank === 0) {
+      if (v.name !== 'home' && v.path !== '/') {
+        console.warn('rank only the home page can be 0')
+      }
+    }
+  })
+  return arr.sort((a: { meta: { rank: number } }, b: { meta: { rank: number } }) => {
+    return a?.meta?.rank - b?.meta?.rank
+  })
+}
+
+export const getRawRoute = (route: RouteLocationNormalized): RouteLocationNormalized => {
+  if (!route) return route
+  const { matched, ...opt } = route
+  return {
+    ...opt,
+    matched: (matched
+      ? matched.map((item) => ({
+          meta: item.meta,
+          name: item.name,
+          path: item.path
+        }))
+      : undefined) as RouteRecordNormalized[]
+  }
+}
+
+// 后端控制路由生成
+export const generateRoute = (routes: AppCustomRouteRecordRaw[]): AppRouteRecordRaw[] => {
+  const res: AppRouteRecordRaw[] = []
+  const modulesRoutesKeys = Object.keys(modules)
+  for (const route of routes) {
+    const meta = {
+      title: route.name,
+      icon: route.icon,
+      hidden: !route.visible,
+      noCache: !route.keepAlive,
+      alwaysShow:
+        route.children &&
+        route.children.length === 1 &&
+        (route.alwaysShow !== undefined ? route.alwaysShow : true)
+    }
+    // 路由地址转首字母大写驼峰，作为路由名称，适配keepAlive
+    let data: AppRouteRecordRaw = {
+      path: route.path,
+      name:
+        route.componentName && route.componentName.length > 0
+          ? route.componentName
+          : toCamelCase(route.path, true),
+      redirect: route.redirect,
+      meta: meta
+    }
+    //处理顶级非目录路由
+    if (!route.children && route.parentId == 0 && route.component) {
+      data.component = Layout
+      data.meta = {}
+      data.name = toCamelCase(route.path, true) + 'Parent'
+      data.redirect = ''
+      meta.alwaysShow = true
+      const childrenData: AppRouteRecordRaw = {
+        path: '',
+        name: toCamelCase(route.path, true),
+        redirect: route.redirect,
+        meta: meta
+      }
+      const index = route?.component
+        ? modulesRoutesKeys.findIndex((ev) => ev.includes(route.component))
+        : modulesRoutesKeys.findIndex((ev) => ev.includes(route.path))
+      childrenData.component = modules[modulesRoutesKeys[index]]
+      data.children = [childrenData]
+    } else {
+      // 目录
+      if (route.children) {
+        data.component = Layout
+        data.redirect = getRedirect(route.path, route.children)
+        // 外链
+      } else if (isUrl(route.path)) {
+        data = {
+          path: '/external-link',
+          component: Layout,
+          meta: {
+            name: route.name
+          },
+          children: [data]
+        } as AppRouteRecordRaw
+        // 菜单
+      } else {
+        // 对后端传component组件路径和不传做兼容（如果后端传component组件路径，那么path可以随便写，如果不传，component组件路径会根path保持一致）
+        const index = route?.component
+          ? modulesRoutesKeys.findIndex((ev) => ev.includes(route.component))
+          : modulesRoutesKeys.findIndex((ev) => ev.includes(route.path))
+        data.component = modules[modulesRoutesKeys[index]]
+      }
+      if (route.children) {
+        data.children = generateRoute(route.children)
+      }
+    }
+    res.push(data as AppRouteRecordRaw)
+  }
+  return res
+}
+export const getRedirect = (parentPath: string, children: AppCustomRouteRecordRaw[]) => {
+  if (!children || children.length == 0) {
+    return parentPath
+  }
+  const path = generateRoutePath(parentPath, children[0].path)
+  // 递归子节点
+  if (children[0].children) return getRedirect(path, children[0].children)
+}
+const generateRoutePath = (parentPath: string, path: string) => {
+  if (parentPath.endsWith('/')) {
+    parentPath = parentPath.slice(0, -1) // 移除默认的 /
+  }
+  if (!path.startsWith('/')) {
+    path = '/' + path
+  }
+  return parentPath + path
+}
+export const pathResolve = (parentPath: string, path: string) => {
+  if (isUrl(path)) return path
+  const childPath = path.startsWith('/') || !path ? path : `/${path}`
+  return `${parentPath}${childPath}`.replace(/\/\//g, '/')
+}
+
+// 路由降级
+export const flatMultiLevelRoutes = (routes: AppRouteRecordRaw[]) => {
+  const modules: AppRouteRecordRaw[] = cloneDeep(routes)
+  for (let index = 0; index < modules.length; index++) {
+    const route = modules[index]
+    if (!isMultipleRoute(route)) {
+      continue
+    }
+    promoteRouteLevel(route)
+  }
+  return modules
+}
+
+// 层级是否大于2
+const isMultipleRoute = (route: AppRouteRecordRaw) => {
+  if (!route || !Reflect.has(route, 'children') || !route.children?.length) {
+    return false
+  }
+
+  const children = route.children
+
+  let flag = false
+  for (let index = 0; index < children.length; index++) {
+    const child = children[index]
+    if (child.children?.length) {
+      flag = true
+      break
+    }
+  }
+  return flag
+}
+
+// 生成二级路由
+const promoteRouteLevel = (route: AppRouteRecordRaw) => {
+  let router: Router | null = createRouter({
+    routes: [route as RouteRecordRaw],
+    history: createWebHashHistory()
+  })
+
+  const routes = router.getRoutes()
+  addToChildren(routes, route.children || [], route)
+  router = null
+
+  route.children = route.children?.map((item) => omit(item, 'children'))
+}
+
+// 添加所有子菜单
+const addToChildren = (
+  routes: RouteRecordNormalized[],
+  children: AppRouteRecordRaw[],
+  routeModule: AppRouteRecordRaw
+) => {
+  for (let index = 0; index < children.length; index++) {
+    const child = children[index]
+    const route = routes.find((item) => item.name === child.name)
+    if (!route) {
+      continue
+    }
+    routeModule.children = routeModule.children || []
+    if (!routeModule.children.find((item) => item.name === route.name)) {
+      routeModule.children?.push(route as unknown as AppRouteRecordRaw)
+    }
+    if (child.children?.length) {
+      addToChildren(routes, child.children, routeModule)
+    }
+  }
+}
+const toCamelCase = (str: string, upperCaseFirst: boolean) => {
+  str = (str || '')
+    .replace(/-(.)/g, function (group1: string) {
+      return group1.toUpperCase()
+    })
+    .replaceAll('-', '')
+
+  if (upperCaseFirst && str) {
+    str = str.charAt(0).toUpperCase() + str.slice(1)
+  }
+
+  return str
+}
diff --git a/src/utils/tree.ts b/src/utils/tree.ts
new file mode 100644
index 000000000..c8503f544
--- /dev/null
+++ b/src/utils/tree.ts
@@ -0,0 +1,399 @@
+interface TreeHelperConfig {
+  id: string
+  children: string
+  pid: string
+}
+
+const DEFAULT_CONFIG: TreeHelperConfig = {
+  id: 'id',
+  children: 'children',
+  pid: 'pid'
+}
+export const defaultProps = {
+  children: 'children',
+  label: 'name',
+  value: 'id',
+  isLeaf: 'leaf'
+}
+
+const getConfig = (config: Partial<TreeHelperConfig>) => Object.assign({}, DEFAULT_CONFIG, config)
+
+// tree from list
+export const listToTree = <T = any>(list: any[], config: Partial<TreeHelperConfig> = {}): T[] => {
+  const conf = getConfig(config) as TreeHelperConfig
+  const nodeMap = new Map()
+  const result: T[] = []
+  const { id, children, pid } = conf
+
+  for (const node of list) {
+    node[children] = node[children] || []
+    nodeMap.set(node[id], node)
+  }
+  for (const node of list) {
+    const parent = nodeMap.get(node[pid])
+    ;(parent ? parent.children : result).push(node)
+  }
+  return result
+}
+
+export const treeToList = <T = any>(tree: any, config: Partial<TreeHelperConfig> = {}): T => {
+  config = getConfig(config)
+  const { children } = config
+  const result: any = [...tree]
+  for (let i = 0; i < result.length; i++) {
+    if (!result[i][children!]) continue
+    result.splice(i + 1, 0, ...result[i][children!])
+  }
+  return result
+}
+
+export const findNode = <T = any>(
+  tree: any,
+  func: Fn,
+  config: Partial<TreeHelperConfig> = {}
+): T | null => {
+  config = getConfig(config)
+  const { children } = config
+  const list = [...tree]
+  for (const node of list) {
+    if (func(node)) return node
+    node[children!] && list.push(...node[children!])
+  }
+  return null
+}
+
+export const findNodeAll = <T = any>(
+  tree: any,
+  func: Fn,
+  config: Partial<TreeHelperConfig> = {}
+): T[] => {
+  config = getConfig(config)
+  const { children } = config
+  const list = [...tree]
+  const result: T[] = []
+  for (const node of list) {
+    func(node) && result.push(node)
+    node[children!] && list.push(...node[children!])
+  }
+  return result
+}
+
+export const findPath = <T = any>(
+  tree: any,
+  func: Fn,
+  config: Partial<TreeHelperConfig> = {}
+): T | T[] | null => {
+  config = getConfig(config)
+  const path: T[] = []
+  const list = [...tree]
+  const visitedSet = new Set()
+  const { children } = config
+  while (list.length) {
+    const node = list[0]
+    if (visitedSet.has(node)) {
+      path.pop()
+      list.shift()
+    } else {
+      visitedSet.add(node)
+      node[children!] && list.unshift(...node[children!])
+      path.push(node)
+      if (func(node)) {
+        return path
+      }
+    }
+  }
+  return null
+}
+
+export const findPathAll = (tree: any, func: Fn, config: Partial<TreeHelperConfig> = {}) => {
+  config = getConfig(config)
+  const path: any[] = []
+  const list = [...tree]
+  const result: any[] = []
+  const visitedSet = new Set(),
+    { children } = config
+  while (list.length) {
+    const node = list[0]
+    if (visitedSet.has(node)) {
+      path.pop()
+      list.shift()
+    } else {
+      visitedSet.add(node)
+      node[children!] && list.unshift(...node[children!])
+      path.push(node)
+      func(node) && result.push([...path])
+    }
+  }
+  return result
+}
+
+export const filter = <T = any>(
+  tree: T[],
+  func: (n: T) => boolean,
+  config: Partial<TreeHelperConfig> = {}
+): T[] => {
+  config = getConfig(config)
+  const children = config.children as string
+
+  function listFilter(list: T[]) {
+    return list
+      .map((node: any) => ({ ...node }))
+      .filter((node) => {
+        node[children] = node[children] && listFilter(node[children])
+        return func(node) || (node[children] && node[children].length)
+      })
+  }
+
+  return listFilter(tree)
+}
+
+export const forEach = <T = any>(
+  tree: T[],
+  func: (n: T) => any,
+  config: Partial<TreeHelperConfig> = {}
+): void => {
+  config = getConfig(config)
+  const list: any[] = [...tree]
+  const { children } = config
+  for (let i = 0; i < list.length; i++) {
+    // func 返回true就终止遍历，避免大量节点场景下无意义循环，引起浏览器卡顿
+    if (func(list[i])) {
+      return
+    }
+    children && list[i][children] && list.splice(i + 1, 0, ...list[i][children])
+  }
+}
+
+/**
+ * @description: Extract tree specified structure
+ */
+export const treeMap = <T = any>(
+  treeData: T[],
+  opt: { children?: string; conversion: Fn }
+): T[] => {
+  return treeData.map((item) => treeMapEach(item, opt))
+}
+
+/**
+ * @description: Extract tree specified structure
+ */
+export const treeMapEach = (
+  data: any,
+  { children = 'children', conversion }: { children?: string; conversion: Fn }
+) => {
+  const haveChildren = Array.isArray(data[children]) && data[children].length > 0
+  const conversionData = conversion(data) || {}
+  if (haveChildren) {
+    return {
+      ...conversionData,
+      [children]: data[children].map((i: number) =>
+        treeMapEach(i, {
+          children,
+          conversion
+        })
+      )
+    }
+  } else {
+    return {
+      ...conversionData
+    }
+  }
+}
+
+/**
+ * 递归遍历树结构
+ * @param treeDatas 树
+ * @param callBack 回调
+ * @param parentNode 父节点
+ */
+export const eachTree = (treeDatas: any[], callBack: Fn, parentNode = {}) => {
+  treeDatas.forEach((element) => {
+    const newNode = callBack(element, parentNode) || element
+    if (element.children) {
+      eachTree(element.children, callBack, newNode)
+    }
+  })
+}
+
+/**
+ * 构造树型结构数据
+ * @param {*} data 数据源
+ * @param {*} id id字段 默认 'id'
+ * @param {*} parentId 父节点字段 默认 'parentId'
+ * @param {*} children 孩子节点字段 默认 'children'
+ */
+export const handleTree = (data: any[], id?: string, parentId?: string, children?: string) => {
+  if (!Array.isArray(data)) {
+    console.warn('data must be an array')
+    return []
+  }
+  const config = {
+    id: id || 'id',
+    parentId: parentId || 'parentId',
+    childrenList: children || 'children'
+  }
+
+  const childrenListMap = {}
+  const nodeIds = {}
+  const tree: any[] = []
+
+  for (const d of data) {
+    const parentId = d[config.parentId]
+    if (childrenListMap[parentId] == null) {
+      childrenListMap[parentId] = []
+    }
+    nodeIds[d[config.id]] = d
+    childrenListMap[parentId].push(d)
+  }
+
+  for (const d of data) {
+    const parentId = d[config.parentId]
+    if (nodeIds[parentId] == null) {
+      tree.push(d)
+    }
+  }
+
+  for (const t of tree) {
+    adaptToChildrenList(t)
+  }
+
+  function adaptToChildrenList(o) {
+    if (childrenListMap[o[config.id]] !== null) {
+      o[config.childrenList] = childrenListMap[o[config.id]]
+    }
+    if (o[config.childrenList]) {
+      for (const c of o[config.childrenList]) {
+        adaptToChildrenList(c)
+      }
+    }
+  }
+
+  return tree
+}
+
+/**
+ * 构造树型结构数据
+ * @param {*} data 数据源
+ * @param {*} id id字段 默认 'id'
+ * @param {*} parentId 父节点字段 默认 'parentId'
+ * @param {*} children 孩子节点字段 默认 'children'
+ * @param {*} rootId 根Id 默认 0
+ */
+// @ts-ignore
+export const handleTree2 = (data, id, parentId, children, rootId) => {
+  id = id || 'id'
+  parentId = parentId || 'parentId'
+  // children = children || 'children'
+  rootId =
+    rootId ||
+    Math.min(
+      ...data.map((item) => {
+        return item[parentId]
+      })
+    ) ||
+    0
+  // 对源数据深度克隆
+  const cloneData = JSON.parse(JSON.stringify(data))
+  // 循环所有项
+  const treeData = cloneData.filter((father) => {
+    const branchArr = cloneData.filter((child) => {
+      // 返回每一项的子级数组
+      return father[id] === child[parentId]
+    })
+    branchArr.length > 0 ? (father.children = branchArr) : ''
+    // 返回第一层
+    return father[parentId] === rootId
+  })
+  return treeData !== '' ? treeData : data
+}
+
+/**
+ * 校验选中的节点，是否为指定 level
+ *
+ * @param tree 要操作的树结构数据
+ * @param nodeId 需要判断在什么层级的数据
+ * @param level 检查的级别, 默认检查到二级
+ * @return true 是；false 否
+ */
+export const checkSelectedNode = (tree: any[], nodeId: any, level = 2): boolean => {
+  if (typeof tree === 'undefined' || !Array.isArray(tree) || tree.length === 0) {
+    console.warn('tree must be an array')
+    return false
+  }
+
+  // 校验是否是一级节点
+  if (tree.some((item) => item.id === nodeId)) {
+    return false
+  }
+
+  // 递归计数
+  let count = 1
+
+  // 深层次校验
+  function performAThoroughValidation(arr: any[]): boolean {
+    count += 1
+    for (const item of arr) {
+      if (item.id === nodeId) {
+        return true
+      } else if (typeof item.children !== 'undefined' && item.children.length !== 0) {
+        if (performAThoroughValidation(item.children)) {
+          return true
+        }
+      }
+    }
+    return false
+  }
+
+  for (const item of tree) {
+    count = 1
+    if (performAThoroughValidation(item.children)) {
+      // 找到后对比是否是期望的层级
+      if (count >= level) {
+        return true
+      }
+    }
+  }
+
+  return false
+}
+
+/**
+ * 获取节点的完整结构
+ * @param tree 树数据
+ * @param nodeId 节点 id
+ */
+export const treeToString = (tree: any[], nodeId) => {
+  if (typeof tree === 'undefined' || !Array.isArray(tree) || tree.length === 0) {
+    console.warn('tree must be an array')
+    return ''
+  }
+  // 校验是否是一级节点
+  const node = tree.find((item) => item.id === nodeId)
+  if (typeof node !== 'undefined') {
+    return node.name
+  }
+  let str = ''
+
+  function performAThoroughValidation(arr) {
+    for (const item of arr) {
+      if (item.id === nodeId) {
+        str += `/${item.name}`
+        return true
+      } else if (typeof item.children !== 'undefined' && item.children.length !== 0) {
+        str += `/${item.name}`
+        if (performAThoroughValidation(item.children)) {
+          return true
+        }
+      }
+    }
+    return false
+  }
+
+  for (const item of tree) {
+    str = `${item.name}`
+    if (performAThoroughValidation(item.children)) {
+      break
+    }
+  }
+  return str
+}
diff --git a/src/utils/tsxHelper.ts b/src/utils/tsxHelper.ts
new file mode 100644
index 000000000..6087fa30d
--- /dev/null
+++ b/src/utils/tsxHelper.ts
@@ -0,0 +1,16 @@
+import { Slots } from 'vue'
+import { isFunction } from '@/utils/is'
+
+export const getSlot = (slots: Slots, slot = 'default', data?: Recordable) => {
+  // Reflect.has 判断一个对象是否存在某个属性
+  if (!slots || !Reflect.has(slots, slot)) {
+    return null
+  }
+  if (!isFunction(slots[slot])) {
+    console.error(`${slot} is not a function!`)
+    return null
+  }
+  const slotFn = slots[slot]
+  if (!slotFn) return null
+  return slotFn(data)
+}
diff --git a/src/utils/validator.ts b/src/utils/validator.ts
new file mode 100644
index 000000000..60671f771
--- /dev/null
+++ b/src/utils/validator.ts
@@ -0,0 +1,775 @@
+//校验学校编码 只能为数字
+export function validateCode(rule, value, callback) {
+    if (!value) {
+        return callback(new Error('学校编码不能为空'))
+    } else {
+        const codeReg = /^[0-9]+$/
+        const codeMax = /^\d{0,5}$/
+        if (codeReg.test(value)) {
+            if (codeMax.test(value)) {
+                callback()
+            } else {
+                callback(new Error('学校编码不能大于5位'))
+            }
+
+        } else {
+            callback(new Error('请输入正确的学校编码，只能是数字'))
+        }
+    }
+}
+
+//校验邮箱
+export function validateEmail(rule, value, callback) {
+    if (value) {
+        const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
+        if (mailReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的邮箱格式'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验英文
+export function validateEng(rule, value, callback) {
+    if (value) {
+        const mailReg = /^[A-Za-z\-\&\(\)\Ⅰ\Ⅱ\Ⅲ\Ⅳ\Ⅴ\Ⅵ\Ⅶ\Ⅷ\Ⅸ\Ⅹ\s]+$/;
+        if (mailReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的英文名字'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验姓名拼音
+export function validateEngName(rule, value, callback) {
+    if (value) {
+        const EngNameReg = /^[A-Za-z \(\)\s]+$/
+        if (EngNameReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的姓名拼音'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验手机号码
+export function validateHanset(rule, value, callback) {
+    if (value) {
+        // const regs =/^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+        // const regs = /^1[3|4|5|7|8][0-9]\d{8}$/
+        const regs = /^1[3-9]\d{9}$/
+        if (regs.test(value)) {
+            callback()
+        } else {
+            return callback(new Error('请输入正确的手机号'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验座机电话
+export function validatePhone(rule, value, callback) {
+    if (value) {
+        //const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
+        // const regs = /^([0-9]{3,4}-)?[0-9]{7,8}$/;
+        const regs = /^((0\d{2,3}-\d{7,8}))$/;
+        if (regs.test(value)) {
+            callback()
+        } else {
+            return callback(new Error('请输入正确的座机号'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验家庭电话 手机或者座机
+export function validateFamilyPhone(rule, value, callback) {
+    if (value) {
+        const isPhone = /^([0-9]{3,4}-)?[0-9]{7,8}$/;
+        // const isMob = /^((\+?86)|(\+86))?(13[0123456789][0-9]{8}|15[0123456789][0-9]{8}|17[0123456789][0-9]{8}|18[0123456789][0-9]{8}|147[0-9]{8}|1349[0-9]{7})$/;
+        const isMob = /^1[3-9]\d{9}$/
+        if (isPhone.test(value) || isMob.test(value)) {
+            callback()
+        } else {
+            return callback(new Error('请输入正确的手机或者座机电话'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 校验只能为中文
+export function validateChinese(rule, value, callback) {
+    if (value) {
+        const chineseReg = /^[\u4E00-\u9FA5]+$/
+        if (chineseReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入简介，只能为中文'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 校验名称既能为中文也可以为英文
+export function validateName(rule, value, callback) {
+    if (value) {
+        const chineseReg = /^[\u4E00-\u9FA5]+$/
+        const engLish = /^[A-Za-z]+$/
+        if (chineseReg.test(value) || engLish.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的中文或者英文名称'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 校验负责人既能为中文也可以为英文
+export function validateChargeperson(rule, value, callback) {
+    if (value) {
+        const chineseReg = /^[\u4E00-\u9FA5]+$/
+        const engLish = /^[A-Za-z]+$/
+        if (chineseReg.test(value) || engLish.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的负责人（中英文都可以）'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验学校名称不能为空
+export function validateXXMC(rule, value, callback) {
+    if (!value) {
+        return callback(new Error('案例名称不能为空'))
+    } else {
+        const chineseReg = /^[\u4E00-\u9FA5]+$/
+        if (chineseReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的案例名称，只能是汉字'))
+        }
+    }
+}
+
+//校验中英文数字和下划线都可以
+export function validateZYS(rule, value, callback) {
+    if (value) {
+        //const postReg =/^[\u4e00-\u9fa5_a-zA-Z0-9_]{4,10}+$/
+        const Reg = /^[\u4e00-\u9fa5a-zA-Z0-9]+$/
+        if (Reg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的名称'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 校验邮政编码
+export function validatePostCode(rule, value, callback) {
+    if (value) {
+        const postReg = /^[1-9]\d{5}$/
+        if (postReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的邮政编码'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 数字
+export function validateNum(rule, value, callback) {
+    if (value) {
+        const numReg = /^[\d]+$/
+        if (numReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入数字'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//数字和小数点
+export function validateNumDot(rule, value, callback) {
+    if (value) {
+        const numReg = /^\d+$|^\d+\.\d+$/g
+        if (numReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入数字或小数点'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 组织机构代码
+export function validateOrganization(rule, value, callback) {
+    if (value) {
+        const orgReg = /^[A-Za-z0-9]\w{14}$/g
+        if (orgReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入组织机构代码'))
+        }
+    } else {
+        callback()
+    }
+
+}
+
+// 传真
+export function validateFax(rule, value, callback) {
+    if (value) {
+        const faxReg = /^(\d{3,4}-)?\d{7,8}$/
+        if (faxReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的传真'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 主页地址
+export function validateHome(rule, value, callback) {
+    if (value) {
+        const homeReg = /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\*\+,;=.]+$/
+        if (homeReg.test(value)) {
+            callback()
+        } else {
+            return callback(new Error('请输入正确的主页地址'))
+        }
+    } else {
+        callback()
+    }
+}
+
+// 学分 小数，且保留最多三位小数
+export function validateXf(rule, value, callback) {
+    if (!value) {
+        return callback(new Error('学分不能为空'))
+    } else {
+        const numReg = /^[0-9]+\.[0-9]{0,3}$/
+        if (numReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入小数，且小数点后最多三位'))
+        }
+    }
+}
+
+// 数字格式  小数点后一位
+export function validateOneNum(rule, value, callback) {
+    if (value) {
+        const numReg = /^\d+(\.\d+)?$/
+        const numOneReg = /^\d*\.{0,1}\d{0,1}$/
+        if (numReg.test(value)) {
+            if (numOneReg.test(value)) {
+                callback()
+            } else {
+                callback(new Error('小数点后最多1位'))
+            }
+        } else {
+            callback(new Error('请输入数字'))
+        }
+    }
+    callback()
+}
+
+// 数字格式  小数点后两位
+export function validateTwoNum(rule, value, callback) {
+    if (value) {
+        const numReg = /^\d+(\.\d+)?$/
+        const numTwoReg = /^\d*\.{0,2}\d{0,2}$/
+        if (numReg.test(value)) {
+            if (numTwoReg.test(value)) {
+                callback()
+            } else {
+                callback(new Error('小数点后最多2位'))
+            }
+        } else {
+            callback(new Error('请输入数字'))
+        }
+    }
+    callback()
+}
+
+
+// 数字格式  小数点后两位  	小数点前保留五位
+export function validateTwoNumThree(rule, value, callback) {
+    if (value) {
+        if (Number(value) > 10000) {// 校验value值不能大于10000
+            callback(new Error('数值过大，请重新输入'))
+        }
+
+        const numReg = /^\d+(\.\d+)?$/
+        const numTwoReg = /^\d*\.{0,2}\d{0,2}$/
+        if (numReg.test(value)) {
+            if (numTwoReg.test(value)) {
+                callback()
+            } else {
+                callback(new Error('小数点后最多2位'))
+            }
+        } else {
+            callback(new Error('请输入数字'))
+        }
+    }
+
+    callback()
+}
+
+// 数字格式  小数点后三位
+export function validateThreeNum(rule, value, callback) {
+    if (value) {
+        const numReg = /^\d+(\.\d+)?$/
+        const numTwoReg = /^\d*\.{0,3}\d{0,3}$/
+        if (numReg.test(value)) {
+            if (numTwoReg.test(value)) {
+                callback()
+            } else {
+                callback(new Error('小数点后最多3位'))
+            }
+        } else {
+            callback(new Error('请输入数字'))
+        }
+    }
+    callback()
+    // if (!value) {
+    // 	return callback(new Error('字段不能为空'))
+    // } else {
+    // 	const numReg = /^\d+(\.\d+)?$/
+    // 	const numTwoReg = /^\d*\.{0,3}\d{0,3}$/
+    // 	if (numReg.test(value)) {
+    // 		if (numTwoReg.test(value)) {
+    // 				callback()
+    // 		} else {
+    // 			callback(new Error('小数点后最多3位'))
+    // 		}
+    // 	} else {
+    // 		callback(new Error('请输入数字'))
+    // 	}
+    // }
+}
+
+//校验年份必须为4位数字
+export function validateNF(rule, value, callback) {
+    if (value) {
+        const NFReg = /^\d{4}$/
+        if (NFReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入4位数字'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验年份必须为4位数字
+export function validateXQ(rule, value, callback) {
+    if (value) {
+        const NFReg = /^\d{5}$/
+        if (NFReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入5位数字'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验分数最大值
+export function validateMaxNumber(rule, value, callback) {
+    if (parseInt(value) <= 200) {
+        callback()
+    } else {
+        callback(new Error('分数不能大于200'))
+    }
+
+}
+
+//校验正整数
+export function validateInteger(rule, value, callback) {
+    if (value) {
+        const integerReg = /^[+]{0,1}(\d+)$/
+        if (integerReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的整数'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//校验整数
+export function validateroundNumber(rule, value, callback) {
+    if (value) {
+        const numReg = /^[1-9]\d*$/
+        if (numReg.test(value)) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的整数'))
+        }
+    } else {
+        callback()
+    }
+}
+//校验身份证号
+export function validateCard(rule, value, callback) {
+    if (value) {
+        const cardBoolean = IdCardValidate(value);
+        // const cardReg =/(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+        // if (cardReg.test(value)) {
+        if (cardBoolean) {
+            callback()
+        } else {
+            callback(new Error('请输入正确的身份证号'))
+        }
+    } else {
+        callback()
+    }
+}
+
+//身份证：身份证校验
+function IdCardValidate(code) {
+    let tip = "";
+    if (code != "") {
+        const city = {
+            11: "北京",
+            12: "天津",
+            13: "河北",
+            14: "山西",
+            15: "内蒙古",
+            21: "辽宁",
+            22: "吉林",
+            23: "黑龙江 ",
+            31: "上海",
+            32: "江苏",
+            33: "浙江",
+            34: "安徽",
+            35: "福建",
+            36: "江西",
+            37: "山东",
+            41: "河南",
+            42: "湖北 ",
+            43: "湖南",
+            44: "广东",
+            45: "广西",
+            46: "海南",
+            50: "重庆",
+            51: "四川",
+            52: "贵州",
+            53: "云南",
+            54: "西藏 ",
+            61: "陕西",
+            62: "甘肃",
+            63: "青海",
+            64: "宁夏",
+            65: "新疆",
+            71: "台湾",
+            81: "香港",
+            82: "澳门",
+            91: "国外 "
+        };
+
+        let pass = true;
+
+        //是否为空
+        if (code === '') {
+            tip = "请输入身份证号，身份证号不能为空";
+            pass = false;
+        }
+        //校验长度，类型
+        else if (isCardNo(code) === false) {
+            tip = "您输入的身份证号码不正确，请重新输入";
+            pass = false;
+        }
+        //检查省份
+        else if (checkProvince(code, city) === false) {
+            tip = "您输入的身份证号码不正确,请重新输入";
+            pass = false;
+        }
+        //校验生日
+        else if (checkBirthday(code) === false) {
+            tip = "您输入的身份证号码生日不正确,请重新输入";
+            pass = false;
+        } else {
+            //18位身份证需要验证最后一位校验位
+            if (code.length == 18) {
+                code = code.split('');
+                //∑(ai×Wi)(mod 11)
+                //加权因子
+                const factor = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
+                //校验位
+                const parity = [1, 0, 'X', 9, 8, 7, 6, 5, 4, 3, 2];
+                let sum = 0;
+                let ai = 0;
+                let wi = 0;
+                for (let i = 0; i < 17; i++) {
+                    ai = code[i];
+                    wi = factor[i];
+                    sum += ai * wi;
+                }
+                const last = parity[sum % 11];
+                if (parity[sum % 11] != code[17]) {
+                    tip = "身份证格式错误";
+                    pass = false;
+                }
+            }
+        }
+        return pass;
+    }
+}
+
+//身份证：检查身份证号码是否符合规范，包括长度，类型
+function isCardNo(card) {
+    //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+    const reg = /(^\d{15}$)|(^\d{17}(\d|X)$)/;
+    if (reg.test(card) === false) {
+        return false;
+    }
+    return true;
+};
+
+//身份证：取身份证前两位,校验省份
+function checkProvince(card, city) {
+    const province = card.substr(0, 2);
+    if (city[province] == undefined) {
+        return false;
+    }
+    return true;
+};
+
+//身份证：检查生日是否正确
+function checkBirthday(card) {
+    const len = card.length;
+    //身份证15位时，次序为省（3位）市（3位）年（2位）月（2位）日（2位）校验位（3位），皆为数字
+    if (len == '15') {
+        const re_fifteen = /^(\d{6})(\d{2})(\d{2})(\d{2})(\d{3})$/;
+        const arr_data = card.match(re_fifteen);
+        const year = arr_data[2];
+        const month = arr_data[3];
+        const day = arr_data[4];
+        const birthday = new Date('19' + year + '/' + month + '/' + day);
+        return verifyBirthday('19' + year, month, day, birthday);
+    }
+    //身份证18位时，次序为省（3位）市（3位）年（4位）月（2位）日（2位）校验位（4位），校验位末尾可能为X
+    if (len == '18') {
+        const re_eighteen = /^(\d{6})(\d{4})(\d{2})(\d{2})(\d{3})([0-9]|X)$/;
+        const arr_data = card.match(re_eighteen);
+        const year = arr_data[2];
+        const month = arr_data[3];
+        const day = arr_data[4];
+        const birthday = new Date(year + '/' + month + '/' + day);
+        return verifyBirthday(year, month, day, birthday);
+    }
+    return false;
+};
+
+//身份证：校验日期
+function verifyBirthday(year, month, day, birthday) {
+    const now = new Date();
+    const now_year = now.getFullYear();
+    //年月日是否合理
+    if (birthday.getFullYear() == year && (birthday.getMonth() + 1) == month && birthday.getDate() == day) {
+        //判断年份的范围（3岁到100岁之间)
+        const time = now_year - year;
+        if (time >= 3 && time <= 100) {
+            return true;
+        }
+        return false;
+    }
+    return false;By18Val
+};
+
+/**
+ * 判断身份证号码为18位时最后的验证位是否正确
+ * @param a_idCard 身份证号码数组
+ * @return
+ */
+function isTrueValidateCodeBy18IdCard(a_idCard) {
+    const By18Val = a_idCard[17].toLowerCase(); // 获取第十八位值
+    const numReg = /^[1-9]\d*$/
+    let numVal = false; // 校验第十八位是否为整数
+    if (numReg.test(Number(By18Val))) {
+        numVal = true
+    } else {
+        numVal = false
+    }
+    if (By18Val == 'x' || By18Val == 'X' || numVal) {
+        return true
+    } else {
+        return false
+    }
+}
+
+/**
+ * 验证身份证号码前两位，省级编码的准确性
+ * @param AddressNum
+ * @constructor
+ */
+function IdCardValidateAddress(AddressNum) {
+    const city = {
+        11: "北京",
+        12: "天津",
+        13: "河北",
+        14: "山西",
+        15: "内蒙古",
+        21: "辽宁",
+        22: "吉林",
+        23: "黑龙江 ",
+        31: "上海",
+        32: "江苏",
+        33: "浙江",
+        34: "安徽",
+        35: "福建",
+        36: "江西",
+        37: "山东",
+        41: "河南",
+        42: "湖北 ",
+        43: "湖南",
+        44: "广东",
+        45: "广西",
+        46: "海南",
+        50: "重庆",
+        51: "四川",
+        52: "贵州",
+        53: "云南",
+        54: "西藏 ",
+        61: "陕西",
+        62: "甘肃",
+        63: "青海",
+        64: "宁夏",
+        65: "新疆",
+        71: "台湾",
+        81: "香港",
+        82: "澳门",
+        91: "国外 "
+    };
+    if (city[AddressNum.substr(0, 2)]) {
+        return true
+    } else {
+        return false
+    }
+}
+
+/**
+ * 验证18位数身份证号码中的生日是否是有效生日
+ * @param idCard 18位书身份证字符串
+ * @return
+ */
+function isValidityBrithBy18IdCard(idCard18) {
+    const year = idCard18.substring(6, 10);
+    const month = idCard18.substring(10, 12);
+    const day = idCard18.substring(12, 14);
+    const temp_date = new Date(year, parseFloat(month) - 1, parseFloat(day));
+    // 这里用getFullYear()获取年份，避免千年虫问题
+    if (temp_date.getFullYear() != parseFloat(year)
+        || temp_date.getMonth() != parseFloat(month) - 1
+        || temp_date.getDate() != parseFloat(day)) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+/**
+ * 验证15位数身份证号码中的生日是否是有效生日
+ * @param idCard15 15位书身份证字符串
+ * @return
+ */
+function isValidityBrithBy15IdCard(idCard15) {
+    const year = idCard15.substring(6, 8);
+    const month = idCard15.substring(8, 10);
+    const day = idCard15.substring(10, 12);
+    const temp_date = new Date(year, parseFloat(month) - 1, parseFloat(day));
+    // 对于老身份证中的你年龄则不需考虑千年虫问题而使用getYear()方法
+    if (temp_date.getYear() != parseFloat(year)
+        || temp_date.getMonth() != parseFloat(month) - 1
+        || temp_date.getDate() != parseFloat(day)) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+/**
+ * 去掉字符串头尾空格
+ * @param str
+ * @returns {*}
+ */
+function trim(str) {
+    return str.replace(/(^\s*)|(\s*$)/g, "");
+}
+
+//校验只可输入大小写字母及数字
+export function validateYS(rule, value, callback) {
+    if (value) {
+        const regs = /^[a-zA-Z0-9-_]+$/
+        if(regs.test(value)){
+            callback()
+        } else {
+            callback(new Error('只能输入大小写字母及数字'))
+        }
+    }
+    else {
+        callback()
+    }
+}
+
+export default {
+    validateCode,
+    validateEmail,
+    validateEng,
+    validatePhone,
+    validateChinese,
+    validatePostCode,
+    validateNum,
+    validateNumDot,
+    validateZYS,
+    validateOrganization,
+    validateFax,
+    validateHome,
+    validateXXMC,
+    validateXf,
+    validateOneNum,
+    validateMaxNumber,
+    validateTwoNum,
+    validateTwoNumThree,
+    validateThreeNum,
+    validateInteger,
+    validateNF,
+    validateXQ,
+    validateroundNumber,
+    validateEngName,
+    validateCard,
+    validateHanset,
+    validateFamilyPhone,
+    validateName,
+    validateChargeperson,
+    validateYS
+}
diff --git a/src/views/bpm/definition/index.vue b/src/views/bpm/definition/index.vue
new file mode 100644
index 000000000..1c179e78e
--- /dev/null
+++ b/src/views/bpm/definition/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="定义编号" align="center" prop="id" width="400" />
+      <el-table-column label="流程名称" align="center" prop="name" width="200">
+        <template #default="scope">
+          <el-button type="primary" link @click="handleBpmnDetail(scope.row)">
+            <span>{{ scope.row.name }}</span>
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="定义分类" align="center" prop="category" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category" />
+        </template>
+      </el-table-column>
+      <el-table-column label="表单信息" align="center" prop="formType" width="200">
+        <template #default="scope">
+          <el-button
+            v-if="scope.row.formType === 10"
+            type="primary"
+            link
+            @click="handleFormDetail(scope.row)"
+          >
+            <span>{{ scope.row.formName }}</span>
+          </el-button>
+          <el-button v-else type="primary" link @click="handleFormDetail(scope.row)">
+            <span>{{ scope.row.formCustomCreatePath }}</span>
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="流程版本" align="center" prop="processDefinition.version" width="80">
+        <template #default="scope">
+          <el-tag v-if="scope.row">v{{ scope.row.version }}</el-tag>
+          <el-tag type="warning" v-else>未部署</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="version" width="80">
+        <template #default="scope">
+          <el-tag type="success" v-if="scope.row.suspensionState === 1">激活</el-tag>
+          <el-tag type="warning" v-if="scope.row.suspensionState === 2">挂起</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="部署时间"
+        align="center"
+        prop="deploymentTime"
+        width="180"
+        :formatter="dateFormatter"
+      />
+      <el-table-column
+        label="定义描述"
+        align="center"
+        prop="description"
+        width="300"
+        show-overflow-tooltip
+      />
+      <el-table-column label="操作" align="center" width="150" fixed="right">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="handleAssignRule(scope.row)"
+            v-hasPermi="['bpm:task-assign-rule:query']"
+          >
+            分配规则
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 弹窗：表单详情 -->
+  <Dialog title="表单详情" v-model="formDetailVisible" width="800">
+    <form-create :rule="formDetailPreview.rule" :option="formDetailPreview.option" />
+  </Dialog>
+
+  <!-- 弹窗：流程模型图的预览 -->
+  <Dialog title="流程图" v-model="bpmnDetailVisible" width="800">
+    <MyProcessViewer
+      key="designer"
+      v-model="bpmnXML"
+      :value="bpmnXML as any"
+      v-bind="bpmnControlForm"
+      :prefix="bpmnControlForm.prefix"
+    />
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import { MyProcessViewer } from '@/components/bpmnProcessDesigner/package'
+import * as DefinitionApi from '@/api/bpm/definition'
+import { setConfAndFields2 } from '@/utils/formCreate'
+
+defineOptions({ name: 'BpmProcessDefinition' })
+
+const { push } = useRouter() // 路由
+const { query } = useRoute() // 查询参数
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  key: query.key
+})
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await DefinitionApi.getProcessDefinitionPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 点击任务分配按钮 */
+const handleAssignRule = (row) => {
+  push({
+    name: 'BpmTaskAssignRuleList',
+    query: {
+      modelId: row.id
+    }
+  })
+}
+
+/** 流程表单的详情按钮操作 */
+const formDetailVisible = ref(false)
+const formDetailPreview = ref({
+  rule: [],
+  option: {}
+})
+const handleFormDetail = async (row) => {
+  if (row.formType == 10) {
+    // 设置表单
+    setConfAndFields2(formDetailPreview, row.formConf, row.formFields)
+    // 弹窗打开
+    formDetailVisible.value = true
+  } else {
+    await push({
+      path: row.formCustomCreatePath
+    })
+  }
+}
+
+/** 流程图的详情按钮操作 */
+const bpmnDetailVisible = ref(false)
+const bpmnXML = ref(null)
+const bpmnControlForm = ref({
+  prefix: 'flowable'
+})
+const handleBpmnDetail = async (row) => {
+  bpmnXML.value = await DefinitionApi.getProcessDefinitionBpmnXML(row.id)
+  bpmnDetailVisible.value = true
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/bpm/form/editor/index.vue b/src/views/bpm/form/editor/index.vue
new file mode 100644
index 000000000..b7c45cabf
--- /dev/null
+++ b/src/views/bpm/form/editor/index.vue
@@ -0,0 +1,119 @@
+<template>
+  <ContentWrap>
+    <!-- 表单设计器 -->
+    <FcDesigner ref="designer" height="780px">
+      <template #handle>
+        <el-button round size="small" type="primary" @click="handleSave">
+          <Icon class="mr-5px" icon="ep:plus" />
+          保存
+        </el-button>
+      </template>
+    </FcDesigner>
+  </ContentWrap>
+
+  <!-- 表单保存的弹窗 -->
+  <Dialog v-model="dialogVisible" title="保存表单" width="600">
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
+      <el-form-item label="表单名" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入表单名" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { CommonStatusEnum } from '@/utils/constants'
+import * as FormApi from '@/api/bpm/form'
+import FcDesigner from '@form-create/designer'
+import { encodeConf, encodeFields, setConfAndFields } from '@/utils/formCreate'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+
+defineOptions({ name: 'BpmFormEditor' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息
+const { push, currentRoute } = useRouter() // 路由
+const { query } = useRoute() // 路由信息
+const { delView } = useTagsViewStore() // 视图操作
+
+const designer = ref() // 表单设计器
+const dialogVisible = ref(false) // 弹窗是否展示
+const formLoading = ref(false) // 表单的加载中：提交的按钮禁用
+const formData = ref({
+  name: '',
+  status: CommonStatusEnum.ENABLE,
+  remark: ''
+})
+const formRules = reactive({
+  name: [{ required: true, message: '表单名不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 处理保存按钮 */
+const handleSave = () => {
+  dialogVisible.value = true
+}
+
+/** 提交表单 */
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as FormApi.FormVO
+    data.conf = encodeConf(designer) // 表单配置
+    data.fields = encodeFields(designer) // 表单字段
+    if (!data.id) {
+      await FormApi.createForm(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await FormApi.updateForm(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    close()
+  } finally {
+    formLoading.value = false
+  }
+}
+/** 关闭按钮 */
+const close = () => {
+  delView(unref(currentRoute))
+  push('/bpm/manager/form')
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  // 场景一：新增表单
+  const id = query.id as unknown as number
+  if (!id) {
+    return
+  }
+  // 场景二：修改表单
+  const data = await FormApi.getForm(id)
+  formData.value = data
+  setConfAndFields(designer, data.conf, data.fields)
+})
+</script>
diff --git a/src/views/bpm/form/index.vue b/src/views/bpm/form/index.vue
new file mode 100644
index 000000000..0c9f2f8fc
--- /dev/null
+++ b/src/views/bpm/form/index.vue
@@ -0,0 +1,165 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form ref="queryFormRef" :inline="true" :model="queryParams" class="-mb-15px" label-width="68px">
+      <el-form-item label="表单名" prop="name">
+        <el-input v-model="queryParams.name" class="!w-240px" clearable placeholder="请输入表单名" @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button v-hasPermi="['bpm:form:create']" type="primary" @click="openForm">
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column align="center" label="编号" prop="id" />
+      <el-table-column align="center" label="表单名" prop="name" />
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="备注" prop="remark" />
+      <el-table-column :formatter="dateFormatter" align="center" label="创建时间" prop="createTime" />
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <el-button v-hasPermi="['bpm:form:update']" link type="primary" @click="openForm(scope.row.id)">
+            <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button v-hasPermi="['bpm:form:query']" link @click="openDetail(scope.row.id)">
+            <Icon icon="ep:document-copy" />
+            详情
+          </el-button>
+          <el-button v-hasPermi="['bpm:form:delete']" link type="danger" @click="handleDelete(scope.row.id)">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单详情的弹窗 -->
+  <Dialog v-model="detailVisible" title="表单详情" width="800">
+    <form-create :option="detailData.option" :rule="detailData.rule" />
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as FormApi from '@/api/bpm/form'
+import { setConfAndFields2 } from '@/utils/formCreate'
+
+defineOptions({ name: 'BpmForm' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const { currentRoute, push } = useRouter() // 路由
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: null
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await FormApi.getFormPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const openForm = (id?: number) => {
+  const toRouter: { name: string; query?: { id: number } } = {
+    name: 'BpmFormEditor'
+  }
+  // 表单新建的时候id传的是event需要排除
+  if (typeof id === 'number') {
+    toRouter.query = {
+      id
+    }
+  }
+  push(toRouter)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await FormApi.deleteForm(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 详情操作 */
+const detailVisible = ref(false)
+const detailData = ref({
+  rule: [],
+  option: {}
+})
+const openDetail = async (rowId: number) => {
+  // 设置表单
+  const data = await FormApi.getForm(rowId)
+  setConfAndFields2(detailData, data.conf, data.fields)
+  // 弹窗打开
+  detailVisible.value = true
+}
+/**表单保存返回后重新加载列表 */
+watch(
+  () => currentRoute.value,
+  () => {
+    getList()
+  },
+  {
+    immediate: true
+  }
+)
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/bpm/group/UserGroupForm.vue b/src/views/bpm/group/UserGroupForm.vue
new file mode 100644
index 000000000..35d833ea4
--- /dev/null
+++ b/src/views/bpm/group/UserGroupForm.vue
@@ -0,0 +1,132 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+    >
+      <el-form-item label="组名" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入组名" />
+      </el-form-item>
+      <el-form-item label="描述">
+        <el-input v-model="formData.description" placeholder="请输入描述" type="textarea" />
+      </el-form-item>
+      <el-form-item label="成员" prop="memberUserIds">
+        <el-select v-model="formData.memberUserIds" multiple placeholder="请选择成员">
+          <el-option
+            v-for="user in userList"
+            :key="user.id"
+            :label="user.nickname"
+            :value="user.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { CommonStatusEnum } from '@/utils/constants'
+import * as UserGroupApi from '@/api/bpm/userGroup'
+import * as UserApi from '@/api/system/user'
+
+defineOptions({ name: 'UserGroupForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  description: undefined,
+  memberUserIds: undefined,
+  status: CommonStatusEnum.ENABLE
+})
+const formRules = reactive({
+  name: [{ required: true, message: '组名不能为空', trigger: 'blur' }],
+  description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+  memberUserIds: [{ required: true, message: '成员不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const userList = ref<any[]>([]) // 用户列表
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await UserGroupApi.getUserGroup(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 加载用户列表
+  userList.value = await UserApi.getSimpleUserList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as UserGroupApi.UserGroupVO
+    if (formType.value === 'create') {
+      await UserGroupApi.createUserGroup(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await UserGroupApi.updateUserGroup(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    description: undefined,
+    memberUserIds: undefined,
+    status: CommonStatusEnum.ENABLE
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/bpm/group/index.vue b/src/views/bpm/group/index.vue
new file mode 100644
index 000000000..307df71d9
--- /dev/null
+++ b/src/views/bpm/group/index.vue
@@ -0,0 +1,149 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="组名" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入组名" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['bpm:user-group:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="组名" align="center" prop="name" />
+      <el-table-column label="描述" align="center" prop="description" />
+      <el-table-column label="成员" align="center">
+        <template #default="scope">
+          <span v-for="userId in scope.row.memberUserIds" :key="userId" class="pr-5px">
+            {{ userList.find((user) => user.id === userId)?.nickname }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" fixed="right" width="180">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['bpm:user-group:update']">
+            <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['bpm:user-group:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <UserGroupForm ref="formRef" @success="getList" />
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as UserGroupApi from '@/api/bpm/userGroup'
+import * as UserApi from '@/api/system/user'
+import UserGroupForm from './UserGroupForm.vue'
+import { UserVO } from '@/api/system/user'
+
+defineOptions({ name: 'BpmUserGroup' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: null,
+  status: null,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const userList = ref<UserVO[]>([]) // 用户列表
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await UserGroupApi.getUserGroupPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await UserGroupApi.deleteUserGroup(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  // 加载用户列表
+  userList.value = await UserApi.getSimpleUserList()
+})
+</script>
diff --git a/src/views/bpm/model/ModelForm.vue b/src/views/bpm/model/ModelForm.vue
new file mode 100644
index 000000000..0bd54091b
--- /dev/null
+++ b/src/views/bpm/model/ModelForm.vue
@@ -0,0 +1,230 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="600">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="110px"
+    >
+      <el-form-item label="流程标识" prop="key">
+        <el-input
+          v-model="formData.key"
+          :disabled="!!formData.id"
+          placeholder="请输入流标标识"
+          style="width: 330px"
+        />
+        <el-tooltip
+          v-if="!formData.id"
+          class="item"
+          content="新建后，流程标识不可修改！"
+          effect="light"
+          placement="top"
+        >
+          <i class="el-icon-question" style="padding-left: 5px"></i>
+        </el-tooltip>
+        <el-tooltip v-else class="item" content="流程标识不可修改！" effect="light" placement="top">
+          <i class="el-icon-question" style="padding-left: 5px"></i>
+        </el-tooltip>
+      </el-form-item>
+      <el-form-item label="流程名称" prop="name">
+        <el-input
+          v-model="formData.name"
+          :disabled="!!formData.id"
+          clearable
+          placeholder="请输入流程名称"
+        />
+      </el-form-item>
+      <el-form-item v-if="formData.id" label="流程分类" prop="category">
+        <el-select
+          v-model="formData.category"
+          clearable
+          placeholder="请选择流程分类"
+          style="width: 100%"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.BPM_MODEL_CATEGORY)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="流程描述" prop="description">
+        <el-input v-model="formData.description" clearable type="textarea" />
+      </el-form-item>
+      <div v-if="formData.id">
+        <el-form-item label="表单类型" prop="formType">
+          <el-radio-group v-model="formData.formType">
+            <el-radio
+              v-for="dict in getIntDictOptions(DICT_TYPE.BPM_MODEL_FORM_TYPE)"
+              :key="dict.value"
+              :label="dict.value"
+            >
+              {{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="formData.formType === 10" label="流程表单" prop="formId">
+          <el-select v-model="formData.formId" clearable style="width: 100%">
+            <el-option
+              v-for="form in formList"
+              :key="form.id"
+              :label="form.name"
+              :value="form.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="formData.formType === 20"
+          label="表单提交路由"
+          prop="formCustomCreatePath"
+        >
+          <el-input
+            v-model="formData.formCustomCreatePath"
+            placeholder="请输入表单提交路由"
+            style="width: 330px"
+          />
+          <el-tooltip
+            class="item"
+            content="自定义表单的提交路径，使用 Vue 的路由地址，例如说：bpm/oa/leave/create"
+            effect="light"
+            placement="top"
+          >
+            <i class="el-icon-question" style="padding-left: 5px"></i>
+          </el-tooltip>
+        </el-form-item>
+        <el-form-item
+          v-if="formData.formType === 20"
+          label="表单查看路由"
+          prop="formCustomViewPath"
+        >
+          <el-input
+            v-model="formData.formCustomViewPath"
+            placeholder="请输入表单查看路由"
+            style="width: 330px"
+          />
+          <el-tooltip
+            class="item"
+            content="自定义表单的查看路径，使用 Vue 的路由地址，例如说：bpm/oa/leave/view"
+            effect="light"
+            placement="top"
+          >
+            <i class="el-icon-question" style="padding-left: 5px"></i>
+          </el-tooltip>
+        </el-form-item>
+      </div>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { ElMessageBox } from 'element-plus'
+import * as ModelApi from '@/api/bpm/model'
+import * as FormApi from '@/api/bpm/form'
+
+defineOptions({ name: 'ModelForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  formType: 10,
+  name: '',
+  category: undefined,
+  description: '',
+  formId: '',
+  formCustomCreatePath: '',
+  formCustomViewPath: ''
+})
+const formRules = reactive({
+  category: [{ required: true, message: '参数分类不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }],
+  key: [{ required: true, message: '参数键名不能为空', trigger: 'blur' }],
+  value: [{ required: true, message: '参数键值不能为空', trigger: 'blur' }],
+  visible: [{ required: true, message: '是否可见不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const formList = ref([]) // 流程表单的下拉框的数据
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ModelApi.getModel(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 获得流程表单的下拉框的数据
+  formList.value = await FormApi.getSimpleFormList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ModelApi.ModelVO
+    if (formType.value === 'create') {
+      await ModelApi.createModel(data)
+      // 提示，引导用户做后续的操作
+      await ElMessageBox.alert(
+        '<strong>新建模型成功！</strong>后续需要执行如下 4 个步骤：' +
+          '<div>1. 点击【修改流程】按钮，配置流程的分类、表单信息</div>' +
+          '<div>2. 点击【设计流程】按钮，绘制流程图</div>' +
+          '<div>3. 点击【分配规则】按钮，设置每个用户任务的审批人</div>' +
+          '<div>4. 点击【发布流程】按钮，完成流程的最终发布</div>' +
+          '另外，每次流程修改后，都需要点击【发布流程】按钮，才能正式生效！！！',
+        '重要提示',
+        {
+          dangerouslyUseHTMLString: true,
+          type: 'success'
+        }
+      )
+    } else {
+      await ModelApi.updateModel(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    formType: 10,
+    name: '',
+    category: undefined,
+    description: '',
+    formId: '',
+    formCustomCreatePath: '',
+    formCustomViewPath: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/bpm/model/ModelImportForm.vue b/src/views/bpm/model/ModelImportForm.vue
new file mode 100644
index 000000000..74f10ffdd
--- /dev/null
+++ b/src/views/bpm/model/ModelImportForm.vue
@@ -0,0 +1,140 @@
+<template>
+  <Dialog v-model="dialogVisible" title="导入流程" width="400">
+    <div>
+      <el-upload
+        ref="uploadRef"
+        v-model:file-list="fileList"
+        :action="importUrl"
+        :auto-upload="false"
+        :data="formData"
+        :disabled="formLoading"
+        :headers="uploadHeaders"
+        :limit="1"
+        :on-error="submitFormError"
+        :on-exceed="handleExceed"
+        :on-success="submitFormSuccess"
+        accept=".bpmn, .xml"
+        drag
+        name="bpmnFile"
+      >
+        <Icon class="el-icon--upload" icon="ep:upload-filled" />
+        <div class="el-upload__text"> 将文件拖到此处，或 <em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip" style="color: red">
+            提示：仅允许导入“bpm”或“xml”格式文件！
+          </div>
+          <div>
+            <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px">
+              <el-form-item label="流程标识" prop="key">
+                <el-input
+                  v-model="formData.key"
+                  placeholder="请输入流标标识"
+                  style="width: 250px"
+                />
+              </el-form-item>
+              <el-form-item label="流程名称" prop="name">
+                <el-input v-model="formData.name" clearable placeholder="请输入流程名称" />
+              </el-form-item>
+              <el-form-item label="流程描述" prop="description">
+                <el-input v-model="formData.description" clearable type="textarea" />
+              </el-form-item>
+            </el-form>
+          </div>
+        </template>
+      </el-upload>
+    </div>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { getAccessToken, getTenantId } from '@/utils/auth'
+
+defineOptions({ name: 'ModelImportForm' })
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const formData = ref({
+  key: '',
+  name: '',
+  description: ''
+})
+const formRules = reactive({
+  key: [{ required: true, message: '流程标识不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '流程名称不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const uploadRef = ref() // 上传 Ref
+const importUrl = import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/bpm/model/import'
+const uploadHeaders = ref() // 上传 Header 头
+const fileList = ref([]) // 文件列表
+
+/** 打开弹窗 */
+const open = async () => {
+  dialogVisible.value = true
+  resetForm()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  if (fileList.value.length == 0) {
+    message.error('请上传文件')
+    return
+  }
+  // 提交请求
+  uploadHeaders.value = {
+    Authorization: 'Bearer ' + getAccessToken(),
+    'tenant-id': getTenantId()
+  }
+  formLoading.value = true
+  uploadRef.value!.submit()
+}
+
+/** 文件上传成功 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitFormSuccess = async (response: any) => {
+  if (response.code !== 0) {
+    message.error(response.msg)
+    formLoading.value = false
+    return
+  }
+  // 提示成功
+  message.success('导入流程成功！请点击【设计流程】按钮，进行编辑保存后，才可以进行【发布流程】')
+  // 发送操作成功的事件
+  emit('success')
+}
+
+/** 上传错误提示 */
+const submitFormError = (): void => {
+  message.error('导入流程失败，请您重新上传！')
+  formLoading.value = false
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  // 重置上传状态和文件
+  formLoading.value = false
+  uploadRef.value?.clearFiles()
+  // 重置表单
+  formData.value = {
+    key: '',
+    name: '',
+    description: ''
+  }
+  formRef.value?.resetFields()
+}
+
+/** 文件数超出提示 */
+const handleExceed = (): void => {
+  message.error('最多只能上传一个文件！')
+}
+</script>
diff --git a/src/views/bpm/model/editor/index.vue b/src/views/bpm/model/editor/index.vue
new file mode 100644
index 000000000..f5c0ec6e2
--- /dev/null
+++ b/src/views/bpm/model/editor/index.vue
@@ -0,0 +1,105 @@
+<template>
+  <ContentWrap>
+    <!-- 流程设计器，负责绘制流程等 -->
+    <MyProcessDesigner
+      key="designer"
+      v-if="xmlString !== undefined"
+      v-model="xmlString"
+      :value="xmlString"
+      v-bind="controlForm"
+      keyboard
+      ref="processDesigner"
+      @init-finished="initModeler"
+      :additionalModel="controlForm.additionalModel"
+      @save="save"
+    />
+    <!-- 流程属性器，负责编辑每个流程节点的属性 -->
+    <MyProcessPenal
+      key="penal"
+      :bpmnModeler="modeler as any"
+      :prefix="controlForm.prefix"
+      class="process-panel"
+      :model="model"
+    />
+  </ContentWrap>
+</template>
+
+<script lang="ts" setup>
+import { MyProcessDesigner, MyProcessPenal } from '@/components/bpmnProcessDesigner/package'
+// 自定义元素选中时的弹出菜单（修改 默认任务 为 用户任务）
+import CustomContentPadProvider from '@/components/bpmnProcessDesigner/package/designer/plugins/content-pad'
+// 自定义左侧菜单（修改 默认任务 为 用户任务）
+import CustomPaletteProvider from '@/components/bpmnProcessDesigner/package/designer/plugins/palette'
+import * as ModelApi from '@/api/bpm/model'
+
+defineOptions({ name: 'BpmModelEditor' })
+
+const router = useRouter() // 路由
+const { query } = useRoute() // 路由的查询
+const message = useMessage() // 国际化
+
+const xmlString = ref(undefined) // BPMN XML
+const modeler = ref(null) // BPMN Modeler
+const controlForm = ref({
+  simulation: true,
+  labelEditing: false,
+  labelVisible: false,
+  prefix: 'flowable',
+  headerButtonSize: 'mini',
+  additionalModel: [CustomContentPadProvider, CustomPaletteProvider]
+})
+const model = ref<ModelApi.ModelVO>() // 流程模型的信息
+
+/** 初始化 modeler */
+const initModeler = (item) => {
+  setTimeout(() => {
+    modeler.value = item
+  }, 10)
+}
+
+/** 添加/修改模型 */
+const save = async (bpmnXml) => {
+  const data = {
+    ...model.value,
+    bpmnXml: bpmnXml // bpmnXml 只是初始化流程图，后续修改无法通过它获得
+  } as unknown as ModelApi.ModelVO
+  // 提交
+  if (data.id) {
+    await ModelApi.updateModel(data)
+    message.success('修改成功')
+  } else {
+    await ModelApi.createModel(data)
+    message.success('新增成功')
+  }
+  // 跳转回去
+  close()
+}
+
+/** 关闭按钮 */
+const close = () => {
+  router.push({ path: '/bpm/manager/model' })
+}
+
+/** 初始化 */
+onMounted(async () => {
+  const modelId = query.modelId as unknown as number
+  if (!modelId) {
+    message.error('缺少模型 modelId 编号')
+    return
+  }
+  // 查询模型
+  const data = await ModelApi.getModel(modelId)
+  xmlString.value = data.bpmnXml
+  model.value = {
+    ...data,
+    bpmnXml: undefined // 清空 bpmnXml 属性
+  }
+})
+</script>
+<style lang="scss">
+.process-panel__container {
+  position: absolute;
+  top: 90px;
+  right: 60px;
+}
+</style>
diff --git a/src/views/bpm/model/index.vue b/src/views/bpm/model/index.vue
new file mode 100644
index 000000000..a1a609f73
--- /dev/null
+++ b/src/views/bpm/model/index.vue
@@ -0,0 +1,314 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="流程标识" prop="key">
+        <el-input v-model="queryParams.key" placeholder="请输入流程标识" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="流程名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入流程名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="流程分类" prop="category">
+        <el-select v-model="queryParams.category" placeholder="请选择流程分类" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.BPM_MODEL_CATEGORY)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['bpm:model:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新建流程
+        </el-button>
+        <el-button type="success" @click="openImportForm" v-hasPermi="['bpm:model:import']">
+          <Icon icon="ep:upload" class="mr-5px" /> 导入流程
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="流程标识" align="center" prop="key" width="200" />
+      <el-table-column label="流程名称" align="center" prop="name" width="200">
+        <template #default="scope">
+          <el-button type="primary" link @click="handleBpmnDetail(scope.row)">
+            <span>{{ scope.row.name }}</span>
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="流程分类" align="center" prop="category" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category" />
+        </template>
+      </el-table-column>
+      <el-table-column label="表单信息" align="center" prop="formType">
+        <template #default="scope">
+          <el-button v-if="scope.row.formType === 10" type="primary" link @click="handleFormDetail(scope.row)">
+            <span>{{ scope.row.formName }}</span>
+          </el-button>
+          <el-button v-else-if="scope.row.formType === 20" type="primary" link @click="handleFormDetail(scope.row)">
+            <span>{{ scope.row.formCustomCreatePath }}</span>
+          </el-button>
+          <label v-else>暂无表单</label>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="最新部署的流程定义" align="center">
+        <el-table-column label="流程版本" align="center" prop="processDefinition.version" width="100">
+          <template #default="scope">
+            <el-tag v-if="scope.row.processDefinition">
+              v{{ scope.row.processDefinition.version }}
+            </el-tag>
+            <el-tag v-else type="warning">未部署</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="激活状态" align="center" prop="processDefinition.version" width="85">
+          <template #default="scope">
+            <el-switch v-if="scope.row.processDefinition" v-model="scope.row.processDefinition.suspensionState"
+              :active-value="1" :inactive-value="2" @change="handleChangeState(scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column label="部署时间" align="center" prop="deploymentTime" width="180">
+          <template #default="scope">
+            <span v-if="scope.row.processDefinition">
+              {{ formatDate(scope.row.processDefinition.deploymentTime) }}
+            </span>
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="300" fixed="right">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['bpm:model:update']">
+            <Icon icon="ep:edit" />
+            修改流程
+          </el-button>
+          <el-button link type="primary" @click="handleDesign(scope.row)" v-hasPermi="['bpm:model:update']">
+            <Icon icon="fa-solid:ruler" />
+            设计流程
+          </el-button>
+          <el-button link type="primary" @click="handleAssignRule(scope.row)" v-hasPermi="['bpm:task-assign-rule:query']">
+            <Icon icon="fa-solid:tasks" />
+            分配规则
+          </el-button>
+          <el-button link type="primary" @click="handleDeploy(scope.row)" v-hasPermi="['bpm:model:deploy']">
+            <Icon icon="ep:promotion" />
+            发布流程
+          </el-button>
+          <el-button link type="primary" v-hasPermi="['bpm:process-definition:query']"
+            @click="handleDefinitionList(scope.row)">
+            <Icon icon="fa:sitemap" />
+            流程定义
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['bpm:model:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改流程 -->
+  <ModelForm ref="formRef" @success="getList" />
+
+  <!-- 表单弹窗：导入流程 -->
+  <ModelImportForm ref="importFormRef" @success="getList" />
+
+  <!-- 弹窗：表单详情 -->
+  <Dialog title="表单详情" v-model="formDetailVisible" width="800">
+    <form-create :rule="formDetailPreview.rule" :option="formDetailPreview.option" />
+  </Dialog>
+
+  <!-- 弹窗：流程模型图的预览 -->
+  <Dialog title="流程图" v-model="bpmnDetailVisible" width="800">
+    <MyProcessViewer key="designer" v-model="bpmnXML" :value="bpmnXML as any" v-bind="bpmnControlForm"
+      :prefix="bpmnControlForm.prefix" />
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
+import { MyProcessViewer } from '@/components/bpmnProcessDesigner/package'
+import * as ModelApi from '@/api/bpm/model'
+import * as FormApi from '@/api/bpm/form'
+import ModelForm from './ModelForm.vue'
+import ModelImportForm from '@/views/bpm/model/ModelImportForm.vue'
+import { setConfAndFields2 } from '@/utils/formCreate'
+
+defineOptions({ name: 'BpmModel' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const { push } = useRouter() // 路由
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  key: undefined,
+  name: undefined,
+  category: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ModelApi.getModelPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 添加/修改操作 */
+const importFormRef = ref()
+const openImportForm = () => {
+  importFormRef.value.open()
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ModelApi.deleteModel(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 更新状态操作 */
+const handleChangeState = async (row) => {
+  const state = row.processDefinition.suspensionState
+  try {
+    // 修改状态的二次确认
+    const id = row.id
+    const statusState = state === 1 ? '激活' : '挂起'
+    const content = '是否确认' + statusState + '流程名字为"' + row.name + '"的数据项?'
+    await message.confirm(content)
+    // 发起修改状态
+    await ModelApi.updateModelState(id, state)
+    // 刷新列表
+    await getList()
+  } catch {
+    // 取消后，进行恢复按钮
+    row.processDefinition.suspensionState = state === 1 ? 2 : 1
+  }
+}
+
+/** 设计流程 */
+const handleDesign = (row) => {
+  push({
+    name: 'BpmModelEditor',
+    query: {
+      modelId: row.id
+    }
+  })
+}
+
+/** 发布流程 */
+const handleDeploy = async (row) => {
+  try {
+    // 删除的二次确认
+    await message.confirm('是否部署该流程！！')
+    // 发起部署
+    await ModelApi.deployModel(row.id)
+    message.success(t('部署成功'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 点击任务分配按钮 */
+const handleAssignRule = (row) => {
+  push({
+    name: 'BpmTaskAssignRuleList',
+    query: {
+      modelId: row.id
+    }
+  })
+}
+
+/** 跳转到指定流程定义列表 */
+const handleDefinitionList = (row) => {
+  push({
+    name: 'BpmProcessDefinition',
+    query: {
+      key: row.key
+    }
+  })
+}
+
+/** 流程表单的详情按钮操作 */
+const formDetailVisible = ref(false)
+const formDetailPreview = ref({
+  rule: [],
+  option: {}
+})
+const handleFormDetail = async (row) => {
+  if (row.formType == 10) {
+    // 设置表单
+    const data = await FormApi.getForm(row.formId)
+    setConfAndFields2(formDetailPreview, data.conf, data.fields)
+    // 弹窗打开
+    formDetailVisible.value = true
+  } else {
+    await push({
+      path: row.formCustomCreatePath
+    })
+  }
+}
+
+/** 流程图的详情按钮操作 */
+const bpmnDetailVisible = ref(false)
+const bpmnXML = ref(null)
+const bpmnControlForm = ref({
+  prefix: 'flowable'
+})
+const handleBpmnDetail = async (row) => {
+  const data = await ModelApi.getModel(row.id)
+  bpmnXML.value = data.bpmnXml || ''
+  bpmnDetailVisible.value = true
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/bpm/oa/leave/create.vue b/src/views/bpm/oa/leave/create.vue
new file mode 100644
index 000000000..a47228c90
--- /dev/null
+++ b/src/views/bpm/oa/leave/create.vue
@@ -0,0 +1,89 @@
+<template>
+  <el-form
+    ref="formRef"
+    :model="formData"
+    :rules="formRules"
+    label-width="80px"
+    v-loading="formLoading"
+  >
+    <el-form-item label="请假类型" prop="type">
+      <el-select v-model="formData.type" placeholder="请选择请假类型" clearable>
+        <el-option
+          v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="开始时间" prop="startTime">
+      <el-date-picker
+        clearable
+        v-model="formData.startTime"
+        type="datetime"
+        value-format="x"
+        placeholder="请选择开始时间"
+      />
+    </el-form-item>
+    <el-form-item label="结束时间" prop="endTime">
+      <el-date-picker
+        clearable
+        v-model="formData.endTime"
+        type="datetime"
+        value-format="x"
+        placeholder="请选择结束时间"
+      />
+    </el-form-item>
+    <el-form-item label="原因" prop="reason">
+      <el-input v-model="formData.reason" type="textarea" placeholder="请输请假原因" />
+    </el-form-item>
+    <el-form-item>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as LeaveApi from '@/api/bpm/leave'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+
+defineOptions({ name: 'BpmOALeaveCreate' })
+
+const message = useMessage() // 消息弹窗
+const { delView } = useTagsViewStore() // 视图操作
+const { currentRoute } = useRouter() // 路由
+
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  type: undefined,
+  reason: undefined,
+  startTime: undefined,
+  endTime: undefined
+})
+const formRules = reactive({
+  type: [{ required: true, message: '请假类型不能为空', trigger: 'blur' }],
+  reason: [{ required: true, message: '请假原因不能为空', trigger: 'change' }],
+  startTime: [{ required: true, message: '请假开始时间不能为空', trigger: 'change' }],
+  endTime: [{ required: true, message: '请假结束时间不能为空', trigger: 'change' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 提交表单 */
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as LeaveApi.LeaveVO
+    await LeaveApi.createLeave(data)
+    message.success('发起成功')
+    // 关闭当前 Tab
+    delView(unref(currentRoute))
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
diff --git a/src/views/bpm/oa/leave/detail.vue b/src/views/bpm/oa/leave/detail.vue
new file mode 100644
index 000000000..87036d8e5
--- /dev/null
+++ b/src/views/bpm/oa/leave/detail.vue
@@ -0,0 +1,51 @@
+<template>
+  <ContentWrap>
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="请假类型">
+        <dict-tag :type="DICT_TYPE.BPM_OA_LEAVE_TYPE" :value="detailData.type" />
+      </el-descriptions-item>
+      <el-descriptions-item label="开始时间">
+        {{ formatDate(detailData.startTime, 'YYYY-MM-DD') }}
+      </el-descriptions-item>
+      <el-descriptions-item label="结束时间">
+        {{ formatDate(detailData.endTime, 'YYYY-MM-DD') }}
+      </el-descriptions-item>
+      <el-descriptions-item label="原因">
+        {{ detailData.reason }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import { propTypes } from '@/utils/propTypes'
+import * as LeaveApi from '@/api/bpm/leave'
+
+defineOptions({ name: 'BpmOALeaveDetail' })
+
+const { query } = useRoute() // 查询参数
+
+const props = defineProps({
+  id: propTypes.number.def(undefined)
+})
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref<any>({}) // 详情数据
+const queryId = query.id as unknown as number // 从 URL 传递过来的 id 编号
+
+/** 获得数据 */
+const getInfo = async () => {
+  detailLoading.value = true
+  try {
+    detailData.value = await LeaveApi.getLeave(props.id || queryId)
+  } finally {
+    detailLoading.value = false
+  }
+}
+defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
+
+/** 初始化 **/
+onMounted(() => {
+  getInfo()
+})
+</script>
diff --git a/src/views/bpm/oa/leave/index.vue b/src/views/bpm/oa/leave/index.vue
new file mode 100644
index 000000000..d2324003a
--- /dev/null
+++ b/src/views/bpm/oa/leave/index.vue
@@ -0,0 +1,175 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="请假类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择请假类型" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="申请时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="结果" prop="result">
+        <el-select v-model="queryParams.result" placeholder="请选择结果" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="原因" prop="reason">
+        <el-input v-model="queryParams.reason" placeholder="请输入原因" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="handleCreate()">
+          <Icon icon="ep:plus" class="mr-5px" /> 发起请假
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="申请编号" align="center" prop="id" />
+      <el-table-column label="状态" align="center" prop="result">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result" />
+        </template>
+      </el-table-column>
+      <el-table-column label="开始时间" align="center" prop="startTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="结束时间" align="center" prop="endTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="请假类型" align="center" prop="type">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.BPM_OA_LEAVE_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="原因" align="center" prop="reason" />
+      <el-table-column label="申请时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" fixed="right" width="240">
+        <template #default="scope">
+          <el-button link type="primary" @click="handleDetail(scope.row)" v-hasPermi="['bpm:oa-leave:query']">
+            <Icon icon="ep:document-copy" />
+            详情
+          </el-button>
+          <el-button link type="primary" @click="handleProcessDetail(scope.row)" v-hasPermi="['bpm:oa-leave:query']">
+            <Icon icon="ep:operation" />
+            进度
+          </el-button>
+          <el-button link type="danger" @click="cancelLeave(scope.row)" v-hasPermi="['bpm:oa-leave:create']"
+            v-if="scope.row.result === 1">
+            <Icon icon="ep:remove" />
+            取消
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as LeaveApi from '@/api/bpm/leave'
+import * as ProcessInstanceApi from '@/api/bpm/processInstance'
+
+defineOptions({ name: 'BpmOALeave' })
+
+const message = useMessage() // 消息弹窗
+const router = useRouter() // 路由
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  type: undefined,
+  result: undefined,
+  reason: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await LeaveApi.getLeavePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加操作 */
+const handleCreate = () => {
+  router.push({ name: 'OALeaveCreate' })
+}
+
+/** 详情操作 */
+const handleDetail = (row: LeaveApi.LeaveVO) => {
+  router.push({
+    name: 'OALeaveDetail',
+    query: {
+      id: row.id
+    }
+  })
+}
+
+/** 取消请假操作 */
+const cancelLeave = async (row) => {
+  // 二次确认
+  const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+    confirmButtonText: t('common.ok'),
+    cancelButtonText: t('common.cancel'),
+    inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+    inputErrorMessage: '取消原因不能为空'
+  })
+  // 发起取消
+  await ProcessInstanceApi.cancelProcessInstance(row.id, value)
+  message.success('取消成功')
+  // 刷新列表
+  await getList()
+}
+
+/** 审批进度 */
+const handleProcessDetail = (row) => {
+  router.push({
+    name: 'BpmProcessInstanceDetail',
+    query: {
+      id: row.processInstanceId
+    }
+  })
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/bpm/processInstance/create/index.vue b/src/views/bpm/processInstance/create/index.vue
new file mode 100644
index 000000000..a10e02088
--- /dev/null
+++ b/src/views/bpm/processInstance/create/index.vue
@@ -0,0 +1,133 @@
+<template>
+  <!-- 第一步，通过流程定义的列表，选择对应的流程 -->
+  <ContentWrap v-if="!selectProcessInstance">
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="流程名称" align="center" prop="name" />
+      <el-table-column label="流程分类" align="center" prop="category">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category" />
+        </template>
+      </el-table-column>
+      <el-table-column label="流程版本" align="center" prop="version">
+        <template #default="scope">
+          <el-tag>v{{ scope.row.version }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="流程描述" align="center" prop="description" />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button link type="primary" @click="handleSelect(scope.row)">
+            <Icon icon="ep:plus" /> 选择
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </ContentWrap>
+
+  <!-- 第二步，填写表单，进行流程的提交 -->
+  <ContentWrap v-else>
+    <el-card class="box-card">
+      <div class="clearfix">
+        <span class="el-icon-document">申请信息【{{ selectProcessInstance.name }}】</span>
+        <el-button style="float: right" type="primary" @click="selectProcessInstance = undefined">
+          <Icon icon="ep:delete" /> 选择其它流程
+        </el-button>
+      </div>
+      <el-col :span="16" :offset="6" style="margin-top: 20px">
+        <form-create
+          :rule="detailForm.rule"
+          v-model:api="fApi"
+          :option="detailForm.option"
+          @submit="submitForm"
+        />
+      </el-col>
+    </el-card>
+    <!-- 流程图预览 -->
+    <ProcessInstanceBpmnViewer :bpmn-xml="bpmnXML as any" />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import * as DefinitionApi from '@/api/bpm/definition'
+import * as ProcessInstanceApi from '@/api/bpm/processInstance'
+import { setConfAndFields2 } from '@/utils/formCreate'
+import type { ApiAttrs } from '@form-create/element-ui/types/config'
+import ProcessInstanceBpmnViewer from '../detail/ProcessInstanceBpmnViewer.vue'
+
+defineOptions({ name: 'BpmProcessInstanceCreate' })
+
+const router = useRouter() // 路由
+const message = useMessage() // 消息
+
+// ========== 列表相关 ==========
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  suspensionState: 1
+})
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    list.value = await DefinitionApi.getProcessDefinitionList(queryParams)
+  } finally {
+    loading.value = false
+  }
+}
+
+// ========== 表单相关 ==========
+const bpmnXML = ref(null) // BPMN 数据
+const fApi = ref<ApiAttrs>()
+const detailForm = ref({
+  // 流程表单详情
+  rule: [],
+  option: {}
+})
+const selectProcessInstance = ref() // 选择的流程实例
+
+/** 处理选择流程的按钮操作 **/
+const handleSelect = async (row) => {
+  // 设置选择的流程
+  selectProcessInstance.value = row
+
+  // 情况一：流程表单
+  if (row.formType == 10) {
+    // 设置表单
+    setConfAndFields2(detailForm, row.formConf, row.formFields)
+    // 加载流程图
+    bpmnXML.value = await DefinitionApi.getProcessDefinitionBpmnXML(row.id)
+    // 情况二：业务表单
+  } else if (row.formCustomCreatePath) {
+    await router.push({
+      path: row.formCustomCreatePath
+    })
+    // 这里暂时无需加载流程图，因为跳出到另外个 Tab；
+  }
+}
+
+/** 提交按钮 */
+const submitForm = async (formData) => {
+  if (!fApi.value || !selectProcessInstance.value) {
+    return
+  }
+  // 提交请求
+  fApi.value.btn.loading(true)
+  try {
+    await ProcessInstanceApi.createProcessInstance({
+      processDefinitionId: selectProcessInstance.value.id,
+      variables: formData
+    })
+    // 提示
+    message.success('发起流程成功')
+    router.go(-1)
+  } finally {
+    fApi.value.btn.loading(false)
+  }
+}
+
+/** 初始化 */
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue b/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue
new file mode 100644
index 000000000..0a2057dd0
--- /dev/null
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue
@@ -0,0 +1,57 @@
+<template>
+  <el-card v-loading="loading" class="box-card">
+    <template #header>
+      <span class="el-icon-picture-outline">流程图</span>
+    </template>
+    <MyProcessViewer
+      key="designer"
+      :activityData="activityList"
+      :prefix="bpmnControlForm.prefix"
+      :processInstanceData="processInstance"
+      :taskData="tasks"
+      :value="bpmnXml"
+      v-bind="bpmnControlForm"
+    />
+  </el-card>
+</template>
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import { MyProcessViewer } from '@/components/bpmnProcessDesigner/package'
+import * as ActivityApi from '@/api/bpm/activity'
+
+defineOptions({ name: 'BpmProcessInstanceBpmnViewer' })
+
+const props = defineProps({
+  loading: propTypes.bool, // 是否加载中
+  id: propTypes.string, // 流程实例的编号
+  processInstance: propTypes.any, // 流程实例的信息
+  tasks: propTypes.array, // 流程任务的数组
+  bpmnXml: propTypes.string // BPMN XML
+})
+
+const bpmnControlForm = ref({
+  prefix: 'flowable'
+})
+const activityList = ref([]) // 任务列表
+// const bpmnXML = computed(() => { // TODO 芋艿：不晓得为啊哈不能这么搞
+//   if (!props.processInstance || !props.processInstance.processDefinition) {
+//     return
+//   }
+//   return DefinitionApi.getProcessDefinitionBpmnXML(props.processInstance.processDefinition.id)
+// })
+
+/** 初始化 */
+onMounted(async () => {
+  if (props.id) {
+    activityList.value = await ActivityApi.getActivityList({
+      processInstanceId: props.id
+    })
+  }
+})
+</script>
+<style>
+.box-card {
+  width: 100%;
+  margin-bottom: 20px;
+}
+</style>
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue b/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue
new file mode 100644
index 000000000..ec87104dc
--- /dev/null
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue
@@ -0,0 +1,97 @@
+<template>
+  <el-card v-loading="loading" class="box-card">
+    <template #header>
+      <span class="el-icon-picture-outline">审批记录</span>
+    </template>
+    <el-col :offset="4" :span="16">
+      <div class="block">
+        <el-timeline>
+          <el-timeline-item
+            v-for="(item, index) in tasks"
+            :key="index"
+            :icon="getTimelineItemIcon(item)"
+            :type="getTimelineItemType(item)"
+          >
+            <p style="font-weight: 700">任务：{{ item.name }}</p>
+            <el-card :body-style="{ padding: '10px' }">
+              <label v-if="item.assigneeUser" style="margin-right: 30px; font-weight: normal">
+                审批人：{{ item.assigneeUser.nickname }}
+                <el-tag size="small" type="info">{{ item.assigneeUser.deptName }}</el-tag>
+              </label>
+              <label v-if="item.createTime" style="font-weight: normal">创建时间：</label>
+              <label style="font-weight: normal; color: #8a909c">
+                {{ formatDate(item?.createTime) }}
+              </label>
+              <label v-if="item.endTime" style="margin-left: 30px; font-weight: normal">
+                审批时间：
+              </label>
+              <label v-if="item.endTime" style="font-weight: normal; color: #8a909c">
+                {{ formatDate(item?.endTime) }}
+              </label>
+              <label v-if="item.durationInMillis" style="margin-left: 30px; font-weight: normal">
+                耗时：
+              </label>
+              <label v-if="item.durationInMillis" style="font-weight: normal; color: #8a909c">
+                {{ formatPast2(item?.durationInMillis) }}
+              </label>
+              <p v-if="item.reason">
+                <el-tag :type="getTimelineItemType(item)">{{ item.reason }}</el-tag>
+              </p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </el-col>
+  </el-card>
+</template>
+<script lang="ts" setup>
+import { formatDate, formatPast2 } from '@/utils/formatTime'
+import { propTypes } from '@/utils/propTypes'
+
+defineOptions({ name: 'BpmProcessInstanceTaskList' })
+
+defineProps({
+  loading: propTypes.bool, // 是否加载中
+  tasks: propTypes.arrayOf(propTypes.object) // 流程任务的数组
+})
+
+/** 获得任务对应的 icon */
+const getTimelineItemIcon = (item) => {
+  if (item.result === 1) {
+    return 'el-icon-time'
+  }
+  if (item.result === 2) {
+    return 'el-icon-check'
+  }
+  if (item.result === 3) {
+    return 'el-icon-close'
+  }
+  if (item.result === 4) {
+    return 'el-icon-remove-outline'
+  }
+  if (item.result === 5) {
+    return 'el-icon-back'
+  }
+  return ''
+}
+
+/** 获得任务对应的颜色 */
+const getTimelineItemType = (item) => {
+  if (item.result === 1) {
+    return 'primary'
+  }
+  if (item.result === 2) {
+    return 'success'
+  }
+  if (item.result === 3) {
+    return 'danger'
+  }
+  if (item.result === 4) {
+    return 'info'
+  }
+  if (item.result === 5) {
+    return 'warning'
+  }
+  return ''
+}
+</script>
diff --git a/src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue b/src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue
new file mode 100644
index 000000000..f93bf2c58
--- /dev/null
+++ b/src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue
@@ -0,0 +1,90 @@
+<template>
+  <Dialog v-model="dialogVisible" title="回退" width="500">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="110px"
+    >
+      <el-form-item label="退回节点" prop="targetDefinitionKey">
+        <el-select v-model="formData.targetDefinitionKey" clearable style="width: 100%">
+          <el-option
+            v-for="item in returnList"
+            :key="item.definitionKey"
+            :label="item.name"
+            :value="item.definitionKey"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="回退理由" prop="reason">
+        <el-input v-model="formData.reason" clearable placeholder="请输入回退理由" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" name="TaskRollbackDialogForm" setup>
+import * as TaskApi from '@/api/bpm/task'
+
+const message = useMessage() // 消息弹窗
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const formData = ref({
+  id: '',
+  targetDefinitionKey: undefined,
+  reason: ''
+})
+const formRules = ref({
+  targetDefinitionKey: [{ required: true, message: '必须选择回退节点', trigger: 'change' }],
+  reason: [{ required: true, message: '回退理由不能为空', trigger: 'blur' }]
+})
+
+const formRef = ref() // 表单 Ref
+const returnList = ref([])
+/** 打开弹窗 */
+const open = async (id: string) => {
+  returnList.value = await TaskApi.getReturnList({ taskId: id })
+  if (returnList.value.length === 0) {
+    message.warning('当前没有可回退的节点')
+    return false
+  }
+  dialogVisible.value = true
+  resetForm()
+  formData.value.id = id
+}
+defineExpose({ open }) // 提供 openModal 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await TaskApi.returnTask(formData.value)
+    message.success('回退成功')
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    targetDefinitionKey: undefined,
+    reason: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/bpm/processInstance/detail/TaskUpdateAssigneeForm.vue b/src/views/bpm/processInstance/detail/TaskUpdateAssigneeForm.vue
new file mode 100644
index 000000000..6adf1de8a
--- /dev/null
+++ b/src/views/bpm/processInstance/detail/TaskUpdateAssigneeForm.vue
@@ -0,0 +1,83 @@
+<template>
+  <Dialog v-model="dialogVisible" title="转派审批人" width="500">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="110px"
+    >
+      <el-form-item label="新审批人" prop="assigneeUserId">
+        <el-select v-model="formData.assigneeUserId" clearable style="width: 100%">
+          <el-option
+            v-for="item in userList"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as TaskApi from '@/api/bpm/task'
+import * as UserApi from '@/api/system/user'
+
+defineOptions({ name: 'BpmTaskUpdateAssigneeForm' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const formData = ref({
+  id: '',
+  assigneeUserId: undefined
+})
+const formRules = ref({
+  assigneeUserId: [{ required: true, message: '新审批人不能为空', trigger: 'change' }]
+})
+
+const formRef = ref() // 表单 Ref
+const userList = ref<any[]>([]) // 用户列表
+
+/** 打开弹窗 */
+const open = async (id: string) => {
+  dialogVisible.value = true
+  resetForm()
+  formData.value.id = id
+  // 获得用户列表
+  userList.value = await UserApi.getSimpleUserList()
+}
+defineExpose({ open }) // 提供 openModal 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await TaskApi.updateTaskAssignee(formData.value)
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    assigneeUserId: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue
new file mode 100644
index 000000000..fbadad4c8
--- /dev/null
+++ b/src/views/bpm/processInstance/detail/index.vue
@@ -0,0 +1,285 @@
+<template>
+  <ContentWrap>
+    <!-- 审批信息 -->
+    <el-card
+      v-for="(item, index) in runningTasks"
+      :key="index"
+      v-loading="processInstanceLoading"
+      class="box-card"
+    >
+      <template #header>
+        <span class="el-icon-picture-outline">审批任务【{{ item.name }}】</span>
+      </template>
+      <el-col :offset="6" :span="16">
+        <el-form
+          :ref="'form' + index"
+          :model="auditForms[index]"
+          :rules="auditRule"
+          label-width="100px"
+        >
+          <el-form-item v-if="processInstance && processInstance.name" label="流程名">
+            {{ processInstance.name }}
+          </el-form-item>
+          <el-form-item v-if="processInstance && processInstance.startUser" label="流程发起人">
+            {{ processInstance.startUser.nickname }}
+            <el-tag size="small" type="info">{{ processInstance.startUser.deptName }}</el-tag>
+          </el-form-item>
+          <el-form-item label="审批建议" prop="reason">
+            <el-input
+              v-model="auditForms[index].reason"
+              placeholder="请输入审批建议"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-form>
+        <div style="margin-bottom: 20px; margin-left: 10%; font-size: 14px">
+          <el-button type="success" @click="handleAudit(item, true)">
+            <Icon icon="ep:select" />
+            通过
+          </el-button>
+          <el-button type="danger" @click="handleAudit(item, false)">
+            <Icon icon="ep:close" />
+            不通过
+          </el-button>
+          <el-button type="primary" @click="openTaskUpdateAssigneeForm(item.id)">
+            <Icon icon="ep:edit" />
+            转办
+          </el-button>
+          <el-button type="primary" @click="handleDelegate(item)">
+            <Icon icon="ep:position" />
+            委派
+          </el-button>
+          <el-button type="warning" @click="handleBack(item)">
+            <Icon icon="ep:back" />
+            回退
+          </el-button>
+        </div>
+      </el-col>
+    </el-card>
+
+    <!-- 申请信息 -->
+    <el-card v-loading="processInstanceLoading" class="box-card">
+      <template #header>
+        <span class="el-icon-document">申请信息【{{ processInstance.name }}】</span>
+      </template>
+      <!-- 情况一：流程表单 -->
+      <el-col v-if="processInstance?.processDefinition?.formType === 10" :offset="6" :span="16">
+        <form-create
+          ref="fApi"
+          v-model="detailForm.value"
+          :option="detailForm.option"
+          :rule="detailForm.rule"
+        />
+      </el-col>
+      <!-- 情况二：业务表单 -->
+      <div v-if="processInstance?.processDefinition?.formType === 20">
+        <BusinessFormComponent :id="processInstance.businessKey" />
+      </div>
+    </el-card>
+
+    <!-- 审批记录 -->
+    <ProcessInstanceTaskList :loading="tasksLoad" :tasks="tasks" />
+
+    <!-- 高亮流程图 -->
+    <ProcessInstanceBpmnViewer
+      :id="`${id}`"
+      :bpmn-xml="bpmnXML"
+      :loading="processInstanceLoading"
+      :process-instance="processInstance"
+      :tasks="tasks"
+    />
+
+    <!-- 弹窗：转派审批人 -->
+    <TaskUpdateAssigneeForm ref="taskUpdateAssigneeFormRef" @success="getDetail" />
+    <!-- 弹窗，回退节点 -->
+    <TaskReturnDialog ref="taskReturnDialogRef" @success="getDetail" />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import { useUserStore } from '@/store/modules/user'
+import { setConfAndFields2 } from '@/utils/formCreate'
+import type { ApiAttrs } from '@form-create/element-ui/types/config'
+import * as DefinitionApi from '@/api/bpm/definition'
+import * as ProcessInstanceApi from '@/api/bpm/processInstance'
+import * as TaskApi from '@/api/bpm/task'
+import TaskUpdateAssigneeForm from './TaskUpdateAssigneeForm.vue'
+import ProcessInstanceBpmnViewer from './ProcessInstanceBpmnViewer.vue'
+import ProcessInstanceTaskList from './ProcessInstanceTaskList.vue'
+import TaskReturnDialog from './TaskReturnDialogForm.vue'
+import { registerComponent } from '@/utils/routerHelper'
+
+defineOptions({ name: 'BpmProcessInstanceDetail' })
+
+const { query } = useRoute() // 查询参数
+const message = useMessage() // 消息弹窗
+const { proxy } = getCurrentInstance() as any
+
+const userId = useUserStore().getUser.id // 当前登录的编号
+const id = query.id as unknown as number // 流程实例的编号
+const processInstanceLoading = ref(false) // 流程实例的加载中
+const processInstance = ref<any>({}) // 流程实例
+const bpmnXML = ref('') // BPMN XML
+const tasksLoad = ref(true) // 任务的加载中
+const tasks = ref<any[]>([]) // 任务列表
+// ========== 审批信息 ==========
+const runningTasks = ref<any[]>([]) // 运行中的任务
+const auditForms = ref<any[]>([]) // 审批任务的表单
+const auditRule = reactive({
+  reason: [{ required: true, message: '审批建议不能为空', trigger: 'blur' }]
+})
+// ========== 申请信息 ==========
+const fApi = ref<ApiAttrs>() //
+const detailForm = ref({
+  // 流程表单详情
+  rule: [],
+  option: {},
+  value: {}
+})
+
+/** 处理审批通过和不通过的操作 */
+const handleAudit = async (task, pass) => {
+  // 1.1 获得对应表单
+  const index = runningTasks.value.indexOf(task)
+  const auditFormRef = proxy.$refs['form' + index][0]
+  // 1.2 校验表单
+  const elForm = unref(auditFormRef)
+  if (!elForm) return
+  const valid = await elForm.validate()
+  if (!valid) return
+
+  // 2.1 提交审批
+  const data = {
+    id: task.id,
+    reason: auditForms.value[index].reason
+  }
+  if (pass) {
+    await TaskApi.approveTask(data)
+    message.success('审批通过成功')
+  } else {
+    await TaskApi.rejectTask(data)
+    message.success('审批不通过成功')
+  }
+  // 2.2 加载最新数据
+  getDetail()
+}
+
+/** 转派审批人 */
+const taskUpdateAssigneeFormRef = ref()
+const openTaskUpdateAssigneeForm = (id: string) => {
+  taskUpdateAssigneeFormRef.value.open(id)
+}
+
+/** 处理审批退回的操作 */
+const handleDelegate = async (task) => {
+  message.error('暂不支持【委派】功能，可以使用【转派】替代！')
+  console.log(task)
+}
+
+//回退弹框组件
+const taskReturnDialogRef = ref()
+/** 处理审批退回的操作 */
+const handleBack = async (task) => {
+  taskReturnDialogRef.value.open(task.id)
+}
+
+/** 获得详情 */
+const getDetail = () => {
+  // 1. 获得流程实例相关
+  getProcessInstance()
+  // 2. 获得流程任务列表（审批记录）
+  getTaskList()
+}
+
+/** 加载流程实例 */
+const BusinessFormComponent = ref(null) // 异步组件
+const getProcessInstance = async () => {
+  try {
+    processInstanceLoading.value = true
+    const data = await ProcessInstanceApi.getProcessInstance(id)
+    if (!data) {
+      message.error('查询不到流程信息！')
+      return
+    }
+    processInstance.value = data
+
+    // 设置表单信息
+    const processDefinition = data.processDefinition
+    if (processDefinition.formType === 10) {
+      setConfAndFields2(
+        detailForm,
+        processDefinition.formConf,
+        processDefinition.formFields,
+        data.formVariables
+      )
+      nextTick().then(() => {
+        fApi.value?.fapi?.btn.show(false)
+        fApi.value?.fapi?.resetBtn.show(false)
+        fApi.value?.fapi?.disabled(true)
+      })
+    } else {
+      BusinessFormComponent.value = registerComponent(data.processDefinition.formCustomViewPath)
+    }
+
+    // 加载流程图
+    bpmnXML.value = await DefinitionApi.getProcessDefinitionBpmnXML(processDefinition.id as number)
+  } finally {
+    processInstanceLoading.value = false
+  }
+}
+
+/** 加载任务列表 */
+const getTaskList = async () => {
+  try {
+    // 获得未取消的任务
+    tasksLoad.value = true
+    const data = await TaskApi.getTaskListByProcessInstanceId(id)
+    tasks.value = []
+    // 1.1 移除已取消的审批
+    data.forEach((task) => {
+      if (task.result !== 4) {
+        tasks.value.push(task)
+      }
+    })
+    // 1.2 排序，将未完成的排在前面，已完成的排在后面；
+    tasks.value.sort((a, b) => {
+      // 有已完成的情况，按照完成时间倒序
+      if (a.endTime && b.endTime) {
+        return b.endTime - a.endTime
+      } else if (a.endTime) {
+        return 1
+      } else if (b.endTime) {
+        return -1
+        // 都是未完成，按照创建时间倒序
+      } else {
+        return b.createTime - a.createTime
+      }
+    })
+
+    // 获得需要自己审批的任务
+    runningTasks.value = []
+    auditForms.value = []
+    tasks.value.forEach((task) => {
+      // 2.1 只有待处理才需要
+      if (task.result !== 1) {
+        return
+      }
+      // 2.2 自己不是处理人
+      if (!task.assigneeUser || task.assigneeUser.id !== userId) {
+        return
+      }
+      // 2.3 添加到处理任务
+      runningTasks.value.push({ ...task })
+      auditForms.value.push({
+        reason: ''
+      })
+    })
+  } finally {
+    tasksLoad.value = false
+  }
+}
+
+/** 初始化 */
+onMounted(() => {
+  getDetail()
+})
+</script>
diff --git a/src/views/bpm/processInstance/index.vue b/src/views/bpm/processInstance/index.vue
new file mode 100644
index 000000000..e2fc270a5
--- /dev/null
+++ b/src/views/bpm/processInstance/index.vue
@@ -0,0 +1,186 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="流程名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入流程名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="所属流程" prop="processDefinitionId">
+        <el-input v-model="queryParams.processDefinitionId" placeholder="请输入流程定义的编号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="流程分类" prop="category">
+        <el-select v-model="queryParams.category" placeholder="请选择流程分类" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.BPM_MODEL_CATEGORY)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="结果" prop="result">
+        <el-select v-model="queryParams.result" placeholder="请选择结果" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="提交时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" v-hasPermi="['bpm:process-instance:query']" @click="handleCreate">
+          <Icon icon="ep:plus" class="mr-5px" /> 发起流程
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="流程编号" align="center" prop="id" width="300px" />
+      <el-table-column label="流程名称" align="center" prop="name" />
+      <el-table-column label="流程分类" align="center" prop="category">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category" />
+        </template>
+      </el-table-column>
+      <el-table-column label="当前审批任务" align="center" prop="tasks">
+        <template #default="scope">
+          <el-button type="primary" v-for="task in scope.row.tasks" :key="task.id" link>
+            <span>{{ task.name }}</span>
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="结果" prop="result">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result" />
+        </template>
+      </el-table-column>
+      <el-table-column label="提交时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="结束时间" align="center" prop="endTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button link type="primary" v-hasPermi="['bpm:process-instance:cancel']" @click="handleDetail(scope.row)">
+            <Icon icon="ep:document-copy" />
+            详情
+          </el-button>
+          <el-button link type="primary" v-if="scope.row.result === 1" v-hasPermi="['bpm:process-instance:query']"
+            @click="handleCancel(scope.row)">
+            <Icon icon="ep:remove" />
+            取消
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import { ElMessageBox } from 'element-plus'
+import * as ProcessInstanceApi from '@/api/bpm/processInstance'
+
+defineOptions({ name: 'BpmProcessInstance' })
+
+const router = useRouter() // 路由
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: '',
+  processDefinitionId: undefined,
+  category: undefined,
+  status: undefined,
+  result: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ProcessInstanceApi.getMyProcessInstancePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 发起流程操作 **/
+const handleCreate = () => {
+  router.push({
+    name: 'BpmProcessInstanceCreate'
+  })
+}
+
+/** 查看详情 */
+const handleDetail = (row) => {
+  router.push({
+    name: 'BpmProcessInstanceDetail',
+    query: {
+      id: row.id
+    }
+  })
+}
+
+/** 取消按钮操作 */
+const handleCancel = async (row) => {
+  // 二次确认
+  const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+    confirmButtonText: t('common.ok'),
+    cancelButtonText: t('common.cancel'),
+    inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+    inputErrorMessage: '取消原因不能为空'
+  })
+  // 发起取消
+  await ProcessInstanceApi.cancelProcessInstance(row.id, value)
+  message.success('取消成功')
+  // 刷新列表
+  await getList()
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/bpm/task/done/TaskDetail.vue b/src/views/bpm/task/done/TaskDetail.vue
new file mode 100644
index 000000000..5bc06f196
--- /dev/null
+++ b/src/views/bpm/task/done/TaskDetail.vue
@@ -0,0 +1,51 @@
+<template>
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="详情">
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="任务编号" min-width="120">
+        {{ detailData.id }}
+      </el-descriptions-item>
+      <el-descriptions-item label="任务名称">
+        {{ detailData.name }}
+      </el-descriptions-item>
+      <el-descriptions-item label="所属流程">
+        {{ detailData.processInstance.name }}
+      </el-descriptions-item>
+      <el-descriptions-item label="流程发起人">
+        {{ detailData.processInstance.startUserNickname }}
+      </el-descriptions-item>
+      <el-descriptions-item label="状态">
+        <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="detailData.result" />
+      </el-descriptions-item>
+      <el-descriptions-item label="原因">
+        {{ detailData.reason }}
+      </el-descriptions-item>
+      <el-descriptions-item label="创建时间">
+        {{ formatDate(detailData.createTime) }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import * as TaskApi from '@/api/bpm/task'
+
+defineOptions({ name: 'BpmTaskDetail' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref() // 详情数据
+
+/** 打开弹窗 */
+const open = async (data: TaskApi.TaskVO) => {
+  dialogVisible.value = true
+  // 设置数据
+  detailLoading.value = true
+  try {
+    detailData.value = data
+  } finally {
+    detailLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/bpm/task/done/index.vue b/src/views/bpm/task/done/index.vue
new file mode 100644
index 000000000..24d62dbf6
--- /dev/null
+++ b/src/views/bpm/task/done/index.vue
@@ -0,0 +1,125 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form ref="queryFormRef" :inline="true" :model="queryParams" class="-mb-15px" label-width="68px">
+      <el-form-item label="任务名称" prop="name">
+        <el-input v-model="queryParams.name" class="!w-240px" clearable placeholder="请输入任务名称"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" end-placeholder="结束日期" start-placeholder="开始日期" type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column align="center" label="任务编号" prop="id" width="300px" />
+      <el-table-column align="center" label="任务名称" prop="name" />
+      <el-table-column align="center" label="所属流程" prop="processInstance.name" />
+      <el-table-column align="center" label="流程发起人" prop="processInstance.startUserNickname" />
+      <el-table-column align="center" label="状态" prop="result">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="原因" prop="reason" />
+      <el-table-column :formatter="dateFormatter" align="center" label="创建时间" prop="createTime" width="180" />
+      <el-table-column align="center" label="操作" fixed="right" width="180">
+        <template #default="scope">
+          <el-button link type="primary" @click="openDetail(scope.row)">
+            <Icon icon="ep:document-copy" />详情
+          </el-button>
+          <el-button link type="primary" @click="handleAudit(scope.row)">
+            <Icon icon="fa:sitemap" />流程
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：详情 -->
+  <TaskDetail ref="detailRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as TaskApi from '@/api/bpm/task'
+import TaskDetail from './TaskDetail.vue'
+
+defineOptions({ name: 'BpmTodoTask' })
+
+const { push } = useRouter() // 路由
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: '',
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询任务列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await TaskApi.getDoneTaskPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: TaskApi.TaskVO) => {
+  detailRef.value.open(row)
+}
+
+/** 处理审批按钮 */
+const handleAudit = (row) => {
+  push({
+    name: 'BpmProcessInstanceDetail',
+    query: {
+      id: row.processInstance.id
+    }
+  })
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/bpm/task/todo/index.vue b/src/views/bpm/task/todo/index.vue
new file mode 100644
index 000000000..5dc164e40
--- /dev/null
+++ b/src/views/bpm/task/todo/index.vue
@@ -0,0 +1,112 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form ref="queryFormRef" :inline="true" :model="queryParams" class="-mb-15px" label-width="68px">
+      <el-form-item label="任务名称" prop="name">
+        <el-input v-model="queryParams.name" class="!w-240px" clearable placeholder="请输入任务名称"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" end-placeholder="结束日期" start-placeholder="开始日期" type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column align="center" label="任务编号" prop="id" width="300px" />
+      <el-table-column align="center" label="任务名称" prop="name" />
+      <el-table-column align="center" label="所属流程" prop="processInstance.name" />
+      <el-table-column align="center" label="流程发起人" prop="processInstance.startUserNickname" />
+      <el-table-column :formatter="dateFormatter" align="center" label="创建时间" prop="createTime" width="180" />
+      <el-table-column label="任务状态" prop="suspensionState">
+        <template #default="scope">
+          <el-tag v-if="scope.row.suspensionState === 1" type="success">激活</el-tag>
+          <el-tag v-if="scope.row.suspensionState === 2" type="warning">挂起</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="160">
+        <template #default="scope">
+          <el-button link type="primary" @click="handleAudit(scope.row)">
+            <Icon icon="fa-solid:stamp" />审批进度
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+</template>
+
+<script lang="ts" setup>
+import { dateFormatter } from '@/utils/formatTime'
+import * as TaskApi from '@/api/bpm/task'
+
+defineOptions({ name: 'BpmDoneTask' })
+
+const { push } = useRouter() // 路由
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: '',
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询任务列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await TaskApi.getTodoTaskPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 处理审批按钮 */
+const handleAudit = (row) => {
+  push({
+    name: 'BpmProcessInstanceDetail',
+    query: {
+      id: row.processInstance.id
+    }
+  })
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/bpm/taskAssignRule/TaskAssignRuleForm.vue b/src/views/bpm/taskAssignRule/TaskAssignRuleForm.vue
new file mode 100644
index 000000000..9b215e0fe
--- /dev/null
+++ b/src/views/bpm/taskAssignRule/TaskAssignRuleForm.vue
@@ -0,0 +1,250 @@
+<template>
+  <Dialog v-model="dialogVisible" title="修改任务规则" width="600">
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
+      <el-form-item label="任务名称" prop="taskDefinitionName">
+        <el-input v-model="formData.taskDefinitionName" disabled placeholder="请输入流标标识" />
+      </el-form-item>
+      <el-form-item label="任务标识" prop="taskDefinitionKey">
+        <el-input v-model="formData.taskDefinitionKey" disabled placeholder="请输入任务标识" />
+      </el-form-item>
+      <el-form-item label="规则类型" prop="type">
+        <el-select v-model="formData.type" clearable style="width: 100%">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.BPM_TASK_ASSIGN_RULE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="formData.type === 10" label="指定角色" prop="roleIds">
+        <el-select v-model="formData.roleIds" clearable multiple style="width: 100%">
+          <el-option
+            v-for="item in roleOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="formData.type === 20 || formData.type === 21"
+        label="指定部门"
+        prop="deptIds"
+        span="24"
+      >
+        <el-tree-select
+          ref="treeRef"
+          v-model="formData.deptIds"
+          :data="deptTreeOptions"
+          :props="defaultProps"
+          empty-text="加载中，请稍后"
+          multiple
+          node-key="id"
+          show-checkbox
+        />
+      </el-form-item>
+      <el-form-item v-if="formData.type === 22" label="指定岗位" prop="postIds" span="24">
+        <el-select v-model="formData.postIds" clearable multiple style="width: 100%">
+          <el-option
+            v-for="item in postOptions"
+            :key="parseInt(item.id)"
+            :label="item.name"
+            :value="parseInt(item.id)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="formData.type === 30 || formData.type === 31 || formData.type === 32"
+        label="指定用户"
+        prop="userIds"
+        span="24"
+      >
+        <el-select v-model="formData.userIds" clearable multiple style="width: 100%">
+          <el-option
+            v-for="item in userOptions"
+            :key="parseInt(item.id)"
+            :label="item.nickname"
+            :value="parseInt(item.id)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="formData.type === 40" label="指定用户组" prop="userGroupIds">
+        <el-select v-model="formData.userGroupIds" clearable multiple style="width: 100%">
+          <el-option
+            v-for="item in userGroupOptions"
+            :key="parseInt(item.id)"
+            :label="item.name"
+            :value="parseInt(item.id)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="formData.type === 50" label="指定脚本" prop="scripts">
+        <el-select v-model="formData.scripts" clearable multiple style="width: 100%">
+          <el-option
+            v-for="dict in taskAssignScriptDictDatas"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <!-- 操作按钮 -->
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { defaultProps, handleTree } from '@/utils/tree'
+import * as TaskAssignRuleApi from '@/api/bpm/taskAssignRule'
+import * as RoleApi from '@/api/system/role'
+import * as DeptApi from '@/api/system/dept'
+import * as PostApi from '@/api/system/post'
+import * as UserApi from '@/api/system/user'
+import * as UserGroupApi from '@/api/bpm/userGroup'
+
+defineOptions({ name: 'BpmTaskAssignRuleForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  type: Number(undefined),
+  modelId: '',
+  options: [],
+  roleIds: [],
+  deptIds: [],
+  postIds: [],
+  userIds: [],
+  userGroupIds: [],
+  scripts: []
+})
+const formRules = reactive({
+  type: [{ required: true, message: '规则类型不能为空', trigger: 'change' }],
+  roleIds: [{ required: true, message: '指定角色不能为空', trigger: 'change' }],
+  deptIds: [{ required: true, message: '指定部门不能为空', trigger: 'change' }],
+  postIds: [{ required: true, message: '指定岗位不能为空', trigger: 'change' }],
+  userIds: [{ required: true, message: '指定用户不能为空', trigger: 'change' }],
+  userGroupIds: [{ required: true, message: '指定用户组不能为空', trigger: 'change' }],
+  scripts: [{ required: true, message: '指定脚本不能为空', trigger: 'change' }]
+})
+const formRef = ref() // 表单 Ref
+const roleOptions = ref<RoleApi.RoleVO[]>([]) // 角色列表
+const deptOptions = ref<DeptApi.DeptVO[]>([]) // 部门列表
+const deptTreeOptions = ref() // 部门树
+const postOptions = ref<PostApi.PostVO[]>([]) // 岗位列表
+const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
+const userGroupOptions = ref<UserGroupApi.UserGroupVO[]>([]) // 用户组列表
+const taskAssignScriptDictDatas = getIntDictOptions(DICT_TYPE.BPM_TASK_ASSIGN_SCRIPT)
+
+/** 打开弹窗 */
+const open = async (modelId: string, row: TaskAssignRuleApi.TaskAssignVO) => {
+  // 1. 先重置表单
+  resetForm()
+  // 2. 再设置表单
+  formData.value = {
+    ...row,
+    modelId: modelId,
+    options: [],
+    roleIds: [],
+    deptIds: [],
+    postIds: [],
+    userIds: [],
+    userGroupIds: [],
+    scripts: []
+  }
+  // 将 options 赋值到对应的 roleIds 等选项
+  if (row.type === 10) {
+    formData.value.roleIds.push(...row.options)
+  } else if (row.type === 20 || row.type === 21) {
+    formData.value.deptIds.push(...row.options)
+  } else if (row.type === 22) {
+    formData.value.postIds.push(...row.options)
+  } else if (row.type === 30 || row.type === 31 || row.type === 32) {
+    formData.value.userIds.push(...row.options)
+  } else if (row.type === 40) {
+    formData.value.userGroupIds.push(...row.options)
+  } else if (row.type === 50) {
+    formData.value.scripts.push(...row.options)
+  }
+  // 打开弹窗
+  dialogVisible.value = true
+
+  // 获得角色列表
+  roleOptions.value = await RoleApi.getSimpleRoleList()
+  // 获得部门列表
+  deptOptions.value = await DeptApi.getSimpleDeptList()
+  deptTreeOptions.value = handleTree(deptOptions.value, 'id')
+  // 获得岗位列表
+  postOptions.value = await PostApi.getSimplePostList()
+  // 获得用户列表
+  userOptions.value = await UserApi.getSimpleUserList()
+  // 获得用户组列表
+  userGroupOptions.value = await UserGroupApi.getSimpleUserGroupList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  // 构建表单
+  const form = {
+    ...formData.value,
+    taskDefinitionName: undefined
+  }
+  // 将 roleIds 等选项赋值到 options 中
+  if (form.type === 10) {
+    form.options = form.roleIds
+  } else if (form.type === 20 || form.type === 21) {
+    form.options = form.deptIds
+  } else if (form.type === 22) {
+    form.options = form.postIds
+  } else if (form.type === 30 || form.type === 31 || form.type === 32) {
+    form.options = form.userIds
+  } else if (form.type === 40) {
+    form.options = form.userGroupIds
+  } else if (form.type === 50) {
+    form.options = form.scripts
+  }
+  form.roleIds = undefined
+  form.deptIds = undefined
+  form.postIds = undefined
+  form.userIds = undefined
+  form.userGroupIds = undefined
+  form.scripts = undefined
+
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = form as unknown as TaskAssignRuleApi.TaskAssignVO
+    if (!data.id) {
+      await TaskAssignRuleApi.createTaskAssignRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await TaskAssignRuleApi.updateTaskAssignRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/bpm/taskAssignRule/index.vue b/src/views/bpm/taskAssignRule/index.vue
new file mode 100644
index 000000000..0fe9bde60
--- /dev/null
+++ b/src/views/bpm/taskAssignRule/index.vue
@@ -0,0 +1,136 @@
+<template>
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="任务名" align="center" prop="taskDefinitionName" />
+      <el-table-column label="任务标识" align="center" prop="taskDefinitionKey" />
+      <el-table-column label="规则类型" align="center" prop="type">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.BPM_TASK_ASSIGN_RULE_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="规则范围" align="center" prop="options">
+        <template #default="scope">
+          <el-tag class="mr-5px" :key="option" v-for="option in scope.row.options">
+            {{ getAssignRuleOptionName(scope.row.type, option) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="queryParams.modelId" label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm(scope.row)"
+            v-hasPermi="['bpm:task-assign-rule:update']"
+          >
+            修改
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </ContentWrap>
+  <!-- 添加/修改弹窗 -->
+  <TaskAssignRuleForm ref="formRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as TaskAssignRuleApi from '@/api/bpm/taskAssignRule'
+import * as RoleApi from '@/api/system/role'
+import * as DeptApi from '@/api/system/dept'
+import * as PostApi from '@/api/system/post'
+import * as UserApi from '@/api/system/user'
+import * as UserGroupApi from '@/api/bpm/userGroup'
+import TaskAssignRuleForm from './TaskAssignRuleForm.vue'
+
+defineOptions({ name: 'BpmTaskAssignRule' })
+
+const { query } = useRoute() // 查询参数
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  modelId: query.modelId, // 流程模型的编号。如果 modelId 非空，则用于流程模型的查看与配置
+  processDefinitionId: query.processDefinitionId // 流程定义的编号。如果 processDefinitionId 非空，则用于流程定义的查看，不支持配置
+})
+const roleOptions = ref<RoleApi.RoleVO[]>([]) // 角色列表
+const deptOptions = ref<DeptApi.DeptVO[]>([]) // 部门列表
+const postOptions = ref<PostApi.PostVO[]>([]) // 岗位列表
+const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
+const userGroupOptions = ref<UserGroupApi.UserGroupVO[]>([]) // 用户组列表
+const taskAssignScriptDictDatas = getIntDictOptions(DICT_TYPE.BPM_TASK_ASSIGN_SCRIPT)
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    list.value = await TaskAssignRuleApi.getTaskAssignRuleList(queryParams)
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 翻译规则范围 */
+// TODO 芋艿：各种 ts 报错
+const getAssignRuleOptionName = (type, option) => {
+  if (type === 10) {
+    for (const roleOption of roleOptions.value) {
+      if (roleOption.id === option) {
+        return roleOption.name
+      }
+    }
+  } else if (type === 20 || type === 21) {
+    for (const deptOption of deptOptions.value) {
+      if (deptOption.id === option) {
+        return deptOption.name
+      }
+    }
+  } else if (type === 22) {
+    for (const postOption of postOptions.value) {
+      if (postOption.id === option) {
+        return postOption.name
+      }
+    }
+  } else if (type === 30 || type === 31 || type === 32) {
+    for (const userOption of userOptions.value) {
+      if (userOption.id === option) {
+        return userOption.nickname
+      }
+    }
+  } else if (type === 40) {
+    for (const userGroupOption of userGroupOptions.value) {
+      if (userGroupOption.id === option) {
+        return userGroupOption.name
+      }
+    }
+  } else if (type === 50) {
+    option = option + '' // 转换成 string
+    for (const dictData of taskAssignScriptDictDatas) {
+      if (dictData.value === option) {
+        return dictData.label
+      }
+    }
+  }
+  return '未知(' + option + ')'
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (row: TaskAssignRuleApi.TaskAssignVO) => {
+  formRef.value.open(queryParams.modelId, row)
+}
+
+/** 初始化 */
+onMounted(async () => {
+  await getList()
+  // 获得角色列表
+  roleOptions.value = await RoleApi.getSimpleRoleList()
+  // 获得部门列表
+  deptOptions.value = await DeptApi.getSimpleDeptList()
+  // 获得岗位列表
+  postOptions.value = await PostApi.getSimplePostList()
+  // 获得用户列表
+  userOptions.value = await UserApi.getSimpleUserList()
+  // 获得用户组列表
+  userGroupOptions.value = await UserGroupApi.getSimpleUserGroupList()
+})
+</script>
diff --git a/src/views/error/403.vue b/src/views/error/403.vue
new file mode 100644
index 000000000..a3ec48776
--- /dev/null
+++ b/src/views/error/403.vue
@@ -0,0 +1,8 @@
+<template>
+  <Error type="403" @error-click="push('/')" />
+</template>
+<script lang="ts" setup>
+defineOptions({ name: 'Error403' })
+
+const { push } = useRouter()
+</script>
diff --git a/src/views/error/404.vue b/src/views/error/404.vue
new file mode 100644
index 000000000..f6a08de2f
--- /dev/null
+++ b/src/views/error/404.vue
@@ -0,0 +1,7 @@
+<template>
+  <Error @error-click="push('/')" />
+</template>
+<script lang="ts" setup>
+defineOptions({ name: 'Error404' })
+const { push } = useRouter()
+</script>
diff --git a/src/views/error/500.vue b/src/views/error/500.vue
new file mode 100644
index 000000000..998487d27
--- /dev/null
+++ b/src/views/error/500.vue
@@ -0,0 +1,7 @@
+<template>
+  <Error type="500" @error-click="push('/')" />
+</template>
+<script lang="ts" setup>
+defineOptions({ name: 'Error500' })
+const { push } = useRouter()
+</script>
diff --git a/src/views/home/Index copy.vue b/src/views/home/Index copy.vue
new file mode 100644
index 000000000..121ec6a8b
--- /dev/null
+++ b/src/views/home/Index copy.vue	
@@ -0,0 +1,381 @@
+<template>
+  <div>
+    <el-card shadow="never">
+      <el-skeleton :loading="loading" animated>
+        <el-row :gutter="20" justify="space-between">
+          <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+            <div class="flex items-center">
+              <img :src="avatar" alt="" class="mr-20px h-70px w-70px rounded-[50%]" />
+              <div>
+                <div class="text-20px">
+                  {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
+                </div>
+                <div class="mt-10px text-14px text-gray-500">
+                  {{ t('workplace.toady') }}，20℃ - 32℃！
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+            <div class="h-70px flex items-center justify-end lt-sm:mt-10px">
+              <div class="px-8px text-right">
+                <div class="mb-20px text-14px text-gray-400">{{ t('workplace.project') }}</div>
+                <CountTo
+                  class="text-20px"
+                  :start-val="0"
+                  :end-val="totalSate.project"
+                  :duration="2600"
+                />
+              </div>
+              <el-divider direction="vertical" />
+              <div class="px-8px text-right">
+                <div class="mb-20px text-14px text-gray-400">{{ t('workplace.toDo') }}</div>
+                <CountTo
+                  class="text-20px"
+                  :start-val="0"
+                  :end-val="totalSate.todo"
+                  :duration="2600"
+                />
+              </div>
+              <el-divider direction="vertical" border-style="dashed" />
+              <div class="px-8px text-right">
+                <div class="mb-20px text-14px text-gray-400">{{ t('workplace.access') }}</div>
+                <CountTo
+                  class="text-20px"
+                  :start-val="0"
+                  :end-val="totalSate.access"
+                  :duration="2600"
+                />
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </el-skeleton>
+    </el-card>
+  </div>
+
+  <el-row class="mt-5px" :gutter="20" justify="space-between">
+    <el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24" class="mb-10px">
+      <el-card shadow="never">
+        <template #header>
+          <div class="h-3 flex justify-between">
+            <span>{{ t('workplace.project') }}</span>
+            <el-link type="primary" :underline="false">{{ t('action.more') }}</el-link>
+          </div>
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <el-row>
+            <el-col
+              v-for="(item, index) in projects"
+              :key="`card-${index}`"
+              :xl="8"
+              :lg="8"
+              :md="8"
+              :sm="24"
+              :xs="24"
+            >
+              <el-card shadow="hover">
+                <div class="flex items-center">
+                  <Icon :icon="item.icon" :size="25" class="mr-10px" />
+                  <span class="text-16px">{{ item.name }}</span>
+                </div>
+                <div class="mt-15px text-14px text-gray-400">{{ t(item.message) }}</div>
+                <div class="mt-20px flex justify-between text-12px text-gray-400">
+                  <span>{{ item.personal }}</span>
+                  <span>{{ formatTime(item.time, 'yyyy-MM-dd') }}</span>
+                </div>
+              </el-card>
+            </el-col>
+          </el-row>
+        </el-skeleton>
+      </el-card>
+
+      <el-card shadow="never" class="mt-5px">
+        <el-skeleton :loading="loading" animated>
+          <el-row :gutter="20" justify="space-between">
+            <el-col :xl="10" :lg="10" :md="24" :sm="24" :xs="24">
+              <el-card shadow="hover" class="mb-10px">
+                <el-skeleton :loading="loading" animated>
+                  <Echart :options="pieOptionsData" :height="280" />
+                </el-skeleton>
+              </el-card>
+            </el-col>
+            <el-col :xl="14" :lg="14" :md="24" :sm="24" :xs="24">
+              <el-card shadow="hover" class="mb-10px">
+                <el-skeleton :loading="loading" animated>
+                  <Echart :options="barOptionsData" :height="280" />
+                </el-skeleton>
+              </el-card>
+            </el-col>
+          </el-row>
+        </el-skeleton>
+      </el-card>
+    </el-col>
+    <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-10px">
+      <el-card shadow="never">
+        <template #header>
+          <div class="h-3 flex justify-between">
+            <span>{{ t('workplace.shortcutOperation') }}</span>
+          </div>
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <el-row>
+            <el-col v-for="item in shortcut" :key="`team-${item.name}`" :span="8" class="mb-10px">
+              <div class="flex items-center">
+                <Icon :icon="item.icon" class="mr-10px" />
+                <el-link type="default" :underline="false" @click="setWatermark(item.name)">
+                  {{ item.name }}
+                </el-link>
+              </div>
+            </el-col>
+          </el-row>
+        </el-skeleton>
+      </el-card>
+      <el-card shadow="never" class="mt-10px">
+        <template #header>
+          <div class="h-3 flex justify-between">
+            <span>{{ t('workplace.notice') }}</span>
+            <el-link type="primary" :underline="false">{{ t('action.more') }}</el-link>
+          </div>
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <div v-for="(item, index) in notice" :key="`dynamics-${index}`">
+            <div class="flex items-center">
+              <img :src="avatar" alt="" class="mr-20px h-35px w-35px rounded-[50%]" />
+              <div>
+                <div class="text-14px">
+                  <Highlight :keys="item.keys.map((v) => t(v))">
+                    {{ item.type }} : {{ item.title }}
+                  </Highlight>
+                </div>
+                <div class="mt-15px text-12px text-gray-400">
+                  {{ formatTime(item.date, 'yyyy-MM-dd') }}
+                </div>
+              </div>
+            </div>
+            <el-divider />
+          </div>
+        </el-skeleton>
+      </el-card>
+    </el-col>
+  </el-row>
+</template>
+<script lang="ts" setup>
+import { set } from 'lodash-es'
+import { EChartsOption } from 'echarts'
+import { formatTime } from '@/utils'
+
+import { useUserStore } from '@/store/modules/user'
+import { useWatermark } from '@/hooks/web/useWatermark'
+import avatarImg from '@/assets/imgs/avatar.gif'
+import type { WorkplaceTotal, Project, Notice, Shortcut } from './types'
+import { pieOptions, barOptions } from './echarts-data'
+
+defineOptions({ name: 'Home' })
+
+const { t } = useI18n()
+const userStore = useUserStore()
+const { setWatermark } = useWatermark()
+const loading = ref(true)
+const avatar = userStore.getUser.avatar ? userStore.getUser.avatar : avatarImg
+const username = userStore.getUser.nickname
+const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption
+// 获取统计数
+let totalSate = reactive<WorkplaceTotal>({
+  project: 0,
+  access: 0,
+  todo: 0
+})
+
+const getCount = async () => {
+  const data = {
+    project: 40,
+    access: 2340,
+    todo: 10
+  }
+  totalSate = Object.assign(totalSate, data)
+}
+
+// 获取项目数
+let projects = reactive<Project[]>([])
+const getProject = async () => {
+  const data = [
+    {
+      name: 'Github',
+      icon: 'akar-icons:github-fill',
+      message: 'workplace.introduction',
+      personal: 'Archer',
+      time: new Date()
+    },
+    {
+      name: 'Vue',
+      icon: 'logos:vue',
+      message: 'workplace.introduction',
+      personal: 'Archer',
+      time: new Date()
+    },
+    {
+      name: 'Angular',
+      icon: 'logos:angular-icon',
+      message: 'workplace.introduction',
+      personal: 'Archer',
+      time: new Date()
+    },
+    {
+      name: 'React',
+      icon: 'logos:react',
+      message: 'workplace.introduction',
+      personal: 'Archer',
+      time: new Date()
+    },
+    {
+      name: 'Webpack',
+      icon: 'logos:webpack',
+      message: 'workplace.introduction',
+      personal: 'Archer',
+      time: new Date()
+    },
+    {
+      name: 'Vite',
+      icon: 'vscode-icons:file-type-vite',
+      message: 'workplace.introduction',
+      personal: 'Archer',
+      time: new Date()
+    }
+  ]
+  projects = Object.assign(projects, data)
+}
+
+// 获取通知公告
+let notice = reactive<Notice[]>([])
+const getNotice = async () => {
+  const data = [
+    {
+      title: '系统升级版本',
+      type: '通知',
+      keys: ['通知', '升级'],
+      date: new Date()
+    },
+    {
+      title: '系统凌晨维护',
+      type: '公告',
+      keys: ['公告', '维护'],
+      date: new Date()
+    },
+    {
+      title: '系统升级版本',
+      type: '通知',
+      keys: ['通知', '升级'],
+      date: new Date()
+    },
+    {
+      title: '系统凌晨维护',
+      type: '公告',
+      keys: ['公告', '维护'],
+      date: new Date()
+    }
+  ]
+  notice = Object.assign(notice, data)
+}
+
+// 获取快捷入口
+let shortcut = reactive<Shortcut[]>([])
+
+const getShortcut = async () => {
+  const data = [
+    {
+      name: 'Github',
+      icon: 'akar-icons:github-fill',
+      url: 'github.io'
+    },
+    {
+      name: 'Vue',
+      icon: 'logos:vue',
+      url: 'vuejs.org'
+    },
+    {
+      name: 'Vite',
+      icon: 'vscode-icons:file-type-vite',
+      url: 'https://vitejs.dev/'
+    },
+    {
+      name: 'Angular',
+      icon: 'logos:angular-icon',
+      url: 'github.io'
+    },
+    {
+      name: 'React',
+      icon: 'logos:react',
+      url: 'github.io'
+    },
+    {
+      name: 'Webpack',
+      icon: 'logos:webpack',
+      url: 'github.io'
+    }
+  ]
+  shortcut = Object.assign(shortcut, data)
+}
+
+// 用户来源
+const getUserAccessSource = async () => {
+  const data = [
+    { value: 335, name: 'analysis.directAccess' },
+    { value: 310, name: 'analysis.mailMarketing' },
+    { value: 234, name: 'analysis.allianceAdvertising' },
+    { value: 135, name: 'analysis.videoAdvertising' },
+    { value: 1548, name: 'analysis.searchEngines' }
+  ]
+  set(
+    pieOptionsData,
+    'legend.data',
+    data.map((v) => t(v.name))
+  )
+  pieOptionsData!.series![0].data = data.map((v) => {
+    return {
+      name: t(v.name),
+      value: v.value
+    }
+  })
+}
+const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
+
+// 周活跃量
+const getWeeklyUserActivity = async () => {
+  const data = [
+    { value: 13253, name: 'analysis.monday' },
+    { value: 34235, name: 'analysis.tuesday' },
+    { value: 26321, name: 'analysis.wednesday' },
+    { value: 12340, name: 'analysis.thursday' },
+    { value: 24643, name: 'analysis.friday' },
+    { value: 1322, name: 'analysis.saturday' },
+    { value: 1324, name: 'analysis.sunday' }
+  ]
+  set(
+    barOptionsData,
+    'xAxis.data',
+    data.map((v) => t(v.name))
+  )
+  set(barOptionsData, 'series', [
+    {
+      name: t('analysis.activeQuantity'),
+      data: data.map((v) => v.value),
+      type: 'bar'
+    }
+  ])
+}
+
+const getAllApi = async () => {
+  await Promise.all([
+    getCount(),
+    getProject(),
+    getNotice(),
+    getShortcut(),
+    getUserAccessSource(),
+    getWeeklyUserActivity()
+  ])
+  loading.value = false
+}
+
+getAllApi()
+</script>
diff --git a/src/views/home/Index2.vue b/src/views/home/Index2.vue
new file mode 100644
index 000000000..c9429ab10
--- /dev/null
+++ b/src/views/home/Index2.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-row :class="prefixCls" :gutter="20" justify="space-between">
+    <el-col :lg="6" :md="12" :sm="12" :xl="6" :xs="24">
+      <el-card class="mb-20px" shadow="hover">
+        <el-skeleton :loading="loading" :rows="2" animated>
+          <template #default>
+            <div :class="`${prefixCls}__item flex justify-between`">
+              <div>
+                <div
+                  :class="`${prefixCls}__item--icon ${prefixCls}__item--peoples p-16px inline-block rounded-6px`"
+                >
+                  <Icon :size="40" icon="svg-icon:peoples" />
+                </div>
+              </div>
+              <div class="flex flex-col justify-between">
+                <div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`"
+                  >{{ t('analysis.newUser') }}
+                </div>
+                <CountTo
+                  :duration="2600"
+                  :end-val="102400"
+                  :start-val="0"
+                  class="text-right text-20px font-700"
+                />
+              </div>
+            </div>
+          </template>
+        </el-skeleton>
+      </el-card>
+    </el-col>
+
+    <el-col :lg="6" :md="12" :sm="12" :xl="6" :xs="24">
+      <el-card class="mb-20px" shadow="hover">
+        <el-skeleton :loading="loading" :rows="2" animated>
+          <template #default>
+            <div :class="`${prefixCls}__item flex justify-between`">
+              <div>
+                <div
+                  :class="`${prefixCls}__item--icon ${prefixCls}__item--message p-16px inline-block rounded-6px`"
+                >
+                  <Icon :size="40" icon="svg-icon:message" />
+                </div>
+              </div>
+              <div class="flex flex-col justify-between">
+                <div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`"
+                  >{{ t('analysis.unreadInformation') }}
+                </div>
+                <CountTo
+                  :duration="2600"
+                  :end-val="81212"
+                  :start-val="0"
+                  class="text-right text-20px font-700"
+                />
+              </div>
+            </div>
+          </template>
+        </el-skeleton>
+      </el-card>
+    </el-col>
+
+    <el-col :lg="6" :md="12" :sm="12" :xl="6" :xs="24">
+      <el-card class="mb-20px" shadow="hover">
+        <el-skeleton :loading="loading" :rows="2" animated>
+          <template #default>
+            <div :class="`${prefixCls}__item flex justify-between`">
+              <div>
+                <div
+                  :class="`${prefixCls}__item--icon ${prefixCls}__item--money p-16px inline-block rounded-6px`"
+                >
+                  <Icon :size="40" icon="svg-icon:money" />
+                </div>
+              </div>
+              <div class="flex flex-col justify-between">
+                <div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`"
+                  >{{ t('analysis.transactionAmount') }}
+                </div>
+                <CountTo
+                  :duration="2600"
+                  :end-val="9280"
+                  :start-val="0"
+                  class="text-right text-20px font-700"
+                />
+              </div>
+            </div>
+          </template>
+        </el-skeleton>
+      </el-card>
+    </el-col>
+
+    <el-col :lg="6" :md="12" :sm="12" :xl="6" :xs="24">
+      <el-card class="mb-20px" shadow="hover">
+        <el-skeleton :loading="loading" :rows="2" animated>
+          <template #default>
+            <div :class="`${prefixCls}__item flex justify-between`">
+              <div>
+                <div
+                  :class="`${prefixCls}__item--icon ${prefixCls}__item--shopping p-16px inline-block rounded-6px`"
+                >
+                  <Icon :size="40" icon="svg-icon:shopping" />
+                </div>
+              </div>
+              <div class="flex flex-col justify-between">
+                <div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`"
+                  >{{ t('analysis.totalShopping') }}
+                </div>
+                <CountTo
+                  :duration="2600"
+                  :end-val="13600"
+                  :start-val="0"
+                  class="text-right text-20px font-700"
+                />
+              </div>
+            </div>
+          </template>
+        </el-skeleton>
+      </el-card>
+    </el-col>
+  </el-row>
+  <el-row :gutter="20" justify="space-between">
+    <el-col :lg="10" :md="24" :sm="24" :xl="10" :xs="24">
+      <el-card class="mb-20px" shadow="hover">
+        <el-skeleton :loading="loading" animated>
+          <Echart :height="300" :options="pieOptionsData" />
+        </el-skeleton>
+      </el-card>
+    </el-col>
+    <el-col :lg="14" :md="24" :sm="24" :xl="14" :xs="24">
+      <el-card class="mb-20px" shadow="hover">
+        <el-skeleton :loading="loading" animated>
+          <Echart :height="300" :options="barOptionsData" />
+        </el-skeleton>
+      </el-card>
+    </el-col>
+    <el-col :span="24">
+      <el-card class="mb-20px" shadow="hover">
+        <el-skeleton :loading="loading" :rows="4" animated>
+          <Echart :height="350" :options="lineOptionsData" />
+        </el-skeleton>
+      </el-card>
+    </el-col>
+  </el-row>
+</template>
+<script lang="ts" setup>
+import { set } from 'lodash-es'
+import { EChartsOption } from 'echarts'
+
+import { useDesign } from '@/hooks/web/useDesign'
+import type { AnalysisTotalTypes } from './types'
+import { barOptions, lineOptions, pieOptions } from './echarts-data'
+
+defineOptions({ name: 'Home2' })
+
+const { t } = useI18n()
+const loading = ref(true)
+const { getPrefixCls } = useDesign()
+const prefixCls = getPrefixCls('panel')
+const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption
+
+let totalState = reactive<AnalysisTotalTypes>({
+  users: 0,
+  messages: 0,
+  moneys: 0,
+  shoppings: 0
+})
+
+const getCount = async () => {
+  const data = {
+    users: 102400,
+    messages: 81212,
+    moneys: 9280,
+    shoppings: 13600
+  }
+  totalState = Object.assign(totalState, data)
+}
+
+// 用户来源
+const getUserAccessSource = async () => {
+  const data = [
+    { value: 335, name: 'analysis.directAccess' },
+    { value: 310, name: 'analysis.mailMarketing' },
+    { value: 234, name: 'analysis.allianceAdvertising' },
+    { value: 135, name: 'analysis.videoAdvertising' },
+    { value: 1548, name: 'analysis.searchEngines' }
+  ]
+  set(
+    pieOptionsData,
+    'legend.data',
+    data.map((v) => t(v.name))
+  )
+  set(pieOptionsData, 'series.data', data)
+}
+const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
+
+// 周活跃量
+const getWeeklyUserActivity = async () => {
+  const data = [
+    { value: 13253, name: 'analysis.monday' },
+    { value: 34235, name: 'analysis.tuesday' },
+    { value: 26321, name: 'analysis.wednesday' },
+    { value: 12340, name: 'analysis.thursday' },
+    { value: 24643, name: 'analysis.friday' },
+    { value: 1322, name: 'analysis.saturday' },
+    { value: 1324, name: 'analysis.sunday' }
+  ]
+  set(
+    barOptionsData,
+    'xAxis.data',
+    data.map((v) => t(v.name))
+  )
+  set(barOptionsData, 'series', [
+    {
+      name: t('analysis.activeQuantity'),
+      data: data.map((v) => v.value),
+      type: 'bar'
+    }
+  ])
+}
+
+const lineOptionsData = reactive<EChartsOption>(lineOptions) as EChartsOption
+
+// 每月销售总额
+const getMonthlySales = async () => {
+  const data = [
+    { estimate: 100, actual: 120, name: 'analysis.january' },
+    { estimate: 120, actual: 82, name: 'analysis.february' },
+    { estimate: 161, actual: 91, name: 'analysis.march' },
+    { estimate: 134, actual: 154, name: 'analysis.april' },
+    { estimate: 105, actual: 162, name: 'analysis.may' },
+    { estimate: 160, actual: 140, name: 'analysis.june' },
+    { estimate: 165, actual: 145, name: 'analysis.july' },
+    { estimate: 114, actual: 250, name: 'analysis.august' },
+    { estimate: 163, actual: 134, name: 'analysis.september' },
+    { estimate: 185, actual: 56, name: 'analysis.october' },
+    { estimate: 118, actual: 99, name: 'analysis.november' },
+    { estimate: 123, actual: 123, name: 'analysis.december' }
+  ]
+  set(
+    lineOptionsData,
+    'xAxis.data',
+    data.map((v) => t(v.name))
+  )
+  set(lineOptionsData, 'series', [
+    {
+      name: t('analysis.estimate'),
+      smooth: true,
+      type: 'line',
+      data: data.map((v) => v.estimate),
+      animationDuration: 2800,
+      animationEasing: 'cubicInOut'
+    },
+    {
+      name: t('analysis.actual'),
+      smooth: true,
+      type: 'line',
+      itemStyle: {},
+      data: data.map((v) => v.actual),
+      animationDuration: 2800,
+      animationEasing: 'quadraticOut'
+    }
+  ])
+}
+
+const getAllApi = async () => {
+  await Promise.all([getCount(), getUserAccessSource(), getWeeklyUserActivity(), getMonthlySales()])
+  loading.value = false
+}
+
+getAllApi()
+</script>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-panel;
+
+.#{$prefix-cls} {
+  &__item {
+    &--peoples {
+      color: #40c9c6;
+    }
+
+    &--message {
+      color: #36a3f7;
+    }
+
+    &--money {
+      color: #f4516c;
+    }
+
+    &--shopping {
+      color: #34bfa3;
+    }
+
+    &:hover {
+      :deep(.#{$namespace}-icon) {
+        color: #fff !important;
+      }
+
+      .#{$prefix-cls}__item--icon {
+        transition: all 0.38s ease-out;
+      }
+
+      .#{$prefix-cls}__item--peoples {
+        background: #40c9c6;
+      }
+
+      .#{$prefix-cls}__item--message {
+        background: #36a3f7;
+      }
+
+      .#{$prefix-cls}__item--money {
+        background: #f4516c;
+      }
+
+      .#{$prefix-cls}__item--shopping {
+        background: #34bfa3;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/home/components/material.vue b/src/views/home/components/material.vue
new file mode 100644
index 000000000..83aadaa35
--- /dev/null
+++ b/src/views/home/components/material.vue
@@ -0,0 +1,336 @@
+<!-- 原料管理员首页 -->
+<template>
+  <div class="row">
+    <div class="data">
+      <div class="small-data-item small-data-item1">
+        <div class="small-data-item-txt">
+          <div>今日到货计划(已发货)</div>
+          <div>{{materialData?.preparetoissueTodayCount}}<span>单</span></div>
+        </div>
+        <img src="../../../assets/imgs/icon1.png" alt="" class="img" />
+      </div>
+      <div class="small-data-item small-data-item2 ml-14px">
+        <div class="small-data-item-txt">
+          <div>今日备料计划(已发料)</div>
+          <div>{{materialData?.preparetoissueTodayCount}}<span>单</span></div>
+        </div>
+        <img src="../../../assets/imgs/icon5.png" alt="" class="img" />
+      </div>
+      <div class="small-data-item small-data-item3 ml-14px">
+        <div class="small-data-item-txt">
+          <div>今日叫料请求(已发料)</div>
+          <div>{{materialData?.issueRequestTodayCount}}<span>单</span></div>
+        </div>
+        <img src="../../../assets/imgs/icon6.png" alt="" class="img" />
+      </div>
+      <div class="small-data-item small-data-item4 ml-14px">
+        <div class="small-data-item-txt">
+          <div>空闲库位数/总库位数</div>
+          <div style="font-size: 20px;">{{materialData?.freeLocationCount}}<span>个</span>/{{materialData?.totalLocationCount}}<span>个</span></div>
+        </div>
+        <img src="../../../assets/imgs/icon3.png" alt="" class="img" />
+      </div>
+    </div>
+    <div class="two-row mt-14px">
+      <div class="data1 w-[47.3%]">
+        <div class="title">呆滞库存预警</div>
+        <el-table
+          :data="materialData?.stagnantBalanceList"
+          style="width: 100%"
+          stripe
+          height="240px"
+        >
+          <el-table-column prop="itemCode" label="物料代码" width="180px" />
+          <el-table-column prop="batch" label="批次" width="180px" />
+          <el-table-column prop="packingNumber" label="包装号" width="180px" />
+          <el-table-column prop="containerNumber" label="器具代码" width="180px" />
+          <el-table-column prop="qty" label="数量" width="180px" />
+          <el-table-column prop="uom" label="计量单位" width="180px">
+            <template #default="scope">
+              {{ formatter(scope.row.uom, DICT_TYPE.UOM) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="locationCode" label="库位代码" width="180px" />
+          <el-table-column prop="warehouseCode" label="仓库代码" width="180px" />
+          <el-table-column prop="inventoryStatus" label="库存状态" width="180px">
+            <template #default="scope">
+              {{ formatter(scope.row.inventoryStatus, DICT_TYPE.INVENTORY_STATUS) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="locationGroupCode" label="库位组代码" width="180px" />
+          <el-table-column prop="areaCode" label="库区代码" width="180px" />
+          <el-table-column prop="erpLocationCode" label="ERP库位代码" width="180px" />
+          <el-table-column prop="altBatch" label="替代批次" width="180px" />
+          <el-table-column prop="arriveDate" label="到货日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="produceDate" label="生产日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="expireDate" label="失效日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="ownerCode" label="货主代码" width="180px" />
+          <el-table-column prop="lockedQty" label="锁定数量" width="180px" />
+          <el-table-column prop="usableQty" label="可用数量" width="180px" />
+          <el-table-column prop="singlePrice" label="单价" width="180px" />
+          <el-table-column prop="amount" label="金额" width="180px" />
+          <el-table-column prop="putInTime" label="入库时间" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="data1 w-[47.3%]">
+        <div class="title">超期库存预警</div>
+        <el-table
+          :data="materialData?.overdueBalanceList"
+          style="width: 100%"
+          stripe
+          height="240px"
+        >
+          <el-table-column prop="itemCode" label="物料代码" width="180px" />
+          <el-table-column prop="batch" label="批次" width="180px" />
+          <el-table-column prop="packingNumber" label="包装号" width="180px" />
+          <el-table-column prop="containerNumber" label="器具代码" width="180px" />
+          <el-table-column prop="qty" label="数量" width="180px" />
+          <el-table-column prop="uom" label="计量单位" width="180px">
+            <template #default="scope">
+              {{ formatter(scope.row.uom, DICT_TYPE.UOM) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="locationCode" label="库位代码" width="180px" />
+          <el-table-column prop="warehouseCode" label="仓库代码" width="180px" />
+          <el-table-column prop="inventoryStatus" label="库存状态" width="180px">
+            <template #default="scope">
+              {{ formatter(scope.row.inventoryStatus, DICT_TYPE.INVENTORY_STATUS) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="locationGroupCode" label="库位组代码" width="180px" />
+          <el-table-column prop="areaCode" label="库区代码" width="180px" />
+          <el-table-column prop="erpLocationCode" label="ERP库位代码" width="180px" />
+          <el-table-column prop="altBatch" label="替代批次" width="180px" />
+          <el-table-column prop="arriveDate" label="到货日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="produceDate" label="生产日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="expireDate" label="失效日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="ownerCode" label="货主代码" width="180px" />
+          <el-table-column prop="lockedQty" label="锁定数量" width="180px" />
+          <el-table-column prop="usableQty" label="可用数量" width="180px" />
+          <el-table-column prop="singlePrice" label="单价" width="180px" />
+          <el-table-column prop="amount" label="金额" width="180px" />
+          <el-table-column prop="putInTime" label="入库时间" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="two-row mt-14px">
+      <div class="data1 w-[47.3%]">
+        <div class="title">高低储预警</div>
+        <el-table
+          :data="materialData?.warningBalanceList"
+          style="width: 100%"
+          stripe
+          height="240px"
+        >
+          <el-table-column prop="itemCode" label="物料代码" width="180px" />
+          <el-table-column prop="batch" label="批次" width="180px" />
+          <el-table-column prop="packingNumber" label="包装号" width="180px" />
+          <el-table-column prop="containerNumber" label="器具代码" width="180px" />
+          <el-table-column prop="qty" label="数量" width="180px" />
+          <el-table-column prop="uom" label="计量单位" width="180px">
+            <template #default="scope">
+              {{ formatter(scope.row.uom, DICT_TYPE.UOM) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="locationCode" label="库位代码" width="180px" />
+          <el-table-column prop="warehouseCode" label="仓库代码" width="180px" />
+          <el-table-column prop="inventoryStatus" label="库存状态" width="180px">
+            <template #default="scope">
+              {{ formatter(scope.row.inventoryStatus, DICT_TYPE.INVENTORY_STATUS) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="locationGroupCode" label="库位组代码" width="180px" />
+          <el-table-column prop="areaCode" label="库区代码" width="180px" />
+          <el-table-column prop="erpLocationCode" label="ERP库位代码" width="180px" />
+          <el-table-column prop="altBatch" label="替代批次" width="180px" />
+          <el-table-column prop="arriveDate" label="到货日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="produceDate" label="生产日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="expireDate" label="失效日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="ownerCode" label="货主代码" width="180px" />
+          <el-table-column prop="lockedQty" label="锁定数量" width="180px" />
+          <el-table-column prop="usableQty" label="可用数量" width="180px" />
+          <el-table-column prop="singlePrice" label="单价" width="180px" />
+          <el-table-column prop="amount" label="金额" width="180px" />
+          <el-table-column prop="putInTime" label="入库时间" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="data1  w-[47.3%]">
+        <div class="title">待处理任务</div>
+        <Echart :options="barOptions" :height="280" :key="lineIndex" />
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import * as IndexApi from '@/api/home'
+import { formatDate } from '@/utils/formatTime'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { set } from 'lodash-es'
+import { EChartsOption } from 'echarts'
+import { barOptions } from '../echarts-data'
+const lineIndex = ref(0)
+
+const materialData = ref()
+// 获取原料管理员数据
+const getMaterialData = async () => {
+ await IndexApi.getMaterialData().then((res) => {
+    materialData.value = res
+    getJobCharts()
+  })
+}
+const formatter = (type, dict) => {
+  let str = getStrDictOptions(dict).filter((item) => type == item.value)[0]?.label
+  return str
+}
+const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
+const getJobCharts = async () => {
+  set(
+    barOptionsData,
+    'xAxis.data',
+    Object.keys( materialData.value.jobCount)
+  )
+  set(barOptionsData, 'legend.data', ['待处理任务'])
+  set(barOptionsData, 'series', [
+    {
+      name:'待处理任务',
+      data: Object.values( materialData.value.jobCount),
+      type: 'bar',
+      barMaxWidth:30
+    }
+  ])
+  lineIndex.value++
+}
+onMounted(async () => {
+  await getMaterialData()
+})
+</script>
+<style scoped lang="scss">
+.title {
+  padding-bottom: 10px;
+  border-bottom: 1px solid #dedede;
+  position: relative;
+  padding-left: 10px;
+  &::after {
+    content: '';
+    position: absolute;
+    width: 4px;
+    height: 16px;
+    background: #3c7adf;
+    left: 0px;
+    top: 3px;
+    border-radius: 8px;
+  }
+}
+.data {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .small-data-item {
+    width:25%;
+    height: 90px;
+    display: flex;
+    align-items: center;
+    border-radius: 6px;
+    color: white;
+    padding: 0px 20px;
+    .small-data-item-txt {
+      flex: 1;
+      div {
+        &:nth-child(1) {
+          font-size: 14px;
+         
+        }
+        &:nth-child(2) {
+          font-size: 26px;
+          margin-top: 4px;
+          font-weight: bold;
+          span {
+            font-size: 14px;
+            padding-left: 6px;
+          font-weight: normal;
+          }
+        }
+      }
+    }
+    .img {
+      width: 40px;
+      opacity: 0.5;
+    }
+  }
+  .small-data-item1 {
+    background: linear-gradient(to left, #fd817d, #fcad80);
+  }
+  .small-data-item2 {
+    background: linear-gradient(to left, #46c6fa, #336bfe);
+  }
+  .small-data-item3 {
+    background: linear-gradient(to left, #96a6cc, #595f82);
+  }
+  .small-data-item4 {
+    background: linear-gradient(to left, #08dcd5, #46e2bb);
+  }
+  .small-data-item5 {
+    background: linear-gradient(to left, #f4c46b, #ffb313);
+  }
+  .small-data-item6 {
+    background: linear-gradient(to left, #6eccf8, #02acfd);
+  }
+}
+.two-row {
+  display: flex;
+  align-content: center;
+  justify-content: space-between;
+  .data1 {
+    background: white;
+    padding: 14px;
+  }
+}
+</style>
diff --git a/src/views/home/components/produce.vue b/src/views/home/components/produce.vue
new file mode 100644
index 000000000..b3615be8a
--- /dev/null
+++ b/src/views/home/components/produce.vue
@@ -0,0 +1,286 @@
+<!-- 生产管理员首页 -->
+<template>
+  <div class="row">
+    <div class="two-row">
+      <div class="data1 w-[47.3%]">
+        <div class="title">今日生产计划</div>
+        <el-table
+          :data="produceData?.productionTodayList"
+          style="width: 100%"
+          stripe
+          height="240px"
+        >
+          <el-table-column prop="number" label="单据号" width="180" />
+          <el-table-column prop="displayOrder" label="顺序" width="170" />
+          <el-table-column prop="workshop" label="车间" width="170" />
+          <el-table-column prop="productionLine" label="生产线" width="170" />
+          <el-table-column prop="shift" label="班次" width="170" />
+          <el-table-column prop="team" label="班组" width="170" />
+          <el-table-column prop="planDate" label="计划日期" width="170"
+            ><template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="beginTime" label="开始日期" width="170"
+            ><template #default="scope">
+              <span>{{ formatDate(scope.row.beginTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="endTime" label="结束日期" width="170"
+            ><template #default="scope">
+              <span>{{ formatDate(scope.row.endTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="businessType" label="业务类型" />
+        </el-table>
+      </div>
+      <div class="data1 w-[47.3%]">
+        <div class="title">线边安全库存</div>
+        <el-table :data="produceData?.safeLocationList" style="width: 100%" stripe height="240px">
+          <el-table-column prop="code" label="代码" width="180" />
+          <el-table-column prop="name" label="名称" width="180" />
+          <el-table-column prop="warehouseCode" label="仓库代码" width="180" />
+          <el-table-column prop="areaCode" label="库区代码" width="180" />
+          <el-table-column prop="locationGroupCode" label="库位组代码" width="180" />
+          <el-table-column prop="erpLocationCode" label="ERP库位代码" width="180" />
+          <el-table-column prop="type" label="类型" width="180" />
+          <el-table-column prop="aisle" label="巷道" width="180" />
+          <el-table-column prop="shelf" label="货架" width="180" />
+          <el-table-column prop="locationRow" label="行" width="180" />
+          <el-table-column prop="locationColum" label="列" width="180" />
+          <el-table-column prop="pickPriority" label="备货优先级" width="180" />
+          <el-table-column prop="maxWeight" label="最大承重" width="180" />
+          <el-table-column prop="maxArea" label="最大面积" width="180" />
+          <el-table-column prop="maxVolume" label="最大体积" width="180" />
+          <el-table-column prop="userGroupCode" label="用户组代码" width="180" />
+          <el-table-column prop="activeTime" label="生效时间" width="170">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="expireTime" label="失效时间" width="170">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="two-row mt-14px">
+      <div class="data1 w-[47.3%]">
+        <div class="title">待上架成品库存</div>
+        <el-table
+          :data="produceData?.productputawayJobDetailList"
+          style="width: 100%"
+          stripe
+          height="240px"
+        >
+          <el-table-column prop="number" label="单据号" width="180" />
+          <el-table-column prop="fromWarehouseCode" label="从仓库代码" width="180" />
+          <el-table-column prop="requestTime" label="申请时间" width="170">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.requestTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="requestDueTime" label="要求截止时间" width="170">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.requestDueTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="status" label="状态"  width="140"/>
+          <el-table-column prop="departmentCode" label="部门" />
+          <el-table-column prop="acceptUserId" label="承接人用户名" width="170" />
+          <el-table-column prop="acceptTime" label="承接时间" width="170">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.acceptTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fromLocationTypes" label="从库位类型范围"  width="170"/>
+          <el-table-column prop="toLocationTypes" label="到库位类型范围" width="170" />
+          <el-table-column prop="toWarehouseCode" label="到仓库代码"  width="170"/>
+          <el-table-column prop="fromAreaCodes" label="从库区代码范围"  width="170"/>
+          <el-table-column prop="toAreaCodes" label="到库区代码范围"  width="170"/>
+          <el-table-column prop="autoComplete" label="自动完成" width="120">
+            <template #default="scope">
+              <span>{{ formatter(scope.row.autoComplete, DICT_TYPE.TRUE_FALSE) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="allowModifyLocation" label="允许修改库位"  width="120">
+            <template #default="scope">
+              <span>{{ formatter(scope.row.allowModifyLocation, DICT_TYPE.TRUE_FALSE) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="allowModifyQty" label="允许修改数量" width="120">
+            <template #default="scope">
+              <span>{{ formatter(scope.row.allowModifyQty, DICT_TYPE.TRUE_FALSE) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="allowBiggerQty" label="允许大于推荐数量" width="140">
+            <template #default="scope">
+              <span>{{ formatter(scope.row.allowBiggerQty, DICT_TYPE.TRUE_FALSE) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="allowSmallerQty" label="允许小于推荐数量" width="140">
+            <template #default="scope">
+              <span>{{ formatter(scope.row.allowSmallerQty, DICT_TYPE.TRUE_FALSE) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="allowModifyInventoryStatus" label="允许修改库存状态" width="140">
+            <template #default="scope">
+              <span>{{
+                formatter(scope.row.allowModifyInventoryStatus, DICT_TYPE.TRUE_FALSE)
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="allowContinuousScanning" label="允许连续扫描" width="120">
+            <template #default="scope">
+              <span>{{ formatter(scope.row.allowContinuousScanning, DICT_TYPE.TRUE_FALSE) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="allowPartialComplete" label="允许部分完成" width="120">
+            <template #default="scope">
+              <span>{{ formatter(scope.row.allowPartialComplete, DICT_TYPE.TRUE_FALSE) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="allowModifyBatch" label="允许修改批次" width="120">
+            <template #default="scope">
+              <span>{{ formatter(scope.row.allowModifyBatch, DICT_TYPE.TRUE_FALSE) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="allowModifyPackingNumber" label="允许修改箱码" width="120">
+            <template #default="scope">
+              <span>{{ formatter(scope.row.allowModifyPackingNumber, DICT_TYPE.TRUE_FALSE) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="data1 w-[47.3%]">
+        <div class="title">待处理任务</div>
+        <Echart :options="barOptions" :height="280" :key="lineIndex" />
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import * as IndexApi from '@/api/home'
+import { formatDate } from '@/utils/formatTime'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { set } from 'lodash-es'
+import { EChartsOption } from 'echarts'
+import { barOptions } from '../echarts-data'
+const lineIndex = ref(0)
+const produceData = ref()
+// 获取生产管理员首页数据
+const getProduceData = async () => {
+  IndexApi.getProduceData().then((res) => {
+    produceData.value = res
+    getJobCharts()
+  })
+}
+const formatter = (type, dict) => {
+  let str = getStrDictOptions(dict).filter((item) => type == item.value)[0]?.label
+  return str
+}
+const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
+const getJobCharts = async () => {
+  set(
+    barOptionsData,
+    'xAxis.data',
+    Object.keys( produceData.value.jobCount)
+  )
+  set(barOptionsData, 'legend.data', ['待处理任务'])
+  set(barOptionsData, 'series', [
+    {
+      name:'待处理任务',
+      data: Object.values( produceData.value.jobCount),
+      type: 'bar',
+      barMaxWidth:30
+    }
+  ])
+  lineIndex.value++
+}
+onMounted(async () => {
+  await getProduceData()
+})
+</script>
+<style scoped lang="scss">
+.title {
+  padding-bottom: 10px;
+  border-bottom: 1px solid #dedede;
+  position: relative;
+  padding-left: 10px;
+  &::after {
+    content: '';
+    position: absolute;
+    width: 4px;
+    height: 16px;
+    background: #3c7adf;
+    left: 0px;
+    top: 3px;
+    border-radius: 8px;
+  }
+}
+.data {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .small-data-item {
+    width: 25%;
+    height: 90px;
+    display: flex;
+    align-items: center;
+    border-radius: 6px;
+    color: white;
+    padding: 0px 20px;
+    .small-data-item-txt {
+      flex: 1;
+      div {
+        &:nth-child(1) {
+          font-size: 14px;
+        }
+        &:nth-child(2) {
+          font-size: 26px;
+          margin-top: 4px;
+          font-weight: bold;
+          span {
+            font-size: 14px;
+            padding-left: 6px;
+            font-weight: normal;
+          }
+        }
+      }
+    }
+    .img {
+      width: 40px;
+      opacity: 0.5;
+    }
+  }
+  .small-data-item1 {
+    background: linear-gradient(to left, #fd817d, #fcad80);
+  }
+  .small-data-item2 {
+    background: linear-gradient(to left, #46c6fa, #336bfe);
+  }
+  .small-data-item3 {
+    background: linear-gradient(to left, #96a6cc, #595f82);
+  }
+  .small-data-item4 {
+    background: linear-gradient(to left, #08dcd5, #46e2bb);
+  }
+  .small-data-item5 {
+    background: linear-gradient(to left, #f4c46b, #ffb313);
+  }
+  .small-data-item6 {
+    background: linear-gradient(to left, #6eccf8, #02acfd);
+  }
+}
+.two-row {
+  display: flex;
+  align-content: center;
+  justify-content: space-between;
+  .data1 {
+    background: white;
+    padding: 14px;
+  }
+}
+</style>
diff --git a/src/views/home/components/product.vue b/src/views/home/components/product.vue
new file mode 100644
index 000000000..5124d9c11
--- /dev/null
+++ b/src/views/home/components/product.vue
@@ -0,0 +1,313 @@
+<!-- 成品管理员首页 -->
+<template>
+  <div class="row">
+    <div class="data">
+      <div class="small-data-item small-data-item1">
+        <div class="small-data-item-txt">
+          <div>今日到货计划(已发货)</div>
+          <div>{{ productData?.deliverPlanTodayCount || 0 }}<span>单</span></div>
+        </div>
+        <img src="../../../assets/imgs/icon1.png" alt="" class="img" />
+      </div>
+    </div>
+    <div class="two-row mt-14px">
+      <div class="data1 w-[47.3%]">
+        <div class="title">呆滞库存预警</div>
+        <el-table
+          :data="productData?.stagnantBalanceList"
+          style="width: 100%"
+          stripe
+          height="240px"
+        >
+          <el-table-column prop="itemCode" label="物料代码" width="180px" />
+          <el-table-column prop="batch" label="批次" width="180px" />
+          <el-table-column prop="packingNumber" label="包装号" width="180px" />
+          <el-table-column prop="containerNumber" label="器具代码" width="180px" />
+          <el-table-column prop="qty" label="数量" width="180px" />
+          <el-table-column prop="uom" label="计量单位" width="180px">
+            <template #default="scope">
+              {{ formatter(scope.row.uom, DICT_TYPE.UOM) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="locationCode" label="库位代码" width="180px" />
+          <el-table-column prop="warehouseCode" label="仓库代码" width="180px" />
+          <el-table-column prop="inventoryStatus" label="库存状态" width="180px">
+            <template #default="scope">
+              {{ formatter(scope.row.inventoryStatus, DICT_TYPE.INVENTORY_STATUS) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="locationGroupCode" label="库位组代码" width="180px" />
+          <el-table-column prop="areaCode" label="库区代码" width="180px" />
+          <el-table-column prop="erpLocationCode" label="ERP库位代码" width="180px" />
+          <el-table-column prop="altBatch" label="替代批次" width="180px" />
+          <el-table-column prop="arriveDate" label="到货日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="produceDate" label="生产日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="expireDate" label="失效日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="ownerCode" label="货主代码" width="180px" />
+          <el-table-column prop="lockedQty" label="锁定数量" width="180px" />
+          <el-table-column prop="usableQty" label="可用数量" width="180px" />
+          <el-table-column prop="singlePrice" label="单价" width="180px" />
+          <el-table-column prop="amount" label="金额" width="180px" />
+          <el-table-column prop="putInTime" label="入库时间" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="data1 w-[47.3%]">
+        <div class="title">超期库存预警</div>
+        <el-table
+          :data="productData?.overdueBalanceList"
+          style="width: 100%"
+          stripe
+          height="240px"
+        >
+          <el-table-column prop="itemCode" label="物料代码" width="180px" />
+          <el-table-column prop="batch" label="批次" width="180px" />
+          <el-table-column prop="packingNumber" label="包装号" width="180px" />
+          <el-table-column prop="containerNumber" label="器具代码" width="180px" />
+          <el-table-column prop="qty" label="数量" width="180px" />
+          <el-table-column prop="uom" label="计量单位" width="180px">
+            <template #default="scope">
+              {{ formatter(scope.row.uom, DICT_TYPE.UOM) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="locationCode" label="库位代码" width="180px" />
+          <el-table-column prop="warehouseCode" label="仓库代码" width="180px" />
+          <el-table-column prop="inventoryStatus" label="库存状态" width="180px">
+            <template #default="scope">
+              {{ formatter(scope.row.inventoryStatus, DICT_TYPE.INVENTORY_STATUS) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="locationGroupCode" label="库位组代码" width="180px" />
+          <el-table-column prop="areaCode" label="库区代码" width="180px" />
+          <el-table-column prop="erpLocationCode" label="ERP库位代码" width="180px" />
+          <el-table-column prop="altBatch" label="替代批次" width="180px" />
+          <el-table-column prop="arriveDate" label="到货日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="produceDate" label="生产日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="expireDate" label="失效日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="ownerCode" label="货主代码" width="180px" />
+          <el-table-column prop="lockedQty" label="锁定数量" width="180px" />
+          <el-table-column prop="usableQty" label="可用数量" width="180px" />
+          <el-table-column prop="singlePrice" label="单价" width="180px" />
+          <el-table-column prop="amount" label="金额" width="180px" />
+          <el-table-column prop="putInTime" label="入库时间" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="two-row mt-14px">
+      <div class="data1 w-[47.3%]">
+        <div class="title">高低储预警</div>
+        <el-table
+          :data="productData?.warningBalanceList"
+          style="width: 100%"
+          stripe
+          height="240px"
+        >
+          <el-table-column prop="itemCode" label="物料代码" width="180px" />
+          <el-table-column prop="batch" label="批次" width="180px" />
+          <el-table-column prop="packingNumber" label="包装号" width="180px" />
+          <el-table-column prop="containerNumber" label="器具代码" width="180px" />
+          <el-table-column prop="qty" label="数量" width="180px" />
+          <el-table-column prop="uom" label="计量单位" width="180px">
+            <template #default="scope">
+              {{ formatter(scope.row.uom, DICT_TYPE.UOM) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="locationCode" label="库位代码" width="180px" />
+          <el-table-column prop="warehouseCode" label="仓库代码" width="180px" />
+          <el-table-column prop="inventoryStatus" label="库存状态" width="180px">
+            <template #default="scope">
+              {{ formatter(scope.row.inventoryStatus, DICT_TYPE.INVENTORY_STATUS) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="locationGroupCode" label="库位组代码" width="180px" />
+          <el-table-column prop="areaCode" label="库区代码" width="180px" />
+          <el-table-column prop="erpLocationCode" label="ERP库位代码" width="180px" />
+          <el-table-column prop="altBatch" label="替代批次" width="180px" />
+          <el-table-column prop="arriveDate" label="到货日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="produceDate" label="生产日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="expireDate" label="失效日期" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="ownerCode" label="货主代码" width="180px" />
+          <el-table-column prop="lockedQty" label="锁定数量" width="180px" />
+          <el-table-column prop="usableQty" label="可用数量" width="180px" />
+          <el-table-column prop="singlePrice" label="单价" width="180px" />
+          <el-table-column prop="amount" label="金额" width="180px" />
+          <el-table-column prop="putInTime" label="入库时间" width="180px">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.planDate) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="data1 w-[47.3%]">
+        <div class="title">待处理任务</div>
+        <Echart :options="barOptions" :height="280" :key="lineIndex" />
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import * as IndexApi from '@/api/home'
+import { formatDate } from '@/utils/formatTime'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { set } from 'lodash-es'
+import { EChartsOption } from 'echarts'
+import { barOptions } from '../echarts-data'
+const lineIndex = ref(0)
+// 获取成品管理员首页首页数据
+const productData = ref()
+const getProductData = async () => {
+  IndexApi.getProductData().then((res) => {
+    productData.value = res
+    getJobCharts()
+  })
+}
+const formatter = (type, dict) => {
+  let str = getStrDictOptions(dict).filter((item) => type == item.value)[0]?.label
+  return str
+}
+const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
+const getJobCharts = async () => {
+  set(
+    barOptionsData,
+    'xAxis.data',
+    Object.keys( productData.value.jobCount)
+  )
+  set(barOptionsData, 'legend.data', ['待处理任务'])
+  set(barOptionsData, 'series', [
+    {
+      name:'待处理任务',
+      data: Object.values( productData.value.jobCount),
+      type: 'bar',
+      barMaxWidth:30
+    }
+  ])
+  lineIndex.value++
+}
+onMounted(async () => {
+  await getProductData()
+})
+</script>
+<style scoped lang="scss">
+.title {
+  padding-bottom: 10px;
+  border-bottom: 1px solid #dedede;
+  position: relative;
+  padding-left: 10px;
+  &::after {
+    content: '';
+    position: absolute;
+    width: 4px;
+    height: 16px;
+    background: #3c7adf;
+    left: 0px;
+    top: 3px;
+    border-radius: 8px;
+  }
+}
+.data {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .small-data-item {
+    width: 25%;
+    height: 90px;
+    display: flex;
+    align-items: center;
+    border-radius: 6px;
+    color: white;
+    padding: 0px 20px;
+    .small-data-item-txt {
+      flex: 1;
+      div {
+        &:nth-child(1) {
+          font-size: 14px;
+        }
+        &:nth-child(2) {
+          font-size: 26px;
+          margin-top: 4px;
+          font-weight: bold;
+          span {
+            font-size: 14px;
+            padding-left: 6px;
+            font-weight: normal;
+          }
+        }
+      }
+    }
+    .img {
+      width: 40px;
+      opacity: 0.5;
+    }
+  }
+  .small-data-item1 {
+    background: linear-gradient(to left, #fd817d, #fcad80);
+  }
+  .small-data-item2 {
+    background: linear-gradient(to left, #46c6fa, #336bfe);
+  }
+  .small-data-item3 {
+    background: linear-gradient(to left, #96a6cc, #595f82);
+  }
+  .small-data-item4 {
+    background: linear-gradient(to left, #08dcd5, #46e2bb);
+  }
+  .small-data-item5 {
+    background: linear-gradient(to left, #f4c46b, #ffb313);
+  }
+  .small-data-item6 {
+    background: linear-gradient(to left, #6eccf8, #02acfd);
+  }
+}
+.two-row {
+  display: flex;
+  align-content: center;
+  justify-content: space-between;
+  .data1 {
+    background: white;
+    padding: 14px;
+  }
+}
+</style>
diff --git a/src/views/home/components/supplierIndex.vue b/src/views/home/components/supplierIndex.vue
new file mode 100644
index 000000000..c665f9867
--- /dev/null
+++ b/src/views/home/components/supplierIndex.vue
@@ -0,0 +1,452 @@
+<!-- 供应商首页 -->
+<template>
+  <div class="one-row">
+    <div class="data">
+      <div class="data-item">
+        <div class="small-title">订单数</div>
+        <div class="small-data">
+          <div class="small-data-item small-data-item1">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.openPurchaseCount || 0 }}<span>单</span></div>
+              <div>开放订单数</div>
+            </div>
+            <img src="../../../assets/imgs/icon1.png" alt="" class="img" />
+          </div>
+          <div class="small-data-item small-data-item2 ml-14px">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.allPurchaseCount || 0 }}<span>单</span></div>
+              <div>全部订单数</div>
+            </div>
+            <img src="../../../assets/imgs/icon5.png" alt="" class="img" />
+          </div>
+        </div>
+      </div>
+      <div class="data-item ml-14px">
+        <div class="small-title">要货计划数</div>
+        <div class="small-data">
+          <div class="small-data-item small-data-item3">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.openPurchasePlanCount || 0 }}<span>单</span></div>
+              <div>开放计划数</div>
+            </div>
+            <img src="../../../assets/imgs/icon6.png" alt="" class="img" />
+          </div>
+          <div class="small-data-item small-data-item4 ml-14px">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.allPurchasePlanCount || 0 }}<span>单</span></div>
+              <div>全部计划数</div>
+            </div>
+            <img src="../../../assets/imgs/icon3.png" alt="" class="img" />
+          </div>
+        </div>
+      </div>
+      <div class="data-item ml-14px">
+        <div class="small-title">发货单数</div>
+        <div class="small-data">
+          <div class="small-data-item small-data-item5">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.notTakeSupplierdeliverCount || 0 }}<span>单</span></div>
+              <div>未收货订单数</div>
+            </div>
+            <img src="../../../assets/imgs/icon4.png" alt="" class="img" />
+          </div>
+          <div class="small-data-item small-data-item6 ml-14px">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.takeSupplierdeliverCount || 0 }}<span>单</span></div>
+              <div>已收货订单数</div>
+            </div>
+            <img src="../../../assets/imgs/icon2.png" alt="" class="img" />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="two-row mt-14px">
+      <div class="data1 w-[65%]">
+        <div class="title">本月发货单趋势</div>
+        <Echart :options="lineOptions" :height="280" :key="lineIndex" />
+      </div>
+      <div class="data1 w-[35%] ml-14px">
+        <div class="title">本月发货零件TOP10</div>
+        <Echart :options="pieOptions" :height="280" :key="lineIndex" />
+      </div>
+    </div>
+    <div class="two-row mt-14px">
+      <div class="data1 w-[47.3%]">
+        <div class="title">最新消息</div>
+        <el-table :data="notaicList" style="width: 100%" stripe height="240px">
+          <el-table-column label="编号" align="center" prop="id" />
+          <el-table-column label="用户类型" align="center" prop="userType">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="用户编号" align="center" prop="userId" width="80" />
+          <el-table-column label="模板编码" align="center" prop="templateCode" width="80" />
+          <el-table-column label="发送人名称" align="center" prop="templateNickname" width="180" />
+          <el-table-column
+            label="模版内容"
+            align="center"
+            prop="templateContent"
+            width="200"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="模版参数"
+            align="center"
+            prop="templateParams"
+            width="180"
+            show-overflow-tooltip
+          >
+            <template #default="scope"> {{ scope.row.templateParams }}</template>
+          </el-table-column>
+          <el-table-column label="模版类型" align="center" prop="templateType" width="120">
+            <template #default="scope">
+              <dict-tag
+                :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE"
+                :value="scope.row.templateType"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="是否已读" align="center" prop="readStatus" width="100">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.readStatus" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="阅读时间"
+            align="center"
+            prop="readTime"
+            width="180"
+            :formatter="dateFormatter"
+          />
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createTime"
+            width="180"
+            :formatter="dateFormatter"
+          />
+          <!-- <el-table-column label="操作" align="center"  fixed="right" width="120">
+        <template #default="scope">
+          <el-button link type="primary" @click="openDetail(scope.row)" v-hasPermi="['system:notify-message:query']">
+            <Icon icon="ep:document-copy" />
+            详情
+          </el-button>
+        </template>
+      </el-table-column> -->
+        </el-table>
+      </div>
+      <div class="data1 w-[47.3%]">
+        <div class="title">最新扣分明细</div>
+        <el-table :data="tableData" style="width: 100%" stripe height="240px">
+          <el-table-column prop="title" label="标题" />
+          <el-table-column prop="name" label="发布人" />
+          <el-table-column prop="date" label="发布日期" />
+        </el-table>
+      </div>
+    </div>
+    <div class="two-row mt-14px">
+      <div class="data1 w-[47.3%]">
+        <div class="title">本月退货明细</div>
+        <el-table
+          :data="supplierData?.purchasereturnRecordMonth"
+          style="width: 100%"
+          stripe
+          height="240px"
+        >
+          <el-table-column prop="number" label="单据号" width="180" />
+          <el-table-column prop="fromPackingNumber" label="从包装号" width="180" />
+          <el-table-column prop="toPackingNumber" label="到包装号" width="180" />
+          <el-table-column prop="fromContainerNumber" label="从器具号" width="120" />
+          <el-table-column prop="toContainerNumber" label="到器具号" width="120" />
+          <el-table-column prop="fromBatch" label="从批次" width="120" />
+          <el-table-column prop="toBatch" label="到批次" width="120" />
+          <el-table-column prop="altBatch" label="替代批次" width="120" />
+          <el-table-column prop="fromLocationCode" label="从库位代码" width="120" />
+          <el-table-column prop="toLocationCode" label="到库位代码" width="120" />
+          <el-table-column prop="fromLocationGroupCode" label="从库位组代码" width="120" />
+          <el-table-column prop="toLocationGroupCode" label="到库位组代码" width="120" />
+          <el-table-column prop="fromAreaCode" label="从库区代码" width="120" />
+          <el-table-column prop="toAreaCode" label="到库区代码" width="120" />
+          <el-table-column prop="fromOwnerCode" label="从货主代码" width="120" />
+          <el-table-column prop="toOwnerCode" label="到货主代码" width="120" />
+          <el-table-column prop="inventoryStatus" label="库存状态" width="120">
+            <template #default="scope">
+              {{ formatter(scope.row.inventoryStatus,DICT_TYPE.INVENTORY_STATUS) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="poNumber" label="订单号" width="120" />
+          <el-table-column prop="poline" label="订单行" width="120" />
+          <el-table-column prop="reason" label="原因" width="120" />
+          <el-table-column prop="singlePrice" label="单价" width="120" />
+          <el-table-column prop="amount" label="金额" width="120" />
+          <el-table-column prop="itemCode" label="物料代码" width="160" />
+          <el-table-column prop="itemName" label="物料名称" width="120" />
+          <el-table-column prop="itemDesc1" label="物料描述1" width="120" />
+          <el-table-column prop="itemDesc2" label="物料描述2" width="120" />
+          <el-table-column prop="qty" label="数量" width="120" />
+          <el-table-column prop="uom" label="计量单位" width="120">
+            <template #default="scope">
+              {{ formatter(scope.row.uom,DICT_TYPE.UOM) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="projectCode" label="项目代码" width="120" />
+          <el-table-column prop="remark" label="备注" width="120" />
+          <el-table-column prop="createTime" label="创建时间" width="170">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="creator" label="创建者" width="120" />
+        </el-table>
+      </div>
+      <div class="data1 w-[47.3%]">
+        <div class="title">本月索赔明细</div>
+        <el-table
+          :data="supplierData?.purchasereturnRecordMonth"
+          style="width: 100%"
+          stripe
+          height="240px"
+        >
+          <el-table-column prop="number" label="单据号" width="180" />
+          <el-table-column prop="fromBatch" label="批次" width="120" />
+          <el-table-column prop="poNumber" label="订单号" width="120" />
+          <el-table-column prop="poline" label="订单行" width="120" />
+          <el-table-column prop="reason" label="原因" width="120" />
+          <el-table-column prop="singlePrice" label="单价" width="120" />
+          <el-table-column prop="amount" label="金额" width="120" />
+          <el-table-column prop="code" label="代码" width="160" />
+          <el-table-column prop="createTime" label="创建时间" width="170">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="creator" label="创建者" width="120" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import { set } from 'lodash-es'
+import { EChartsOption } from 'echarts'
+import { lineOptions, pieOptions } from '../echarts-data'
+import { formatDate } from '@/utils/formatTime'
+import * as NotifyMessageApi from '@/api/system/notify/message'
+import * as IndexApi from '@/api/home'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+const { t } = useI18n()
+const tableData = [
+  {
+    date: '2016-05-03',
+    name: 'Tom',
+    title: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-02',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-04',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-01',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-01',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-01',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  }
+]
+const supplierData = ref()
+const lineIndex = ref(0)
+// 本月发货单趋势
+const lineOptionsData = reactive<EChartsOption>(lineOptions) as EChartsOption
+const getInvoiceCharts = async () => {
+  set(
+    lineOptionsData,
+    'xAxis.data',
+    supplierData.value.supplierdeliverMonthCount.map((v) => v.date)
+  )
+  set(lineOptionsData, 'legend.data', ['本月发货单趋势'])
+  set(lineOptionsData, 'series', [
+    {
+      name: '本月发货单趋势',
+      smooth: true,
+      type: 'line',
+      itemStyle: {},
+      animationDuration: 2800,
+      animationEasing: 'quadraticOut',
+      data: supplierData.value.supplierdeliverMonthCount.map((v) => v.count)
+    }
+  ])
+  lineIndex.value++
+}
+//本月发货零件TOP10
+const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption
+const getPartTOPCharts = async () => {
+  const data = [
+    { value: 335, name: 'analysis.directAccess' },
+    { value: 310, name: 'analysis.mailMarketing' },
+    { value: 234, name: 'analysis.allianceAdvertising' },
+    { value: 135, name: 'analysis.videoAdvertising' },
+    { value: 1548, name: 'analysis.searchEngines' }
+  ]
+  console.log(supplierData.value.supplierdeliverItemMonthTop)
+  set(
+    pieOptionsData,
+    'legend.data',
+    supplierData.value.supplierdeliverItemMonthTop.map((v) => v.itemCode)
+  )
+  pieOptionsData!.series![0].data = supplierData.value.supplierdeliverItemMonthTop.map((v) => {
+    return {
+      name: v.itemCode,
+      value: v.qty
+    }
+  })
+  lineIndex.value++
+}
+// 获取供应商数据
+const getSupplierData = async () => {
+  IndexApi.getSupplierData().then((res) => {
+    supplierData.value = res
+    getInvoiceCharts()
+    getPartTOPCharts()
+  })
+}
+// 最新消息
+const notaicList = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  userType: undefined,
+  userId: undefined,
+  templateCode: undefined,
+  templateType: undefined,
+  createTime: []
+})
+/** 查询列表 */
+const getList = async () => {
+  try {
+    const data = await NotifyMessageApi.getNotifyMessagePage(queryParams)
+    notaicList.value = data.list
+  } finally {
+  }
+}
+const formatter = (type,dict) => {
+  let str = getStrDictOptions(dict).filter((item) => type == item.value)[0]?.label
+  return str
+}
+onMounted(async () => {
+  await getSupplierData()
+  getList()
+})
+</script>
+<style scoped lang="scss">
+.title {
+  padding-bottom: 10px;
+  border-bottom: 1px solid #dedede;
+  position: relative;
+  padding-left: 10px;
+  &::after {
+    content: '';
+    position: absolute;
+    width: 4px;
+    height: 16px;
+    background: #3c7adf;
+    left: 0px;
+    top: 3px;
+    border-radius: 8px;
+  }
+}
+.data {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .data-item {
+    width: calc(100% / 3);
+    padding: 10px 0px;
+    background: white;
+    .small-title {
+      padding: 0px 14px 10px;
+    }
+    .small-data {
+      display: flex;
+      align-content: center;
+      justify-content: space-between;
+      padding: 0px 14px;
+      .small-data-item {
+        width: 50%;
+        height: 70px;
+        display: flex;
+        align-items: center;
+        border-radius: 6px;
+        color: white;
+        padding: 0px 20px;
+        .small-data-item-txt {
+          flex: 1;
+          div {
+            &:nth-child(1) {
+              font-size: 20px;
+              span {
+                font-size: 12px;
+                padding-left: 6px;
+              }
+            }
+            &:nth-child(2) {
+              font-size: 12px;
+            }
+          }
+        }
+        .img {
+          width: 30px;
+          opacity: 0.5;
+        }
+      }
+      .small-data-item1 {
+        background: linear-gradient(to left, #fd817d, #fcad80);
+      }
+      .small-data-item2 {
+        background: linear-gradient(to left, #46c6fa, #336bfe);
+      }
+      .small-data-item3 {
+        background: linear-gradient(to left, #96a6cc, #595f82);
+      }
+      .small-data-item4 {
+        background: linear-gradient(to left, #08dcd5, #46e2bb);
+      }
+      .small-data-item5 {
+        background: linear-gradient(to left, #f4c46b, #ffb313);
+      }
+      .small-data-item6 {
+        background: linear-gradient(to left, #6eccf8, #02acfd);
+      }
+    }
+  }
+}
+.two-row {
+  display: flex;
+  align-content: center;
+  justify-content: space-between;
+  .data1 {
+    background: white;
+    padding: 14px;
+  }
+}
+</style>
diff --git a/src/views/home/echarts-data.ts b/src/views/home/echarts-data.ts
new file mode 100644
index 000000000..15c7b4afd
--- /dev/null
+++ b/src/views/home/echarts-data.ts
@@ -0,0 +1,286 @@
+import { EChartsOption } from 'echarts'
+
+const { t } = useI18n()
+
+export const lineOptions: EChartsOption = {
+  
+  xAxis: {
+    data: [ 1, 2, 3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30
+    ],
+    boundaryGap: false,
+    axisTick: {
+      show: false
+    }
+  },
+  grid: {
+    left: 20,
+    right: 20,
+    bottom: 20,
+    top: 50,
+    containLabel: true
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'cross'
+    },
+    padding: [5, 10]
+  },
+  yAxis: {
+    axisTick: {
+      show: false
+    }
+  },
+  legend: {
+    data: ['销售','哈哈'],
+    top: 20
+  },
+  series: [
+    {
+      name: '销售',
+      smooth: true,
+      type: 'line',
+      data: [100, 120, 161, 134, 105, 160, 165, 114, 163, 185, 118, 123],
+      animationDuration: 2800,
+      animationEasing: 'cubicInOut'
+    },
+    {
+      name: '哈哈',
+      smooth: true,
+      type: 'line',
+      itemStyle: {},
+      data: [120, 82, 91, 154, 162, 140, 145, 250, 134, 56, 99, 123],
+      animationDuration: 2800,
+      animationEasing: 'quadraticOut'
+    }
+  ]
+}
+
+export const pieOptions: EChartsOption = {
+  // title: {
+  //   text: t('analysis.userAccessSource'),
+  //   left: 'center'
+  // },
+  tooltip: {
+    trigger: 'item',
+    formatter: '{a} <br/>{b} : {c} ({d}%)'
+  },
+  legend: {
+    orient: 'vertical',
+    left: 'left',
+    top:20,
+    data: [
+      t('analysis.directAccess'),
+      t('analysis.mailMarketing'),
+      t('analysis.allianceAdvertising'),
+      t('analysis.videoAdvertising'),
+      t('analysis.searchEngines')
+    ]
+  },
+  series: [
+    {
+      name: t('analysis.userAccessSource'),
+      type: 'pie',
+      radius: '55%',
+      center: ['50%', '60%'],
+      data: [
+        { value: 335, name: t('analysis.directAccess') },
+        { value: 310, name: t('analysis.mailMarketing') },
+        { value: 234, name: t('analysis.allianceAdvertising') },
+        { value: 135, name: t('analysis.videoAdvertising') },
+        { value: 1548, name: t('analysis.searchEngines') }
+      ]
+    }
+  ]
+}
+
+export const barOptions: EChartsOption = {
+  title: {
+    text: '',
+    left: 'center'
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'shadow'
+    }
+  },
+  grid: {
+    left: 50,
+    right: 20,
+    bottom: 20
+  },
+  xAxis: {
+    type: 'category',
+    data: [],
+    axisTick: {
+      alignWithLabel: true
+    }
+  },
+  yAxis: {
+    type: 'value'
+  },
+  series: [
+    {
+      name: t('analysis.activeQuantity'),
+      data: [],
+      type: 'bar'
+    }
+  ]
+}
+
+export const radarOption: EChartsOption = {
+  legend: {
+    data: [t('workplace.personal'), t('workplace.team')]
+  },
+  radar: {
+    // shape: 'circle',
+    indicator: [
+      { name: t('workplace.quote'), max: 65 },
+      { name: t('workplace.contribution'), max: 160 },
+      { name: t('workplace.hot'), max: 300 },
+      { name: t('workplace.yield'), max: 130 },
+      { name: t('workplace.follow'), max: 100 }
+    ]
+  },
+  series: [
+    {
+      name: `xxx${t('workplace.index')}`,
+      type: 'radar',
+      data: [
+        {
+          value: [42, 30, 20, 35, 80],
+          name: t('workplace.personal')
+        },
+        {
+          value: [50, 140, 290, 100, 90],
+          name: t('workplace.team')
+        }
+      ]
+    }
+  ]
+}
+
+export const wordOptions = {
+  series: [
+    {
+      type: 'wordCloud',
+      gridSize: 2,
+      sizeRange: [12, 50],
+      rotationRange: [-90, 90],
+      shape: 'pentagon',
+      width: 600,
+      height: 400,
+      drawOutOfBound: true,
+      textStyle: {
+        color: function () {
+          return (
+            'rgb(' +
+            [
+              Math.round(Math.random() * 160),
+              Math.round(Math.random() * 160),
+              Math.round(Math.random() * 160)
+            ].join(',') +
+            ')'
+          )
+        }
+      },
+      emphasis: {
+        textStyle: {
+          shadowBlur: 10,
+          shadowColor: '#333'
+        }
+      },
+      data: [
+        {
+          name: 'Sam S Club',
+          value: 10000,
+          textStyle: {
+            color: 'black'
+          },
+          emphasis: {
+            textStyle: {
+              color: 'red'
+            }
+          }
+        },
+        {
+          name: 'Macys',
+          value: 6181
+        },
+        {
+          name: 'Amy Schumer',
+          value: 4386
+        },
+        {
+          name: 'Jurassic World',
+          value: 4055
+        },
+        {
+          name: 'Charter Communications',
+          value: 2467
+        },
+        {
+          name: 'Chick Fil A',
+          value: 2244
+        },
+        {
+          name: 'Planet Fitness',
+          value: 1898
+        },
+        {
+          name: 'Pitch Perfect',
+          value: 1484
+        },
+        {
+          name: 'Express',
+          value: 1112
+        },
+        {
+          name: 'Home',
+          value: 965
+        },
+        {
+          name: 'Johnny Depp',
+          value: 847
+        },
+        {
+          name: 'Lena Dunham',
+          value: 582
+        },
+        {
+          name: 'Lewis Hamilton',
+          value: 555
+        },
+        {
+          name: 'KXAN',
+          value: 550
+        },
+        {
+          name: 'Mary Ellen Mark',
+          value: 462
+        },
+        {
+          name: 'Farrah Abraham',
+          value: 366
+        },
+        {
+          name: 'Rita Ora',
+          value: 360
+        },
+        {
+          name: 'Serena Williams',
+          value: 282
+        },
+        {
+          name: 'NCAA baseball tournament',
+          value: 273
+        },
+        {
+          name: 'Point Break',
+          value: 265
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
new file mode 100644
index 000000000..1cc81ac3a
--- /dev/null
+++ b/src/views/home/index.vue
@@ -0,0 +1,14 @@
+<template>
+  <div>
+    <supplierIndex v-hasRole="['super_admin','supplier']"/>
+    <material v-hasRole="['super_admin']"/>
+    <product v-hasRole="['super_admin']"/>
+    <produce v-hasRole="['super_admin']"/>
+  </div>
+</template>
+<script lang="ts" setup>
+  import supplierIndex from './components/supplierIndex.vue'
+  import material from './components/material.vue'
+  import product from './components/product.vue'
+  import produce from './components/produce.vue'
+</script>
diff --git a/src/views/home/types.ts b/src/views/home/types.ts
new file mode 100644
index 000000000..e6313d36c
--- /dev/null
+++ b/src/views/home/types.ts
@@ -0,0 +1,55 @@
+export type WorkplaceTotal = {
+  project: number
+  access: number
+  todo: number
+}
+
+export type Project = {
+  name: string
+  icon: string
+  message: string
+  personal: string
+  time: Date | number | string
+}
+
+export type Notice = {
+  title: string
+  type: string
+  keys: string[]
+  date: Date | number | string
+}
+
+export type Shortcut = {
+  name: string
+  icon: string
+  url: string
+}
+
+export type RadarData = {
+  personal: number
+  team: number
+  max: number
+  name: string
+}
+export type AnalysisTotalTypes = {
+  users: number
+  messages: number
+  moneys: number
+  shoppings: number
+}
+
+export type UserAccessSource = {
+  value: number
+  name: string
+}
+
+export type WeeklyUserActivity = {
+  value: number
+  name: string
+}
+
+export type MonthlySales = {
+  name: string
+  estimate: number
+  actual: number
+}
diff --git a/src/views/infra/apiAccessLog/ApiAccessLogDetail.vue b/src/views/infra/apiAccessLog/ApiAccessLogDetail.vue
new file mode 100644
index 000000000..43a34dc43
--- /dev/null
+++ b/src/views/infra/apiAccessLog/ApiAccessLogDetail.vue
@@ -0,0 +1,67 @@
+<template>
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="详情" width="800">
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="日志主键" min-width="120">
+        {{ detailData.id }}
+      </el-descriptions-item>
+      <el-descriptions-item label="链路追踪">
+        {{ detailData.traceId }}
+      </el-descriptions-item>
+      <el-descriptions-item label="应用名">
+        {{ detailData.applicationName }}
+      </el-descriptions-item>
+      <el-descriptions-item label="用户信息">
+        {{ detailData.userId }}
+        <dict-tag :type="DICT_TYPE.USER_TYPE" :value="detailData.userType" />
+      </el-descriptions-item>
+      <el-descriptions-item label="用户 IP">
+        {{ detailData.userIp }}
+      </el-descriptions-item>
+      <el-descriptions-item label="用户 UA">
+        {{ detailData.userAgent }}
+      </el-descriptions-item>
+      <el-descriptions-item label="请求信息">
+        {{ detailData.requestMethod }} {{ detailData.requestUrl }}
+      </el-descriptions-item>
+      <el-descriptions-item label="请求参数">
+        {{ detailData.requestParams }}
+      </el-descriptions-item>
+      <el-descriptions-item label="请求时间">
+        {{ formatDate(detailData.beginTime) }} ~ {{ formatDate(detailData.endTime) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="请求耗时">{{ detailData.duration }} ms</el-descriptions-item>
+      <el-descriptions-item label="操作结果">
+        <div v-if="detailData.resultCode === 0">正常</div>
+        <div v-else-if="detailData.resultCode > 0"
+          >失败 | {{ detailData.resultCode }} | {{ detailData.resultMsg }}
+        </div>
+      </el-descriptions-item>
+    </el-descriptions>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import * as ApiAccessLog from '@/api/infra/apiAccessLog'
+
+defineOptions({ name: 'ApiAccessLogDetail' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单地加载中
+const detailData = ref() // 详情数据
+
+/** 打开弹窗 */
+const open = async (data: ApiAccessLog.ApiAccessLogVO) => {
+  dialogVisible.value = true
+  // 设置数据
+  detailLoading.value = true
+  try {
+    detailData.value = data
+  } finally {
+    detailLoading.value = false
+  }
+}
+
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/infra/apiAccessLog/index.vue b/src/views/infra/apiAccessLog/index.vue
new file mode 100644
index 000000000..245f43334
--- /dev/null
+++ b/src/views/infra/apiAccessLog/index.vue
@@ -0,0 +1,167 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="用户编号" prop="userId">
+        <el-input v-model="queryParams.userId" placeholder="请输入用户编号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="用户类型" prop="userType">
+        <el-select v-model="queryParams.userType" placeholder="请选择用户类型" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.USER_TYPE)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="应用名" prop="applicationName">
+        <el-input v-model="queryParams.applicationName" placeholder="请输入应用名" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="请求时间" prop="beginTime">
+        <el-date-picker v-model="queryParams.beginTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="执行时长" prop="duration">
+        <el-input v-model="queryParams.duration" placeholder="请输入执行时长" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="结果码" prop="resultCode">
+        <el-input v-model="queryParams.resultCode" placeholder="请输入结果码" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="success" @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['infra:api-error-log:export']">
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="日志编号" align="center" prop="id" />
+      <el-table-column label="用户编号" align="center" prop="userId" />
+      <el-table-column label="用户类型" align="center" prop="userType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="应用名" align="center" prop="applicationName" />
+      <el-table-column label="请求方法" align="center" prop="requestMethod" width="80" />
+      <el-table-column label="请求地址" align="center" prop="requestUrl" width="250" />
+      <el-table-column label="请求时间" align="center" prop="beginTime" width="180">
+        <template #default="scope">
+          <span>{{ formatDate(scope.row.beginTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="执行时长" align="center" prop="duration" width="180">
+        <template #default="scope"> {{ scope.row.duration }} ms </template>
+      </el-table-column>
+      <el-table-column label="操作结果" align="center" prop="status">
+        <template #default="scope">
+          {{ scope.row.resultCode === 0 ? '成功' : '失败(' + scope.row.resultMsg + ')' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" fixed="right" width="120">
+        <template #default="scope">
+          <el-button link type="primary" @click="openDetail(scope.row)" v-hasPermi="['infra:api-access-log:query']">
+            <Icon icon="ep:document-copy" />
+            详细
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：详情 -->
+  <ApiAccessLogDetail ref="detailRef" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import download from '@/utils/download'
+import { formatDate } from '@/utils/formatTime'
+import * as ApiAccessLogApi from '@/api/infra/apiAccessLog'
+import ApiAccessLogDetail from './ApiAccessLogDetail.vue'
+
+defineOptions({ name: 'InfraApiAccessLog' })
+
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  userId: null,
+  userType: null,
+  applicationName: null,
+  requestUrl: null,
+  duration: null,
+  resultCode: null,
+  beginTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ApiAccessLogApi.getApiAccessLogPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (data: ApiAccessLogApi.ApiAccessLogVO) => {
+  detailRef.value.open(data)
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ApiAccessLogApi.exportApiAccessLog(queryParams)
+    download.excel(data, 'API 访问日志.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/infra/apiErrorLog/ApiErrorLogDetail.vue b/src/views/infra/apiErrorLog/ApiErrorLogDetail.vue
new file mode 100644
index 000000000..7340ca82f
--- /dev/null
+++ b/src/views/infra/apiErrorLog/ApiErrorLogDetail.vue
@@ -0,0 +1,81 @@
+<template>
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="详情" width="800">
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="日志主键" min-width="120">
+        {{ detailData.id }}
+      </el-descriptions-item>
+      <el-descriptions-item label="链路追踪">
+        {{ detailData.traceId }}
+      </el-descriptions-item>
+      <el-descriptions-item label="应用名">
+        {{ detailData.applicationName }}
+      </el-descriptions-item>
+      <el-descriptions-item label="用户编号">
+        {{ detailData.userId }}
+        <dict-tag :type="DICT_TYPE.USER_TYPE" :value="detailData.userType" />
+      </el-descriptions-item>
+      <el-descriptions-item label="用户 IP">
+        {{ detailData.userIp }}
+      </el-descriptions-item>
+      <el-descriptions-item label="用户 UA">
+        {{ detailData.userAgent }}
+      </el-descriptions-item>
+      <el-descriptions-item label="请求信息">
+        {{ detailData.requestMethod }} {{ detailData.requestUrl }}
+      </el-descriptions-item>
+      <el-descriptions-item label="请求参数">
+        {{ detailData.requestParams }}
+      </el-descriptions-item>
+      <el-descriptions-item label="异常时间">
+        {{ formatDate(detailData.exceptionTime) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="异常名">
+        {{ detailData.exceptionName }}
+      </el-descriptions-item>
+      <el-descriptions-item v-if="detailData.exceptionStackTrace" label="异常堆栈">
+        <el-input
+          v-model="detailData.exceptionStackTrace"
+          :autosize="{ maxRows: 20 }"
+          :readonly="true"
+          type="textarea"
+        />
+      </el-descriptions-item>
+      <el-descriptions-item label="处理状态">
+        <dict-tag
+          :type="DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS"
+          :value="detailData.processStatus"
+        />
+      </el-descriptions-item>
+      <el-descriptions-item v-if="detailData.processUserId" label="处理人">
+        {{ detailData.processUserId }}
+      </el-descriptions-item>
+      <el-descriptions-item v-if="detailData.processTime" label="处理时间">
+        {{ formatDate(detailData.processTime) }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import * as ApiErrorLog from '@/api/infra/apiErrorLog'
+
+defineOptions({ name: 'ApiErrorLogDetail' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref() // 详情数据
+
+/** 打开弹窗 */
+const open = async (data: ApiErrorLog.ApiErrorLogVO) => {
+  dialogVisible.value = true
+  // 设置数据
+  detailLoading.value = true
+  try {
+    detailData.value = data
+  } finally {
+    detailLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/infra/apiErrorLog/index.vue b/src/views/infra/apiErrorLog/index.vue
new file mode 100644
index 000000000..683675545
--- /dev/null
+++ b/src/views/infra/apiErrorLog/index.vue
@@ -0,0 +1,249 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="用户编号" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="用户类型" prop="userType">
+        <el-select
+          v-model="queryParams.userType"
+          placeholder="请选择用户类型"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.USER_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="应用名" prop="applicationName">
+        <el-input
+          v-model="queryParams.applicationName"
+          placeholder="请输入应用名"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="异常时间" prop="exceptionTime">
+        <el-date-picker
+          v-model="queryParams.exceptionTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="处理状态" prop="processStatus">
+        <el-select
+          v-model="queryParams.processStatus"
+          placeholder="请选择处理状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain  @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button type="info" plain  @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="success"
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['infra:api-error-log:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="日志编号" align="center" prop="id" />
+      <el-table-column label="用户编号" align="center" prop="userId" />
+      <el-table-column label="用户类型" align="center" prop="userType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="应用名" align="center" prop="applicationName" width="200" />
+      <el-table-column label="请求方法" align="center" prop="requestMethod" width="80" />
+      <el-table-column label="请求地址" align="center" prop="requestUrl" width="180" />
+      <el-table-column
+        label="异常发生时间"
+        align="center"
+        prop="exceptionTime"
+        width="180"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="异常名" align="center" prop="exceptionName" width="180" />
+      <el-table-column label="处理状态" align="center" prop="processStatus">
+        <template #default="scope">
+          <dict-tag
+            :type="DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS"
+            :value="scope.row.processStatus"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center"  fixed="right" width="240">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openDetail(scope.row)"
+            v-hasPermi="['infra:api-error-log:query']"
+          ><Icon icon="ep:document-copy" />
+            详细
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            v-if="scope.row.processStatus === InfraApiErrorLogProcessStatusEnum.INIT"
+            @click="handleProcess(scope.row.id, InfraApiErrorLogProcessStatusEnum.DONE)"
+            v-hasPermi="['infra:api-error-log:update-status']"
+          ><Icon icon="ep:finished" />
+            已处理
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            v-if="scope.row.processStatus === InfraApiErrorLogProcessStatusEnum.INIT"
+            @click="handleProcess(scope.row.id, InfraApiErrorLogProcessStatusEnum.IGNORE)"
+            v-hasPermi="['infra:api-error-log:update-status']"
+          ><Icon icon="ep:remove" />
+            已忽略
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：详情 -->
+  <ApiErrorLogDetail ref="detailRef" />
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as ApiErrorLogApi from '@/api/infra/apiErrorLog'
+import ApiErrorLogDetail from './ApiErrorLogDetail.vue'
+import { InfraApiErrorLogProcessStatusEnum } from '@/utils/constants'
+
+defineOptions({ name: 'InfraApiErrorLog' })
+
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  userId: null,
+  userType: null,
+  applicationName: null,
+  requestUrl: null,
+  processStatus: null,
+  exceptionTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ApiErrorLogApi.getApiErrorLogPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (data: ApiErrorLogApi.ApiErrorLogVO) => {
+  detailRef.value.open(data)
+}
+
+/** 处理已处理 / 已忽略的操作 **/
+const handleProcess = async (id: number, processStatus: number) => {
+  try {
+    // 操作的二次确认
+    const type = processStatus === InfraApiErrorLogProcessStatusEnum.DONE ? '已处理' : '已忽略'
+    await message.confirm('确认标记为' + type + '?')
+    // 执行操作
+    await ApiErrorLogApi.updateApiErrorLogPage(id, processStatus)
+    await message.success(type)
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ApiErrorLogApi.exportApiErrorLog(queryParams)
+    download.excel(data, '异常日志.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/infra/build/index.vue b/src/views/infra/build/index.vue
new file mode 100644
index 000000000..11bfc9998
--- /dev/null
+++ b/src/views/infra/build/index.vue
@@ -0,0 +1,143 @@
+<template>
+  <ContentWrap>
+    <el-row>
+      <el-col>
+        <div class="float-right mb-2">
+          <el-button size="small" type="primary" @click="showJson">生成 JSON</el-button>
+          <el-button size="small" type="success" @click="showOption">生成 Options</el-button>
+          <el-button size="small" type="danger" @click="showTemplate">生成组件</el-button>
+        </div>
+      </el-col>
+      <!-- 表单设计器 -->
+      <el-col>
+        <FcDesigner ref="designer" height="780px" />
+      </el-col>
+    </el-row>
+  </ContentWrap>
+
+  <!-- 弹窗：表单预览 -->
+  <Dialog v-model="dialogVisible" :title="dialogTitle" max-height="600">
+    <div v-if="dialogVisible" ref="editor">
+      <el-button style="float: right" @click="copy(formData)">
+        {{ t('common.copy') }}
+      </el-button>
+      <el-scrollbar height="580">
+        <div>
+          <pre><code class="hljs" v-dompurify-html="highlightedCode(formData)"></code></pre>
+        </div>
+      </el-scrollbar>
+    </div>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+defineOptions({ name: 'InfraBuild' })
+import FcDesigner from '@form-create/designer'
+import { useClipboard } from '@vueuse/core'
+import { isString } from '@/utils/is'
+
+import hljs from 'highlight.js' // 导入代码高亮文件
+import 'highlight.js/styles/github.css' // 导入代码高亮样式
+import xml from 'highlight.js/lib/languages/java'
+import json from 'highlight.js/lib/languages/json'
+import formCreate from '@form-create/element-ui'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息
+
+const designer = ref() // 表单设计器
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formType = ref(-1) // 表单的类型：0 - 生成 JSON；1 - 生成 Options；2 - 生成组件
+const formData = ref('') // 表单数据
+
+/** 打开弹窗 */
+const openModel = (title: string) => {
+  dialogVisible.value = true
+  dialogTitle.value = title
+}
+
+/** 生成 JSON */
+const showJson = () => {
+  openModel('生成 JSON')
+  formType.value = 0
+  formData.value = designer.value.getRule()
+}
+
+/** 生成 Options */
+const showOption = () => {
+  openModel('生成 Options')
+  formType.value = 1
+  formData.value = designer.value.getOption()
+}
+
+/** 生成组件 */
+const showTemplate = () => {
+  openModel('生成组件')
+  formType.value = 2
+  formData.value = makeTemplate()
+}
+
+const makeTemplate = () => {
+  const rule = designer.value.getRule()
+  const opt = designer.value.getOption()
+  return `<template>
+    <form-create
+      v-model="fapi"
+      :rule="rule"
+      :option="option"
+      @submit="onSubmit"
+    ></form-create>
+  </template>
+  <script setup lang=ts>
+    import formCreate from "@form-create/element-ui";
+    const faps = ref(null)
+    const rule = ref('')
+    const option = ref('')
+    const init = () => {
+      rule.value = formCreate.parseJson('${formCreate.toJson(rule).replaceAll('\\', '\\\\')}')
+      option.value = formCreate.parseJson('${JSON.stringify(opt)}')
+    }
+    const onSubmit = (formData) => {
+      //todo 提交表单
+    }
+    init()
+  <\/script>`
+}
+
+/** 复制 **/
+const copy = async (text: string) => {
+  const { copy, copied, isSupported } = useClipboard({ source: text })
+  if (!isSupported) {
+    message.error(t('common.copyError'))
+  } else {
+    await copy()
+    if (unref(copied)) {
+      message.success(t('common.copySuccess'))
+    }
+  }
+}
+
+/**
+ * 代码高亮
+ */
+const highlightedCode = (code) => {
+  // 处理语言和代码
+  let language = 'json'
+  if (formType.value === 2) {
+    language = 'xml'
+  }
+  if (!isString(code)) {
+    code = JSON.stringify(code)
+  }
+  // 高亮
+  const result = hljs.highlight(language, code, true)
+  return result.value || '&nbsp;'
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  // 注册代码高亮的各种语言
+  hljs.registerLanguage('xml', xml)
+  hljs.registerLanguage('json', json)
+})
+</script>
diff --git a/src/views/infra/codegen/PreviewCode.vue b/src/views/infra/codegen/PreviewCode.vue
new file mode 100644
index 000000000..b04775ecf
--- /dev/null
+++ b/src/views/infra/codegen/PreviewCode.vue
@@ -0,0 +1,222 @@
+<template>
+  <Dialog
+    v-model="dialogVisible"
+    align-center
+    class="app-infra-codegen-preview-container"
+    title="代码预览"
+    width="80%"
+  >
+    <div class="flex">
+      <!-- 代码目录树 -->
+      <el-card
+        v-loading="loading"
+        :gutter="12"
+        class="w-1/3"
+        element-loading-text="生成文件目录中..."
+        shadow="hover"
+      >
+        <el-scrollbar height="calc(100vh - 88px - 40px)">
+          <el-tree
+            ref="treeRef"
+            :data="preview.fileTree"
+            :expand-on-click-node="false"
+            highlight-current
+            default-expand-all
+            node-key="id"
+            @node-click="handleNodeClick"
+          />
+        </el-scrollbar>
+      </el-card>
+      <!-- 代码 -->
+      <el-card
+        v-loading="loading"
+        :gutter="12"
+        class="ml-3 w-2/3"
+        element-loading-text="加载代码中..."
+        shadow="hover"
+      >
+        <el-tabs v-model="preview.activeName">
+          <el-tab-pane
+            v-for="item in previewCodegen"
+            :key="item.filePath"
+            :label="item.filePath.substring(item.filePath.lastIndexOf('/') + 1)"
+            :name="item.filePath"
+          >
+            <el-button class="float-right" text type="primary" @click="copy(item.code)">
+              {{ t('common.copy') }}
+            </el-button>
+            <el-scrollbar height="600px">
+              <pre><code v-dompurify-html="highlightedCode(item)" class="hljs"></code></pre>
+            </el-scrollbar>
+          </el-tab-pane>
+        </el-tabs>
+      </el-card>
+    </div>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { useClipboard } from '@vueuse/core'
+import { handleTree2 } from '@/utils/tree'
+import * as CodegenApi from '@/api/infra/codegen'
+
+import hljs from 'highlight.js' // 导入代码高亮文件
+import 'highlight.js/styles/github.css' // 导入代码高亮样式
+import java from 'highlight.js/lib/languages/java'
+import xml from 'highlight.js/lib/languages/java'
+import javascript from 'highlight.js/lib/languages/javascript'
+import sql from 'highlight.js/lib/languages/sql'
+import typescript from 'highlight.js/lib/languages/typescript'
+
+defineOptions({ name: 'InfraCodegenPreviewCode' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const loading = ref(false) // 加载中的状态
+const preview = reactive({
+  fileTree: [], // 文件树
+  activeName: '' // 激活的文件名
+})
+const previewCodegen = ref<CodegenApi.CodegenPreviewVO[]>()
+
+/** 点击文件 */
+const handleNodeClick = async (data, node) => {
+  if (node && !node.isLeaf) {
+    return false
+  }
+  preview.activeName = data.id
+}
+
+/** 生成 files 目录 **/
+interface filesType {
+  id: string
+  label: string
+  parentId: string
+}
+
+/** 打开弹窗 */
+const open = async (id: number) => {
+  dialogVisible.value = true
+  try {
+    loading.value = true
+    // 生成代码
+    const data = await CodegenApi.previewCodegen(id)
+    previewCodegen.value = data
+    // 处理文件
+    let file = handleFiles(data)
+    preview.fileTree = handleTree2(file, 'id', 'parentId', 'children', '/')
+    // 点击首个文件
+    preview.activeName = data[0].filePath
+  } finally {
+    loading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 处理文件 */
+const handleFiles = (datas: CodegenApi.CodegenPreviewVO[]) => {
+  let exists = {} // key：file 的 id；value：true
+  let files: filesType[] = []
+  // 遍历每个元素
+  for (const data of datas) {
+    let paths = data.filePath.split('/')
+    let fullPath = '' // 从头开始的路径，用于生成 id
+    // 特殊处理 java 文件
+    if (paths[paths.length - 1].indexOf('.java') >= 0) {
+      let newPaths: string[] = []
+      for (let i = 0; i < paths.length; i++) {
+        let path = paths[i]
+        if (path !== 'java') {
+          newPaths.push(path)
+          continue
+        }
+        newPaths.push(path)
+        // 特殊处理中间的 package，进行合并
+        let tmp = ''
+        while (i < paths.length) {
+          path = paths[i + 1]
+          if (
+            path === 'controller' ||
+            path === 'convert' ||
+            path === 'dal' ||
+            path === 'enums' ||
+            path === 'service' ||
+            path === 'vo' || // 下面三个，主要是兜底。可能考虑到有人改了包结构
+            path === 'mysql' ||
+            path === 'dataobject'
+          ) {
+            break
+          }
+          tmp = tmp ? tmp + '.' + path : path
+          i++
+        }
+        if (tmp) {
+          newPaths.push(tmp)
+        }
+      }
+      paths = newPaths
+    }
+    // 遍历每个 path， 拼接成树
+    for (let i = 0; i < paths.length; i++) {
+      // 已经添加到 files 中，则跳过
+      let oldFullPath = fullPath
+      // 下面的 replaceAll 的原因，是因为上面包处理了，导致和 tabs 不匹配，所以 replaceAll 下
+      fullPath = fullPath.length === 0 ? paths[i] : fullPath.replaceAll('.', '/') + '/' + paths[i]
+      if (exists[fullPath]) {
+        continue
+      }
+      // 添加到 files 中
+      exists[fullPath] = true
+      files.push({
+        id: fullPath,
+        label: paths[i],
+        parentId: oldFullPath || '/' // "/" 为根节点
+      })
+    }
+  }
+  return files
+}
+
+/** 复制 **/
+const copy = async (text: string) => {
+  const { copy, copied, isSupported } = useClipboard({ source: text })
+  if (!isSupported) {
+    message.error(t('common.copyError'))
+    return
+  }
+  await copy()
+  if (unref(copied)) {
+    message.success(t('common.copySuccess'))
+  }
+}
+
+/**
+ * 代码高亮
+ */
+const highlightedCode = (item) => {
+  const language = item.filePath.substring(item.filePath.lastIndexOf('.') + 1)
+  const result = hljs.highlight(language, item.code || '', true)
+  return result.value || '&nbsp;'
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  // 注册代码高亮的各种语言
+  hljs.registerLanguage('java', java)
+  hljs.registerLanguage('xml', xml)
+  hljs.registerLanguage('html', xml)
+  hljs.registerLanguage('vue', xml)
+  hljs.registerLanguage('javascript', javascript)
+  hljs.registerLanguage('sql', sql)
+  hljs.registerLanguage('typescript', typescript)
+})
+</script>
+<style lang="scss">
+.app-infra-codegen-preview-container {
+  .el-scrollbar .el-scrollbar__wrap .el-scrollbar__view {
+    display: inline-block;
+    white-space: nowrap;
+  }
+}
+</style>
diff --git a/src/views/infra/codegen/components/BasicInfoForm.vue b/src/views/infra/codegen/components/BasicInfoForm.vue
new file mode 100644
index 000000000..185930047
--- /dev/null
+++ b/src/views/infra/codegen/components/BasicInfoForm.vue
@@ -0,0 +1,87 @@
+<template>
+  <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px">
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="表名称" prop="tableName">
+          <el-input v-model="formData.tableName" placeholder="请输入仓库名称" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="表描述" prop="tableComment">
+          <el-input v-model="formData.tableComment" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item prop="className">
+          <template #label>
+            <span>
+              实体类名称
+              <el-tooltip
+                content="默认去除表名的前缀。如果存在重复，则需要手动添加前缀，避免 MyBatis 报 Alias 重复的问题。"
+                placement="top"
+              >
+                <Icon class="" icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+          </template>
+          <el-input v-model="formData.className" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="作者" prop="author">
+          <el-input v-model="formData.author" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="formData.remark" :rows="3" type="textarea" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script lang="ts" setup>
+import * as CodegenApi from '@/api/infra/codegen'
+import { PropType } from 'vue'
+
+defineOptions({ name: 'InfraCodegenBasicInfoForm' })
+
+const props = defineProps({
+  table: {
+    type: Object as PropType<Nullable<CodegenApi.CodegenTableVO>>,
+    default: () => null
+  }
+})
+
+const formRef = ref()
+const formData = ref({
+  tableName: '',
+  tableComment: '',
+  className: '',
+  author: '',
+  remark: ''
+})
+const rules = reactive({
+  tableName: [required],
+  tableComment: [required],
+  className: [required],
+  author: [required]
+})
+
+/** 监听 table 属性，复制给 formData 属性 */
+watch(
+  () => props.table,
+  (table) => {
+    if (!table) return
+    formData.value = table
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+
+defineExpose({
+  validate: async () => unref(formRef)?.validate()
+})
+</script>
diff --git a/src/views/infra/codegen/components/ColumInfoForm.vue b/src/views/infra/codegen/components/ColumInfoForm.vue
new file mode 100644
index 000000000..737c2e2ba
--- /dev/null
+++ b/src/views/infra/codegen/components/ColumInfoForm.vue
@@ -0,0 +1,153 @@
+<template>
+  <el-table ref="dragTable" :data="formData" :max-height="tableHeight" row-key="columnId">
+    <el-table-column
+      :show-overflow-tooltip="true"
+      label="字段列名"
+      min-width="10%"
+      prop="columnName"
+    />
+    <el-table-column label="字段描述" min-width="10%">
+      <template #default="scope">
+        <el-input v-model="scope.row.columnComment" />
+      </template>
+    </el-table-column>
+    <el-table-column
+      :show-overflow-tooltip="true"
+      label="物理类型"
+      min-width="10%"
+      prop="dataType"
+    />
+    <el-table-column label="Java类型" min-width="11%">
+      <template #default="scope">
+        <el-select v-model="scope.row.javaType">
+          <el-option label="Long" value="Long" />
+          <el-option label="String" value="String" />
+          <el-option label="Integer" value="Integer" />
+          <el-option label="Double" value="Double" />
+          <el-option label="BigDecimal" value="BigDecimal" />
+          <el-option label="LocalDateTime" value="LocalDateTime" />
+          <el-option label="Boolean" value="Boolean" />
+        </el-select>
+      </template>
+    </el-table-column>
+    <el-table-column label="java属性" min-width="10%">
+      <template #default="scope">
+        <el-input v-model="scope.row.javaField" />
+      </template>
+    </el-table-column>
+    <el-table-column label="插入" min-width="4%">
+      <template #default="scope">
+        <el-checkbox v-model="scope.row.createOperation" false-label="false" true-label="true" />
+      </template>
+    </el-table-column>
+    <el-table-column label="编辑" min-width="4%">
+      <template #default="scope">
+        <el-checkbox v-model="scope.row.updateOperation" false-label="false" true-label="true" />
+      </template>
+    </el-table-column>
+    <el-table-column label="列表" min-width="4%">
+      <template #default="scope">
+        <el-checkbox
+          v-model="scope.row.listOperationResult"
+          false-label="false"
+          true-label="true"
+        />
+      </template>
+    </el-table-column>
+    <el-table-column label="查询" min-width="4%">
+      <template #default="scope">
+        <el-checkbox v-model="scope.row.listOperation" false-label="false" true-label="true" />
+      </template>
+    </el-table-column>
+    <el-table-column label="查询方式" min-width="10%">
+      <template #default="scope">
+        <el-select v-model="scope.row.listOperationCondition">
+          <el-option label="=" value="=" />
+          <el-option label="!=" value="!=" />
+          <el-option label=">" value=">" />
+          <el-option label=">=" value=">=" />
+          <el-option label="<" value="<>" />
+          <el-option label="<=" value="<=" />
+          <el-option label="LIKE" value="LIKE" />
+          <el-option label="BETWEEN" value="BETWEEN" />
+        </el-select>
+      </template>
+    </el-table-column>
+    <el-table-column label="允许空" min-width="5%">
+      <template #default="scope">
+        <el-checkbox v-model="scope.row.nullable" false-label="false" true-label="true" />
+      </template>
+    </el-table-column>
+    <el-table-column label="显示类型" min-width="12%">
+      <template #default="scope">
+        <el-select v-model="scope.row.htmlType">
+          <el-option label="文本框" value="input" />
+          <el-option label="文本域" value="textarea" />
+          <el-option label="下拉框" value="select" />
+          <el-option label="单选框" value="radio" />
+          <el-option label="复选框" value="checkbox" />
+          <el-option label="日期控件" value="datetime" />
+          <el-option label="图片上传" value="imageUpload" />
+          <el-option label="文件上传" value="fileUpload" />
+          <el-option label="富文本控件" value="editor" />
+        </el-select>
+      </template>
+    </el-table-column>
+    <el-table-column label="字典类型" min-width="12%">
+      <template #default="scope">
+        <el-select v-model="scope.row.dictType" clearable filterable placeholder="请选择">
+          <el-option
+            v-for="dict in dictOptions"
+            :key="dict.id"
+            :label="dict.name"
+            :value="dict.type"
+          />
+        </el-select>
+      </template>
+    </el-table-column>
+    <el-table-column label="示例" min-width="10%">
+      <template #default="scope">
+        <el-input v-model="scope.row.example" />
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+<script lang="ts" setup>
+import { PropType } from 'vue'
+import * as CodegenApi from '@/api/infra/codegen'
+import * as DictDataApi from '@/api/system/dict/dict.type'
+
+defineOptions({ name: 'InfraCodegenColumInfoForm' })
+
+const props = defineProps({
+  columns: {
+    type: Array as unknown as PropType<CodegenApi.CodegenColumnVO[]>,
+    default: () => null
+  }
+})
+
+const formData = ref<CodegenApi.CodegenColumnVO[]>([])
+const tableHeight = document.documentElement.scrollHeight - 350 + 'px'
+
+/** 查询字典下拉列表 */
+const dictOptions = ref<DictDataApi.DictTypeVO[]>()
+const getDictOptions = async () => {
+  dictOptions.value = await DictDataApi.getSimpleDictTypeList()
+}
+
+watch(
+  () => props.columns,
+  (columns) => {
+    if (!columns) return
+    formData.value = columns
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+
+onMounted(async () => {
+  await getDictOptions()
+})
+</script>
diff --git a/src/views/infra/codegen/components/GenerateInfoForm.vue b/src/views/infra/codegen/components/GenerateInfoForm.vue
new file mode 100644
index 000000000..744edfe69
--- /dev/null
+++ b/src/views/infra/codegen/components/GenerateInfoForm.vue
@@ -0,0 +1,391 @@
+<template>
+  <el-form ref="formRef" :model="formData" :rules="rules" label-width="150px">
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="生成模板" prop="templateType">
+          <el-select v-model="formData.templateType" @change="tplSelectChange">
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_CODEGEN_TEMPLATE_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="前端类型" prop="frontType">
+          <el-select v-model="formData.frontType">
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_CODEGEN_FRONT_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item label="生成场景" prop="scene">
+          <el-select v-model="formData.scene">
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_CODEGEN_SCENE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item>
+          <template #label>
+            <span>
+              上级菜单
+              <el-tooltip content="分配到指定菜单下，例如 系统管理" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+          </template>
+          <el-tree-select
+            v-model="formData.parentMenuId"
+            :data="menus"
+            :props="menuTreeProps"
+            check-strictly
+            node-key="id"
+            placeholder="请选择系统菜单"
+          />
+        </el-form-item>
+      </el-col>
+
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item prop="packageName">-->
+      <!--          <span slot="label">-->
+      <!--            生成包路径-->
+      <!--            <el-tooltip content="生成在哪个java包下，例如 com.ruoyi.system" placement="top">-->
+      <!--              <i class="el-icon-question"></i>-->
+      <!--            </el-tooltip>-->
+      <!--          </span>-->
+      <!--          <el-input v-model="formData.packageName" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+
+      <el-col :span="12">
+        <el-form-item prop="moduleName">
+          <template #label>
+            <span>
+              模块名
+              <el-tooltip
+                content="模块名，即一级目录，例如 system、infra、tool 等等"
+                placement="top"
+              >
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+          </template>
+          <el-input v-model="formData.moduleName" />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item prop="businessName">
+          <template #label>
+            <span>
+              业务名
+              <el-tooltip
+                content="业务名，即二级目录，例如 user、permission、dict 等等"
+                placement="top"
+              >
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+          </template>
+          <el-input v-model="formData.businessName" />
+        </el-form-item>
+      </el-col>
+
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item prop="businessPackage">-->
+      <!--          <span slot="label">-->
+      <!--            业务包-->
+      <!--            <el-tooltip content="业务包，自定义二级目录。例如说，我们希望将 dictType 和 dictData 归类成 dict 业务" placement="top">-->
+      <!--              <i class="el-icon-question"></i>-->
+      <!--            </el-tooltip>-->
+      <!--          </span>-->
+      <!--          <el-input v-model="formData.businessPackage" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+
+      <el-col :span="12">
+        <el-form-item prop="className">
+          <template #label>
+            <span>
+              类名称
+              <el-tooltip
+                content="类名称（首字母大写），例如SysUser、SysMenu、SysDictData 等等"
+                placement="top"
+              >
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+          </template>
+          <el-input v-model="formData.className" />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item prop="classComment">
+          <template #label>
+            <span>
+              类描述
+              <el-tooltip content="用作类描述，例如 用户" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+          </template>
+          <el-input v-model="formData.classComment" />
+        </el-form-item>
+      </el-col>
+
+      <el-col v-if="formData.genType === '1'" :span="24">
+        <el-form-item prop="genPath">
+          <template #label>
+            <span>
+              自定义路径
+              <el-tooltip
+                content="填写磁盘绝对路径，若不填写，则生成到当前Web项目下"
+                placement="top"
+              >
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+          </template>
+          <el-input v-model="formData.genPath">
+            <template #append>
+              <el-dropdown>
+                <el-button type="primary">
+                  最近路径快速选择
+                  <i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <template #dropdown>
+                  <el-dropdown-menu>
+                    <el-dropdown-item @click="formData.genPath = '/'">
+                      恢复默认的生成基础路径
+                    </el-dropdown-item>
+                  </el-dropdown-menu>
+                </template>
+              </el-dropdown>
+            </template>
+          </el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row v-show="formData.tplCategory === 'tree'">
+      <h4 class="form-header">其他信息</h4>
+      <el-col :span="12">
+        <el-form-item>
+          <template #label>
+            <span>
+              树编码字段
+              <el-tooltip content="树显示的编码字段名， 如：dept_id" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+          </template>
+          <el-select v-model="formData.treeCode" placeholder="请选择">
+            <el-option
+              v-for="(column, index) in formData.columns"
+              :key="index"
+              :label="column.columnName + '：' + column.columnComment"
+              :value="column.columnName"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item>
+          <template #label>
+            <span>
+              树父编码字段
+              <el-tooltip content="树显示的父编码字段名， 如：parent_Id" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+          </template>
+          <el-select v-model="formData.treeParentCode" placeholder="请选择">
+            <el-option
+              v-for="(column, index) in formData.columns"
+              :key="index"
+              :label="column.columnName + '：' + column.columnComment"
+              :value="column.columnName"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item>
+          <template #label>
+            <span>
+              树名称字段
+              <el-tooltip content="树节点的显示名称字段名， 如：dept_name" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+          </template>
+
+          <el-select v-model="formData.treeName" placeholder="请选择">
+            <el-option
+              v-for="(column, index) in formData.columns"
+              :key="index"
+              :label="column.columnName + '：' + column.columnComment"
+              :value="column.columnName"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row v-show="formData.tplCategory === 'sub'">
+      <h4 class="form-header">关联信息</h4>
+      <el-col :span="12">
+        <el-form-item>
+          <template #label>
+            <span>
+              关联子表的表名
+              <el-tooltip content="关联子表的表名， 如：sys_user" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+          </template>
+          <el-select v-model="formData.subTableName" placeholder="请选择" @change="subSelectChange">
+            <el-option
+              v-for="(table0, index) in tables"
+              :key="index"
+              :label="table0.tableName + '：' + table0.tableComment"
+              :value="table0.tableName"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item>
+          <template #label>
+            <span>
+              子表关联的外键名
+              <el-tooltip content="子表关联的外键名， 如：user_id" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+          </template>
+          <el-select v-model="formData.subTableFkName" placeholder="请选择">
+            <el-option
+              v-for="(column, index) in subColumns"
+              :key="index"
+              :label="column.columnName + '：' + column.columnComment"
+              :value="column.columnName"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { handleTree } from '@/utils/tree'
+import * as CodegenApi from '@/api/infra/codegen'
+import * as MenuApi from '@/api/system/menu'
+import { PropType } from 'vue'
+
+defineOptions({ name: 'InfraCodegenGenerateInfoForm' })
+
+const message = useMessage() // 消息弹窗
+const props = defineProps({
+  table: {
+    type: Object as PropType<Nullable<CodegenApi.CodegenTableVO>>,
+    default: () => null
+  }
+})
+
+const formRef = ref()
+const formData = ref({
+  templateType: null,
+  frontType: null,
+  scene: null,
+  moduleName: '',
+  businessName: '',
+  className: '',
+  classComment: '',
+  parentMenuId: null,
+  genPath: '',
+  treeCode: '',
+  treeParentCode: '',
+  treeName: '',
+  tplCategory: '',
+  subTableName: '',
+  subTableFkName: '',
+  genType: ''
+})
+
+const rules = reactive({
+  templateType: [required],
+  frontType: [required],
+  scene: [required],
+  moduleName: [required],
+  businessName: [required],
+  businessPackage: [required],
+  className: [required],
+  classComment: [required]
+})
+
+const tables = ref([])
+const subColumns = ref([])
+const menus = ref<any[]>([])
+const menuTreeProps = {
+  label: 'name'
+}
+
+/** 选择子表名触发 */
+const subSelectChange = () => {
+  formData.value.subTableFkName = ''
+}
+
+/** 选择生成模板触发 */
+const tplSelectChange = (value) => {
+  if (value !== 1) {
+    // TODO 芋艿：暂时不考虑支持树形结构
+    message.error(
+      '暂时不考虑支持【树形】和【主子表】的代码生成。原因是：导致 vm 模板过于复杂，不利于胖友二次开发'
+    )
+    return false
+  }
+  if (value !== 'sub') {
+    formData.value.subTableName = ''
+    formData.value.subTableFkName = ''
+  }
+}
+
+watch(
+  () => props.table,
+  (table) => {
+    if (!table) return
+    formData.value = table as any
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+
+onMounted(async () => {
+  try {
+    const resp = await MenuApi.getSimpleMenusList()
+    menus.value = handleTree(resp)
+  } catch {}
+})
+
+defineExpose({
+  validate: async () => unref(formRef)?.validate()
+})
+</script>
diff --git a/src/views/infra/codegen/components/index.ts b/src/views/infra/codegen/components/index.ts
new file mode 100644
index 000000000..1634a76f0
--- /dev/null
+++ b/src/views/infra/codegen/components/index.ts
@@ -0,0 +1,4 @@
+import BasicInfoForm from './BasicInfoForm.vue'
+import ColumInfoForm from './ColumInfoForm.vue'
+import GenerateInfoForm from './GenerateInfoForm.vue'
+export { BasicInfoForm, ColumInfoForm, GenerateInfoForm }
diff --git a/src/views/infra/codegen/editTable.vue b/src/views/infra/codegen/editTable.vue
new file mode 100644
index 000000000..9c4e76578
--- /dev/null
+++ b/src/views/infra/codegen/editTable.vue
@@ -0,0 +1,83 @@
+<template>
+  <ContentWrap v-loading="formLoading">
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="基本信息" name="basicInfo">
+        <basic-info-form ref="basicInfoRef" :table="formData.table" />
+      </el-tab-pane>
+      <el-tab-pane label="字段信息" name="colum">
+        <colum-info-form ref="columInfoRef" :columns="formData.columns" />
+      </el-tab-pane>
+      <el-tab-pane label="生成信息" name="generateInfo">
+        <generate-info-form ref="generateInfoRef" :table="formData.table" />
+      </el-tab-pane>
+    </el-tabs>
+    <el-form>
+      <el-form-item style="float: right">
+        <el-button :loading="formLoading" type="primary" @click="submitForm">保存</el-button>
+        <el-button @click="close">返回</el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import { BasicInfoForm, ColumInfoForm, GenerateInfoForm } from './components'
+import * as CodegenApi from '@/api/infra/codegen'
+
+defineOptions({ name: 'InfraCodegenEditTable' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const { push, currentRoute } = useRouter() // 路由
+const { query } = useRoute() // 查询参数
+const { delView } = useTagsViewStore() // 视图操作
+
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const activeName = ref('colum') // Tag 激活的窗口
+const basicInfoRef = ref<ComponentRef<typeof BasicInfoForm>>()
+const columInfoRef = ref<ComponentRef<typeof ColumInfoForm>>()
+const generateInfoRef = ref<ComponentRef<typeof GenerateInfoForm>>()
+const formData = ref<CodegenApi.CodegenUpdateReqVO>({
+  table: {},
+  columns: []
+})
+
+/** 获得详情 */
+const getDetail = async () => {
+  const id = query.id as unknown as number
+  if (!id) {
+    return
+  }
+  formLoading.value = true
+  try {
+    formData.value = await CodegenApi.getCodegenTable(id)
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 提交按钮 */
+const submitForm = async () => {
+  // 参数校验
+  if (!unref(formData)) return
+  await unref(basicInfoRef)?.validate()
+  await unref(generateInfoRef)?.validate()
+  try {
+    // 提交请求
+    await CodegenApi.updateCodegenTable(formData.value)
+    message.success(t('common.updateSuccess'))
+    close()
+  } catch {}
+}
+
+/** 关闭按钮 */
+const close = () => {
+  delView(unref(currentRoute))
+  push('/infra/codegen')
+}
+
+/** 初始化 */
+onMounted(() => {
+  getDetail()
+})
+</script>
diff --git a/src/views/infra/codegen/importTable.vue b/src/views/infra/codegen/importTable.vue
new file mode 100644
index 000000000..6cd4610a6
--- /dev/null
+++ b/src/views/infra/codegen/importTable.vue
@@ -0,0 +1,151 @@
+<template>
+  <Dialog v-model="dialogVisible" title="导入表" width="800px">
+    <!-- 搜索栏 -->
+    <el-form ref="queryFormRef" :inline="true" :model="queryParams" label-width="68px">
+      <el-form-item label="数据源" prop="dataSourceConfigId">
+        <el-select
+          v-model="queryParams.dataSourceConfigId"
+          class="!w-240px"
+          placeholder="请选择数据源"
+        >
+          <el-option
+            v-for="config in dataSourceConfigList"
+            :key="config.id"
+            :label="config.name"
+            :value="config.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="表名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          class="!w-240px"
+          clearable
+          placeholder="请输入表名称"
+          @keyup.enter="getList"
+        />
+      </el-form-item>
+      <el-form-item label="表描述" prop="comment">
+        <el-input
+          v-model="queryParams.comment"
+          class="!w-240px"
+          clearable
+          placeholder="请输入表描述"
+          @keyup.enter="getList"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="getList">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 列表 -->
+    <el-row>
+      <el-table
+        ref="tableRef"
+        v-loading="dbTableLoading"
+        :data="dbTableList"
+        height="260px"
+        @row-click="handleRowClick"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column :show-overflow-tooltip="true" label="表名称" prop="name" />
+        <el-table-column :show-overflow-tooltip="true" label="表描述" prop="comment" />
+      </el-table>
+    </el-row>
+    <!-- 操作 -->
+    <template #footer>
+      <el-button :disabled="tableList.length === 0" type="primary" @click="handleImportTable">
+        导入
+      </el-button>
+      <el-button @click="close">关闭</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as CodegenApi from '@/api/infra/codegen'
+import * as DataSourceConfigApi from '@/api/infra/dataSourceConfig'
+import { ElTable } from 'element-plus'
+
+defineOptions({ name: 'InfraCodegenImportTable' })
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dbTableLoading = ref(true) // 数据源的加载中
+const dbTableList = ref<CodegenApi.DatabaseTableVO[]>([]) // 表的列表
+const queryParams = reactive({
+  name: undefined,
+  comment: undefined,
+  dataSourceConfigId: 0
+})
+const queryFormRef = ref() // 搜索的表单
+const dataSourceConfigList = ref<DataSourceConfigApi.DataSourceConfigVO[]>([]) // 数据源列表
+
+/** 查询表数据 */
+const getList = async () => {
+  dbTableLoading.value = true
+  try {
+    dbTableList.value = await CodegenApi.getSchemaTableList(queryParams)
+  } finally {
+    dbTableLoading.value = false
+  }
+}
+
+/** 重置操作 */
+const resetQuery = async () => {
+  queryParams.name = undefined
+  queryParams.comment = undefined
+  queryParams.dataSourceConfigId = dataSourceConfigList.value[0].id as number
+  await getList()
+}
+
+/** 打开弹窗 */
+const open = async () => {
+  // 加载数据源的列表
+  dataSourceConfigList.value = await DataSourceConfigApi.getDataSourceConfigList()
+  queryParams.dataSourceConfigId = dataSourceConfigList.value[0].id as number
+  dialogVisible.value = true
+  // 加载表的列表
+  await getList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 关闭弹窗 */
+const close = () => {
+  dialogVisible.value = false
+  tableList.value = []
+}
+
+const tableRef = ref<typeof ElTable>() // 表格的 Ref
+const tableList = ref<string[]>([]) // 选中的表名
+
+/** 处理某一行的点击 */
+const handleRowClick = (row) => {
+  unref(tableRef)?.toggleRowSelection(row)
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection) => {
+  tableList.value = selection.map((item) => item.name)
+}
+
+/** 导入按钮操作 */
+const handleImportTable = async () => {
+  await CodegenApi.createCodegenList({
+    dataSourceConfigId: queryParams.dataSourceConfigId,
+    tableNames: tableList.value
+  })
+  message.success('导入成功')
+  emit('success')
+  close()
+}
+const emit = defineEmits(['success'])
+</script>
diff --git a/src/views/infra/codegen/index.vue b/src/views/infra/codegen/index.vue
new file mode 100644
index 000000000..3018fb097
--- /dev/null
+++ b/src/views/infra/codegen/index.vue
@@ -0,0 +1,258 @@
+<template>
+  <!-- 搜索 -->
+  <ContentWrap>
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="68px"
+    >
+      <el-form-item label="表名称" prop="tableName">
+        <el-input
+          v-model="queryParams.tableName"
+          class="!w-240px"
+          clearable
+          placeholder="请输入表名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="表描述" prop="tableComment">
+        <el-input
+          v-model="queryParams.tableComment"
+          class="!w-240px"
+          clearable
+          placeholder="请输入表描述"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain  @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button type="info" plain  @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button v-hasPermi="['infra:codegen:create']" type="primary" @click="openImportTable()">
+          <Icon class="mr-5px" icon="ep:zoom-in" />
+          导入
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column align="center" label="数据源">
+        <template #default="scope">
+          {{
+            dataSourceConfigList.find((config) => config.id === scope.row.dataSourceConfigId)?.name
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="表名称" prop="tableName" width="200" />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        align="center"
+        label="表描述"
+        prop="tableComment"
+        width="200"
+      />
+      <el-table-column align="center" label="实体" prop="className" width="200" />
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="创建时间"
+        prop="createTime"
+        width="180"
+      />
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="更新时间"
+        prop="createTime"
+        width="180"
+      />
+      <el-table-column align="center" fixed="right" label="操作" width="300px">
+        <template #default="scope">
+          <el-button
+            v-hasPermi="['infra:codegen:preview']"
+            link
+            type="primary"
+            @click="handlePreview(scope.row)"
+          >
+          <Icon icon="ep:view" />
+            预览
+          </el-button>
+          <el-button
+            v-hasPermi="['infra:codegen:update']"
+            link
+            type="primary"
+            @click="handleUpdate(scope.row.id)"
+          >
+          <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button
+            v-hasPermi="['infra:codegen:delete']"
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+           <Icon icon="ep:delete" />
+            删除
+          </el-button>
+          <el-button
+            v-hasPermi="['infra:codegen:update']"
+            link
+            type="primary"
+            @click="handleSyncDB(scope.row)"
+          >
+             <Icon icon="ep:refresh" />
+            同步
+          </el-button>
+          <el-button
+            v-hasPermi="['infra:codegen:download']"
+            link
+            type="primary"
+            @click="handleGenTable(scope.row)"
+          >
+             <Icon icon="fa:code" />
+            生成代码
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 弹窗：导入表 -->
+  <ImportTable ref="importRef" @success="getList" />
+  <!-- 弹窗：预览代码 -->
+  <PreviewCode ref="previewRef" />
+</template>
+<script lang="ts" setup>
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as CodegenApi from '@/api/infra/codegen'
+import * as DataSourceConfigApi from '@/api/infra/dataSourceConfig'
+import ImportTable from './importTable.vue'
+import PreviewCode from './PreviewCode.vue'
+
+defineOptions({ name: 'InfraCodegen' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const { push } = useRouter() // 路由跳转
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  tableName: undefined,
+  tableComment: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const dataSourceConfigList = ref<DataSourceConfigApi.DataSourceConfigVO[]>([]) // 数据源列表
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await CodegenApi.getCodegenTablePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 导入操作 */
+const importRef = ref()
+const openImportTable = () => {
+  importRef.value.open()
+}
+
+/** 编辑操作 */
+const handleUpdate = (id: number) => {
+  push('/codegen/edit?id=' + id)
+}
+
+/** 预览操作 */
+const previewRef = ref()
+const handlePreview = (row: CodegenApi.CodegenTableVO) => {
+  previewRef.value.open(row.id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await CodegenApi.deleteCodegenTable(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 同步操作  */
+const handleSyncDB = async (row: CodegenApi.CodegenTableVO) => {
+  // 基于 DB 同步
+  const tableName = row.tableName
+  try {
+    await message.confirm('确认要强制同步' + tableName + '表结构吗?', t('common.reminder'))
+    await CodegenApi.syncCodegenFromDB(row.id)
+    message.success('同步成功')
+  } catch {}
+}
+
+/** 生成代码操作 */
+const handleGenTable = async (row: CodegenApi.CodegenTableVO) => {
+  const res = await CodegenApi.downloadCodegen(row.id)
+  download.zip(res, 'codegen-' + row.className + '.zip')
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  // 加载数据源列表
+  dataSourceConfigList.value = await DataSourceConfigApi.getDataSourceConfigList()
+})
+</script>
diff --git a/src/views/infra/config/ConfigForm.vue b/src/views/infra/config/ConfigForm.vue
new file mode 100644
index 000000000..e8a7bac26
--- /dev/null
+++ b/src/views/infra/config/ConfigForm.vue
@@ -0,0 +1,155 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-form-item label="参数分类" prop="category">
+        <el-input v-model="formData.category" placeholder="请输入参数分类" />
+      </el-form-item>
+      <el-form-item label="参数名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入参数名称" />
+      </el-form-item>
+      <el-form-item label="参数键名" prop="key">
+        <el-input v-model="formData.key" placeholder="请输入参数键名" />
+      </el-form-item>
+      <el-form-item label="参数键值" prop="value">
+        <el-input v-model="formData.value" placeholder="请输入参数键值" />
+      </el-form-item>
+      <el-form-item label="物料类型">
+        <el-select v-model="formData.itemTypeList" multiple placeholder="配置物料类型">
+          <el-option v-for="item in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="库区类型">
+        <el-select v-model="formData.areaTypeList" multiple placeholder="库区类型">
+          <el-option v-for="item in getStrDictOptions(DICT_TYPE.AREA_TYPE)" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="库存状态">
+        <el-select v-model="formData.inventoryStatusList" multiple placeholder="库存状态">
+          <el-option v-for="item in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否可见" prop="visible">
+        <el-radio-group v-model="formData.visible">
+          <el-radio
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入内容" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getBoolDictOptions,getStrDictOptions } from '@/utils/dict'
+import * as ConfigApi from '@/api/infra/config'
+
+defineOptions({ name: 'InfraConfigForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  category: '',
+  name: '',
+  key: '',
+  value: '',
+  itemTypeList:'',
+  areaTypeList:'',
+  inventoryStatusList:'',
+  visible: true,
+  remark: ''
+})
+const formRules = reactive({
+  category: [{ required: true, message: '参数分类不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }],
+  key: [{ required: true, message: '参数键名不能为空', trigger: 'blur' }],
+  value: [{ required: true, message: '参数键值不能为空', trigger: 'blur' }],
+  visible: [{ required: true, message: '是否可见不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+// const itemTypeList = ref([]) // 物料类型列表
+
+
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ConfigApi.getConfig(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as ConfigApi.ConfigVO
+    if (formType.value === 'create') {
+      await ConfigApi.createConfig(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ConfigApi.updateConfig(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    category: '',
+    name: '',
+    key: '',
+    value: '',
+    itemTypeList:'',
+    areaTypeList:'',
+    inventoryStatusList:'',
+    visible: true,
+    remark: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue
new file mode 100644
index 000000000..c4835d17f
--- /dev/null
+++ b/src/views/infra/config/index.vue
@@ -0,0 +1,184 @@
+<template>
+  <!-- 搜索 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="参数名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入参数名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="参数键名" prop="key">
+        <el-input v-model="queryParams.key" placeholder="请输入参数键名" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="系统内置" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择系统内置" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_CONFIG_TYPE)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['infra:config:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button type="success" @click="handleExport" :loading="exportLoading" v-hasPermi="['infra:config:export']">
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="参数主键" align="left" prop="id"  :width="100"/>
+      <el-table-column label="参数分类" align="left" prop="category" :width="150"/>
+      <el-table-column label="参数名称" align="left" prop="name" :show-overflow-tooltip="true" :width="200"/>
+      <el-table-column label="参数键名" align="left" prop="key" :show-overflow-tooltip="true" :width="250"/>
+      <el-table-column label="参数键值" align="left" prop="value" :width="200"/>
+      <el-table-column label="物料类型" align="left" prop="itemType" :width="250">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ITEM_TYPE" :value="scope.row.itemType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="库区类型" align="left" prop="areaType" :width="250">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.AREA_TYPE" :value="scope.row.areaType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="库存状态" align="left" prop="inventoryStatus" :width="250">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INVENTORY_STATUS" :value="scope.row.inventoryStatus" />
+        </template>
+      </el-table-column>  
+      <el-table-column label="是否可见" align="center" prop="visible">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.visible" />
+        </template>
+      </el-table-column>
+      <el-table-column label="系统内置" align="center" prop="type" :width="150">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_CONFIG_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" :width="150"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" fixed="right" width="180">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['infra:config:update']">
+            <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['infra:config:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ConfigForm ref="formRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as ConfigApi from '@/api/infra/config'
+import ConfigForm from './ConfigForm.vue'
+
+defineOptions({ name: 'InfraConfig' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  key: undefined,
+  type: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ConfigApi.getConfigPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ConfigApi.deleteConfig(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ConfigApi.exportConfig(queryParams)
+    download.excel(data, '参数配置.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/infra/customInterface/index.vue b/src/views/infra/customInterface/index.vue
new file mode 100644
index 000000000..935922305
--- /dev/null
+++ b/src/views/infra/customInterface/index.vue
@@ -0,0 +1,21 @@
+<template>
+    <IFrame :src="src"/>
+</template>
+<script lang="ts" setup name="CustomInterface">
+// import { getAccessToken, getTenantId } from '@/utils/auth'
+const src = import.meta.env.VITE_INTERFACE_URL
+
+// window.MAGIC_EDITOR_CONFIG = {
+//   request: {
+//     beforeSend: function (config) {
+//       // 如果是基于Cookie验证的，此处可以不配。
+//       config.headers.token = getAccessToken() // 此处自行获取Token
+//       return config;
+//     }
+//   },
+//   getMagicTokenValue: function () {
+//     var token = getAccessToken(); // 此处自行获取token 
+//     return token;
+//   }
+// }
+</script>
diff --git a/src/views/infra/dataSourceConfig/DataSourceConfigForm.vue b/src/views/infra/dataSourceConfig/DataSourceConfigForm.vue
new file mode 100644
index 000000000..e2a4eaabd
--- /dev/null
+++ b/src/views/infra/dataSourceConfig/DataSourceConfigForm.vue
@@ -0,0 +1,111 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+    >
+      <el-form-item label="数据源名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入参数名称" />
+      </el-form-item>
+      <el-form-item label="数据源连接" prop="url">
+        <el-input v-model="formData.url" placeholder="请输入数据源连接" />
+      </el-form-item>
+      <el-form-item label="用户名" prop="username">
+        <el-input v-model="formData.username" placeholder="请输入用户名" />
+      </el-form-item>
+      <el-form-item label="密码" prop="password">
+        <el-input v-model="formData.password" placeholder="请输入密码" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as DataSourceConfigApi from '@/api/infra/dataSourceConfig'
+
+defineOptions({ name: 'InfraDataSourceConfigForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref<DataSourceConfigApi.DataSourceConfigVO>({
+  id: undefined,
+  name: '',
+  url: '',
+  username: '',
+  password: ''
+})
+const formRules = reactive({
+  name: [{ required: true, message: '数据源名称不能为空', trigger: 'blur' }],
+  url: [{ required: true, message: '数据源连接不能为空', trigger: 'blur' }],
+  username: [{ required: true, message: '用户名不能为空', trigger: 'blur' }],
+  password: [{ required: true, message: '密码不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await DataSourceConfigApi.getDataSourceConfig(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as DataSourceConfigApi.DataSourceConfigVO
+    if (formType.value === 'create') {
+      await DataSourceConfigApi.createDataSourceConfig(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DataSourceConfigApi.updateDataSourceConfig(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: '',
+    url: '',
+    username: '',
+    password: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/infra/dataSourceConfig/index.vue b/src/views/infra/dataSourceConfig/index.vue
new file mode 100644
index 000000000..6e12bee8b
--- /dev/null
+++ b/src/views/infra/dataSourceConfig/index.vue
@@ -0,0 +1,87 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :inline="true">
+      <el-form-item>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['infra:data-source-config:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="主键编号" align="center" prop="id" />
+      <el-table-column label="数据源名称" align="center" prop="name" />
+      <el-table-column label="数据源连接" align="center" prop="url" :show-overflow-tooltip="true" />
+      <el-table-column label="用户名" align="center" prop="username" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" fixed="right" width="180">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['infra:data-source-config:update']" :disabled="scope.row.id === 0">
+            <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)"
+            v-hasPermi="['infra:data-source-config:delete']" :disabled="scope.row.id === 0">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <DataSourceConfigForm ref="formRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { dateFormatter } from '@/utils/formatTime'
+import * as DataSourceConfigApi from '@/api/infra/dataSourceConfig'
+import DataSourceConfigForm from './DataSourceConfigForm.vue'
+
+defineOptions({ name: 'InfraDataSourceConfig' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    list.value = await DataSourceConfigApi.getDataSourceConfigList()
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await DataSourceConfigApi.deleteDataSourceConfig(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/infra/dbDoc/index.vue b/src/views/infra/dbDoc/index.vue
new file mode 100644
index 000000000..51481c76a
--- /dev/null
+++ b/src/views/infra/dbDoc/index.vue
@@ -0,0 +1,57 @@
+<template>
+  <ContentWrap title="数据库文档">
+    <div class="mb-10px">
+      <el-button type="primary" @click="handleExport('HTML')">
+        <Icon icon="ep:download" /> 导出 HTML
+      </el-button>
+      <el-button type="primary" @click="handleExport('Word')">
+        <Icon icon="ep:download" /> 导出 Word
+      </el-button>
+      <el-button type="primary" @click="handleExport('Markdown')">
+        <Icon icon="ep:download" /> 导出 Markdown
+      </el-button>
+    </div>
+    <IFrame v-if="!loading" v-loading="loading" :src="src" />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import download from '@/utils/download'
+import * as DbDocApi from '@/api/infra/dbDoc'
+
+defineOptions({ name: 'InfraDBDoc' })
+
+const loading = ref(true) // 是否加载中
+const src = ref('') // HTML 的地址
+
+/** 页面加载 */
+const init = async () => {
+  try {
+    const data = await DbDocApi.exportHtml()
+    const blob = new Blob([data], { type: 'text/html' })
+    src.value = window.URL.createObjectURL(blob)
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 处理导出  */
+const handleExport = async (type: string) => {
+  if (type === 'HTML') {
+    const res = await DbDocApi.exportHtml()
+    download.html(res, '数据库文档.html')
+  }
+  if (type === 'Word') {
+    const res = await DbDocApi.exportWord()
+    download.word(res, '数据库文档.doc')
+  }
+  if (type === 'Markdown') {
+    const res = await DbDocApi.exportMarkdown()
+    download.markdown(res, '数据库文档.md')
+  }
+}
+
+/** 初始化 */
+onMounted(async () => {
+  await init()
+})
+</script>
diff --git a/src/views/infra/druid/index.vue b/src/views/infra/druid/index.vue
new file mode 100644
index 000000000..3beac7414
--- /dev/null
+++ b/src/views/infra/druid/index.vue
@@ -0,0 +1,25 @@
+<template>
+  <ContentWrap>
+    <IFrame v-if="!loading" :src="url" />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import * as ConfigApi from '@/api/infra/config'
+
+defineOptions({ name: 'InfraDruid' })
+
+const loading = ref(true) // 是否加载中
+const url = ref(import.meta.env.VITE_BASE_URL + '/druid/index.html')
+
+/** 初始化 */
+onMounted(async () => {
+  try {
+    const data = await ConfigApi.getConfigKey('url.druid')
+    if (data && data.length > 0) {
+      url.value = data
+    }
+  } finally {
+    loading.value = false
+  }
+})
+</script>
diff --git a/src/views/infra/file/FileForm.vue b/src/views/infra/file/FileForm.vue
new file mode 100644
index 000000000..beeaea018
--- /dev/null
+++ b/src/views/infra/file/FileForm.vue
@@ -0,0 +1,104 @@
+<template>
+  <Dialog v-model="dialogVisible" title="上传文件">
+    <el-upload
+      ref="uploadRef"
+      v-model:file-list="fileList"
+      :action="url"
+      :auto-upload="false"
+      :data="data"
+      :disabled="formLoading"
+      :headers="uploadHeaders"
+      :limit="1"
+      :on-change="handleFileChange"
+      :on-error="submitFormError"
+      :on-exceed="handleExceed"
+      :on-success="submitFormSuccess"
+      accept=".jpg, .png, .gif"
+      drag
+    >
+      <i class="el-icon-upload"></i>
+      <div class="el-upload__text"> 将文件拖到此处，或 <em>点击上传</em></div>
+      <template #tip>
+        <div class="el-upload__tip" style="color: red">
+          提示：仅允许导入 jpg、png、gif 格式文件！
+        </div>
+      </template>
+    </el-upload>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitFileForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { getAccessToken, getTenantId } from '@/utils/auth'
+
+defineOptions({ name: 'InfraFileForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const url = import.meta.env.VITE_UPLOAD_URL
+const uploadHeaders = ref() // 上传 Header 头
+const fileList = ref([]) // 文件列表
+const data = ref({ path: '' })
+const uploadRef = ref()
+
+/** 打开弹窗 */
+const open = async () => {
+  dialogVisible.value = true
+  resetForm()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 处理上传的文件发生变化 */
+const handleFileChange = (file) => {
+  data.value.path = file.name
+}
+
+/** 提交表单 */
+const submitFileForm = () => {
+  if (fileList.value.length == 0) {
+    message.error('请上传文件')
+    return
+  }
+  // 提交请求
+  uploadHeaders.value = {
+    Authorization: 'Bearer ' + getAccessToken(),
+    'tenant-id': getTenantId()
+  }
+  unref(uploadRef)?.submit()
+}
+
+/** 文件上传成功处理 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitFormSuccess = () => {
+  // 清理
+  dialogVisible.value = false
+  formLoading.value = false
+  unref(uploadRef)?.clearFiles()
+  // 提示成功，并刷新
+  message.success(t('common.createSuccess'))
+  emit('success')
+}
+
+/** 上传错误提示 */
+const submitFormError = (): void => {
+  message.error('上传失败，请您重新上传！')
+  formLoading.value = false
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  // 重置上传状态和文件
+  formLoading.value = false
+  uploadRef.value?.clearFiles()
+}
+
+/** 文件数超出提示 */
+const handleExceed = (): void => {
+  message.error('最多只能上传一个文件！')
+}
+</script>
diff --git a/src/views/infra/file/index.vue b/src/views/infra/file/index.vue
new file mode 100644
index 000000000..4d864022b
--- /dev/null
+++ b/src/views/infra/file/index.vue
@@ -0,0 +1,164 @@
+<template>
+  <!-- 搜索 -->
+  <ContentWrap>
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="文件路径" prop="path">
+        <el-input
+          v-model="queryParams.path"
+          placeholder="请输入文件路径"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="文件类型" prop="type" width="80">
+        <el-input
+          v-model="queryParams.type"
+          placeholder="请输入文件类型"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain  @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button type="info" plain  @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button type="primary" @click="openForm">
+          <Icon icon="ep:upload" class="mr-5px" /> 上传文件
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="文件名" align="center" prop="name" :show-overflow-tooltip="true" />
+      <el-table-column label="文件路径" align="center" prop="path" :show-overflow-tooltip="true" />
+      <el-table-column label="URL" align="center" prop="url" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="文件大小"
+        align="center"
+        prop="size"
+        width="120"
+        :formatter="fileSizeFormatter"
+      />
+      <el-table-column label="文件类型" align="center" prop="type" width="180px" />
+      <el-table-column
+        label="上传时间"
+        align="center"
+        prop="createTime"
+        width="180"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="操作" align="center" fixed="right" width="120">
+        <template #default="scope">
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['infra:config:delete']"
+          >
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <FileForm ref="formRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { fileSizeFormatter } from '@/utils'
+import { dateFormatter } from '@/utils/formatTime'
+import * as FileApi from '@/api/infra/file'
+import FileForm from './FileForm.vue'
+
+defineOptions({ name: 'InfraFile' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  type: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await FileApi.getFilePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = () => {
+  formRef.value.open()
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await FileApi.deleteFile(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/infra/fileConfig/FileConfigForm.vue b/src/views/infra/fileConfig/FileConfigForm.vue
new file mode 100644
index 000000000..06b80e7d8
--- /dev/null
+++ b/src/views/infra/fileConfig/FileConfigForm.vue
@@ -0,0 +1,195 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+    >
+      <el-form-item label="配置名" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入配置名" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="存储器" prop="storage">
+        <el-select
+          v-model="formData.storage"
+          :disabled="formData.id !== undefined"
+          placeholder="请选择存储器"
+        >
+          <el-option
+            v-for="dict in getDictOptions(DICT_TYPE.INFRA_FILE_STORAGE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="parseInt(dict.value)"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- DB -->
+      <!-- Local / FTP / SFTP -->
+      <el-form-item
+        v-if="formData.storage >= 10 && formData.storage <= 12"
+        label="基础路径"
+        prop="config.basePath"
+      >
+        <el-input v-model="formData.config.basePath" placeholder="请输入基础路径" />
+      </el-form-item>
+      <el-form-item
+        v-if="formData.storage >= 11 && formData.storage <= 12"
+        label="主机地址"
+        prop="config.host"
+      >
+        <el-input v-model="formData.config.host" placeholder="请输入主机地址" />
+      </el-form-item>
+      <el-form-item
+        v-if="formData.storage >= 11 && formData.storage <= 12"
+        label="主机端口"
+        prop="config.port"
+      >
+        <el-input-number v-model="formData.config.port" :min="0" placeholder="请输入主机端口" />
+      </el-form-item>
+      <el-form-item
+        v-if="formData.storage >= 11 && formData.storage <= 12"
+        label="用户名"
+        prop="config.username"
+      >
+        <el-input v-model="formData.config.username" placeholder="请输入密码" />
+      </el-form-item>
+      <el-form-item
+        v-if="formData.storage >= 11 && formData.storage <= 12"
+        label="密码"
+        prop="config.password"
+      >
+        <el-input v-model="formData.config.password" placeholder="请输入密码" />
+      </el-form-item>
+      <el-form-item v-if="formData.storage === 11" label="连接模式" prop="config.mode">
+        <el-radio-group v-model="formData.config.mode">
+          <el-radio key="Active" label="Active">主动模式</el-radio>
+          <el-radio key="Passive" label="Passive">被动模式</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- S3 -->
+      <el-form-item v-if="formData.storage === 20" label="节点地址" prop="config.endpoint">
+        <el-input v-model="formData.config.endpoint" placeholder="请输入节点地址" />
+      </el-form-item>
+      <el-form-item v-if="formData.storage === 20" label="存储 bucket" prop="config.bucket">
+        <el-input v-model="formData.config.bucket" placeholder="请输入 bucket" />
+      </el-form-item>
+      <el-form-item v-if="formData.storage === 20" label="accessKey" prop="config.accessKey">
+        <el-input v-model="formData.config.accessKey" placeholder="请输入 accessKey" />
+      </el-form-item>
+      <el-form-item v-if="formData.storage === 20" label="accessSecret" prop="config.accessSecret">
+        <el-input v-model="formData.config.accessSecret" placeholder="请输入 accessSecret" />
+      </el-form-item>
+      <!-- 通用 -->
+      <el-form-item v-if="formData.storage === 20" label="自定义域名">
+        <!-- 无需参数校验，所以去掉 prop -->
+        <el-input v-model="formData.config.domain" placeholder="请输入自定义域名" />
+      </el-form-item>
+      <el-form-item v-else-if="formData.storage" label="自定义域名" prop="config.domain">
+        <el-input v-model="formData.config.domain" placeholder="请输入自定义域名" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import * as FileConfigApi from '@/api/infra/fileConfig'
+
+defineOptions({ name: 'InfraFileConfigForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: '',
+  storage: 0,
+  remark: '',
+  config: {}
+})
+const formRules = reactive({
+  name: [{ required: true, message: '配置名不能为空', trigger: 'blur' }],
+  storage: [{ required: true, message: '存储器不能为空', trigger: 'change' }],
+  config: {
+    basePath: [{ required: true, message: '基础路径不能为空', trigger: 'blur' }],
+    host: [{ required: true, message: '主机地址不能为空', trigger: 'blur' }],
+    port: [{ required: true, message: '主机端口不能为空', trigger: 'blur' }],
+    username: [{ required: true, message: '用户名不能为空', trigger: 'blur' }],
+    password: [{ required: true, message: '密码不能为空', trigger: 'blur' }],
+    mode: [{ required: true, message: '连接模式不能为空', trigger: 'change' }],
+    endpoint: [{ required: true, message: '节点地址不能为空', trigger: 'blur' }],
+    bucket: [{ required: true, message: '存储 bucket 不能为空', trigger: 'blur' }],
+    accessKey: [{ required: true, message: 'accessKey 不能为空', trigger: 'blur' }],
+    accessSecret: [{ required: true, message: 'accessSecret 不能为空', trigger: 'blur' }],
+    domain: [{ required: true, message: '自定义域名不能为空', trigger: 'blur' }]
+  }
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await FileConfigApi.getFileConfig(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as FileConfigApi.FileConfigVO
+    if (formType.value === 'create') {
+      await FileConfigApi.createFileConfig(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await FileConfigApi.updateFileConfig(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: '',
+    storage: 0,
+    remark: '',
+    config: {}
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/infra/fileConfig/index.vue b/src/views/infra/fileConfig/index.vue
new file mode 100644
index 000000000..eec0dd368
--- /dev/null
+++ b/src/views/infra/fileConfig/index.vue
@@ -0,0 +1,168 @@
+<template>
+  <!-- 搜索 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="配置名" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入配置名" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="存储器" prop="storage">
+        <el-select v-model="queryParams.storage" placeholder="请选择存储器" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_FILE_STORAGE)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['infra:file-config:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="配置名" align="center" prop="name" />
+      <el-table-column label="存储器" align="center" prop="storage">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_FILE_STORAGE" :value="scope.row.storage" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="主配置" align="center" prop="primary">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.master" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" width="320px" fixed="right">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['infra:file-config:update']">
+            <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button link type="primary" :disabled="scope.row.master" @click="handleMaster(scope.row.id)"
+            v-hasPermi="['infra:file-config:update']">
+            <Icon icon="ep:tools" />
+            主配置
+          </el-button>
+          <el-button link type="primary" @click="handleTest(scope.row.id)">
+            <Icon icon="ep:cellphone" />测试
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['infra:config:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <FileConfigForm ref="formRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import * as FileConfigApi from '@/api/infra/fileConfig'
+import FileConfigForm from './FileConfigForm.vue'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+
+defineOptions({ name: 'InfraFileConfig' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  storage: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await FileConfigApi.getFileConfigPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await FileConfigApi.deleteFileConfig(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 主配置按钮操作 */
+const handleMaster = async (id) => {
+  try {
+    await message.confirm('是否确认修改配置编号为"' + id + '"的数据项为主配置?')
+    await FileConfigApi.updateFileConfigMaster(id)
+    message.success(t('common.updateSuccess'))
+    await getList()
+  } catch { }
+}
+
+/** 测试按钮操作 */
+const handleTest = async (id) => {
+  try {
+    const response = await FileConfigApi.testFileConfig(id)
+    message.alert('测试通过，上传文件成功！访问地址：' + response)
+  } catch { }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/infra/job/JobDetail.vue b/src/views/infra/job/JobDetail.vue
new file mode 100644
index 000000000..db91d0f82
--- /dev/null
+++ b/src/views/infra/job/JobDetail.vue
@@ -0,0 +1,73 @@
+<template>
+  <Dialog v-model="dialogVisible" title="任务详细" width="700px">
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="任务编号" min-width="60">
+        {{ detailData.id }}
+      </el-descriptions-item>
+      <el-descriptions-item label="任务名称">
+        {{ detailData.name }}
+      </el-descriptions-item>
+      <el-descriptions-item label="任务名称">
+        <dict-tag :type="DICT_TYPE.INFRA_JOB_STATUS" :value="detailData.status" />
+      </el-descriptions-item>
+      <el-descriptions-item label="处理器的名字">
+        {{ detailData.handlerName }}
+      </el-descriptions-item>
+      <el-descriptions-item label="处理器的参数">
+        {{ detailData.handlerParam }}
+      </el-descriptions-item>
+      <el-descriptions-item label="Cron 表达式">
+        {{ detailData.cronExpression }}
+      </el-descriptions-item>
+      <el-descriptions-item label="重试次数">
+        {{ detailData.retryCount }}
+      </el-descriptions-item>
+      <el-descriptions-item label="重试间隔">
+        {{ detailData.retryInterval + ' 毫秒' }}
+      </el-descriptions-item>
+      <el-descriptions-item label="监控超时时间">
+        {{ detailData.monitorTimeout > 0 ? detailData.monitorTimeout + ' 毫秒' : '未开启' }}
+      </el-descriptions-item>
+      <el-descriptions-item label="后续执行时间">
+        <el-timeline>
+          <el-timeline-item
+            v-for="(nextTime, index) in nextTimes"
+            :key="index"
+            :timestamp="formatDate(nextTime)"
+          >
+            第 {{ index + 1 }} 次
+          </el-timeline-item>
+        </el-timeline>
+      </el-descriptions-item>
+    </el-descriptions>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import * as JobApi from '@/api/infra/job'
+
+defineOptions({ name: 'InfraJobDetail' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref({}) // 详情数据
+const nextTimes = ref([]) // 下一轮执行时间的数组
+
+/** 打开弹窗 */
+const open = async (id: number) => {
+  dialogVisible.value = true
+  // 查看，设置数据
+  if (id) {
+    detailLoading.value = true
+    try {
+      detailData.value = await JobApi.getJob(id)
+      // 获取下一次执行时间
+      nextTimes.value = await JobApi.getJobNextTimes(id)
+    } finally {
+      detailLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/infra/job/JobForm.vue b/src/views/infra/job/JobForm.vue
new file mode 100644
index 000000000..632eef7f8
--- /dev/null
+++ b/src/views/infra/job/JobForm.vue
@@ -0,0 +1,131 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="任务名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入任务名称" />
+      </el-form-item>
+      <el-form-item label="处理器的名字" prop="handlerName">
+        <el-input
+          :readonly="formData.id !== undefined"
+          v-model="formData.handlerName"
+          placeholder="请输入处理器的名字"
+        />
+      </el-form-item>
+      <el-form-item label="处理器的参数" prop="handlerParam">
+        <el-input v-model="formData.handlerParam" placeholder="请输入处理器的参数" />
+      </el-form-item>
+      <el-form-item label="CRON 表达式" prop="cronExpression">
+        <crontab v-model="formData.cronExpression" />
+      </el-form-item>
+      <el-form-item label="重试次数" prop="retryCount">
+        <el-input
+          v-model="formData.retryCount"
+          placeholder="请输入重试次数。设置为 0 时，不进行重试"
+        />
+      </el-form-item>
+      <el-form-item label="重试间隔" prop="retryInterval">
+        <el-input
+          v-model="formData.retryInterval"
+          placeholder="请输入重试间隔，单位：毫秒。设置为 0 时，无需间隔"
+        />
+      </el-form-item>
+      <el-form-item label="监控超时时间" prop="monitorTimeout">
+        <el-input v-model="formData.monitorTimeout" placeholder="请输入监控超时时间，单位：毫秒" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" @click="submitForm" :loading="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as JobApi from '@/api/infra/job'
+
+defineOptions({ name: 'JobForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: '',
+  handlerName: '',
+  handlerParam: '',
+  cronExpression: ''
+})
+const formRules = reactive({
+  name: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
+  handlerName: [{ required: true, message: '处理器的名字不能为空', trigger: 'blur' }],
+  cronExpression: [{ required: true, message: 'CRON 表达式不能为空', trigger: 'blur' }],
+  retryCount: [{ required: true, message: '重试次数不能为空', trigger: 'blur' }],
+  retryInterval: [{ required: true, message: '重试间隔不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await JobApi.getJob(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交按钮 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as JobApi.JobVO
+    if (formType.value === 'create') {
+      await JobApi.createJob(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await JobApi.updateJob(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: '',
+    handlerName: '',
+    handlerParam: '',
+    cronExpression: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/infra/job/index.vue b/src/views/infra/job/index.vue
new file mode 100644
index 000000000..d662abc17
--- /dev/null
+++ b/src/views/infra/job/index.vue
@@ -0,0 +1,255 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="100px">
+      <el-form-item label="任务名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入任务名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="任务状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_JOB_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="处理器的名字" prop="handlerName">
+        <el-input v-model="queryParams.handlerName" placeholder="请输入处理器的名字" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['infra:job:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button type="success" @click="handleExport" :loading="exportLoading" v-hasPermi="['infra:job:export']">
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+        <el-button type="warning" @click="handleJobLog" v-hasPermi="['infra:job:query']">
+          <Icon icon="ep:zoom-in" class="mr-5px" /> 执行日志
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="任务编号" align="center" prop="id" />
+      <el-table-column label="任务名称" align="center" prop="name" />
+      <el-table-column label="任务状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_JOB_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="处理器的名字" align="center" prop="handlerName" />
+      <el-table-column label="处理器的参数" align="center" prop="handlerParam" />
+      <el-table-column label="CRON 表达式" align="center" prop="cronExpression" />
+      <el-table-column label="操作" align="center" fixed="right" width="260">
+        <template #default="scope">
+          <el-button type="primary" link @click="openForm('update', scope.row.id)" v-hasPermi="['infra:job:update']">
+            <Icon icon="ep:edit" />
+            修改
+          </el-button>
+          <el-button type="primary" link @click="handleChangeStatus(scope.row)" v-hasPermi="['infra:job:update']">
+            <Icon :icon="scope.row.status === InfraJobStatusEnum.STOP ? 'ep:video-play' : 'ep:video-pause'" />
+            {{ scope.row.status === InfraJobStatusEnum.STOP ? '开启' : '暂停' }}
+          </el-button>
+          <el-button type="danger" link @click="handleDelete(scope.row.id)" v-hasPermi="['infra:job:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+          <el-dropdown @command="(command) => handleCommand(command, scope.row)"
+            v-hasPermi="['infra:job:trigger', 'infra:job:query']">
+            <el-button type="primary" link>
+              <Icon icon="ep:d-arrow-right" /> 更多
+            </el-button>
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item command="handleRun" v-if="checkPermi(['infra:job:trigger'])">
+                 <Icon icon="ep:video-play" /> 执行一次
+                </el-dropdown-item>
+                <el-dropdown-item command="openDetail" v-if="checkPermi(['infra:job:query'])">
+                  <Icon icon="fa-solid:tasks" />任务详细
+                </el-dropdown-item>
+                <el-dropdown-item command="handleJobLog" v-if="checkPermi(['infra:job:query'])">
+                 <Icon icon="ep:document" /> 调度日志
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <JobForm ref="formRef" @success="getList" />
+  <!-- 表单弹窗：查看 -->
+  <JobDetail ref="detailRef" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { checkPermi } from '@/utils/permission'
+import JobForm from './JobForm.vue'
+import JobDetail from './JobDetail.vue'
+import download from '@/utils/download'
+import * as JobApi from '@/api/infra/job'
+import { InfraJobStatusEnum } from '@/utils/constants'
+
+defineOptions({ name: 'InfraJob' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const { push } = useRouter() // 路由
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  status: undefined,
+  handlerName: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await JobApi.getJobPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await JobApi.exportJob(queryParams)
+    download.excel(data, '定时任务.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 修改状态操作 */
+const handleChangeStatus = async (row: JobApi.JobVO) => {
+  try {
+    // 修改状态的二次确认
+    const text = row.status === InfraJobStatusEnum.STOP ? '开启' : '关闭'
+    await message.confirm(
+      '确认要' + text + '定时任务编号为"' + row.id + '"的数据项?',
+      t('common.reminder')
+    )
+    const status =
+      row.status === InfraJobStatusEnum.STOP ? InfraJobStatusEnum.NORMAL : InfraJobStatusEnum.STOP
+    await JobApi.updateJobStatus(row.id, status)
+    message.success(text + '成功')
+    // 刷新列表
+    await getList()
+  } catch {
+    // 取消后，进行恢复按钮
+    row.status =
+      row.status === InfraJobStatusEnum.NORMAL ? InfraJobStatusEnum.STOP : InfraJobStatusEnum.NORMAL
+  }
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await JobApi.deleteJob(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** '更多'操作按钮 */
+const handleCommand = (command, row) => {
+  switch (command) {
+    case 'handleRun':
+      handleRun(row)
+      break
+    case 'openDetail':
+      openDetail(row.id)
+      break
+    case 'handleJobLog':
+      handleJobLog(row?.id)
+      break
+    default:
+      break
+  }
+}
+
+/** 执行一次 */
+const handleRun = async (row: JobApi.JobVO) => {
+  try {
+    // 二次确认
+    await message.confirm('确认要立即执行一次' + row.name + '?', t('common.reminder'))
+    // 提交执行
+    await JobApi.runJob(row.id)
+    message.success('执行成功')
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 查看操作 */
+const detailRef = ref()
+const openDetail = (id: number) => {
+  detailRef.value.open(id)
+}
+
+/** 跳转执行日志 */
+const handleJobLog = (id: number) => {
+  if (id > 0) {
+    push('/job/job-log?id=' + id)
+  } else {
+    push('/job/job-log')
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/infra/job/logger/JobLogDetail.vue b/src/views/infra/job/logger/JobLogDetail.vue
new file mode 100644
index 000000000..a010c9473
--- /dev/null
+++ b/src/views/infra/job/logger/JobLogDetail.vue
@@ -0,0 +1,59 @@
+<template>
+  <Dialog v-model="dialogVisible" title="任务详细" width="700px">
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="日志编号" min-width="60">
+        {{ detailData.id }}
+      </el-descriptions-item>
+      <el-descriptions-item label="任务编号">
+        {{ detailData.jobId }}
+      </el-descriptions-item>
+      <el-descriptions-item label="处理器的名字">
+        {{ detailData.handlerName }}
+      </el-descriptions-item>
+      <el-descriptions-item label="处理器的参数">
+        {{ detailData.handlerParam }}
+      </el-descriptions-item>
+      <el-descriptions-item label="第几次执行">
+        {{ detailData.executeIndex }}
+      </el-descriptions-item>
+      <el-descriptions-item label="执行时间">
+        {{ formatDate(detailData.beginTime) + ' ~ ' + formatDate(detailData.endTime) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="执行时长">
+        {{ detailData.duration + ' 毫秒' }}
+      </el-descriptions-item>
+      <el-descriptions-item label="任务状态">
+        <dict-tag :type="DICT_TYPE.INFRA_JOB_LOG_STATUS" :value="detailData.status" />
+      </el-descriptions-item>
+      <el-descriptions-item label="执行结果">
+        {{ detailData.duration + ' result' }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import * as JobLogApi from '@/api/infra/jobLog'
+
+defineOptions({ name: 'JobLogDetail' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref({}) // 详情数据
+
+/** 打开弹窗 */
+const open = async (id: number) => {
+  dialogVisible.value = true
+  // 查看，设置数据
+  if (id) {
+    detailLoading.value = true
+    try {
+      detailData.value = await JobLogApi.getJobLog(id)
+    } finally {
+      detailLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/infra/job/logger/index.vue b/src/views/infra/job/logger/index.vue
new file mode 100644
index 000000000..a9fb08f97
--- /dev/null
+++ b/src/views/infra/job/logger/index.vue
@@ -0,0 +1,196 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="120px"
+    >
+      <el-form-item label="处理器的名字" prop="handlerName">
+        <el-input
+          v-model="queryParams.handlerName"
+          placeholder="请输入处理器的名字"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="开始执行时间" prop="beginTime">
+        <el-date-picker
+          v-model="queryParams.beginTime"
+          type="date"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="选择开始执行时间"
+          clearable
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="结束执行时间" prop="endTime">
+        <el-date-picker
+          v-model="queryParams.endTime"
+          type="date"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="选择结束执行时间"
+          clearable
+          :default-time="new Date('1 23:59:59')"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="任务状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择任务状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_JOB_LOG_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['infra:job:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="日志编号" align="center" prop="id" />
+      <el-table-column label="任务编号" align="center" prop="jobId" />
+      <el-table-column label="处理器的名字" align="center" prop="handlerName" />
+      <el-table-column label="处理器的参数" align="center" prop="handlerParam" />
+      <el-table-column label="第几次执行" align="center" prop="executeIndex" />
+      <el-table-column label="执行时间" align="center" width="170s">
+        <template #default="scope">
+          <span>{{ formatDate(scope.row.beginTime) + ' ~ ' + formatDate(scope.row.endTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="执行时长" align="center" prop="duration">
+        <template #default="scope">
+          <span>{{ scope.row.duration + ' 毫秒' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_JOB_LOG_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            type="primary"
+            link
+            @click="openDetail(scope.row.id)"
+            v-hasPermi="['infra:job:query']"
+          >
+            详细
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：查看 -->
+  <JobLogDetail ref="detailRef" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import download from '@/utils/download'
+import JobLogDetail from './JobLogDetail.vue'
+import * as JobLogApi from '@/api/infra/jobLog'
+
+defineOptions({ name: 'InfraJobLog' })
+
+const message = useMessage() // 消息弹窗
+const { query } = useRoute() // 查询参数
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  jobId: query.id,
+  handlerName: undefined,
+  beginTime: undefined,
+  endTime: undefined,
+  status: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await JobLogApi.getJobLogPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 查看操作 */
+const detailRef = ref()
+const openDetail = (rowId?: number) => {
+  detailRef.value.open(rowId)
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await JobLogApi.exportJobLog(queryParams)
+    download.excel(data, '定时任务执行日志.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/infra/redis/index.vue b/src/views/infra/redis/index.vue
new file mode 100644
index 000000000..1924b7966
--- /dev/null
+++ b/src/views/infra/redis/index.vue
@@ -0,0 +1,266 @@
+<template>
+  <el-scrollbar height="calc(100vh - 88px - 40px - 50px)">
+    <el-row>
+      <!-- 基本信息 -->
+      <el-col :span="24" class="card-box" shadow="hover">
+        <el-card>
+          <el-descriptions title="基本信息" :column="6" border>
+            <el-descriptions-item label="Redis版本 :">
+              {{ cache?.info?.redis_version }}
+            </el-descriptions-item>
+            <el-descriptions-item label="运行模式 :">
+              {{ cache?.info?.redis_mode == 'standalone' ? '单机' : '集群' }}
+            </el-descriptions-item>
+            <el-descriptions-item label="端口 :">
+              {{ cache?.info?.tcp_port }}
+            </el-descriptions-item>
+            <el-descriptions-item label="客户端数 :">
+              {{ cache?.info?.connected_clients }}
+            </el-descriptions-item>
+            <el-descriptions-item label="运行时间(天) :">
+              {{ cache?.info?.uptime_in_days }}
+            </el-descriptions-item>
+            <el-descriptions-item label="使用内存 :">
+              {{ cache?.info?.used_memory_human }}
+            </el-descriptions-item>
+            <el-descriptions-item label="使用CPU :">
+              {{ cache?.info ? parseFloat(cache?.info?.used_cpu_user_children).toFixed(2) : '' }}
+            </el-descriptions-item>
+            <el-descriptions-item label="内存配置 :">
+              {{ cache?.info?.maxmemory_human }}
+            </el-descriptions-item>
+            <el-descriptions-item label="AOF是否开启 :">
+              {{ cache?.info?.aof_enabled == '0' ? '否' : '是' }}
+            </el-descriptions-item>
+            <el-descriptions-item label="RDB是否成功 :">
+              {{ cache?.info?.rdb_last_bgsave_status }}
+            </el-descriptions-item>
+            <el-descriptions-item label="Key数量 :">
+              {{ cache?.dbSize }}
+            </el-descriptions-item>
+            <el-descriptions-item label="网络入口/出口 :">
+              {{ cache?.info?.instantaneous_input_kbps }}kps/
+              {{ cache?.info?.instantaneous_output_kbps }}kps
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+      </el-col>
+      <!-- 命令统计 -->
+      <el-col :span="12" class="mt-3">
+        <el-card :gutter="12" shadow="hover">
+          <Echart :options="commandStatsRefChika" :height="420" />
+        </el-card>
+      </el-col>
+      <!-- 内存使用量统计 -->
+      <el-col :span="12" class="mt-3">
+        <el-card class="ml-3" :gutter="12" shadow="hover">
+          <Echart :options="usedmemoryEchartChika" :height="420" />
+        </el-card>
+      </el-col>
+    </el-row>
+  </el-scrollbar>
+</template>
+<script lang="ts" setup>
+import * as RedisApi from '@/api/infra/redis'
+import { RedisMonitorInfoVO } from '@/api/infra/redis/types'
+const cache = ref<RedisMonitorInfoVO>()
+
+// 基本信息
+const readRedisInfo = async () => {
+  const data = await RedisApi.getCache()
+  cache.value = data
+}
+
+// 内存使用情况
+const usedmemoryEchartChika = reactive<any>({
+  title: {
+    // 仪表盘标题。
+    text: '内存使用情况',
+    left: 'center',
+    show: true, // 是否显示标题,默认 true。
+    offsetCenter: [0, '20%'], //相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
+    color: 'yellow', // 文字的颜色,默认 #333。
+    fontSize: 20 // 文字的字体大小,默认 15。
+  },
+  toolbox: {
+    show: false,
+    feature: {
+      restore: { show: true },
+      saveAsImage: { show: true }
+    }
+  },
+  series: [
+    {
+      name: '峰值',
+      type: 'gauge',
+      min: 0,
+      max: 50,
+      splitNumber: 10,
+      //这是指针的颜色
+      color: '#F5C74E',
+      radius: '85%',
+      center: ['50%', '50%'],
+      startAngle: 225,
+      endAngle: -45,
+      axisLine: {
+        // 坐标轴线
+        lineStyle: {
+          // 属性lineStyle控制线条样式
+          color: [
+            [0.2, '#7FFF00'],
+            [0.8, '#00FFFF'],
+            [1, '#FF0000']
+          ],
+          //width: 6 外框的大小（环的宽度）
+          width: 10
+        }
+      },
+      axisTick: {
+        // 坐标轴小标记
+        //里面的线长是5（短线）
+        length: 5, // 属性length控制线长
+        lineStyle: {
+          // 属性lineStyle控制线条样式
+          color: '#76D9D7'
+        }
+      },
+      splitLine: {
+        // 分隔线
+        length: 20, // 属性length控制线长
+        lineStyle: {
+          // 属性lineStyle（详见lineStyle）控制线条样式
+          color: '#76D9D7'
+        }
+      },
+      axisLabel: {
+        color: '#76D9D7',
+        distance: 15,
+        fontSize: 15
+      },
+      pointer: {
+        // 指针的大小
+        width: 7,
+        show: true
+      },
+      detail: {
+        textStyle: {
+          fontWeight: 'normal',
+          // 里面文字下的数值大小（50）
+          fontSize: 15,
+          color: '#FFFFFF'
+        },
+        valueAnimation: true
+      },
+      progress: {
+        show: true
+      }
+    }
+  ]
+})
+
+// 指令使用情况
+const commandStatsRefChika = reactive({
+  title: {
+    text: '命令统计',
+    left: 'center'
+  },
+  tooltip: {
+    trigger: 'item',
+    formatter: '{a} <br/>{b} : {c} ({d}%)'
+  },
+  legend: {
+    type: 'scroll',
+    orient: 'vertical',
+    right: 30,
+    top: 10,
+    bottom: 20,
+    data: [] as any[],
+    textStyle: {
+      color: '#a1a1a1'
+    }
+  },
+  series: [
+    {
+      name: '命令',
+      type: 'pie',
+      radius: [20, 120],
+      center: ['40%', '60%'],
+      data: [] as any[],
+      roseType: 'radius',
+      label: {
+        show: true
+      },
+      emphasis: {
+        label: {
+          show: true
+        },
+        itemStyle: {
+          shadowBlur: 10,
+          shadowOffsetX: 0,
+          shadowColor: 'rgba(0, 0, 0, 0.5)'
+        }
+      }
+    }
+  ]
+})
+
+/** 加载数据 */
+const getSummary = () => {
+  // 初始化命令图表
+  initCommandStatsChart()
+  usedMemoryInstance()
+}
+
+/** 命令使用情况 */
+const initCommandStatsChart = async () => {
+  usedmemoryEchartChika.series[0].data = []
+  // 发起请求
+  try {
+    const data = await RedisApi.getCache()
+    cache.value = data
+    // 处理数据
+    const commandStats = [] as any[]
+    const nameList = [] as string[]
+    data.commandStats.forEach((row) => {
+      commandStats.push({
+        name: row.command,
+        value: row.calls
+      })
+      nameList.push(row.command)
+    })
+    commandStatsRefChika.legend.data = nameList
+    commandStatsRefChika.series[0].data = commandStats
+  } catch {}
+}
+const usedMemoryInstance = async () => {
+  try {
+    const data = await RedisApi.getCache()
+    cache.value = data
+    // 仪表盘详情，用于显示数据。
+    usedmemoryEchartChika.series[0].detail = {
+      show: true, // 是否显示详情,默认 true。
+      offsetCenter: [0, '50%'], // 相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
+      color: 'auto', // 文字的颜色,默认 auto。
+      fontSize: 30, // 文字的字体大小,默认 15。
+      formatter: cache.value!.info.used_memory_human // 格式化函数或者字符串
+    }
+
+    usedmemoryEchartChika.series[0].data[0] = {
+      value: cache.value!.info.used_memory_human,
+      name: '内存消耗'
+    }
+    console.log(cache.value!.info)
+    usedmemoryEchartChika.tooltip = {
+      formatter: '{b} <br/>{a} : ' + cache.value!.info.used_memory_human
+    }
+  } catch {}
+}
+
+/** 初始化 **/
+onMounted(() => {
+  // 读取 redis 信息
+  readRedisInfo()
+  // 加载数据
+  getSummary()
+})
+</script>
diff --git a/src/views/infra/server/index.vue b/src/views/infra/server/index.vue
new file mode 100644
index 000000000..da839bd89
--- /dev/null
+++ b/src/views/infra/server/index.vue
@@ -0,0 +1,28 @@
+<template>
+  <ContentWrap>
+    <IFrame v-if="!loading" v-loading="loading" :src="src" />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import * as ConfigApi from '@/api/infra/config'
+
+defineOptions({ name: 'InfraAdminServer' })
+
+const loading = ref(true) // 是否加载中
+const src = ref(import.meta.env.VITE_BASE_URL + '/admin/applications')
+
+/** 初始化 */
+onMounted(async () => {
+  try {
+    // 友情提示：如果访问出现 404 问题：
+    // 1）boot 参考 https://doc.iocoder.cn/server-monitor/ 解决；
+    // 2）cloud 参考 https://cloud.iocoder.cn/server-monitor/ 解决
+    const data = await ConfigApi.getConfigKey('url.spring-boot-admin')
+    if (data && data.length > 0) {
+      src.value = data
+    }
+  } finally {
+    loading.value = false
+  }
+})
+</script>
diff --git a/src/views/infra/skywalking/index.vue b/src/views/infra/skywalking/index.vue
new file mode 100644
index 000000000..7918a055c
--- /dev/null
+++ b/src/views/infra/skywalking/index.vue
@@ -0,0 +1,25 @@
+<template>
+  <ContentWrap>
+    <IFrame v-if="!loading" v-loading="loading" :src="src" />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import * as ConfigApi from '@/api/infra/config'
+
+defineOptions({ name: 'InfraSkyWalking' })
+
+const loading = ref(true) // 是否加载中
+const src = ref('http://skywalking.shop.iocoder.cn')
+
+/** 初始化 */
+onMounted(async () => {
+  try {
+    const data = await ConfigApi.getConfigKey('url.skywalking')
+    if (data && data.length > 0) {
+      src.value = data
+    }
+  } finally {
+    loading.value = false
+  }
+})
+</script>
diff --git a/src/views/infra/swagger/index.vue b/src/views/infra/swagger/index.vue
new file mode 100644
index 000000000..4c39c13de
--- /dev/null
+++ b/src/views/infra/swagger/index.vue
@@ -0,0 +1,26 @@
+<template>
+  <ContentWrap>
+    <IFrame :src="src" />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import * as ConfigApi from '@/api/infra/config'
+
+defineOptions({ name: 'InfraSwagger' })
+
+const loading = ref(true) // 是否加载中
+const src = ref(import.meta.env.VITE_BASE_URL + '/doc.html') // Knife4j UI
+// const src = ref(import.meta.env.VITE_BASE_URL + '/swagger-ui') // Swagger UI
+
+/** 初始化 */
+onMounted(async () => {
+  try {
+    const data = await ConfigApi.getConfigKey('url.swagger')
+    if (data && data.length > 0) {
+      src.value = data
+    }
+  } finally {
+    loading.value = false
+  }
+})
+</script>
diff --git a/src/views/infra/testDemo/index.vue b/src/views/infra/testDemo/index.vue
new file mode 100644
index 000000000..ca6a5b076
--- /dev/null
+++ b/src/views/infra/testDemo/index.vue
@@ -0,0 +1,4 @@
+<template>
+  <div>index</div>
+</template>
+<script lang="ts" setup></script>
diff --git a/src/views/infra/webSocket/index.vue b/src/views/infra/webSocket/index.vue
new file mode 100644
index 000000000..ce6db7983
--- /dev/null
+++ b/src/views/infra/webSocket/index.vue
@@ -0,0 +1,118 @@
+<template>
+  <div class="flex">
+    <el-card :gutter="12" class="w-1/2" shadow="always">
+      <template #header>
+        <div class="card-header">
+          <span>连接</span>
+        </div>
+      </template>
+      <div class="flex items-center">
+        <span class="mr-4 text-lg font-medium"> 连接状态: </span>
+        <el-tag :color="getTagColor">{{ status }}</el-tag>
+      </div>
+      <hr class="my-4" />
+
+      <div class="flex">
+        <el-input v-model="server" disabled>
+          <template #prepend> 服务地址</template>
+        </el-input>
+        <el-button :type="getIsOpen ? 'danger' : 'primary'" @click="toggle">
+          {{ getIsOpen ? '关闭连接' : '开启连接' }}
+        </el-button>
+      </div>
+      <p class="mt-4 text-lg font-medium">设置</p>
+      <hr class="my-4" />
+      <el-input
+        v-model="sendValue"
+        :autosize="{ minRows: 2, maxRows: 4 }"
+        :disabled="!getIsOpen"
+        clearable
+        type="textarea"
+      />
+      <el-button :disabled="!getIsOpen" block class="mt-4" type="primary" @click="handlerSend">
+        发送
+      </el-button>
+    </el-card>
+    <el-card :gutter="12" class="w-1/2" shadow="always">
+      <template #header>
+        <div class="card-header">
+          <span>消息记录</span>
+        </div>
+      </template>
+      <div class="max-h-80 overflow-auto">
+        <ul>
+          <li v-for="item in getList" :key="item.time" class="mt-2">
+            <div class="flex items-center">
+              <span class="text-primary mr-2 font-medium">收到消息:</span>
+              <span>{{ formatDate(item.time) }}</span>
+            </div>
+            <div>
+              {{ item.res }}
+            </div>
+          </li>
+        </ul>
+      </div>
+    </el-card>
+  </div>
+</template>
+<script lang="ts" setup>
+import { formatDate } from '@/utils/formatTime'
+import { useUserStore } from '@/store/modules/user'
+import { useWebSocket } from '@vueuse/core'
+
+defineOptions({ name: 'InfraWebSocket' })
+
+const userStore = useUserStore()
+
+const sendValue = ref('')
+
+const server = ref(
+  (import.meta.env.VITE_BASE_URL + '/websocket/message').replace('http', 'ws') +
+    '?userId=' +
+    userStore.getUser.id
+)
+
+const state = reactive({
+  recordList: [] as { id: number; time: number; res: string }[]
+})
+
+const { status, data, send, close, open } = useWebSocket(server.value, {
+  autoReconnect: false,
+  heartbeat: true
+})
+
+watchEffect(() => {
+  if (data.value) {
+    try {
+      const res = JSON.parse(data.value)
+      state.recordList.push(res)
+    } catch (error) {
+      state.recordList.push({
+        res: data.value,
+        id: Math.ceil(Math.random() * 1000),
+        time: new Date().getTime()
+      })
+    }
+  }
+})
+
+const getIsOpen = computed(() => status.value === 'OPEN')
+const getTagColor = computed(() => (getIsOpen.value ? 'success' : 'red'))
+
+const getList = computed(() => {
+  return [...state.recordList].reverse()
+})
+
+function handlerSend() {
+  send(sendValue.value)
+  sendValue.value = ''
+}
+
+function toggle() {
+  if (getIsOpen.value) {
+    close()
+  } else {
+    open()
+  }
+}
+</script>
diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
new file mode 100644
index 000000000..f442aaef1
--- /dev/null
+++ b/src/views/login/components/LoginForm.vue
@@ -0,0 +1,287 @@
+<template>
+  <el-form v-show="getShow" ref="formLogin" :model="loginData.loginForm" :rules="LoginRules" class="login-form"
+    label-position="top" label-width="120px" size="large">
+    <el-row style="margin-right: -10px; margin-left: -10px">
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+        <el-form-item>
+          <LoginFormTitle style="width: 100%" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+        <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
+          <el-input v-model="loginData.loginForm.tenantName" :placeholder="t('login.tenantNamePlaceholder')"
+            :prefix-icon="iconHouse" link type="primary" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+        <el-form-item prop="username">
+          <el-input v-model="loginData.loginForm.username" :placeholder="t('login.usernamePlaceholder')"
+            :prefix-icon="iconAvatar" style="height: 42px;" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+        <el-form-item prop="password">
+          <el-input v-model="loginData.loginForm.password" :placeholder="t('login.passwordPlaceholder')"
+            :prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" style="height: 42px;" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+        <el-form-item prop="code">
+          <div class="flex w-[100%]">
+            <el-input v-model="loginData.loginForm.code" :placeholder="t('login.codePlaceholder')"
+              style="width: 76%;margin-right: 10px;height: 42px;" @keyup.enter="handleLogin()">
+              <template #prefix>
+                <img src="@/assets/imgs/code.png" alt="" style="width: 16px;height: 16px;" />
+              </template>
+            </el-input>
+            <div class="login-code flex-1">
+              <img :src="codeUrl" @click="getCode" class="login-code-img" />
+            </div>
+          </div>
+
+        </el-form-item>
+      </el-col>
+
+
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px">
+        <el-form-item>
+          <el-row justify="space-between" style="width: 100%">
+            <el-col :span="6">
+              <el-checkbox v-model="loginData.loginForm.rememberMe">
+                {{ t('login.remember') }}
+              </el-checkbox>
+            </el-col>
+            <el-col :offset="6" :span="12">
+              <el-link style="float: right" type="primary">{{ t('login.forgetPassword') }}</el-link>
+            </el-col>
+          </el-row>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+        <el-form-item>
+          <XButton :loading="loginLoading" :title="t('login.login')" class="w-[100%]" type="primary"
+            @click="handleLogin()" />
+        </el-form-item>
+      </el-col>
+      <!-- <Verify
+        ref="verify"
+        :captchaType="captchaType"
+        :imgSize="{ width: '400px', height: '200px' }"
+        mode="pop"
+        @success="handleLogin"
+      /> -->
+    </el-row>
+  </el-form>
+</template>
+<script lang="ts" setup>
+import { ElLoading } from 'element-plus'
+import LoginFormTitle from './LoginFormTitle.vue'
+import type { RouteLocationNormalizedLoaded } from 'vue-router'
+
+import { useIcon } from '@/hooks/web/useIcon'
+
+import * as authUtil from '@/utils/auth'
+import { usePermissionStore } from '@/store/modules/permission'
+import * as LoginApi from '@/api/login'
+import { LoginStateEnum, useFormValid, useLoginState } from './useLogin'
+import { getCodeImg } from "@/api/login";
+
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import * as DeptApi from '@/api/system/dept'
+
+defineOptions({ name: 'LoginForm' })
+
+const { t } = useI18n()
+const message = useMessage()
+const iconHouse = useIcon({ icon: 'ep:house' })
+const iconAvatar = useIcon({ icon: 'ep:avatar' })
+const iconLock = useIcon({ icon: 'ep:lock' })
+const formLogin = ref()
+const { validForm } = useFormValid(formLogin)
+const { setLoginState, getLoginState } = useLoginState()
+const { currentRoute, push } = useRouter()
+const permissionStore = usePermissionStore()
+const redirect = ref<string>('')
+const loginLoading = ref(false)
+const verify = ref()
+const captchaType = ref('blockPuzzle') // blockPuzzle 滑块 clickWord 点击文字
+
+const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN)
+// 验证码开关
+const captchaEnabled = ref(true);
+const codeUrl = ref("");
+
+const LoginRules = {
+  tenantName: [required],
+  username: [required],
+  password: [required]
+}
+const loginData = reactive({
+  isShowPassword: false,
+  captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE,
+  tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE,
+  loginForm: {
+    tenantName: '闻荫源码',
+    username: 'admin',
+    password: '123456',
+    captchaVerification: '',
+    rememberMe: false,
+    code: '',
+    uuid: ''
+  }
+})
+
+const socialList = [
+  { icon: 'ant-design:github-filled', type: 0 },
+  { icon: 'ant-design:wechat-filled', type: 30 },
+  { icon: 'ant-design:alipay-circle-filled', type: 0 },
+  { icon: 'ant-design:dingtalk-circle-filled', type: 20 }
+]
+
+// 获取验证码
+// const getCode = async () => {
+//   // 情况一，未开启：则直接登录
+//   if (loginData.captchaEnable === 'false') {
+//     await handleLogin({})
+//   } else {
+//     // 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
+//     // 弹出验证码
+//     verify.value.show()
+//   }
+// }
+function getCode() {
+  getCodeImg().then(res => {
+    captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled;
+    if (captchaEnabled.value) {
+      codeUrl.value = "data:image/gif;base64," + res.img;
+      loginData.loginForm.uuid = res.uuid;
+    }
+  });
+}
+//获取租户ID
+const getTenantId = async () => {
+  if (loginData.tenantEnable === 'true') {
+    const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName)
+    authUtil.setTenantId(res)
+  }
+}
+// 记住我
+const getCookie = () => {
+  const loginForm = authUtil.getLoginForm()
+  if (loginForm) {
+    loginData.loginForm = {
+      ...loginData.loginForm,
+      username: loginForm.username ? loginForm.username : loginData.loginForm.username,
+      password: loginForm.password ? loginForm.password : loginData.loginForm.password,
+      rememberMe: loginForm.rememberMe ? true : false,
+      tenantName: loginForm.tenantName ? loginForm.tenantName : loginData.loginForm.tenantName
+    }
+  }
+}
+const loading = ref() // ElLoading.service 返回的实例
+// 登录
+const handleLogin = async (params) => {
+  console.log('登录-185')
+  loginLoading.value = true
+  try {
+    await getTenantId()
+    const data = await validForm()
+    if (!data) {
+      return
+    }
+    const res = await LoginApi.login(loginData.loginForm)
+    if (!res) {
+      console.log('登录-195')
+      getCode()
+      return
+    }
+    loading.value = ElLoading.service({
+      lock: true,
+      text: '正在加载系统中...',
+      background: 'rgba(0, 0, 0, 0.7)'
+    })
+    if (loginData.loginForm.rememberMe) {
+      authUtil.setLoginForm(loginData.loginForm)
+    } else {
+      authUtil.removeLoginForm()
+    }
+    authUtil.setToken(res)
+    if (!redirect.value) {
+      redirect.value = '/'
+    }
+    // 判断是否为SSO登录
+    if (redirect.value.indexOf('sso') !== -1) {
+      window.location.href = window.location.href.replace('/login?redirect=', '')
+    } else {
+      console.log(redirect.value)
+      push({ path: redirect.value || permissionStore.addRouters[0].path })
+    }
+    // 存储 部门信息
+    const { wsCache } = useCache()
+    wsCache.set(CACHE_KEY.DEPT, await DeptApi.getSimpleDeptList())
+  } finally {
+    console.log('登录-224')
+    getCode()
+    loginLoading.value = false
+    loading.value.close()
+  }
+}
+
+// 社交登录
+const doSocialLogin = async (type: number) => {
+  if (type === 0) {
+    message.error('此方式未配置')
+  } else {
+    loginLoading.value = true
+    if (loginData.tenantEnable === 'true') {
+      await message.prompt('请输入租户名称', t('common.reminder')).then(async ({ value }) => {
+        const res = await LoginApi.getTenantIdByName(value)
+        authUtil.setTenantId(res)
+      })
+    }
+    // 计算 redirectUri
+    const redirectUri =
+      location.origin + '/social-login?type=' + type + '&redirect=' + (redirect.value || '/')
+    // 进行跳转
+    const res = await LoginApi.socialAuthRedirect(type, encodeURIComponent(redirectUri))
+    console.log(33)
+    window.location.href = res
+  }
+}
+watch(
+  () => currentRoute.value,
+  (route: RouteLocationNormalizedLoaded) => {
+    redirect.value = route?.query?.redirect as string
+  },
+  {
+    immediate: true
+  }
+)
+onMounted(() => {
+  getCode();
+  getCookie()
+})
+</script>
+
+<style lang="scss" scoped>
+:deep(.anticon) {
+  &:hover {
+    color: var(--el-color-primary) !important;
+  }
+}
+
+.login-code {
+  float: right;
+  width: 100%;
+  height: 38px;
+
+  img {
+    width: 100%;
+    height: auto;
+    max-width: 100px;
+    vertical-align: middle;
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/login/components/LoginFormTitle.vue b/src/views/login/components/LoginFormTitle.vue
new file mode 100644
index 000000000..cdf4facce
--- /dev/null
+++ b/src/views/login/components/LoginFormTitle.vue
@@ -0,0 +1,26 @@
+<template>
+  <h2 class="enter-x mb-3 text-center text-2xl font-bold xl:text-center xl:text-3xl">
+    {{ getFormTitle }}
+  </h2>
+</template>
+<script lang="ts" setup>
+import { LoginStateEnum, useLoginState } from './useLogin'
+
+defineOptions({ name: 'LoginFormTitle' })
+
+const { t } = useI18n()
+
+const { getLoginState } = useLoginState()
+
+const getFormTitle = computed(() => {
+  const titleObj = {
+    [LoginStateEnum.RESET_PASSWORD]: t('sys.login.forgetFormTitle'),
+    [LoginStateEnum.LOGIN]: t('sys.login.signInFormTitle'),
+    [LoginStateEnum.REGISTER]: t('sys.login.signUpFormTitle'),
+    [LoginStateEnum.MOBILE]: t('sys.login.mobileSignInFormTitle'),
+    [LoginStateEnum.QR_CODE]: t('sys.login.qrSignInFormTitle'),
+    [LoginStateEnum.SSO]: t('sys.login.ssoFormTitle')
+  }
+  return titleObj[unref(getLoginState)]
+})
+</script>
diff --git a/src/views/login/components/MobileForm.vue b/src/views/login/components/MobileForm.vue
new file mode 100644
index 000000000..ebb36b84e
--- /dev/null
+++ b/src/views/login/components/MobileForm.vue
@@ -0,0 +1,225 @@
+<template>
+  <el-form
+    v-show="getShow"
+    ref="formSmsLogin"
+    :model="loginData.loginForm"
+    :rules="rules"
+    class="login-form"
+    label-position="top"
+    label-width="120px"
+    size="large"
+  >
+    <el-row style="margin-right: -10px; margin-left: -10px">
+      <!-- 租户名 -->
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+        <el-form-item>
+          <LoginFormTitle style="width: 100%" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+        <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
+          <el-input
+            v-model="loginData.loginForm.tenantName"
+            :placeholder="t('login.tenantNamePlaceholder')"
+            :prefix-icon="iconHouse"
+            type="primary"
+            link
+          />
+        </el-form-item>
+      </el-col>
+      <!-- 手机号 -->
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+        <el-form-item prop="mobileNumber">
+          <el-input
+            v-model="loginData.loginForm.mobileNumber"
+            :placeholder="t('login.mobileNumberPlaceholder')"
+            :prefix-icon="iconCellphone"
+          />
+        </el-form-item>
+      </el-col>
+      <!-- 验证码 -->
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+        <el-form-item prop="code">
+          <el-row :gutter="5" justify="space-between" style="width: 100%">
+            <el-col :span="24">
+              <el-input
+                v-model="loginData.loginForm.code"
+                :placeholder="t('login.codePlaceholder')"
+                :prefix-icon="iconCircleCheck"
+              >
+                <!-- <el-button class="w-[100%]"> -->
+                <template #append>
+                  <span
+                    v-if="mobileCodeTimer <= 0"
+                    class="getMobileCode"
+                    style="cursor: pointer"
+                    @click="getSmsCode"
+                  >
+                    {{ t('login.getSmsCode') }}
+                  </span>
+                  <span v-if="mobileCodeTimer > 0" class="getMobileCode" style="cursor: pointer">
+                    {{ mobileCodeTimer }}秒后可重新获取
+                  </span>
+                </template>
+              </el-input>
+              <!-- </el-button> -->
+            </el-col>
+          </el-row>
+        </el-form-item>
+      </el-col>
+      <!-- 登录按钮 / 返回按钮 -->
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+        <el-form-item>
+          <XButton
+            :loading="loginLoading"
+            :title="t('login.login')"
+            class="w-[100%]"
+            type="primary"
+            @click="signIn()"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+        <el-form-item>
+          <XButton
+            :loading="loginLoading"
+            :title="t('login.backLogin')"
+            class="w-[100%]"
+            @click="handleBackLogin()"
+          />
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script lang="ts" setup>
+import type { RouteLocationNormalizedLoaded } from 'vue-router'
+
+import { useIcon } from '@/hooks/web/useIcon'
+
+import { setTenantId, setToken } from '@/utils/auth'
+import { usePermissionStore } from '@/store/modules/permission'
+import { getTenantIdByName, sendSmsCode, smsLogin } from '@/api/login'
+import LoginFormTitle from './LoginFormTitle.vue'
+import { LoginStateEnum, useFormValid, useLoginState } from './useLogin'
+
+defineOptions({ name: 'MobileForm' })
+
+const { t } = useI18n()
+const message = useMessage()
+const permissionStore = usePermissionStore()
+const { currentRoute, push } = useRouter()
+const formSmsLogin = ref()
+const loginLoading = ref(false)
+const iconHouse = useIcon({ icon: 'ep:house' })
+const iconCellphone = useIcon({ icon: 'ep:cellphone' })
+const iconCircleCheck = useIcon({ icon: 'ep:circle-check' })
+const { validForm } = useFormValid(formSmsLogin)
+const { handleBackLogin, getLoginState } = useLoginState()
+const getShow = computed(() => unref(getLoginState) === LoginStateEnum.MOBILE)
+
+const rules = {
+  tenantName: [required],
+  mobileNumber: [required],
+  code: [required]
+}
+const loginData = reactive({
+  codeImg: '',
+  tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE,
+  token: '',
+  loading: {
+    signIn: false
+  },
+  loginForm: {
+    uuid: '',
+    tenantName: '闻荫源码',
+    mobileNumber: '',
+    code: ''
+  }
+})
+const smsVO = reactive({
+  smsCode: {
+    mobile: '',
+    scene: 21
+  },
+  loginSms: {
+    mobile: '',
+    code: ''
+  }
+})
+const mobileCodeTimer = ref(0)
+const redirect = ref<string>('')
+const getSmsCode = async () => {
+  await getTenantId()
+  smsVO.smsCode.mobile = loginData.loginForm.mobileNumber
+  await sendSmsCode(smsVO.smsCode).then(async () => {
+    message.success(t('login.SmsSendMsg'))
+    // 设置倒计时
+    mobileCodeTimer.value = 60
+    let msgTimer = setInterval(() => {
+      mobileCodeTimer.value = mobileCodeTimer.value - 1
+      if (mobileCodeTimer.value <= 0) {
+        clearInterval(msgTimer)
+      }
+    }, 1000)
+  })
+}
+watch(
+  () => currentRoute.value,
+  (route: RouteLocationNormalizedLoaded) => {
+    redirect.value = route?.query?.redirect as string
+  },
+  {
+    immediate: true
+  }
+)
+// 获取租户 ID
+const getTenantId = async () => {
+  if (loginData.tenantEnable === 'true') {
+    const res = await getTenantIdByName(loginData.loginForm.tenantName)
+    setTenantId(res)
+  }
+}
+// 登录
+const signIn = async () => {
+  await getTenantId()
+  const data = await validForm()
+  if (!data) return
+  ElLoading.service({
+    lock: true,
+    text: '正在加载系统中...',
+    background: 'rgba(0, 0, 0, 0.7)'
+  })
+  loginLoading.value = true
+  smsVO.loginSms.mobile = loginData.loginForm.mobileNumber
+  smsVO.loginSms.code = loginData.loginForm.code
+  await smsLogin(smsVO.loginSms)
+    .then(async (res) => {
+      setToken(res)
+      if (!redirect.value) {
+        redirect.value = '/'
+      }
+      push({ path: redirect.value || permissionStore.addRouters[0].path })
+    })
+    .catch(() => {})
+    .finally(() => {
+      loginLoading.value = false
+      setTimeout(() => {
+        const loadingInstance = ElLoading.service()
+        loadingInstance.close()
+      }, 400)
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.anticon) {
+  &:hover {
+    color: var(--el-color-primary) !important;
+  }
+}
+
+.smsbtn {
+  margin-top: 33px;
+}
+</style>
diff --git a/src/views/login/components/QrCodeForm.vue b/src/views/login/components/QrCodeForm.vue
new file mode 100644
index 000000000..31d28453e
--- /dev/null
+++ b/src/views/login/components/QrCodeForm.vue
@@ -0,0 +1,30 @@
+<template>
+  <el-row v-show="getShow" style="margin-right: -10px; margin-left: -10px">
+    <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <LoginFormTitle style="width: 100%" />
+    </el-col>
+    <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-card class="mb-10px text-center" shadow="hover">
+        <Qrcode :logo="logoImg" />
+      </el-card>
+    </el-col>
+    <el-divider class="enter-x">{{ t('login.qrcode') }}</el-divider>
+    <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <div class="mt-15px w-[100%]">
+        <XButton :title="t('login.backLogin')" class="w-[100%]" @click="handleBackLogin()" />
+      </div>
+    </el-col>
+  </el-row>
+</template>
+<script lang="ts" setup>
+import logoImg from '@/assets/imgs/logo.png'
+
+import LoginFormTitle from './LoginFormTitle.vue'
+import { LoginStateEnum, useLoginState } from './useLogin'
+
+defineOptions({ name: 'QrCodeForm' })
+
+const { t } = useI18n()
+const { handleBackLogin, getLoginState } = useLoginState()
+const getShow = computed(() => unref(getLoginState) === LoginStateEnum.QR_CODE)
+</script>
diff --git a/src/views/login/components/RegisterForm.vue b/src/views/login/components/RegisterForm.vue
new file mode 100644
index 000000000..23b3bd428
--- /dev/null
+++ b/src/views/login/components/RegisterForm.vue
@@ -0,0 +1,142 @@
+<template>
+  <Form
+    v-show="getShow"
+    :rules="rules"
+    :schema="schema"
+    class="dark:(border-1 border-[var(--el-border-color)] border-solid)"
+    hide-required-asterisk
+    label-position="top"
+    size="large"
+    @register="register"
+  >
+    <template #title>
+      <LoginFormTitle style="width: 100%" />
+    </template>
+
+    <template #code="form">
+      <div class="w-[100%] flex">
+        <el-input v-model="form['code']" :placeholder="t('login.codePlaceholder')" />
+      </div>
+    </template>
+
+    <template #register>
+      <div class="w-[100%]">
+        <XButton
+          :loading="loading"
+          :title="t('login.register')"
+          class="w-[100%]"
+          type="primary"
+          @click="loginRegister()"
+        />
+      </div>
+      <div class="mt-15px w-[100%]">
+        <XButton :title="t('login.hasUser')" class="w-[100%]" @click="handleBackLogin()" />
+      </div>
+    </template>
+  </Form>
+</template>
+<script lang="ts" setup>
+import type { FormRules } from 'element-plus'
+
+import { useForm } from '@/hooks/web/useForm'
+import { useValidator } from '@/hooks/web/useValidator'
+import LoginFormTitle from './LoginFormTitle.vue'
+import { LoginStateEnum, useLoginState } from './useLogin'
+import { FormSchema } from '@/types/form'
+
+defineOptions({ name: 'RegisterForm' })
+
+const { t } = useI18n()
+const { required } = useValidator()
+const { register, elFormRef } = useForm()
+const { handleBackLogin, getLoginState } = useLoginState()
+const getShow = computed(() => unref(getLoginState) === LoginStateEnum.REGISTER)
+
+const schema = reactive<FormSchema[]>([
+  {
+    field: 'title',
+    colProps: {
+      span: 24
+    }
+  },
+  {
+    field: 'username',
+    label: t('login.username'),
+    value: '',
+    component: 'Input',
+    colProps: {
+      span: 24
+    },
+    componentProps: {
+      placeholder: t('login.usernamePlaceholder')
+    }
+  },
+  {
+    field: 'password',
+    label: t('login.password'),
+    value: '',
+    component: 'InputPassword',
+    colProps: {
+      span: 24
+    },
+    componentProps: {
+      style: {
+        width: '100%'
+      },
+      strength: true,
+      placeholder: t('login.passwordPlaceholder')
+    }
+  },
+  {
+    field: 'check_password',
+    label: t('login.checkPassword'),
+    value: '',
+    component: 'InputPassword',
+    colProps: {
+      span: 24
+    },
+    componentProps: {
+      style: {
+        width: '100%'
+      },
+      strength: true,
+      placeholder: t('login.passwordPlaceholder')
+    }
+  },
+  {
+    field: 'code',
+    label: t('login.code'),
+    colProps: {
+      span: 24
+    }
+  },
+  {
+    field: 'register',
+    colProps: {
+      span: 24
+    }
+  }
+])
+
+const rules: FormRules = {
+  username: [required()],
+  password: [required()],
+  check_password: [required()],
+  code: [required()]
+}
+
+const loading = ref(false)
+
+const loginRegister = async () => {
+  const formRef = unref(elFormRef)
+  formRef?.validate(async (valid) => {
+    if (valid) {
+      try {
+        loading.value = true
+      } finally {
+        loading.value = false
+      }
+    }
+  })
+}
+</script>
diff --git a/src/views/login/components/SSOLogin.vue b/src/views/login/components/SSOLogin.vue
new file mode 100644
index 000000000..f31ab0e5f
--- /dev/null
+++ b/src/views/login/components/SSOLogin.vue
@@ -0,0 +1,199 @@
+<template>
+  <div v-show="ssoVisible" class="form-cont">
+    <!-- 应用名 -->
+    <LoginFormTitle style="width: 100%" />
+    <el-tabs class="form" style="float: none" value="uname">
+      <el-tab-pane :label="client.name" name="uname" />
+    </el-tabs>
+    <div>
+      <el-form :model="formData" class="login-form">
+        <!-- 授权范围的选择 -->
+        此第三方应用请求获得以下权限：
+        <el-form-item prop="scopes">
+          <el-checkbox-group v-model="formData.scopes">
+            <el-checkbox
+              v-for="scope in queryParams.scopes"
+              :key="scope"
+              :label="scope"
+              style="display: block; margin-bottom: -10px"
+            >
+              {{ formatScope(scope) }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <!-- 下方的登录按钮 -->
+        <el-form-item class="w-1/1">
+          <el-button
+            :loading="formLoading"
+            class="w-6/10"
+            type="primary"
+            @click.prevent="handleAuthorize(true)"
+          >
+            <span v-if="!formLoading">同意授权</span>
+            <span v-else>授 权 中...</span>
+          </el-button>
+          <el-button class="w-3/10" @click.prevent="handleAuthorize(false)">拒绝</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import LoginFormTitle from './LoginFormTitle.vue'
+import * as OAuth2Api from '@/api/login/oauth2'
+import { LoginStateEnum, useLoginState } from './useLogin'
+import type { RouteLocationNormalizedLoaded } from 'vue-router'
+
+defineOptions({ name: 'SSOLogin' })
+
+const route = useRoute() // 路由
+const { currentRoute } = useRouter() // 路由
+const { getLoginState, setLoginState } = useLoginState()
+
+const client = ref({
+  // 客户端信息
+  name: '',
+  logo: ''
+})
+interface queryType {
+  responseType: string
+  clientId: string
+  redirectUri: string
+  state: string
+  scopes: string[]
+}
+const queryParams = reactive<queryType>({
+  // URL 上的 client_id、scope 等参数
+  responseType: '',
+  clientId: '',
+  redirectUri: '',
+  state: '',
+  scopes: [] // 优先从 query 参数获取；如果未传递，从后端获取
+})
+const ssoVisible = computed(() => unref(getLoginState) === LoginStateEnum.SSO) // 是否展示 SSO 登录的表单
+interface formType {
+  scopes: string[]
+}
+const formData = reactive<formType>({
+  scopes: [] // 已选中的 scope 数组
+})
+const formLoading = ref(false) // 表单是否提交中
+
+/** 初始化授权信息 */
+const init = async () => {
+  // 防止在没有登录的情况下循环弹窗
+  if (typeof route.query.client_id === 'undefined') return
+  // 解析参数
+  // 例如说【自动授权不通过】：client_id=default&redirect_uri=https%3A%2F%2Fwww.iocoder.cn&response_type=code&scope=user.read%20user.write
+  // 例如说【自动授权通过】：client_id=default&redirect_uri=https%3A%2F%2Fwww.iocoder.cn&response_type=code&scope=user.read
+  queryParams.responseType = route.query.response_type as string
+  queryParams.clientId = route.query.client_id as string
+  queryParams.redirectUri = route.query.redirect_uri as string
+  queryParams.state = route.query.state as string
+  if (route.query.scope) {
+    queryParams.scopes = (route.query.scope as string).split(' ')
+  }
+
+  // 如果有 scope 参数，先执行一次自动授权，看看是否之前都授权过了。
+  if (queryParams.scopes.length > 0) {
+    const data = await doAuthorize(true, queryParams.scopes, [])
+    if (data) {
+      location.href = data
+      return
+    }
+  }
+
+  // 获取授权页的基本信息
+  const data = await OAuth2Api.getAuthorize(queryParams.clientId)
+  client.value = data.client
+  // 解析 scope
+  let scopes
+  // 1.1 如果 params.scope 非空，则过滤下返回的 scopes
+  if (queryParams.scopes.length > 0) {
+    scopes = []
+    for (const scope of data.scopes) {
+      if (queryParams.scopes.indexOf(scope.key) >= 0) {
+        scopes.push(scope)
+      }
+    }
+    // 1.2 如果 params.scope 为空，则使用返回的 scopes 设置它
+  } else {
+    scopes = data.scopes
+    for (const scope of scopes) {
+      queryParams.scopes.push(scope.key)
+    }
+  }
+  // 生成已选中的 checkedScopes
+  for (const scope of scopes) {
+    if (scope.value) {
+      formData.scopes.push(scope.key)
+    }
+  }
+}
+
+/** 处理授权的提交 */
+const handleAuthorize = async (approved) => {
+  // 计算 checkedScopes + uncheckedScopes
+  let checkedScopes
+  let uncheckedScopes
+  if (approved) {
+    // 同意授权，按照用户的选择
+    checkedScopes = formData.scopes
+    uncheckedScopes = queryParams.scopes.filter((item) => checkedScopes.indexOf(item) === -1)
+  } else {
+    // 拒绝，则都是取消
+    checkedScopes = []
+    uncheckedScopes = queryParams.scopes
+  }
+  // 提交授权的请求
+  formLoading.value = true
+  try {
+    const data = await doAuthorize(false, checkedScopes, uncheckedScopes)
+    if (!data) {
+      return
+    }
+    location.href = data
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 调用授权 API 接口 */
+const doAuthorize = (autoApprove, checkedScopes, uncheckedScopes) => {
+  return OAuth2Api.authorize(
+    queryParams.responseType,
+    queryParams.clientId,
+    queryParams.redirectUri,
+    queryParams.state,
+    autoApprove,
+    checkedScopes,
+    uncheckedScopes
+  )
+}
+
+/** 格式化 scope 文本 */
+const formatScope = (scope) => {
+  // 格式化 scope 授权范围，方便用户理解。
+  // 这里仅仅是一个 demo，可以考虑录入到字典数据中，例如说字典类型 "system_oauth2_scope"，它的每个 scope 都是一条字典数据。
+  switch (scope) {
+    case 'user.read':
+      return '访问你的个人信息'
+    case 'user.write':
+      return '修改你的个人信息'
+    default:
+      return scope
+  }
+}
+
+/** 监听当前路由为 SSOLogin 时，进行数据的初始化 */
+watch(
+  () => currentRoute.value,
+  (route: RouteLocationNormalizedLoaded) => {
+    if (route.name === 'SSOLogin') {
+      setLoginState(LoginStateEnum.SSO)
+      init()
+    }
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/views/login/components/index.ts b/src/views/login/components/index.ts
new file mode 100644
index 000000000..204ad73d0
--- /dev/null
+++ b/src/views/login/components/index.ts
@@ -0,0 +1,8 @@
+import LoginForm from './LoginForm.vue'
+import MobileForm from './MobileForm.vue'
+import LoginFormTitle from './LoginFormTitle.vue'
+import RegisterForm from './RegisterForm.vue'
+import QrCodeForm from './QrCodeForm.vue'
+import SSOLoginVue from './SSOLogin.vue'
+
+export { LoginForm, MobileForm, LoginFormTitle, RegisterForm, QrCodeForm, SSOLoginVue }
diff --git a/src/views/login/components/useLogin.ts b/src/views/login/components/useLogin.ts
new file mode 100644
index 000000000..b4a02f8f1
--- /dev/null
+++ b/src/views/login/components/useLogin.ts
@@ -0,0 +1,42 @@
+import { Ref } from 'vue'
+
+export enum LoginStateEnum {
+  LOGIN,
+  REGISTER,
+  RESET_PASSWORD,
+  MOBILE,
+  QR_CODE,
+  SSO
+}
+
+const currentState = ref(LoginStateEnum.LOGIN)
+
+export function useLoginState() {
+  function setLoginState(state: LoginStateEnum) {
+    currentState.value = state
+  }
+  const getLoginState = computed(() => currentState.value)
+
+  function handleBackLogin() {
+    setLoginState(LoginStateEnum.LOGIN)
+  }
+
+  return {
+    setLoginState,
+    getLoginState,
+    handleBackLogin
+  }
+}
+
+export function useFormValid<T extends Object = any>(formRef: Ref<any>) {
+  async function validForm() {
+    const form = unref(formRef)
+    if (!form) return
+    const data = await form.validate()
+    return data as T
+  }
+
+  return {
+    validForm
+  }
+}
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
new file mode 100644
index 000000000..a0025ab66
--- /dev/null
+++ b/src/views/login/login.vue
@@ -0,0 +1,104 @@
+<template>
+  <div
+    :class="prefixCls"
+    class="relative h-[100%] lt-xl:bg-[var(--login-bg-color)] lt-md:px-10px lt-sm:px-10px lt-xl:px-10px"
+  >
+    <div class="relative mx-auto h-full flex">
+      <div
+        :class="`${prefixCls}__left flex-1 bg-gray-500 bg-opacity-20 relative p-30px lt-xl:hidden`"
+      >
+        <!-- 左上角的 logo + 系统标题 -->
+        <div class="relative flex items-center text-white">
+          <img alt="" class="mr-10px h-24px w-48px" src="@/assets/imgs/logo.png" />
+          <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
+        </div>
+        <!-- 左边的背景图 + 欢迎语 -->
+        <div class="h-[calc(100%-60px)] flex items-center justify-center">
+          <TransitionGroup
+            appear
+            enter-active-class="animate__animated animate__bounceInLeft"
+            tag="div"
+          >
+            <img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" />
+            <div key="2" class="text-3xl text-white">{{ t('login.welcome') }}</div>
+            <div key="3" class="mt-5 text-14px font-normal text-white">
+              {{ t('login.message') }}
+            </div>
+          </TransitionGroup>
+        </div>
+      </div>
+      <div class="relative flex-1 p-30px dark:bg-[var(--login-bg-color)] lt-sm:p-10px">
+        <!-- 右上角的主题、语言选择 -->
+        <div
+          class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end"
+        >
+          <div class="flex items-center at-2xl:hidden at-xl:hidden">
+            <img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" />
+            <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
+          </div>
+          <div class="flex items-center justify-end space-x-10px">
+            <!-- <ThemeSwitch /> -->
+            <LocaleDropdown class="dark:text-white lt-xl:text-white" />
+          </div>
+        </div>
+        <!-- 右边的登录界面 -->
+        <Transition appear enter-active-class="animate__animated animate__bounceInRight">
+          <div
+            class="m-auto h-full w-[100%] flex items-center at-2xl:max-w-500px at-lg:max-w-500px at-md:max-w-500px at-xl:max-w-500px"
+          >
+            <!-- 账号登录 -->
+            <LoginForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
+            <!-- 手机登录 -->
+            <MobileForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
+            <!-- 二维码登录 -->
+            <QrCodeForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
+            <!-- 注册 -->
+            <RegisterForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
+            <!-- 三方登录 -->
+            <SSOLoginVue class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
+          </div>
+        </Transition>
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import { underlineToHump } from '@/utils'
+
+import { useDesign } from '@/hooks/web/useDesign'
+import { useAppStore } from '@/store/modules/app'
+import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
+import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
+
+import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue } from './components'
+
+defineOptions({ name: 'Login' })
+
+const { t } = useI18n()
+const appStore = useAppStore()
+const { getPrefixCls } = useDesign()
+const prefixCls = getPrefixCls('login')
+</script>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-login;
+
+.#{$prefix-cls} {
+  overflow: auto;
+
+  &__left {
+    &::before {
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: -1;
+      width: 100%;
+      height: 100%;
+      background-image: url('@/assets/svgs/login-bg.svg');
+      background-position: center;
+      background-repeat: no-repeat;
+      content: '';
+    }
+  }
+}
+</style>
diff --git a/src/views/mes/jobcalendar/index.vue b/src/views/mes/jobcalendar/index.vue
new file mode 100644
index 000000000..ac7716f24
--- /dev/null
+++ b/src/views/mes/jobcalendar/index.vue
@@ -0,0 +1,10 @@
+<template>
+  <el-calendar v-model="value" />
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+const value = ref(new Date())
+</script>
+  
+  
\ No newline at end of file
diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue
new file mode 100644
index 000000000..3f041b99b
--- /dev/null
+++ b/src/views/mes/processroute/components/configDialog.vue
@@ -0,0 +1,294 @@
+<template>
+  <div>
+    <el-drawer
+      v-model="isShowDrawer"
+      title="详情"
+      direction="rtl"
+      size="80%"
+      v-loading="detailLoading"
+      :on-close="handleDrawerClose()"
+    >
+      <template #header>
+        <div class="font-size-18px">
+          <el-row :gutter="10">
+            <el-col :span="22">
+              {{ titleValueRef }}
+              <el-tag type="info">[{{ titleNameRef }}]</el-tag>
+            </el-col>
+            <el-col :span="2">
+              <el-button size="primary" @click="saveResult()" style="width: 100%">
+                保存修改
+              </el-button>
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+
+      <el-row :gutter="10" style="height: calc(100vh - 300px)">
+        <el-col :span="6">
+              <el-input v-model="processListParmas.name" placeholder="工序名称">
+                <template #append>
+                  <el-button @click="getProcessList" >查询</el-button>
+                </template>
+              </el-input>
+           
+          <el-table :data="processData" ref="tableProcess" style="width: 100%; height: 80%">
+            <el-table-column prop="name" label="工序名称">
+              <template #default="scope">
+                <el-button size="mini" text @click="userAddNode(scope.row)" style="width: 100%"
+                  >{{ scope.row.name }}[{{ scope.row.code }}]</el-button
+                >
+              </template>
+            </el-table-column>
+            <el-table-column prop="code" label="工序编码" width="180" v-if="false" />
+          </el-table>
+        </el-col>
+        <el-col :span="18"><div ref="graphContainer"></div></el-col>
+      </el-row>
+      <el-row style="height: 150px" :gutter="5">
+        <el-col :span="6">
+          <el-card class="footer-card">
+            <template #header>
+              <div class="card-header">
+                <span>产品信息</span>
+              </div>
+            </template>
+            <p>产品名称：{{ productData.name }}</p>
+            <p>产品编码：{{ productData.code }}</p>
+            <p>产品描述：{{ productData.desc1 }}</p>
+          </el-card>
+        </el-col>
+        <el-col :span="6"
+          ><el-card class="footer-card">
+            <template #header>
+              <div class="card-header">
+                <span>设备信息</span>
+              </div>
+            </template>
+            <p v-for="item in deviceList" :key="item" class="text item">{{ item.name }}</p>
+          </el-card></el-col
+        >
+        <el-col :span="6"
+          ><el-card class="footer-card">
+            <template #header>
+              <div class="card-header">
+                <span>人员信息</span>
+              </div>
+            </template>
+            <p v-for="item in workerList" :key="item" class="text item">{{ item.name }}</p>
+          </el-card></el-col
+        >
+        <el-col :span="6"
+          ><el-card class="footer-card">
+            <template #header>
+              <div class="card-header">
+                <span>工位信息</span>
+              </div>
+            </template>
+            <p>工位编码：{{ workStationData.name }}</p>
+            <p>工位名称：{{ workStationData.code }}</p>
+          </el-card></el-col
+        >
+      </el-row>
+    </el-drawer>
+  </div>
+</template>
+<script lang="ts" setup>
+import { start_node, end_node, createGraph, registerNodes, getNewNode } from './graphbase.data'
+import * as ProcessrouteApi from '@/api/mes/processroute'
+import { Search } from '@/components/Search'
+import { Graph } from '@antv/x6'
+//import { async } from '@antv/x6/lib/registry/marker/async'
+//import { object } from 'vue-types'
+const graphContainer = ref<HTMLElement | null>(null)
+defineOptions({ name: 'ProcessRouteConfig' })
+const isShowDrawer = ref(false)
+const detailLoading = ref(false)
+const message = useMessage() // 消息弹窗
+//const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'ProcessRouteConfig'
+//const updateKey = ref(0)
+const titleNameRef = ref()
+const titleValueRef = ref()
+const processRouteId = ref()
+const processData = ref([]) //工序数据
+const tableProcess = ref()
+// const workshopCodeOptions = ref([{ code: '', name: '车间1' }])
+// const productionLineCodeOptions = ref([{ code: '', name: '产线' }])
+const productData = ref({ name: '', code: '', desc1: '--' }) //产品数据
+const deviceList = ref([
+  { name: '设备', code: '0000' },
+  { name: '设备', code: '0000' }
+]) //设备数据
+const workerList = ref([{ name: '--' }, { name: '--' }]) //人员数据
+const workStationData = ref({ name: '工位', code: '' }) //工位数据
+//初始化图形组件
+const graph = ref<Graph>()
+const openDetail = async (rowData: any) => {
+  rowData.value = rowData
+  titleNameRef.value = rowData.value.processrouteCode
+  titleValueRef.value = rowData.value.processName
+  processRouteId.value = rowData.value.id
+  let graphJson = JSON.parse(rowData.value.graphJson)
+  isShowDrawer.value = true
+  nextTick(() => {
+    graph.value = createGraph(graphContainer.value as HTMLElement)
+    graph.value.on('node:click', ({ e, x, y, node, view }) => {
+      nodeClick(e, x, y, node, view)
+    })
+    graph.value.fromJSON(graphJson.cells)
+  })
+  getItembasicInfo(rowData.value.productCode)
+}
+//关闭后销毁图形组件
+const handleDrawerClose = () => {
+  //console.log('close')
+  if (graph && graph.value != undefined) {
+    //console.log(graph.value.toJSON())
+  }
+}
+//**获取 工序信息 */
+const getProcessInfo = async (id: number) => {
+  const res = await ProcessrouteApi.getProcesInfo(id)
+  return res
+}
+
+/** 获取产品信息 */
+const getItembasicInfo = async (code: String) => {
+  const res = await ProcessrouteApi.getProductInfo(code)
+  productData.value = res
+  //console.log(productData.value)
+}
+/** 获取设备列表 */
+const getDeviceList = async (code: String) => {
+  const res = await ProcessrouteApi.getDeviceList(code)
+  deviceList.value = res.data
+  //console.log(productData.value)
+}
+/** 获取工位信息 */
+const getWorkStation = async (code: String) => {
+  const res = await ProcessrouteApi.getWorkStation(code)
+  workStationData.value = res.data
+  //console.log(productData.value)
+}
+/** 获取人员信息列表 */
+const getWorkerList = async (code: String) => {
+  const res = await ProcessrouteApi.getWorkerList(code)
+  workerList.value = res.data
+  //console.log(productData.value)
+}
+const processListParmas = ref({
+  name: '',
+  workshopCode: '',
+  productionLineCode:'',
+  pageNum: 1,
+  pageSize: 50
+})
+/**获取工序列表 */
+const getProcessList = async () => {
+  //console.log(processListParmas.value)
+  const res = await ProcessrouteApi.getProcessList(processListParmas.value)
+ 
+  processData.value = res.list
+  
+  //return res
+}
+const nodeClick = (e, x, y, node, view) => {
+  //console.log('nodeClick', e, x, y, node, view)
+  let data = getProcessInfo(node.id)
+  getDeviceList(node.id)
+  getWorkerList(node.id)
+  getWorkStation(node.id)
+  message.info(data.toString())
+}
+
+//添加节点
+const userAddNode = (row) => {
+  if (graph && graph.value != undefined) {
+    let node_template = getNewNode(row.code, row.name, row.code)
+    node_template.x = end_node.value.x - 100
+    node_template.y = end_node.value.y + 100
+    let noden = graph.value.addNode(node_template)
+    if (graph.value.getNodes().length == 1) {
+      let start = graph.value.addNode(start_node.value)
+      let end = graph.value.addNode(end_node.value)
+      graph.value.addEdge({
+        id: 'startEdge',
+        source: start.id, // 源节点 ID
+        target: noden.id
+        // tools: [
+        //   {
+        //     name: 'button-remove',
+        //     args: { distance: -40 },
+        //   },
+        // ]
+      })
+      graph.value.addEdge({
+        id: 'endEdge',
+        source: noden.id, // 源节点 ID
+        target: end.id
+        // tools: [
+        //   {
+        //     name: 'button-remove',
+        //     args: { distance: -40 },
+        //   },
+        // ]
+      })
+    }
+  }
+}
+//-------
+defineExpose({ openDetail, createGraph }) // 提供 open 方法，用于打开弹窗
+onMounted(() => {
+  registerNodes()
+
+  getProcessList()
+})
+//保存图形
+const saveResult = async () => {
+  if (graph.value == undefined) {
+    message.info('未设置任何的流程图信息，不能保存！')
+    return
+  }
+  if (graph.value.getNodes().length < 3) {
+    message.info('除了开始结束节点外至少需要设置一个节点！')
+    return
+  }
+  let gdata = {
+    processrouteCode: titleNameRef.value,
+    graphJson: graph.value.toJSON(),
+    processrouteId: processRouteId.value
+  }
+
+  let res = ProcessrouteApi.saveGraphData(gdata)
+  if (res) {
+    message.success('保存成功！')
+  } else {
+    message.error('保存失败！')
+  }
+  isShowDrawer.value = false
+  handleDrawerClose()
+  emit('close')
+  //return res
+}
+// 验证图形
+onUnmounted(() => {})
+const emit = defineEmits(['close'])
+</script>
+<style lang="scss">
+.el-drawer__body {
+  background: #f5f5f5 !important;
+}
+
+::v-deep(.label-class-name) {
+  color: #dedede;
+}
+.footer-card {
+  width: 100%;
+  height: 100%;
+}
+</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/mes/processroute/components/graphbase.data.ts b/src/views/mes/processroute/components/graphbase.data.ts
new file mode 100644
index 000000000..c5dc0893a
--- /dev/null
+++ b/src/views/mes/processroute/components/graphbase.data.ts
@@ -0,0 +1,290 @@
+import { Graph, Node, Path, Cell } from '@antv/x6'
+//工艺节点的定义
+export const process_node = ref({
+  width: 120,
+  height: 40,
+  attrs: {
+    body: {
+      stroke: '#5F95FF',
+      strokeWidth: 1,
+      fill: 'rgba(255,255,255,0.8)',
+      refWidth: 1,
+      refHeight: 1
+    },
+    // image: {
+    //   'xlink:href':
+    //     'https://gw.alipayobjects.com/zos/antfincdn/FLrTNDvlna/antv.png',
+    //   width: 16,
+    //   height: 16,
+    //   x: 12,
+    //   y: 12,
+    // },
+    title: {
+      text: 'Node',
+      refX: 5,
+      refY: 5,
+      fill: 'rgba(0,0,0,0.85)',
+      fontSize: 12,
+      'text-anchor': 'start'
+    },
+    text: {
+      text: 'this is content text',
+      refX: 5,
+      refY: 25,
+      fontSize: 12,
+      fill: 'rgba(0,0,0,0.6)',
+      'text-anchor': 'start'
+    }
+  },
+  ports: {
+    groups: {
+      in: {
+        position: 'left',
+        attrs: {
+          circle: {
+            magnet: true,
+            stroke: '#8f8f8f',
+            r: 5
+          }
+        }
+      },
+      out: {
+        position: 'right',
+        attrs: {
+          circle: {
+            magnet: true,
+            stroke: '#8f8f8f',
+            r: 5
+          }
+        }
+      }
+    }
+  },
+  tools: [
+    {
+      name: 'button-remove',
+      args: {
+        x: '100%',
+        y: 0,
+        offset: { x: -10, y: 10 }
+      }
+    }
+  ],
+  markup: [
+    {
+      tagName: 'rect',
+      selector: 'body'
+    },
+    // {
+    //   tagName: 'image',
+    //   selector: 'image',
+    // },
+    {
+      tagName: 'text',
+      selector: 'title'
+    },
+    {
+      tagName: 'text',
+      selector: 'text'
+    }
+  ]
+})
+//--------开始结束节点的定义---------------------
+
+export const base_node = ref({
+  width: 66,
+  height: 36,
+  inherit: 'rect', // 继承于 rect 节点
+  attrs: {
+    body: {
+      stroke: '#5F95FF',
+      strokeWidth: 1,
+      fill: '#EFF4FF',
+      refWidth: 2,
+      refHeight: 2
+    },
+    text: {
+      fontSize: 12,
+      fill: '#262626'
+    }
+  },
+  ports: {
+    groups: {
+      in: {
+        position: 'left',
+        attrs: {
+          circle: {
+            magnet: true,
+            stroke: '#8f8f8f',
+            r: 5
+          }
+        }
+      },
+      out: {
+        position: 'right',
+        attrs: {
+          circle: {
+            magnet: true,
+            stroke: '#8f8f8f',
+            r: 5
+          }
+        }
+      }
+    }
+  }
+})
+
+export const start_node = ref({
+  id: 'startNode',
+  label: '开始',
+  x: 50,
+  y: 200,
+  attrs: {
+    body: {
+      rx: 20,
+      ry: 26
+    }
+  },
+  shape: 'base-node',
+  ports: [{ id: 'out', group: 'out' }]
+})
+//结束节点的定义
+export const end_node = ref({
+  id: 'endNode',
+  x: 200,
+  y: 200,
+  label: '结束',
+  attrs: {
+    body: {
+      rx: 20,
+      ry: 26
+    }
+  },
+  shape: 'base-node',
+  ports: [{ id: 'in', group: 'in' }]
+})
+export const createGraph = (graphContainer: any) => {
+  const ret = ref<Graph>()
+  ret.value= new Graph({
+    container: graphContainer,
+    autoResize: true,
+    background: { color: '#F2F7FA' }, // 创建画布时初始化背景相关配置对象
+    grid: { size: 10, visible: true, type: 'mesh' }, //创建画布时，通过配置对象来设置背景网格
+    mousewheel: {
+      enabled: true,
+      modifiers: 'ctrl',
+      factor: 1.1,
+      maxScale: 1.5,
+      minScale: 0.5
+    },
+    connecting: {
+      snap: true,
+      allowBlank: false,
+      allowLoop: false,
+      allowNode: false,
+      highlight: true,
+
+      createEdge() {
+        return this.createEdge({
+          attrs: {
+            line: {
+              stroke: '#8f8f8f',
+              strokeWidth: 1
+            }
+          }
+        })
+      },
+      validateMagnet({ magnet }) {
+        return magnet.getAttribute('port-group') !== 'in'
+      },
+      validateConnection({ sourceMagnet, targetMagnet }) {
+        // 只能从输出链接桩创建连接
+        if (!sourceMagnet || sourceMagnet.getAttribute('port-group') === 'in') {
+          return false
+        }
+        // 只能连接到输入链接桩
+        if (!targetMagnet || targetMagnet.getAttribute('port-group') !== 'in') {
+          return false
+        }
+        return true
+      }
+    },
+    panning: {
+      enabled: true
+    },
+    highlighting: {
+      // 连接桩可以被连接时在连接桩外围围渲染一个包围框
+      magnetAvailable: {
+        name: 'stroke',
+        args: {
+          attrs: {
+            fill: '#fff',
+            stroke: '#A4DEB1',
+            strokeWidth: 4
+          }
+        }
+      }
+    }
+    //selecting:{enabled: true, multiple: true,rubberEdge: true,rubberNode: true,modifiers: 'shift',rubberband: true}
+  })
+  // ret.value.on('node:click', ({ e, x, y, node, view }) => {
+  //   //nodeClick(e, x, y, node, view)
+  //   nodeClick(e, x, y, node, view)
+  // })
+  // ret.value.on('node:removed', ({ node, index, options }) => {
+  //   nodeRemoved(node, index, options)
+  // })
+  ret.value.on('edge:mouseenter', ({ cell }) => {
+    cell.addTools([
+      {
+        name: 'vertices',
+        args: {
+          d: 'M 10 -8 -10 0 10 8 Z',
+          fill: '#333',
+          stroke: '#fff',
+          'stroke-width': 2,
+          cursor: 'move'
+        }
+      },
+      {
+        name: 'button-remove',
+        args: { distance: 20 }
+      }
+    ])
+  })
+  ret.value.on('edge:mouseleave', ({ cell }) => {
+    cell.removeTools()
+  })
+  return ret.value
+}
+//注册节点
+export const registerNodes = () => {
+  //-----图形定制化节点-------------------
+  Graph.registerNode('process-node', process_node.value, true)
+  Graph.registerNode('base-node', base_node.value, true)
+}
+//获取新的节点
+export const getNewNode = (id: string, title: string, contentText: string) => {
+  return {
+    id: id,
+    width: 120,
+    height: 40,
+    x: 100,
+    y: 100,
+    attrs: {
+      title: {
+        text: title
+      },
+      text: {
+        text: contentText
+      }
+    },
+    shape: 'process-node',
+    ports: [
+      { id: 'in', group: 'in' },
+      { id: 'out', group: 'out' }
+    ]
+  }
+}
+
+
diff --git a/src/views/mes/processroute/index.vue b/src/views/mes/processroute/index.vue
new file mode 100644
index 000000000..234a7c32b
--- /dev/null
+++ b/src/views/mes/processroute/index.vue
@@ -0,0 +1,258 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Processroute.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Processroute.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row)">
+          <span>{{ row.processroute_code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ProcessrouteRules"
+    :formAllSchemas="Processroute.allSchemas"
+    :apiUpdate="ProcessrouteApi.updateProcessroute"
+    :apiCreate="ProcessrouteApi.createProcessroute"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <ProcessRouteConfig ref="configDialogRef" @close="getList" /> 
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/mes/processroute/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Processroute,ProcessrouteRules } from './processroute.data'
+import * as ProcessrouteApi from '@/api/mes/processroute'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+// import Detail from '@/components/Detail/src/Detail.vue'
+import ProcessRouteConfig from './components/configDialog.vue'
+import { async } from '@antv/x6/lib/registry/marker/async'
+
+defineOptions({ name: 'Processroute' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Processroute.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProcessrouteApi.getProcessroutePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'mes:processroute:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:processroute:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:processroute:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'mes:processroute:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'mes:processroute:delete'}), // 删除
+  defaultButtons.mainListHandleBtn({label: '配置',
+    name: 'config',
+    hide: false,
+    type: 'warning',
+    icon: '',
+    color: '',
+    hasPermi: ''}), // 路由设置
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'config') { // 
+    openDetail(row)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  // var isHave =Processroute.allSchemas.formSchema.some(function (item) {
+  //   return item.field === 'activeTime' || item.field === 'expireTime';
+  // });
+  // if(isHave){
+  //   if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+  //     message.error('失效时间要大于生效时间')
+  //     return;
+  //   }
+  // }
+  // if(data.activeTime==0)data.activeTime = null;
+  // if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await ProcessrouteApi.createProcessroute(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ProcessrouteApi.updateProcessroute(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const configDialogRef = ref()
+const openDetail =(row) => {
+  
+  configDialogRef.value.openDetail(row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ProcessrouteApi.deleteProcessroute(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProcessrouteApi.exportProcessroute(tableObject.params)
+    download.excel(data, '工艺路线定义.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+/** 路线配置操作 */
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '工艺路线定义导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProcessrouteApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/mes/processroute/processroute.data.ts b/src/views/mes/processroute/processroute.data.ts
new file mode 100644
index 000000000..fb82886cf
--- /dev/null
+++ b/src/views/mes/processroute/processroute.data.ts
@@ -0,0 +1,148 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+// 表单校验
+export const ProcessrouteRules = reactive({
+})
+
+export const Processroute = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '删除时间',
+    field: 'deleteTime',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '主键',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  
+  
+  {
+    label: '删除用户名',
+    field: 'deleter',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '工艺路线编码',
+    field: 'processrouteCode',
+    sort: 'custom',
+    isSearch: true,
+    // form: {
+    //   component: 'Input',
+
+    //   componentProps: {
+    //     slots:{
+    //       default:}
+    //     disabled: true
+    //   }
+    // }
+  },
+
+  {
+    label: '工艺路线名称',
+    field: 'processName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '产品编码',
+    field: 'productCode',
+    sort: 'custom',
+    isSearch: true,
+    width: 150,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '产品信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '版本号',
+    field: 'routeVersion',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: false,
+    dictType: DICT_TYPE.ITEM_STATUS,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'ENABLE',
+      componentProps: {
+        inactiveValue: 'DISABLE',
+        activeValue: 'ENABLE'
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '图形数据',
+    field: 'graphJson',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    isSearch:false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/mes/productionPlan/index.vue b/src/views/mes/productionPlan/index.vue
new file mode 100644
index 000000000..1c9271bea
--- /dev/null
+++ b/src/views/mes/productionPlan/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionPlan.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionPlan.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ProductionPlanRules"
+    :formAllSchemas="ProductionPlan.allSchemas"
+    :apiUpdate="ProductionPlanApi.updateProductionPlan"
+    :apiCreate="ProductionPlanApi.createProductionPlan"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ProductionPlan.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/mes/productionPlan/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionPlan,ProductionPlanRules } from './productionPlan.data'
+import * as ProductionPlanApi from '@/api/mes/productionPlan'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'MesProductionPlan' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionPlan.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionPlanApi.getProductionPlanPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'mes:productionPlan:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:productionPlan:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:productionPlan:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'mes:productionPlan:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'mes:productionPlan:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =ProductionPlan.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await ProductionPlanApi.createProductionPlan(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ProductionPlanApi.updateProductionPlan(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicProductionPlan')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ProductionPlanApi.deleteProductionPlan(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionPlanApi.exportProductionPlan(tableObject.params)
+    download.excel(data, '生产排产计划.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '生产排产计划导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductionPlanApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/mes/productionPlan/productionPlan.data.ts b/src/views/mes/productionPlan/productionPlan.data.ts
new file mode 100644
index 000000000..f6f8f68ec
--- /dev/null
+++ b/src/views/mes/productionPlan/productionPlan.data.ts
@@ -0,0 +1,182 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ProductionPlanRules = reactive({
+  endTime: [required],
+  concurrencyStamp: [required],
+})
+
+export const ProductionPlan = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '计划编号',
+    field: 'planCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '计划名称',
+    field: 'planName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '班组类型',
+    field: 'teamType',
+    sort: 'custom',
+    isSearch: true,
+                // form: {
+                //   component: 'SelectV2'
+                // },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '轮班方式',
+    field: 'shiftMode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '单据状态',
+    field: 'billState',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '删除时间',
+    field: 'deleteTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '删除用户名',
+    field: 'deleter',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '位置ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '备用字段一',
+    field: 'textOne',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段二',
+    field: 'textTwo',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段三',
+    field: 'textThree',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/mes/teamSetting/index.vue b/src/views/mes/teamSetting/index.vue
new file mode 100644
index 000000000..135bba85f
--- /dev/null
+++ b/src/views/mes/teamSetting/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="TeamSetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="TeamSetting.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="TeamSettingRules"
+    :formAllSchemas="TeamSetting.allSchemas"
+    :apiUpdate="TeamSettingApi.updateTeamSetting"
+    :apiCreate="TeamSettingApi.createTeamSetting"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="TeamSetting.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/mes/teamSetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { TeamSetting,TeamSettingRules } from './teamSetting.data'
+import * as TeamSettingApi from '@/api/mes/teamSetting'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'MesTeamSetting' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(TeamSetting.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: TeamSettingApi.getTeamSettingPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'mes:teamSetting:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:teamSetting:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:teamSetting:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'mes:teamSetting:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'mes:teamSetting:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =TeamSetting.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await TeamSettingApi.createTeamSetting(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await TeamSettingApi.updateTeamSetting(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicTeamSetting')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await TeamSettingApi.deleteTeamSetting(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TeamSettingApi.exportTeamSetting(tableObject.params)
+    download.excel(data, '班组人员管理.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '班组人员管理导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await TeamSettingApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/mes/teamSetting/teamSetting.data.ts b/src/views/mes/teamSetting/teamSetting.data.ts
new file mode 100644
index 000000000..a24d17006
--- /dev/null
+++ b/src/views/mes/teamSetting/teamSetting.data.ts
@@ -0,0 +1,178 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const TeamSettingRules = reactive({
+  endTime: [required],
+  concurrencyStamp: [required],
+})
+
+export const TeamSetting = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '班组编号',
+    field: 'teamCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '班组名称',
+    field: 'teamName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '班组类型',
+    field: 'teamType',
+    sort: 'custom',
+    isSearch: true,
+                // form: {
+                //   component: 'SelectV2'
+                // },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '备用字段一',
+    field: 'textOne',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段二',
+    field: 'textTwo',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段三',
+    field: 'textThree',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段四',
+    field: 'textFour',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段五',
+    field: 'textFive',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '删除时间',
+    field: 'deleteTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '删除用户名',
+    field: 'deleter',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '位置ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
new file mode 100644
index 000000000..1aa880115
--- /dev/null
+++ b/src/views/mes/workstation/index.vue
@@ -0,0 +1,286 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Workstation.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Workstation.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="WorkstationRules"
+    :formAllSchemas="Workstation.allSchemas"
+    :apiUpdate="WorkstationApi.updateWorkstation"
+    :apiCreate="WorkstationApi.createWorkstation"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef"
+          :isBasic="false"
+          :allSchemas="Workstation.allSchemas"
+          :detailAllSchemas="detailAllSchemas"
+          :detailAllSchemasRules="WorkstationRules"
+          :apiPage="apiPage"
+          :tabs="TabsList"
+          :detailButtonIsShowAdd = "true"
+          :detailButtonIsShowDelete="true"
+          @changeTabs="changeTabs"
+  />
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/mes/workstation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import {
+  Equipment,
+  Process,
+  Production,
+  TabsList,
+  Team,
+  Workstation,
+  WorkstationRules
+} from './workstation.data'
+import * as WorkstationApi from '@/api/mes/workstation'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import {
+  getEquipmentPage,
+  getProcessPage,
+  getProductionPage,
+  goalParams,
+  params
+} from "@/api/mes/workstation";
+defineOptions({ name: 'Workstation' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Workstation.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: WorkstationApi.getWorkstationPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:workstation:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:workstation:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:workstation:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:workstation:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:workstation:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    await handleDelete(row.id)
+  }
+}
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =Workstation.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await WorkstationApi.createWorkstation(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await WorkstationApi.updateWorkstation(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await WorkstationApi.deleteWorkstation(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await WorkstationApi.exportWorkstation(tableObject.params)
+    download.excel(data, '工位.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '工位导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await WorkstationApi.importTemplate()
+})
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  goalParams.workstationCode = row.code
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
+}
+// 子包装数据
+const detailAllSchemas = ref(Team.allSchemas)
+const apiPage = ref(WorkstationApi.getTeamPage)
+const tableKey = ref("workstationDetail");
+// tabs 切换事件
+const changeTabs = (data) =>{
+  tableKey.value = data.prop
+  if(data.prop == 'Team'){
+    apiPage.value = WorkstationApi.getTeamPage
+    detailAllSchemas.value = Team.allSchemas
+  }else if(data.prop == 'Equipment'){
+    apiPage.value = WorkstationApi.getEquipmentPage
+    detailAllSchemas.value = Equipment.allSchemas
+  }else if(data.prop == 'Process'){
+    apiPage.value = WorkstationApi.getProcessPage
+    detailAllSchemas.value = Process.allSchemas
+  }else if(data.prop == 'Production'){
+    apiPage.value = WorkstationApi.getProductionPage
+    detailAllSchemas.value = Production.allSchemas
+  }
+}
+</script>
diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
new file mode 100644
index 000000000..baf468591
--- /dev/null
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -0,0 +1,170 @@
+import type {CrudSchema} from '@/hooks/web/useCrudSchemas'
+import {dateFormatter} from '@/utils/formatTime'
+
+// 表单校验
+export const WorkstationRules = reactive({
+  code: [required]
+})
+export const TabsList = [{
+  label: "班组",
+  prop: 'Team',
+},
+  {
+    label: "设备",
+    prop: 'Equipment',
+  },
+  {
+    label: "工序",
+    prop: 'Process',
+  },
+  {
+    label: "产品",
+    prop: 'Production',
+  }
+
+]
+export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
+
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '班组代码',
+    field: 'teamCode',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+export const Team = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  }
+]))
+export const Equipment = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  }
+]))
+export const Process = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  }
+]))
+export const Production = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  }
+]))
diff --git a/src/views/profile/components/BasicInfo.vue b/src/views/profile/components/BasicInfo.vue
new file mode 100644
index 000000000..e2189b156
--- /dev/null
+++ b/src/views/profile/components/BasicInfo.vue
@@ -0,0 +1,92 @@
+<template>
+  <Form ref="formRef" :labelWidth="200" :rules="rules" :schema="schema">
+    <template #sex="form">
+      <el-radio-group v-model="form['sex']">
+        <el-radio :label="1">{{ t('profile.user.man') }}</el-radio>
+        <el-radio :label="2">{{ t('profile.user.woman') }}</el-radio>
+      </el-radio-group>
+    </template>
+  </Form>
+  <div style="text-align: center">
+    <XButton :title="t('common.save')" type="primary" @click="submit()" />
+    <XButton :title="t('common.reset')" type="danger" @click="init()" />
+  </div>
+</template>
+<script lang="ts" setup>
+import type { FormRules } from 'element-plus'
+import { FormSchema } from '@/types/form'
+import type { FormExpose } from '@/components/Form'
+import {
+  getUserProfile,
+  updateUserProfile,
+  UserProfileUpdateReqVO
+} from '@/api/system/user/profile'
+
+defineOptions({ name: 'BasicInfo' })
+
+const { t } = useI18n()
+const message = useMessage() // 消息弹窗
+// 表单校验
+const rules = reactive<FormRules>({
+  nickname: [{ required: true, message: t('profile.rules.nickname'), trigger: 'blur' }],
+  email: [
+    { required: true, message: t('profile.rules.mail'), trigger: 'blur' },
+    {
+      type: 'email',
+      message: t('profile.rules.truemail'),
+      trigger: ['blur', 'change']
+    }
+  ],
+  mobile: [
+    { required: true, message: t('profile.rules.phone'), trigger: 'blur' },
+    {
+      pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+      message: t('profile.rules.truephone'),
+      trigger: 'blur'
+    }
+  ]
+})
+const schema = reactive<FormSchema[]>([
+  {
+    field: 'nickname',
+    label: t('profile.user.nickname'),
+    component: 'Input'
+  },
+  {
+    field: 'mobile',
+    label: t('profile.user.mobile'),
+    component: 'Input'
+  },
+  {
+    field: 'email',
+    label: t('profile.user.email'),
+    component: 'Input'
+  },
+  {
+    field: 'sex',
+    label: t('profile.user.sex'),
+    component: 'InputNumber',
+    value: 0
+  }
+])
+const formRef = ref<FormExpose>() // 表单 Ref
+const submit = () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      const data = unref(formRef)?.formModel as UserProfileUpdateReqVO
+      await updateUserProfile(data)
+      message.success(t('common.updateSuccess'))
+      await init()
+    }
+  })
+}
+const init = async () => {
+  const res = await getUserProfile()
+  unref(formRef)?.setValues(res)
+}
+onMounted(async () => {
+  await init()
+})
+</script>
diff --git a/src/views/profile/components/ProfileUser.vue b/src/views/profile/components/ProfileUser.vue
new file mode 100644
index 000000000..b493499f3
--- /dev/null
+++ b/src/views/profile/components/ProfileUser.vue
@@ -0,0 +1,99 @@
+<template>
+  <div>
+    <div class="text-center">
+      <UserAvatar :img="userInfo?.avatar" />
+    </div>
+    <ul class="list-group list-group-striped">
+      <li class="list-group-item">
+        <Icon class="mr-5px" icon="ep:user" />
+        {{ t('profile.user.username') }}
+        <div class="pull-right">{{ userInfo?.username }}</div>
+      </li>
+      <li class="list-group-item">
+        <Icon class="mr-5px" icon="ep:phone" />
+        {{ t('profile.user.mobile') }}
+        <div class="pull-right">{{ userInfo?.mobile }}</div>
+      </li>
+      <li class="list-group-item">
+        <Icon class="mr-5px" icon="fontisto:email" />
+        {{ t('profile.user.email') }}
+        <div class="pull-right">{{ userInfo?.email }}</div>
+      </li>
+      <li class="list-group-item">
+        <Icon class="mr-5px" icon="carbon:tree-view-alt" />
+        {{ t('profile.user.dept') }}
+        <div v-if="userInfo?.dept" class="pull-right">{{ userInfo?.dept.name }}</div>
+      </li>
+      <li class="list-group-item">
+        <Icon class="mr-5px" icon="ep:suitcase" />
+        {{ t('profile.user.posts') }}
+        <div v-if="userInfo?.posts" class="pull-right">
+          {{ userInfo?.posts.map((post) => post.name).join(',') }}
+        </div>
+      </li>
+      <li class="list-group-item">
+        <Icon class="mr-5px" icon="icon-park-outline:peoples" />
+        {{ t('profile.user.roles') }}
+        <div v-if="userInfo?.roles" class="pull-right">
+          {{ userInfo?.roles.map((role) => role.name).join(',') }}
+        </div>
+      </li>
+      <li class="list-group-item">
+        <Icon class="mr-5px" icon="ep:calendar" />
+        {{ t('profile.user.createTime') }}
+        <div class="pull-right">{{ formatDate(userInfo?.createTime) }}</div>
+      </li>
+    </ul>
+  </div>
+</template>
+<script lang="ts" setup>
+import { formatDate } from '@/utils/formatTime'
+import UserAvatar from './UserAvatar.vue'
+
+import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
+
+defineOptions({ name: 'ProfileUser' })
+
+const { t } = useI18n()
+const userInfo = ref<ProfileVO>()
+const getUserInfo = async () => {
+  const users = await getUserProfile()
+  userInfo.value = users
+}
+onMounted(async () => {
+  await getUserInfo()
+})
+</script>
+
+<style scoped>
+.text-center {
+  position: relative;
+  height: 120px;
+  text-align: center;
+}
+
+.list-group-striped > .list-group-item {
+  padding-right: 0;
+  padding-left: 0;
+  border-right: 0;
+  border-left: 0;
+  border-radius: 0;
+}
+
+.list-group {
+  padding-left: 0;
+  list-style: none;
+}
+
+.list-group-item {
+  padding: 11px 0;
+  margin-bottom: -1px;
+  font-size: 13px;
+  border-top: 1px solid #e7eaec;
+  border-bottom: 1px solid #e7eaec;
+}
+
+.pull-right {
+  float: right !important;
+}
+</style>
diff --git a/src/views/profile/components/ResetPwd.vue b/src/views/profile/components/ResetPwd.vue
new file mode 100644
index 000000000..477be91f4
--- /dev/null
+++ b/src/views/profile/components/ResetPwd.vue
@@ -0,0 +1,73 @@
+<template>
+  <el-form ref="formRef" :model="password" :rules="rules" :label-width="200">
+    <el-form-item :label="t('profile.password.oldPassword')" prop="oldPassword">
+      <InputPassword v-model="password.oldPassword" />
+    </el-form-item>
+    <el-form-item :label="t('profile.password.newPassword')" prop="newPassword">
+      <InputPassword v-model="password.newPassword" strength />
+    </el-form-item>
+    <el-form-item :label="t('profile.password.confirmPassword')" prop="confirmPassword">
+      <InputPassword v-model="password.confirmPassword" strength />
+    </el-form-item>
+    <el-form-item>
+      <XButton :title="t('common.save')" type="primary" @click="submit(formRef)" />
+      <XButton :title="t('common.reset')" type="danger" @click="reset(formRef)" />
+    </el-form-item>
+  </el-form>
+</template>
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+
+import { InputPassword } from '@/components/InputPassword'
+import { updateUserPassword } from '@/api/system/user/profile'
+
+defineOptions({ name: 'ResetPwd' })
+
+const { t } = useI18n()
+const message = useMessage()
+const formRef = ref<FormInstance>()
+const password = reactive({
+  oldPassword: '',
+  newPassword: '',
+  confirmPassword: ''
+})
+
+// 表单校验
+const equalToPassword = (_rule, value, callback) => {
+  if (password.newPassword !== value) {
+    callback(new Error(t('profile.password.diffPwd')))
+  } else {
+    callback()
+  }
+}
+
+const rules = reactive<FormRules>({
+  oldPassword: [
+    { required: true, message: t('profile.password.oldPwdMsg'), trigger: 'blur' },
+    { min: 6, max: 20, message: t('profile.password.pwdRules'), trigger: 'blur' }
+  ],
+  newPassword: [
+    { required: true, message: t('profile.password.newPwdMsg'), trigger: 'blur' },
+    { min: 6, max: 20, message: t('profile.password.pwdRules'), trigger: 'blur' }
+  ],
+  confirmPassword: [
+    { required: true, message: t('profile.password.cfPwdMsg'), trigger: 'blur' },
+    { required: true, validator: equalToPassword, trigger: 'blur' }
+  ]
+})
+
+const submit = (formEl: FormInstance | undefined) => {
+  if (!formEl) return
+  formEl.validate(async (valid) => {
+    if (valid) {
+      await updateUserPassword(password.oldPassword, password.newPassword)
+      message.success(t('common.updateSuccess'))
+    }
+  })
+}
+
+const reset = (formEl: FormInstance | undefined) => {
+  if (!formEl) return
+  formEl.resetFields()
+}
+</script>
diff --git a/src/views/profile/components/UserAvatar.vue b/src/views/profile/components/UserAvatar.vue
new file mode 100644
index 000000000..c20168fa7
--- /dev/null
+++ b/src/views/profile/components/UserAvatar.vue
@@ -0,0 +1,39 @@
+<template>
+  <div class="change-avatar">
+    <CropperAvatar
+      ref="cropperRef"
+      :btnProps="{ preIcon: 'ant-design:cloud-upload-outlined' }"
+      :showBtn="false"
+      :value="img"
+      width="120px"
+      @change="handelUpload"
+    />
+  </div>
+</template>
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import { uploadAvatar } from '@/api/system/user/profile'
+import { CropperAvatar } from '@/components/Cropper'
+
+defineOptions({ name: 'UserAvatar' })
+
+defineProps({
+  img: propTypes.string.def('')
+})
+
+const cropperRef = ref()
+const handelUpload = async ({ data }) => {
+  await uploadAvatar({ avatarFile: data })
+  cropperRef.value.close()
+}
+</script>
+
+<style lang="scss" scoped>
+.change-avatar {
+  img {
+    display: block;
+    margin-bottom: 15px;
+    border-radius: 50%;
+  }
+}
+</style>
diff --git a/src/views/profile/components/UserSocial.vue b/src/views/profile/components/UserSocial.vue
new file mode 100644
index 000000000..2f021abfd
--- /dev/null
+++ b/src/views/profile/components/UserSocial.vue
@@ -0,0 +1,94 @@
+<template>
+  <el-table :data="socialUsers" :show-header="false">
+    <el-table-column fixed="left" title="序号" type="seq" width="60" />
+    <el-table-column align="left" label="社交平台" width="120">
+      <template #default="{ row }">
+        <img :src="row.img" alt="" class="h-5 align-middle" />
+        <p class="mr-5">{{ row.title }}</p>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="操作">
+      <template #default="{ row }">
+        <template v-if="row.openid">
+          已绑定
+          <XTextButton class="mr-5" title="(解绑)" type="primary" @click="unbind(row)" />
+        </template>
+        <template v-else>
+          未绑定
+          <XTextButton class="mr-5" title="(绑定)" type="primary" @click="bind(row)" />
+        </template>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+<script lang="ts" setup>
+import { SystemUserSocialTypeEnum } from '@/utils/constants'
+import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
+import { socialAuthRedirect, socialBind, socialUnbind } from '@/api/system/user/socialUser'
+
+defineOptions({ name: 'UserSocial' })
+
+const message = useMessage()
+const socialUsers = ref<any[]>([])
+const userInfo = ref<ProfileVO>()
+
+const initSocial = async () => {
+  const res = await getUserProfile()
+  userInfo.value = res
+  for (const i in SystemUserSocialTypeEnum) {
+    const socialUser = { ...SystemUserSocialTypeEnum[i] }
+    socialUsers.value.push(socialUser)
+    if (userInfo.value?.socialUsers) {
+      for (const j in userInfo.value.socialUsers) {
+        if (socialUser.type === userInfo.value.socialUsers[j].type) {
+          socialUser.openid = userInfo.value.socialUsers[j].openid
+          break
+        }
+      }
+    }
+  }
+}
+const route = useRoute()
+const bindSocial = () => {
+  // 社交绑定
+  const type = route.query.type
+  const code = route.query.code
+  const state = route.query.state
+  if (!code) {
+    return
+  }
+  socialBind(type, code, state).then(() => {
+    message.success('绑定成功')
+    initSocial()
+  })
+}
+const bind = (row) => {
+  const redirectUri = location.origin + '/user/profile?type=' + row.type
+  // 进行跳转
+  socialAuthRedirect(row.type, encodeURIComponent(redirectUri)).then((res) => {
+    window.location.href = res
+  })
+}
+const unbind = async (row) => {
+  const res = await socialUnbind(row.type, row.openid)
+  if (res) {
+    row.openid = undefined
+  }
+  message.success('解绑成功')
+}
+
+onMounted(async () => {
+  await initSocial()
+})
+
+watch(
+  () => route,
+  (newRoute) => {
+    bindSocial()
+    console.log(newRoute)
+  },
+  {
+    immediate: true
+  }
+)
+</script>
diff --git a/src/views/profile/components/index.ts b/src/views/profile/components/index.ts
new file mode 100644
index 000000000..9e1883cf4
--- /dev/null
+++ b/src/views/profile/components/index.ts
@@ -0,0 +1,7 @@
+import BasicInfo from './BasicInfo.vue'
+import ProfileUser from './ProfileUser.vue'
+import ResetPwd from './ResetPwd.vue'
+import UserAvatarVue from './UserAvatar.vue'
+import UserSocial from './UserSocial.vue'
+
+export { BasicInfo, ProfileUser, ResetPwd, UserAvatarVue, UserSocial }
diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
new file mode 100644
index 000000000..e813f0435
--- /dev/null
+++ b/src/views/profile/index.vue
@@ -0,0 +1,64 @@
+<template>
+  <div class="flex">
+    <el-card class="user w-1/3" shadow="hover">
+      <template #header>
+        <div class="card-header">
+          <span>{{ t('profile.user.title') }}</span>
+        </div>
+      </template>
+      <ProfileUser />
+    </el-card>
+    <el-card class="user ml-3 w-2/3" shadow="hover">
+      <template #header>
+        <div class="card-header">
+          <span>{{ t('profile.info.title') }}</span>
+        </div>
+      </template>
+      <div>
+        <el-tabs v-model="activeName" tab-position="top" style="height: 400px" class="profile-tabs">
+          <el-tab-pane :label="t('profile.info.basicInfo')" name="basicInfo">
+            <BasicInfo />
+          </el-tab-pane>
+          <el-tab-pane :label="t('profile.info.resetPwd')" name="resetPwd">
+            <ResetPwd />
+          </el-tab-pane>
+          <!-- <el-tab-pane :label="t('profile.info.userSocial')" name="userSocial">
+            <UserSocial />
+          </el-tab-pane> -->
+        </el-tabs>
+      </div>
+    </el-card>
+  </div>
+</template>
+<script setup lang="ts" name="Profile">
+import { BasicInfo, ProfileUser, ResetPwd, UserSocial } from './components/'
+const { t } = useI18n()
+
+const activeName = ref('basicInfo')
+</script>
+<style scoped>
+.user {
+  max-height: 960px;
+  padding: 15px 20px 20px;
+}
+
+.card-header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+:deep(.el-card .el-card__header, .el-card .el-card__body) {
+  padding: 15px !important;
+}
+
+.profile-tabs > .el-tabs__content {
+  padding: 32px;
+  font-weight: 600;
+  color: #6b778c;
+}
+
+.el-tabs--left .el-tabs__content {
+  height: 100%;
+}
+</style>
diff --git a/src/views/redirect/redirect.vue b/src/views/redirect/redirect.vue
new file mode 100644
index 000000000..f7717ce77
--- /dev/null
+++ b/src/views/redirect/redirect.vue
@@ -0,0 +1,28 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts" setup>
+defineOptions({ name: 'Redirect' })
+
+const { currentRoute, replace } = useRouter()
+const { params, query } = unref(currentRoute)
+const { path, _redirect_type = 'path' } = params
+
+Reflect.deleteProperty(params, '_redirect_type')
+Reflect.deleteProperty(params, 'path')
+
+const _path = Array.isArray(path) ? path.join('/') : path
+
+if (_redirect_type === 'name') {
+  replace({
+    name: _path,
+    query,
+    params
+  })
+} else {
+  replace({
+    path: _path.startsWith('/') ? _path : '/' + _path,
+    query
+  })
+}
+</script>
diff --git a/src/views/report/goview/index.vue b/src/views/report/goview/index.vue
new file mode 100644
index 000000000..1bac28692
--- /dev/null
+++ b/src/views/report/goview/index.vue
@@ -0,0 +1,10 @@
+<template>
+  <ContentWrap>
+    <IFrame :src="src" />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+defineOptions({ name: 'GoView' })
+
+const src = 'http://127.0.0.1:3000'
+</script>
diff --git a/src/views/report/jmreport/index.vue b/src/views/report/jmreport/index.vue
new file mode 100644
index 000000000..e05bb51f5
--- /dev/null
+++ b/src/views/report/jmreport/index.vue
@@ -0,0 +1,13 @@
+<template>
+  <ContentWrap>
+    <IFrame :src="src" />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import { getAccessToken } from '@/utils/auth'
+
+defineOptions({ name: 'JimuReport' })
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/list?token=' + getAccessToken())
+</script>
diff --git a/src/views/system/area/AreaForm.vue b/src/views/system/area/AreaForm.vue
new file mode 100644
index 000000000..47dfd1d4d
--- /dev/null
+++ b/src/views/system/area/AreaForm.vue
@@ -0,0 +1,72 @@
+<template>
+  <Dialog v-model="dialogVisible" title="IP 查询">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-form-item label="IP" prop="ip">
+        <el-input v-model="formData.ip" placeholder="请输入 IP 地址" />
+      </el-form-item>
+      <el-form-item label="地址" prop="result">
+        <el-input v-model="formData.result" placeholder="展示查询 IP 结果" readonly />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as AreaApi from '@/api/system/area'
+
+defineOptions({ name: 'SystemAreaForm' })
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：提交的按钮禁用
+const formData = ref({
+  ip: '',
+  result: undefined
+})
+const formRules = reactive({
+  ip: [{ required: true, message: 'IP 地址不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async () => {
+  dialogVisible.value = true
+  resetForm()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    formData.value.result = await AreaApi.getAreaByIp(formData.value.ip!.trim())
+    message.success('查询成功')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    ip: '',
+    result: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue
new file mode 100644
index 000000000..eb5c4f706
--- /dev/null
+++ b/src/views/system/area/index.vue
@@ -0,0 +1,73 @@
+<template>
+  <!-- 操作栏 -->
+  <ContentWrap>
+    <el-button type="primary" @click="openForm()">
+      <Icon icon="ep:plus" class="mr-5px" /> IP 查询
+    </el-button>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <div style="width: 100%; height: 700px">
+      <!-- AutoResizer 自动调节大小 -->
+      <el-auto-resizer>
+        <template #default="{ height, width }">
+          <!-- Virtualized Table 虚拟化表格：高性能，解决表格在大数据量下的卡顿问题 -->
+          <el-table-v2
+            :columns="columns"
+            :data="list"
+            :width="width"
+            :height="height"
+            expand-column-key="id"
+          />
+        </template>
+      </el-auto-resizer>
+    </div>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <AreaForm ref="formRef" />
+</template>
+<script setup lang="tsx">
+import type { Column } from 'element-plus'
+import AreaForm from './AreaForm.vue'
+import * as AreaApi from '@/api/system/area'
+
+defineOptions({ name: 'SystemArea' })
+
+// 表格的 column 字段
+const columns: Column[] = [
+  {
+    dataKey: 'id', // 需要渲染当前列的数据字段。例如说：{id:9527, name:'Mike'}，则填 id
+    title: '编号', // 显示在单元格表头的文本
+    width: 400, // 当前列的宽度，必须设置
+    fixed: true, // 是否固定列
+    key: 'id' // 树形展开对应的 key
+  },
+  {
+    dataKey: 'name',
+    title: '地名',
+    width: 200
+  }
+]
+// 表格的数据
+const list = ref([])
+
+/**
+ * 获得数据列表
+ */
+const getList = async () => {
+  list.value = await AreaApi.getAreaTree()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = () => {
+  formRef.value.open()
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/dept/DeptForm.vue b/src/views/system/dept/DeptForm.vue
new file mode 100644
index 000000000..e76d9f9e6
--- /dev/null
+++ b/src/views/system/dept/DeptForm.vue
@@ -0,0 +1,173 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-form-item label="上级部门" prop="parentId">
+        <el-tree-select
+          v-model="formData.parentId"
+          :data="deptTree"
+          :props="defaultProps"
+          check-strictly
+          default-expand-all
+          placeholder="请选择上级部门"
+          value-key="deptId"
+        />
+      </el-form-item>
+      <el-form-item label="部门名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入部门名称" />
+      </el-form-item>
+      <el-form-item label="显示排序" prop="sort">
+        <el-input-number v-model="formData.sort" :min="0" controls-position="right" />
+      </el-form-item>
+      <el-form-item label="负责人" prop="leaderUserId">
+        <el-select v-model="formData.leaderUserId" clearable placeholder="请输入负责人">
+          <el-option
+            v-for="item in userList"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="phone">
+        <el-input v-model="formData.phone" maxlength="11" placeholder="请输入联系电话" />
+      </el-form-item>
+      <el-form-item label="邮箱" prop="email">
+        <el-input v-model="formData.email" maxlength="50" placeholder="请输入邮箱" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="formData.status" clearable placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { defaultProps, handleTree } from '@/utils/tree'
+import * as DeptApi from '@/api/system/dept'
+import * as UserApi from '@/api/system/user'
+import { CommonStatusEnum } from '@/utils/constants'
+
+defineOptions({ name: 'SystemDeptForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  title: '',
+  parentId: undefined,
+  name: undefined,
+  sort: undefined,
+  leaderUserId: undefined,
+  phone: undefined,
+  email: undefined,
+  status: CommonStatusEnum.ENABLE
+})
+const formRules = reactive({
+  parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
+  sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
+  email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
+  phone: [
+    { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+  ],
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const deptTree = ref() // 树形结构
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await DeptApi.getDept(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 获得用户列表
+  userList.value = await UserApi.getSimpleUserList()
+  // 获得部门树
+  await getTree()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as DeptApi.DeptVO
+    if (formType.value === 'create') {
+      await DeptApi.createDept(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DeptApi.updateDept(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    title: '',
+    parentId: undefined,
+    name: undefined,
+    sort: undefined,
+    leaderUserId: undefined,
+    phone: undefined,
+    email: undefined,
+    status: CommonStatusEnum.ENABLE
+  }
+  formRef.value?.resetFields()
+}
+
+/** 获得部门树 */
+const getTree = async () => {
+  deptTree.value = []
+  const data = await DeptApi.getSimpleDeptList()
+  let dept: Tree = { id: 0, name: '顶级部门', children: [] }
+  dept.children = handleTree(data)
+  deptTree.value.push(dept)
+}
+</script>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
new file mode 100644
index 000000000..8b1e3d86c
--- /dev/null
+++ b/src/views/system/dept/index.vue
@@ -0,0 +1,149 @@
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="部门名称" prop="title">
+        <el-input v-model="queryParams.name" placeholder="请输入部门名称" clearable class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="部门状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择部门状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['system:dept:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button type="danger" @click="toggleExpandAll">
+          <Icon icon="ep:sort" class="mr-5px" /> 展开/折叠
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" row-key="id" :default-expand-all="isExpandAll" v-if="refreshTable">
+      <el-table-column prop="name" label="部门名称" />
+      <el-table-column prop="leader" align="center" label="负责人">
+        <template #default="scope">
+          {{ userList.find((user) => user.id === scope.row.leaderUserId)?.nickname }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="sort" align="center" label="排序" width="200" />
+      <el-table-column prop="status" align="center" label="状态" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" class-name="fixed-width" fixed="right" width="200px">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['system:dept:update']">
+            <Icon icon="ep:edit" />
+            修改
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['system:dept:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <DeptForm ref="formRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import { handleTree } from '@/utils/tree'
+import * as DeptApi from '@/api/system/dept'
+import DeptForm from './DeptForm.vue'
+import * as UserApi from '@/api/system/user'
+
+defineOptions({ name: 'SystemDept' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref() // 列表的数据
+const queryParams = reactive({
+  title: '',
+  name: undefined,
+  status: undefined,
+  pageNo: 1,
+  pageSize: 100
+})
+const queryFormRef = ref() // 搜索的表单
+const isExpandAll = ref(true) // 是否展开，默认全部展开
+const refreshTable = ref(true) // 重新渲染表格状态
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+
+/** 查询部门列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await DeptApi.getDeptPage(queryParams)
+    list.value = handleTree(data)
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 展开/折叠操作 */
+const toggleExpandAll = () => {
+  refreshTable.value = false
+  isExpandAll.value = !isExpandAll.value
+  nextTick(() => {
+    refreshTable.value = true
+  })
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryParams.pageNo = 1
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await DeptApi.deleteDept(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  // 获取用户列表
+  userList.value = await UserApi.getSimpleUserList()
+})
+</script>
diff --git a/src/views/system/dict/DictTypeForm.vue b/src/views/system/dict/DictTypeForm.vue
new file mode 100644
index 000000000..5e416d785
--- /dev/null
+++ b/src/views/system/dict/DictTypeForm.vue
@@ -0,0 +1,124 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-form-item label="字典名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入字典名称" />
+      </el-form-item>
+      <el-form-item label="字典类型" prop="type">
+        <el-input
+          v-model="formData.type"
+          :disabled="typeof formData.id !== 'undefined'"
+          placeholder="请输入参数名称"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入内容" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as DictTypeApi from '@/api/system/dict/dict.type'
+import { CommonStatusEnum } from '@/utils/constants'
+
+defineOptions({ name: 'SystemDictTypeForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: '',
+  type: '',
+  status: CommonStatusEnum.ENABLE,
+  remark: ''
+})
+const formRules = reactive({
+  name: [{ required: true, message: '字典名称不能为空', trigger: 'blur' }],
+  type: [{ required: true, message: '字典类型不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await DictTypeApi.getDictType(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as DictTypeApi.DictTypeVO
+    if (formType.value === 'create') {
+      await DictTypeApi.createDictType(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DictTypeApi.updateDictType(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    type: '',
+    name: '',
+    status: CommonStatusEnum.ENABLE,
+    remark: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/dict/data/DictDataForm.vue b/src/views/system/dict/data/DictDataForm.vue
new file mode 100644
index 000000000..2094371de
--- /dev/null
+++ b/src/views/system/dict/data/DictDataForm.vue
@@ -0,0 +1,183 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-form-item label="字典类型" prop="type">
+        <el-input
+          v-model="formData.dictType"
+          :disabled="typeof formData.id !== 'undefined'"
+          placeholder="请输入参数名称"
+        />
+      </el-form-item>
+      <el-form-item label="数据标签" prop="label">
+        <el-input v-model="formData.label" placeholder="请输入数据标签" />
+      </el-form-item>
+      <el-form-item label="数据键值" prop="value">
+        <el-input v-model="formData.value" placeholder="请输入数据键值" />
+      </el-form-item>
+      <el-form-item label="显示排序" prop="sort">
+        <el-input-number v-model="formData.sort" :min="0" controls-position="right" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="颜色类型" prop="colorType">
+        <el-select v-model="formData.colorType">
+          <el-option
+            v-for="item in colorTypeOptions"
+            :key="item.value"
+            :label="item.label + '(' + item.value + ')'"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="CSS Class" prop="cssClass">
+        <el-input v-model="formData.cssClass" placeholder="请输入 CSS Class" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入内容" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as DictDataApi from '@/api/system/dict/dict.data'
+import { CommonStatusEnum } from '@/utils/constants'
+
+defineOptions({ name: 'SystemDictDataForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  sort: undefined,
+  label: '',
+  value: '',
+  dictType: '',
+  status: CommonStatusEnum.ENABLE,
+  colorType: '',
+  cssClass: '',
+  remark: ''
+})
+const formRules = reactive({
+  label: [{ required: true, message: '数据标签不能为空', trigger: 'blur' }],
+  value: [{ required: true, message: '数据键值不能为空', trigger: 'blur' }],
+  sort: [{ required: true, message: '数据顺序不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
+})
+const formRef = ref() // 表单 Ref
+
+// 数据标签回显样式
+const colorTypeOptions = readonly([
+  {
+    value: 'default',
+    label: '默认'
+  },
+  {
+    value: 'primary',
+    label: '主要'
+  },
+  {
+    value: 'success',
+    label: '成功'
+  },
+  {
+    value: 'info',
+    label: '信息'
+  },
+  {
+    value: 'warning',
+    label: '警告'
+  },
+  {
+    value: 'danger',
+    label: '危险'
+  }
+])
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number, dictType?: string) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  if (dictType) {
+    formData.value.dictType = dictType
+  }
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await DictDataApi.getDictData(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as DictDataApi.DictDataVO
+    if (formType.value === 'create') {
+      await DictDataApi.createDictData(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DictDataApi.updateDictData(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    sort: undefined,
+    label: '',
+    value: '',
+    dictType: '',
+    status: CommonStatusEnum.ENABLE,
+    colorType: '',
+    cssClass: '',
+    remark: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/dict/data/index.vue b/src/views/system/dict/data/index.vue
new file mode 100644
index 000000000..f07f1ae6a
--- /dev/null
+++ b/src/views/system/dict/data/index.vue
@@ -0,0 +1,210 @@
+<template>
+  <ContentWrap>
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="字典名称" prop="dictType">
+        <el-select v-model="queryParams.dictType" class="!w-240px">
+          <el-option
+            v-for="item in dictTypeList"
+            :key="item.type"
+            :label="item.name"
+            :value="item.type"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="字典标签" prop="label">
+        <el-input
+          v-model="queryParams.label"
+          placeholder="请输入字典标签"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="数据状态" clearable class="!w-240px">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['system:dict:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['system:dict:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="字典编码" align="center" prop="id" />
+      <el-table-column label="字典标签" align="center" prop="label" />
+      <el-table-column label="字典键值" align="center" prop="value" />
+      <el-table-column label="字典排序" align="center" prop="sort" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="颜色类型" align="center" prop="colorType" />
+      <el-table-column label="CSS Class" align="center" prop="cssClass" />
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['system:dict:update']"
+          >
+            修改
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['system:dict:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <DictDataForm ref="formRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as DictDataApi from '@/api/system/dict/dict.data'
+import * as DictTypeApi from '@/api/system/dict/dict.type'
+import DictDataForm from './DictDataForm.vue'
+
+defineOptions({ name: 'SystemDictData' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  label: '',
+  status: undefined,
+  dictType: route.params.dictType
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const dictTypeList = ref<DictTypeApi.DictTypeVO[]>() // 字典类型的列表
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await DictDataApi.getDictDataPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id, queryParams.dictType)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await DictDataApi.deleteDictData(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DictDataApi.exportDictData(queryParams)
+    download.excel(data, '字典数据.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  // 查询字典（精简)列表
+  dictTypeList.value = await DictTypeApi.getSimpleDictTypeList()
+})
+</script>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
new file mode 100644
index 000000000..f9a257af4
--- /dev/null
+++ b/src/views/system/dict/index.vue
@@ -0,0 +1,175 @@
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form ref="queryFormRef" :inline="true" :model="queryParams" class="-mb-15px" label-width="68px">
+      <el-form-item label="字典名称" prop="name">
+        <el-input v-model="queryParams.name" class="!w-240px" clearable placeholder="请输入字典名称"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="字典类型" prop="type">
+        <el-input v-model="queryParams.type" class="!w-240px" clearable placeholder="请输入字典类型"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择字典状态">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" end-placeholder="结束日期" start-placeholder="开始日期" type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button v-hasPermi="['system:dict:create']" type="primary" @click="openForm('create')">
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+        <el-button v-hasPermi="['system:dict:export']" :loading="exportLoading" type="success" @click="handleExport">
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column align="center" label="字典编号" prop="id" />
+      <el-table-column align="center" label="字典名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="字典类型" prop="type" width="300" />
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="备注" prop="remark" />
+      <el-table-column :formatter="dateFormatter" align="center" label="创建时间" prop="createTime" width="180" />
+      <el-table-column align="center" label="操作"  fixed="right" width="240">
+        <template #default="scope">
+          <el-button v-hasPermi="['system:dict:update']" link type="primary" @click="openForm('update', scope.row.id)">
+            <Icon icon="ep:edit" />
+            修改
+          </el-button>
+          <el-button link type="primary">
+            <router-link :to="'/dict/type/data/' + scope.row.type">
+              <el-button link type="primary">
+                <Icon icon="fa:area-chart" />数据
+              </el-button>
+            </router-link>
+          </el-button>
+          <el-button v-hasPermi="['system:dict:delete']" link type="danger" @click="handleDelete(scope.row.id)">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <DictTypeForm ref="formRef" @success="getList" />
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as DictTypeApi from '@/api/system/dict/dict.type'
+import DictTypeForm from './DictTypeForm.vue'
+import download from '@/utils/download'
+
+defineOptions({ name: 'SystemDictType' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: '',
+  type: '',
+  status: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询字典类型列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await DictTypeApi.getDictTypePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await DictTypeApi.deleteDictType(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DictTypeApi.exportDictType(queryParams)
+    download.excel(data, '字典类型.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/errorCode/ErrorCodeForm.vue b/src/views/system/errorCode/ErrorCodeForm.vue
new file mode 100644
index 000000000..24ac2b988
--- /dev/null
+++ b/src/views/system/errorCode/ErrorCodeForm.vue
@@ -0,0 +1,112 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+    >
+      <el-form-item label="应用名" prop="applicationName">
+        <el-input v-model="formData.applicationName" clearable placeholder="请输入应用名" />
+      </el-form-item>
+      <el-form-item label="错误码编码" prop="code">
+        <el-input v-model="formData.code" clearable placeholder="请输入错误码编码" />
+      </el-form-item>
+      <el-form-item label="错误码提示" prop="message">
+        <el-input v-model="formData.message" clearable placeholder="请输入错误码提示" />
+      </el-form-item>
+      <el-form-item label="备注" prop="memo">
+        <el-input v-model="formData.memo" clearable placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as ErrorCodeApi from '@/api/system/errorCode'
+
+defineOptions({ name: 'SystemErrorCodeForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+// 表单参数
+const formData = ref({
+  id: undefined,
+  code: undefined,
+  applicationName: '',
+  message: '',
+  memo: ''
+})
+// 表单校验
+const formRules = reactive({
+  applicationName: [{ required: true, message: '应用名不能为空', trigger: 'blur' }],
+  code: [{ required: true, message: '错误码编码不能为空', trigger: 'blur' }],
+  message: [{ required: true, message: '错误码提示不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ErrorCodeApi.getErrorCode(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as ErrorCodeApi.ErrorCodeVO
+    if (formType.value === 'create') {
+      await ErrorCodeApi.createErrorCode(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ErrorCodeApi.updateErrorCode(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 表单重置 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    applicationName: '',
+    code: undefined,
+    message: '',
+    memo: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/errorCode/index.vue b/src/views/system/errorCode/index.vue
new file mode 100644
index 000000000..dac5240a0
--- /dev/null
+++ b/src/views/system/errorCode/index.vue
@@ -0,0 +1,171 @@
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="90px">
+      <el-form-item label="错误码类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择错误码类型" clearable>
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_ERROR_CODE_TYPE)" :key="dict.value"
+            :label="dict.label" :value="dict.value" class="!w-240px" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="应用名" prop="applicationName">
+        <el-input v-model="queryParams.applicationName" placeholder="请输入应用名" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="错误码编码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入错误码编码" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="错误码提示" prop="message">
+        <el-input v-model="queryParams.message" placeholder="请输入错误码提示" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['system:error-code:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button type="success" @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['system:error-code:export']">
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="类型" align="center" prop="type" width="80">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_ERROR_CODE_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="应用名" align="center" prop="applicationName" width="200" />
+      <el-table-column label="错误码编码" align="center" prop="code" width="120" />
+      <el-table-column label="错误码提示" align="center" prop="message" width="300" />
+      <el-table-column label="备注" align="center" prop="memo" width="200" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" class-name="small-paddingfixed-width" fixed="right" width="180">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['system:error-code:update']">
+            <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['system:error-code:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ErrorCodeForm ref="formRef" @success="getList" />
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as ErrorCodeApi from '@/api/system/errorCode'
+import ErrorCodeForm from './ErrorCodeForm.vue'
+
+defineOptions({ name: 'SystemErrorCode' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 遮罩层
+const exportLoading = ref(false) // 导出遮罩层
+const total = ref(0) // 总条数
+const list = ref([]) // 错误码列表
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  type: undefined,
+  applicationName: undefined,
+  code: undefined,
+  message: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ErrorCodeApi.getErrorCodePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    await ErrorCodeApi.deleteErrorCode(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ErrorCodeApi.excelErrorCode(queryParams)
+    download.excel(data, '错误码.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/loginlog/LoginLogDetail.vue b/src/views/system/loginlog/LoginLogDetail.vue
new file mode 100644
index 000000000..54db02594
--- /dev/null
+++ b/src/views/system/loginlog/LoginLogDetail.vue
@@ -0,0 +1,51 @@
+<template>
+  <Dialog v-model="dialogVisible" title="详情" width="800">
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="日志编号" min-width="120">
+        {{ detailData.id }}
+      </el-descriptions-item>
+      <el-descriptions-item label="操作类型">
+        <dict-tag :type="DICT_TYPE.SYSTEM_LOGIN_TYPE" :value="detailData.logType" />
+      </el-descriptions-item>
+      <el-descriptions-item label="用户名称">
+        {{ detailData.username }}
+      </el-descriptions-item>
+      <el-descriptions-item label="登录地址">
+        {{ detailData.userIp }}
+      </el-descriptions-item>
+      <el-descriptions-item label="浏览器">
+        {{ detailData.userAgent }}
+      </el-descriptions-item>
+      <el-descriptions-item label="登陆结果">
+        <dict-tag :type="DICT_TYPE.SYSTEM_LOGIN_RESULT" :value="detailData.result" />
+      </el-descriptions-item>
+      <el-descriptions-item label="登录日期">
+        {{ formatDate(detailData.createTime) }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import * as LoginLogApi from '@/api/system/loginLog'
+
+defineOptions({ name: 'SystemLoginLogDetail' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref() // 详情数据
+
+/** 打开弹窗 */
+const open = async (data: LoginLogApi.LoginLogVO) => {
+  dialogVisible.value = true
+  // 设置数据
+  detailLoading.value = true
+  try {
+    detailData.value = data
+  } finally {
+    detailLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/system/loginlog/index.vue b/src/views/system/loginlog/index.vue
new file mode 100644
index 000000000..997fcef9d
--- /dev/null
+++ b/src/views/system/loginlog/index.vue
@@ -0,0 +1,140 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="用户名称" prop="username">
+        <el-input v-model="queryParams.username" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="登录地址" prop="userIp">
+        <el-input v-model="queryParams.userIp" placeholder="请输入登录地址" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="登录日期" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="success" @click="handleExport" :loading="exportLoading" v-hasPermi="['infra:config:export']">
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="日志编号" align="center" prop="id" />
+      <el-table-column label="操作类型" align="center" prop="logType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_LOGIN_TYPE" :value="scope.row.logType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="用户名称" align="center" prop="username" width="180" />
+      <el-table-column label="登录地址" align="center" prop="userIp" width="180" />
+      <el-table-column label="浏览器" align="center" prop="userAgent" />
+      <el-table-column label="登陆结果" align="center" prop="result">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_LOGIN_RESULT" :value="scope.row.result" />
+        </template>
+      </el-table-column>
+      <el-table-column label="登录日期" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" fixed="right" width="120">
+        <template #default="scope">
+          <el-button link type="primary" @click="openDetail(scope.row)" v-hasPermi="['infra:config:query']">
+            <Icon icon="ep:document-copy" />
+            详情
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：详情 -->
+  <LoginLogDetail ref="detailRef" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as LoginLogApi from '@/api/system/loginLog'
+import LoginLogDetail from './LoginLogDetail.vue'
+
+defineOptions({ name: 'SystemLoginLog' })
+
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  username: undefined,
+  userIp: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await LoginLogApi.getLoginLogPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (data: LoginLogApi.LoginLogVO) => {
+  detailRef.value.open(data)
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await LoginLogApi.exportLoginLog(queryParams)
+    download.excel(data, '登录日志.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/mail/account/MailAccountDetail.vue b/src/views/system/mail/account/MailAccountDetail.vue
new file mode 100644
index 000000000..4174fab8b
--- /dev/null
+++ b/src/views/system/mail/account/MailAccountDetail.vue
@@ -0,0 +1,28 @@
+<template>
+  <Dialog v-model="dialogVisible" title="详情">
+    <Descriptions :data="detailData" :schema="allSchemas.detailSchema" />
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as MailAccountApi from '@/api/system/mail/account'
+import { allSchemas } from './account.data'
+
+defineOptions({ name: 'SystemMailAccountDetail' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref() // 详情数据
+
+/** 打开弹窗 */
+const open = async (id: number) => {
+  dialogVisible.value = true
+  // 设置数据
+  detailLoading.value = true
+  try {
+    detailData.value = await MailAccountApi.getMailAccount(id)
+  } finally {
+    detailLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/system/mail/account/MailAccountForm.vue b/src/views/system/mail/account/MailAccountForm.vue
new file mode 100644
index 000000000..e0108725e
--- /dev/null
+++ b/src/views/system/mail/account/MailAccountForm.vue
@@ -0,0 +1,68 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <Form ref="formRef" v-loading="formLoading" :rules="rules" :schema="allSchemas.formSchema" />
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as MailAccountApi from '@/api/system/mail/account'
+import { allSchemas, rules } from './account.data'
+
+defineOptions({ name: 'SystemMailAccountForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      const data = await MailAccountApi.getMailAccount(id)
+      formRef.value.setValues(data)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.getElFormRef().validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formRef.value.formModel as MailAccountApi.MailAccountVO
+    if (formType.value === 'create') {
+      await MailAccountApi.createMailAccount(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await MailAccountApi.updateMailAccount(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
diff --git a/src/views/system/mail/account/account.data.ts b/src/views/system/mail/account/account.data.ts
new file mode 100644
index 000000000..8b33edc5b
--- /dev/null
+++ b/src/views/system/mail/account/account.data.ts
@@ -0,0 +1,76 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+// 表单校验
+export const rules = reactive({
+  mail: [
+    { required: true, message: t('profile.rules.mail'), trigger: 'blur' },
+    {
+      type: 'email',
+      message: t('profile.rules.truemail'),
+      trigger: ['blur', 'change']
+    }
+  ],
+  username: [required],
+  password: [required],
+  host: [required],
+  port: [required],
+  sslEnable: [required]
+})
+
+// CrudSchema：https://doc.iocoder.cn/vue3/crud-schema/
+const crudSchemas = reactive<CrudSchema[]>([
+  {
+    label: '邮箱',
+    field: 'mail',
+    isSearch: true
+  },
+  {
+    label: '用户名',
+    field: 'username',
+    isSearch: true
+  },
+  {
+    label: '密码',
+    field: 'password',
+    isTable: false
+  },
+  {
+    label: 'SMTP 服务器域名',
+    field: 'host'
+  },
+  {
+    label: 'SMTP 服务器端口',
+    field: 'port',
+    form: {
+      component: 'InputNumber',
+      value: 465
+    }
+  },
+  {
+    label: '是否开启 SSL',
+    field: 'sslEnable',
+    dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
+    dictClass: 'boolean',
+    form: {
+      component: 'Radio'
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    isDetail: false
+  }
+])
+export const { allSchemas } = useCrudSchemas(crudSchemas)
diff --git a/src/views/system/mail/account/index.vue b/src/views/system/mail/account/index.vue
new file mode 100644
index 000000000..1610ff037
--- /dev/null
+++ b/src/views/system/mail/account/index.vue
@@ -0,0 +1,80 @@
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <Search :schema="allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams">
+      <!-- 新增等操作按钮 -->
+      <template #actionMore>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['system:mail-account:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+      </template>
+    </Search>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table :columns="allSchemas.tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+      total: tableObject.total
+    }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage">
+      <template #action="{ row }">
+        <el-button link type="primary" @click="openForm('update', row.id)" v-hasPermi="['system:mail-account:update']">
+          <Icon icon="ep:edit" />
+          编辑
+        </el-button>
+        <el-button link type="primary" @click="openDetail(row.id)" v-hasPermi="['system:mail-account:query']">
+          <Icon icon="ep:document-copy" />
+          详情
+        </el-button>
+        <el-button link type="danger" v-hasPermi="['system:mail-account:delete']" @click="handleDelete(row.id)">
+          <Icon icon="ep:delete" />
+          删除
+        </el-button>
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <MailAccountForm ref="formRef" @success="getList" />
+  <!-- 详情弹窗 -->
+  <MailAccountDetail ref="detailRef" />
+</template>
+<script lang="ts" setup>
+import { allSchemas } from './account.data'
+import * as MailAccountApi from '@/api/system/mail/account'
+import MailAccountForm from './MailAccountForm.vue'
+import MailAccountDetail from './MailAccountDetail.vue'
+
+defineOptions({ name: 'SystemMailAccount' })
+
+// tableObject：表格的属性对象，可获得分页大小、条数等属性
+// tableMethods：表格的操作对象，可进行获得分页、删除记录等操作
+// 详细可见：https://doc.iocoder.cn/vue3/crud-schema/
+const { tableObject, tableMethods } = useTable({
+  getListApi: MailAccountApi.getMailAccountPage, // 分页接口
+  delListApi: MailAccountApi.deleteMailAccount // 删除接口
+})
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (id: number) => {
+  detailRef.value.open(id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = (id: number) => {
+  tableMethods.delList(id, false)
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/mail/log/MailLogDetail.vue b/src/views/system/mail/log/MailLogDetail.vue
new file mode 100644
index 000000000..b1f1ea7d2
--- /dev/null
+++ b/src/views/system/mail/log/MailLogDetail.vue
@@ -0,0 +1,33 @@
+<template>
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="详情">
+    <Descriptions :data="detailData" :schema="allSchemas.detailSchema">
+      <!-- 展示 HTML 内容 -->
+      <template #templateContent="{ row }">
+        <div v-dompurify-html="row.templateContent"></div>
+      </template>
+    </Descriptions>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as MailLogApi from '@/api/system/mail/log'
+import { allSchemas } from './log.data'
+
+defineOptions({ name: 'SystemMailLogDetail' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref() // 详情数据
+
+/** 打开弹窗 */
+const open = async (id: number) => {
+  dialogVisible.value = true
+  // 设置数据
+  detailLoading.value = true
+  try {
+    detailData.value = await MailLogApi.getMailLog(id)
+  } finally {
+    detailLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/system/mail/log/index.vue b/src/views/system/mail/log/index.vue
new file mode 100644
index 000000000..ed9ac64f3
--- /dev/null
+++ b/src/views/system/mail/log/index.vue
@@ -0,0 +1,62 @@
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <Search :schema="allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="allSchemas.tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+    >
+      <template #action="{ row }">
+        <el-button
+          link
+          type="primary"
+          @click="openDetail(row.id)"
+          v-hasPermi="['system:mail-log:query']"
+        >
+         <Icon icon="ep:document-copy" />
+          详情
+        </el-button>
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：详情 -->
+  <mail-log-detail ref="detailRef" />
+</template>
+<script lang="ts" setup>
+import { allSchemas } from './log.data'
+import * as MailLogApi from '@/api/system/mail/log'
+import MailLogDetail from './MailLogDetail.vue'
+
+defineOptions({ name: 'SystemMailLog' })
+
+// tableObject：表格的属性对象，可获得分页大小、条数等属性
+// tableMethods：表格的操作对象，可进行获得分页、删除记录等操作
+// 详细可见：https://doc.iocoder.cn/vue3/crud-schema/
+const { tableObject, tableMethods } = useTable({
+  getListApi: MailLogApi.getMailLogPage // 分页接口
+})
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (id: number) => {
+  detailRef.value.open(id)
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/mail/log/log.data.ts b/src/views/system/mail/log/log.data.ts
new file mode 100644
index 000000000..62cbf516a
--- /dev/null
+++ b/src/views/system/mail/log/log.data.ts
@@ -0,0 +1,133 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as MailAccountApi from '@/api/system/mail/account'
+
+// 邮箱账号的列表
+const accountList = await MailAccountApi.getSimpleMailAccountList()
+
+// CrudSchema：https://doc.iocoder.cn/vue3/crud-schema/
+const crudSchemas = reactive<CrudSchema[]>([
+  {
+    label: '编号',
+    field: 'id'
+  },
+  {
+    label: '发送时间',
+    field: 'sendTime',
+    formatter: dateFormatter,
+    search: {
+      show: true,
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    }
+  },
+  {
+    label: '接收邮箱',
+    field: 'toMail'
+  },
+  {
+    label: '用户编号',
+    field: 'userId',
+    isSearch: true,
+    isTable: false
+  },
+  {
+    label: '用户类型',
+    field: 'userType',
+    dictType: DICT_TYPE.USER_TYPE,
+    dictClass: 'number',
+    isSearch: true,
+    isTable: false
+  },
+  {
+    label: '邮件标题',
+    field: 'templateTitle'
+  },
+  {
+    label: '邮件内容',
+    field: 'templateContent',
+    isTable: false
+  },
+  {
+    label: '邮箱参数',
+    field: 'templateParams',
+    isTable: false
+  },
+  {
+    label: '发送状态',
+    field: 'sendStatus',
+    dictType: DICT_TYPE.SYSTEM_MAIL_SEND_STATUS,
+    dictClass: 'string',
+    isSearch: true
+  },
+  {
+    label: '邮箱账号',
+    field: 'accountId',
+    isTable: false,
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => accountList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'mail',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '发送邮箱地址',
+    field: 'fromMail',
+    table: {
+      label: '邮箱账号'
+    }
+  },
+  {
+    label: '模板编号',
+    field: 'templateId',
+    isSearch: true
+  },
+  {
+    label: '模板编码',
+    field: 'templateCode',
+    isTable: false
+  },
+  {
+    label: '模版发送人名称',
+    field: 'templateNickname',
+    isTable: false
+  },
+  {
+    label: '发送返回的消息编号',
+    field: 'sendMessageId',
+    isTable: false
+  },
+  {
+    label: '发送异常',
+    field: 'sendException',
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false
+  }
+])
+export const { allSchemas } = useCrudSchemas(crudSchemas)
diff --git a/src/views/system/mail/template/MailTemplateForm.vue b/src/views/system/mail/template/MailTemplateForm.vue
new file mode 100644
index 000000000..0d9fa8999
--- /dev/null
+++ b/src/views/system/mail/template/MailTemplateForm.vue
@@ -0,0 +1,74 @@
+<template>
+  <Dialog
+    v-model="dialogVisible"
+    :max-height="500"
+    :scroll="true"
+    :title="dialogTitle"
+    :width="800"
+  >
+    <Form ref="formRef" v-loading="formLoading" :rules="rules" :schema="allSchemas.formSchema" />
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as MailTemplateApi from '@/api/system/mail/template'
+import { allSchemas, rules } from './template.data'
+
+defineOptions({ name: 'SystemMailTemplateForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      const data = await MailTemplateApi.getMailTemplate(id)
+      formRef.value.setValues(data)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.getElFormRef().validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formRef.value.formModel as MailTemplateApi.MailTemplateVO
+    if (formType.value === 'create') {
+      await MailTemplateApi.createMailTemplate(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await MailTemplateApi.updateMailTemplate(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
diff --git a/src/views/system/mail/template/MailTemplateSendForm.vue b/src/views/system/mail/template/MailTemplateSendForm.vue
new file mode 100644
index 000000000..ebf945dff
--- /dev/null
+++ b/src/views/system/mail/template/MailTemplateSendForm.vue
@@ -0,0 +1,115 @@
+<template>
+  <Dialog v-model="dialogVisible" title="测试">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+    >
+      <el-form-item label="模板内容" prop="content">
+        <Editor :model-value="formData.content" height="150px" readonly />
+      </el-form-item>
+      <el-form-item label="收件邮箱" prop="mail">
+        <el-input v-model="formData.mail" placeholder="请输入收件邮箱" />
+      </el-form-item>
+      <el-form-item
+        v-for="param in formData.params"
+        :key="param"
+        :label="'参数 {' + param + '}'"
+        :prop="'templateParams.' + param"
+      >
+        <el-input
+          v-model="formData.templateParams[param]"
+          :placeholder="'请输入 ' + param + ' 参数'"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as MailTemplateApi from '@/api/system/mail/template'
+
+defineOptions({ name: 'SystemMailTemplateSendForm' })
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  content: '',
+  params: {},
+  mail: '',
+  templateCode: '',
+  templateParams: new Map()
+})
+const formRules = reactive({
+  mail: [{ required: true, message: '邮箱不能为空', trigger: 'blur' }],
+  templateCode: [{ required: true, message: '模版编号不能为空', trigger: 'blur' }],
+  templateParams: {}
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (id: number) => {
+  dialogVisible.value = true
+  resetForm()
+  // 设置数据
+  formLoading.value = true
+  try {
+    const data = await MailTemplateApi.getMailTemplate(id)
+    // 设置动态表单
+    formData.value.content = data.content
+    formData.value.params = data.params
+    formData.value.templateCode = data.code
+    formData.value.templateParams = data.params.reduce((obj, item) => {
+      obj[item] = '' // 给每个动态属性赋值，避免无法读取
+      return obj
+    }, {})
+    formRules.templateParams = data.params.reduce((obj, item) => {
+      obj[item] = { required: true, message: '参数 ' + item + ' 不能为空', trigger: 'blur' }
+      return obj
+    }, {})
+  } finally {
+    formLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as MailTemplateApi.MailSendReqVO
+    const logId = await MailTemplateApi.sendMail(data)
+    if (logId) {
+      message.success('提交发送成功！发送结果，见发送日志编号：' + logId)
+    }
+    dialogVisible.value = false
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    content: '',
+    params: {},
+    mail: '',
+    templateCode: '',
+    templateParams: new Map()
+  }
+  formRules.templateParams = {}
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/mail/template/index.vue b/src/views/system/mail/template/index.vue
new file mode 100644
index 000000000..295ee3fec
--- /dev/null
+++ b/src/views/system/mail/template/index.vue
@@ -0,0 +1,84 @@
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <Search :schema="allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams">
+      <!-- 新增等操作按钮 -->
+      <template #actionMore>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['system:mail-account:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+      </template>
+    </Search>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table :columns="allSchemas.tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+      total: tableObject.total
+    }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage" width="300px">
+      <template #action="{ row }">
+        <div>
+          <el-button link type="primary" @click="openSendForm(row.id)" v-hasPermi="['system:mail-template:send-mail']">
+            <Icon icon="ep:cellphone" />
+            测试
+          </el-button>
+          <el-button link type="primary" @click="openForm('update', row.id)" v-hasPermi="['system:mail-template:update']">
+            <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button link type="danger" v-hasPermi="['system:mail-template:delete']" @click="handleDelete(row.id)">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </div>
+
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <MailTemplateForm ref="formRef" @success="getList" />
+
+  <!-- 表单弹窗：发送测试 -->
+  <MailTemplateSendForm ref="sendFormRef" />
+</template>
+<script lang="ts" setup>
+import { allSchemas } from './template.data'
+import * as MailTemplateApi from '@/api/system/mail/template'
+import MailTemplateForm from './MailTemplateForm.vue'
+import MailTemplateSendForm from './MailTemplateSendForm.vue'
+
+defineOptions({ name: 'SystemMailTemplate' })
+
+// tableObject：表格的属性对象，可获得分页大小、条数等属性
+// tableMethods：表格的操作对象，可进行获得分页、删除记录等操作
+// 详细可见：https://doc.iocoder.cn/vue3/crud-schema/
+const { tableObject, tableMethods } = useTable({
+  getListApi: MailTemplateApi.getMailTemplatePage, // 分页接口
+  delListApi: MailTemplateApi.deleteMailTemplate // 删除接口
+})
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = (id: number) => {
+  tableMethods.delList(id, false)
+}
+
+/** 发送测试操作 */
+const sendFormRef = ref()
+const openSendForm = (id: number) => {
+  sendFormRef.value.open(id)
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/mail/template/template.data.ts b/src/views/system/mail/template/template.data.ts
new file mode 100644
index 000000000..e68f875a1
--- /dev/null
+++ b/src/views/system/mail/template/template.data.ts
@@ -0,0 +1,113 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as MailAccountApi from '@/api/system/mail/account'
+
+// 邮箱账号的列表
+const accountList = await MailAccountApi.getSimpleMailAccountList()
+
+// 表单校验
+export const rules = reactive({
+  name: [required],
+  code: [required],
+  accountId: [required],
+  label: [required],
+  content: [required],
+  params: [required],
+  status: [required]
+})
+
+// CrudSchema：https://doc.iocoder.cn/vue3/crud-schema/
+const crudSchemas = reactive<CrudSchema[]>([
+  {
+    label: '模板编码',
+    field: 'code',
+    isSearch: true
+  },
+  {
+    label: '模板名称',
+    field: 'name',
+    isSearch: true
+  },
+  {
+    label: '模板标题',
+    field: 'title'
+  },
+  {
+    label: '模板内容',
+    field: 'content',
+    form: {
+      component: 'Editor',
+      componentProps: {
+        valueHtml: '',
+        height: 200
+      }
+    }
+  },
+  {
+    label: '邮箱账号',
+    field: 'accountId',
+    width: '200px',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return accountList.find((account) => account.id === cellValue)?.mail
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => accountList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'mail',
+          valueField: 'id'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => accountList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'mail',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '发送人名称',
+    field: 'nickname'
+  },
+  {
+    label: '开启状态',
+    field: 'status',
+    isSearch: true,
+    dictType: DICT_TYPE.COMMON_STATUS,
+    dictClass: 'number'
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    formatter: dateFormatter,
+    search: {
+      show: true,
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false
+  }
+])
+export const { allSchemas } = useCrudSchemas(crudSchemas)
diff --git a/src/views/system/menu/MenuForm.vue b/src/views/system/menu/MenuForm.vue
new file mode 100644
index 000000000..78debc554
--- /dev/null
+++ b/src/views/system/menu/MenuForm.vue
@@ -0,0 +1,256 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+    >
+      <el-form-item label="上级菜单">
+        <el-tree-select
+          v-model="formData.parentId"
+          :data="menuTree"
+          :default-expanded-keys="[0]"
+          :props="defaultProps"
+          check-strictly
+          node-key="id"
+        />
+      </el-form-item>
+      <el-form-item label="菜单名称" prop="name">
+        <el-input v-model="formData.name" clearable placeholder="请输入菜单名称" />
+      </el-form-item>
+      <el-form-item label="菜单类型" prop="type">
+        <el-radio-group v-model="formData.type">
+          <el-radio-button
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_MENU_TYPE)"
+            :key="dict.label"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-if="formData.type !== 3" label="菜单图标">
+        <IconSelect v-model="formData.icon" clearable />
+      </el-form-item>
+      <el-form-item v-if="formData.type !== 3" label="路由地址" prop="path">
+        <template #label>
+          <Tooltip
+            message="访问的路由地址，如：`user`。如需外网地址时，则以 `http(s)://` 开头"
+            titel="路由地址"
+          />
+        </template>
+        <el-input v-model="formData.path" clearable placeholder="请输入路由地址" />
+      </el-form-item>
+      <el-form-item v-if="formData.type === 2" label="组件地址" prop="component">
+        <el-input v-model="formData.component" clearable placeholder="例如说：system/user/index" />
+      </el-form-item>
+      <el-form-item v-if="formData.type === 2" label="组件名字" prop="componentName">
+        <el-input v-model="formData.componentName" clearable placeholder="例如说：SystemUser" />
+      </el-form-item>
+      <el-form-item v-if="formData.type !== 1" label="权限标识" prop="permission">
+        <template #label>
+          <Tooltip
+            message="Controller 方法上的权限字符，如：@PreAuthorize(`@ss.hasPermission('system:user:list')`)"
+            titel="权限标识"
+          />
+        </template>
+        <el-input v-model="formData.permission" clearable placeholder="请输入权限标识" />
+      </el-form-item>
+      <el-form-item label="显示排序" prop="sort">
+        <el-input-number v-model="formData.sort" :min="0" clearable controls-position="right" />
+      </el-form-item>
+      <el-form-item label="菜单状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.label"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-if="formData.type !== 3" label="显示状态" prop="visible">
+        <template #label>
+          <Tooltip message="选择隐藏时，路由将不会出现在侧边栏，但仍然可以访问" titel="显示状态" />
+        </template>
+        <el-radio-group v-model="formData.visible">
+          <el-radio key="true" :label="true" border>显示</el-radio>
+          <el-radio key="false" :label="false" border>隐藏</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-if="formData.type !== 3" label="总是显示" prop="alwaysShow">
+        <template #label>
+          <Tooltip
+            message="选择不是时，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单"
+            titel="总是显示"
+          />
+        </template>
+        <el-radio-group v-model="formData.alwaysShow">
+          <el-radio key="true" :label="true" border>总是</el-radio>
+          <el-radio key="false" :label="false" border>不是</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-if="formData.type === 2" label="缓存状态" prop="keepAlive">
+        <template #label>
+          <Tooltip
+            message="选择缓存时，则会被 `keep-alive` 缓存，必须填写「组件名称」字段"
+            titel="缓存状态"
+          />
+        </template>
+        <el-radio-group v-model="formData.keepAlive">
+          <el-radio key="true" :label="true" border>缓存</el-radio>
+          <el-radio key="false" :label="false" border>不缓存</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as MenuApi from '@/api/system/menu'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CommonStatusEnum, SystemMenuTypeEnum } from '@/utils/constants'
+import { defaultProps, handleTree } from '@/utils/tree'
+
+defineOptions({ name: 'SystemMenuForm' })
+
+const { wsCache } = useCache()
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: 0,
+  name: '',
+  permission: '',
+  type: SystemMenuTypeEnum.DIR,
+  sort: Number(undefined),
+  parentId: 0,
+  path: '',
+  icon: '',
+  component: '',
+  componentName: '',
+  status: CommonStatusEnum.ENABLE,
+  visible: true,
+  keepAlive: true,
+  alwaysShow: true
+})
+const formRules = reactive({
+  name: [{ required: true, message: '菜单名称不能为空', trigger: 'blur' }],
+  sort: [{ required: true, message: '菜单顺序不能为空', trigger: 'blur' }],
+  path: [{ required: true, message: '路由地址不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number, parentId?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  if (parentId) {
+    formData.value.parentId = parentId
+  }
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await MenuApi.getMenu(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 获得菜单列表
+  await getTree()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    if (
+      formData.value.type === SystemMenuTypeEnum.DIR ||
+      formData.value.type === SystemMenuTypeEnum.MENU
+    ) {
+      if (!isExternal(formData.value.path)) {
+        if (formData.value.parentId === 0 && formData.value.path.charAt(0) !== '/') {
+          message.error('路径必须以 / 开头')
+          return
+        } else if (formData.value.parentId !== 0 && formData.value.path.charAt(0) === '/') {
+          message.error('路径不能以 / 开头')
+          return
+        }
+      }
+    }
+    const data = formData.value as unknown as MenuApi.MenuVO
+    if (formType.value === 'create') {
+      await MenuApi.createMenu(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await MenuApi.updateMenu(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+    // 清空，从而触发刷新
+    wsCache.delete(CACHE_KEY.ROLE_ROUTERS)
+  }
+}
+
+/** 获取下拉框[上级菜单]的数据  */
+const menuTree = ref<Tree[]>([]) // 树形结构
+const getTree = async () => {
+  menuTree.value = []
+  const res = await MenuApi.getSimpleMenusList()
+  let menu: Tree = { id: 0, name: '主类目', children: [] }
+  menu.children = handleTree(res)
+  menuTree.value.push(menu)
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: 0,
+    name: '',
+    permission: '',
+    type: SystemMenuTypeEnum.DIR,
+    sort: Number(undefined),
+    parentId: 0,
+    path: '',
+    icon: '',
+    component: '',
+    componentName: '',
+    status: CommonStatusEnum.ENABLE,
+    visible: true,
+    keepAlive: true,
+    alwaysShow: true
+  }
+  formRef.value?.resetFields()
+}
+
+/** 判断 path 是不是外部的 HTTP 等链接 */
+const isExternal = (path: string) => {
+  return /^(https?:|mailto:|tel:)/.test(path)
+}
+</script>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
new file mode 100644
index 000000000..3456695ab
--- /dev/null
+++ b/src/views/system/menu/index.vue
@@ -0,0 +1,276 @@
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form ref="queryFormRef" :inline="true" :model="queryParams" class="-mb-15px" label-width="68px">
+      <el-form-item label="菜单名称" prop="name">
+        <el-input v-model="queryParams.name" class="!w-240px" clearable placeholder="请输入菜单名称"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择菜单状态">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button v-hasPermi="['system:menu:create']" type="primary" @click="openForm('create')">
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+        <!-- <el-button type="danger" @click="toggleExpandAll">
+          <Icon class="mr-5px" icon="ep:sort" />
+          展开/折叠
+        </el-button> -->
+        <el-button @click="refreshMenu">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          刷新菜单缓存
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table-v2
+      v-model:expanded-row-keys="expandedRowKeys"
+      v-if="refreshTable"
+      v-loading="loading"
+      :expand-column-key="expandColumnKey"
+      :columns="columns"
+      :data="list"
+      :width="clientWidth-300"
+      :height="clientHeight-280"
+      @row-expand="onRowExpanded"
+      @expanded-rows-change="onExpandedRowsChange"
+      fixed
+    />
+    <!-- <el-table v-if="refreshTable" v-loading="loading" :data="list" :default-expand-all="isExpandAll" row-key="id">
+      <el-table-column :show-overflow-tooltip="true" label="菜单名称" prop="name" width="250" />
+      <el-table-column align="center" label="图标" prop="icon" width="100">
+        <template #default="scope">
+          <Icon :icon="scope.row.icon" />
+        </template>
+      </el-table-column>
+      <el-table-column label="排序" prop="sort" width="60" />
+      <el-table-column :show-overflow-tooltip="true" label="权限标识" prop="permission" />
+      <el-table-column :show-overflow-tooltip="true" label="组件路径" prop="component" />
+      <el-table-column :show-overflow-tooltip="true" label="组件名称" prop="componentName" />
+      <el-table-column label="状态" prop="status" width="80">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作">
+        <template #default="scope">
+          <el-button v-hasPermi="['system:menu:update']" link type="primary" @click="openForm('update', scope.row.id)">
+            <Icon icon="ep:edit" />
+            修改
+          </el-button>
+          <el-button v-hasPermi="['system:menu:create']" link type="primary"
+            @click="openForm('create', undefined, scope.row.id)">
+            <Icon icon="ep:plus" />
+            新增
+          </el-button>
+          <el-button v-hasPermi="['system:menu:delete']" link type="danger" @click="handleDelete(scope.row.id)">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table> -->
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <MenuForm ref="formRef" @success="getList" />
+</template>
+<script lang="tsx" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { handleTree } from '@/utils/tree'
+import * as MenuApi from '@/api/system/menu'
+import MenuForm from './MenuForm.vue'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { getInfo } from '@/api/login'
+import Icon from '@/components/Icon/src/Icon.vue'
+import { ElButton, TableV2FixedDir  } from 'element-plus'
+
+defineOptions({ name: 'SystemMenu' })
+const clientWidth = window.document.documentElement.clientWidth
+const clientHeight = window.document.documentElement.clientHeight
+
+const { wsCache } = useCache()
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const list = ref<any>([]) // 列表的数据
+const queryParams = reactive({
+  name: undefined,
+  status: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const isExpandAll = ref(false) // 是否展开，默认全部折叠
+const refreshTable = ref(true) // 重新渲染表格状态
+
+const expandedRowKeys = ref<string[]>([])
+const expandColumnKey = ref('name')
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await MenuApi.getMenuList(queryParams)
+    list.value = handleTree(data)
+    let userInfo = await getInfo()
+    wsCache.set(CACHE_KEY.USER, userInfo)
+    wsCache.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus)
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number, parentId?: number) => {
+  formRef.value.open(type, id, parentId)
+}
+
+/** 展开/折叠操作 */
+const toggleExpandAll = () => {
+  refreshTable.value = false
+  isExpandAll.value = !isExpandAll.value
+  nextTick(() => {
+    refreshTable.value = true
+  })
+}
+
+/** 刷新菜单缓存按钮操作 */
+const refreshMenu = async () => {
+  try {
+    await message.confirm('即将更新缓存刷新浏览器！', '刷新菜单缓存')
+    // 清空，从而触发刷新
+    wsCache.delete(CACHE_KEY.ROLE_ROUTERS)
+    // 刷新浏览器
+    location.reload()
+  } catch { }
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await MenuApi.deleteMenu(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+// 列表展现数组
+const columns = ref<any>([{
+    key: '1',
+    dataKey: '2',
+    title: '3',
+    width: 250,
+  }])
+
+const generateColumns = [{
+    key: 'name',
+    dataKey: 'name',
+    title: '菜单名称',
+    width: 200,
+  },{
+    key: 'icon',
+    dataKey: 'icon',
+    title: '图标',
+    width: 100,
+    cellRenderer: ({ cellData: icon }) => <Icon icon={icon} />
+  },{
+    key: 'sort',
+    dataKey: 'sort',
+    title: '排序',
+    width: 150,
+  },{
+    key: 'permission',
+    dataKey: 'permission',
+    title: '权限标识',
+    width: 250,
+  },{
+    key: 'path',
+    dataKey: 'path',
+    title: '组件路径',
+    width: 250,
+  },{
+    key: 'componentName',
+    dataKey: 'componentName',
+    title: '组件名称',
+    width: 250,
+  },{
+    key: 'status',
+    dataKey: 'status',
+    title: '状态',
+    width: 100,
+    cellRenderer: ({ cellData: status }) => <dict-tag type={DICT_TYPE.COMMON_STATUS} value={status} />
+  },{
+    key: 'ation',
+    dataKey: 'ation',
+    title: '操作',
+    width: 250,
+    cellRenderer: ({ rowData }) => (
+      <>
+      <ElButton  link type={'primary'} onClick={()=>{openForm('update', rowData.id)}}>
+        <Icon icon="ep:edit" />
+        修改
+      </ElButton>
+      <ElButton  link type={'primary'} onClick={()=>{openForm('create', undefined, rowData.id)}}>
+        <Icon icon="ep:plus" />
+        新增
+      </ElButton>
+      <ElButton  link type={'danger'} onClick={()=>{handleDelete(rowData.id)}}>
+        <Icon icon="ep:delete" />
+        删除
+      </ElButton>
+      </>
+    ),
+    // v-hasPermi={['system:menu:update']}
+    // v-hasPermi={['system:menu:create']}
+    // v-hasPermi={['system:menu:delete']}
+  }].map((column, columnIndex) => {
+    let fixed!: TableV2FixedDir
+    if (columnIndex == 7) fixed = TableV2FixedDir.RIGHT
+    return { ...column, fixed }
+  })
+
+  const onRowExpanded = () => {
+  }
+  const onExpandedRowsChange = () => {
+  }
+
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  console.log(127, list)
+  columns.value = generateColumns
+
+})
+</script>
diff --git a/src/views/system/notice/NoticeForm.vue b/src/views/system/notice/NoticeForm.vue
new file mode 100644
index 000000000..5c18d8004
--- /dev/null
+++ b/src/views/system/notice/NoticeForm.vue
@@ -0,0 +1,132 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="800">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-form-item label="公告标题" prop="title">
+        <el-input v-model="formData.title" placeholder="请输入公告标题" />
+      </el-form-item>
+      <el-form-item label="公告内容" prop="content">
+        <Editor v-model="formData.content" height="150px" />
+      </el-form-item>
+      <el-form-item label="公告类型" prop="type">
+        <el-select v-model="formData.type" clearable placeholder="请选择公告类型">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_NOTICE_TYPE)"
+            :key="parseInt(dict.value as any)"
+            :label="dict.label"
+            :value="parseInt(dict.value as any)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="formData.status" clearable placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="parseInt(dict.value as any)"
+            :label="dict.label"
+            :value="parseInt(dict.value as any)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输备注" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { CommonStatusEnum } from '@/utils/constants'
+import * as NoticeApi from '@/api/system/notice'
+
+defineOptions({ name: 'SystemNoticeForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  title: '',
+  type: undefined,
+  content: '',
+  status: CommonStatusEnum.ENABLE,
+  remark: ''
+})
+const formRules = reactive({
+  title: [{ required: true, message: '公告标题不能为空', trigger: 'blur' }],
+  type: [{ required: true, message: '公告类型不能为空', trigger: 'change' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
+  content: [{ required: true, message: '公告内容不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await NoticeApi.getNotice(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as NoticeApi.NoticeVO
+    if (formType.value === 'create') {
+      await NoticeApi.createNotice(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await NoticeApi.updateNotice(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    title: '',
+    type: undefined,
+    content: '',
+    status: CommonStatusEnum.ENABLE,
+    remark: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
new file mode 100644
index 000000000..2a85b9a78
--- /dev/null
+++ b/src/views/system/notice/index.vue
@@ -0,0 +1,136 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="公告标题" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入公告标题" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="公告状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择公告状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['system:notice:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="公告编号" align="center" prop="id" />
+      <el-table-column label="公告标题" align="center" prop="title" />
+      <el-table-column label="公告类型" align="center" prop="type">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_NOTICE_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center"  fixed="right" width="180">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['system:notice:update']">
+            <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['system:notice:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <NoticeForm ref="formRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as NoticeApi from '@/api/system/notice'
+import NoticeForm from './NoticeForm.vue'
+
+defineOptions({ name: 'SystemNotice' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  title: '',
+  type: undefined,
+  status: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询公告列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await NoticeApi.getNoticePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await NoticeApi.deleteNotice(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/notify/message/NotifyMessageDetail.vue b/src/views/system/notify/message/NotifyMessageDetail.vue
new file mode 100644
index 000000000..837f5e319
--- /dev/null
+++ b/src/views/system/notify/message/NotifyMessageDetail.vue
@@ -0,0 +1,66 @@
+<template>
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="详情">
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="编号" min-width="120">
+        {{ detailData.id }}
+      </el-descriptions-item>
+      <el-descriptions-item label="用户类型">
+        <dict-tag :type="DICT_TYPE.USER_TYPE" :value="detailData.userType" />
+      </el-descriptions-item>
+      <el-descriptions-item label="用户编号">
+        {{ detailData.userId }}
+      </el-descriptions-item>
+      <el-descriptions-item label="模版编号">
+        {{ detailData.templateId }}
+      </el-descriptions-item>
+      <el-descriptions-item label="模板编码">
+        {{ detailData.templateCode }}
+      </el-descriptions-item>
+      <el-descriptions-item label="发送人名称">
+        {{ detailData.templateNickname }}
+      </el-descriptions-item>
+      <el-descriptions-item label="模版内容">
+        {{ detailData.templateContent }}
+      </el-descriptions-item>
+      <el-descriptions-item label="模版参数">
+        {{ detailData.templateParams }}
+      </el-descriptions-item>
+      <el-descriptions-item label="模版类型">
+        <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="detailData.templateType" />
+      </el-descriptions-item>
+      <el-descriptions-item label="是否已读">
+        <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="detailData.readStatus" />
+      </el-descriptions-item>
+      <el-descriptions-item label="阅读时间">
+        {{ formatDate(detailData.readTime) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="创建时间">
+        {{ formatDate(detailData.createTime) }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import * as NotifyMessageApi from '@/api/system/notify/message'
+
+defineOptions({ name: 'SystemNotifyMessageDetail' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref() // 详情数据
+
+/** 打开弹窗 */
+const open = async (data: NotifyMessageApi.NotifyMessageVO) => {
+  dialogVisible.value = true
+  // 设置数据
+  detailLoading.value = true
+  try {
+    detailData.value = data
+  } finally {
+    detailLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/system/notify/message/index.vue b/src/views/system/notify/message/index.vue
new file mode 100644
index 000000000..511142eb1
--- /dev/null
+++ b/src/views/system/notify/message/index.vue
@@ -0,0 +1,142 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="用户编号" prop="userId">
+        <el-input v-model="queryParams.userId" placeholder="请输入用户编号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="用户类型" prop="userType">
+        <el-select v-model="queryParams.userType" placeholder="请选择用户类型" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.USER_TYPE)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="模板编码" prop="templateCode">
+        <el-input v-model="queryParams.templateCode" placeholder="请输入模板编码" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="模版类型" prop="templateType">
+        <el-select v-model="queryParams.templateType" placeholder="请选择模版类型" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="用户类型" align="center" prop="userType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="用户编号" align="center" prop="userId" width="80" />
+      <el-table-column label="模板编码" align="center" prop="templateCode" width="80" />
+      <el-table-column label="发送人名称" align="center" prop="templateNickname" width="180" />
+      <el-table-column label="模版内容" align="center" prop="templateContent" width="200" show-overflow-tooltip />
+      <el-table-column label="模版参数" align="center" prop="templateParams" width="180" show-overflow-tooltip>
+        <template #default="scope"> {{ scope.row.templateParams }}</template>
+      </el-table-column>
+      <el-table-column label="模版类型" align="center" prop="templateType" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="scope.row.templateType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否已读" align="center" prop="readStatus" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.readStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="阅读时间" align="center" prop="readTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center"  fixed="right" width="120">
+        <template #default="scope">
+          <el-button link type="primary" @click="openDetail(scope.row)" v-hasPermi="['system:notify-message:query']">
+            <Icon icon="ep:document-copy" />
+            详情
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：详情 -->
+  <NotifyMessageDetail ref="detailRef" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as NotifyMessageApi from '@/api/system/notify/message'
+import NotifyMessageDetail from './NotifyMessageDetail.vue'
+
+defineOptions({ name: 'SystemNotifyMessage' })
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  userType: undefined,
+  userId: undefined,
+  templateCode: undefined,
+  templateType: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await NotifyMessageApi.getNotifyMessagePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (data: NotifyMessageApi.NotifyMessageVO) => {
+  detailRef.value.open(data)
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/notify/my/MyNotifyMessageDetail.vue b/src/views/system/notify/my/MyNotifyMessageDetail.vue
new file mode 100644
index 000000000..19f606ce1
--- /dev/null
+++ b/src/views/system/notify/my/MyNotifyMessageDetail.vue
@@ -0,0 +1,48 @@
+<template>
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="消息详情">
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="发送人">
+        {{ detailData.templateNickname }}
+      </el-descriptions-item>
+      <el-descriptions-item label="发送时间">
+        {{ formatDate(detailData.createTime) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="消息类型">
+        <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="detailData.templateType" />
+      </el-descriptions-item>
+      <el-descriptions-item label="是否已读">
+        <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="detailData.readStatus" />
+      </el-descriptions-item>
+      <el-descriptions-item v-if="detailData.readStatus" label="阅读时间">
+        {{ formatDate(detailData.readTime) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="内容">
+        {{ detailData.templateContent }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import * as NotifyMessageApi from '@/api/system/notify/message'
+
+defineOptions({ name: 'MyNotifyMessageDetailDetail' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref() // 详情数据
+
+/** 打开弹窗 */
+const open = async (data: NotifyMessageApi.NotifyMessageVO) => {
+  dialogVisible.value = true
+  // 设置数据
+  detailLoading.value = true
+  try {
+    detailData.value = data
+  } finally {
+    detailLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/system/notify/my/index.vue b/src/views/system/notify/my/index.vue
new file mode 100644
index 000000000..ab68cf846
--- /dev/null
+++ b/src/views/system/notify/my/index.vue
@@ -0,0 +1,216 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="是否已读" prop="readStatus">
+        <el-select
+          v-model="queryParams.readStatus"
+          placeholder="请选择状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="发送时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button @click="handleUpdateList">
+          <Icon icon="ep:reading" class="mr-5px" /> 标记已读
+        </el-button>
+        <el-button @click="handleUpdateAll">
+          <Icon icon="ep:reading" class="mr-5px" /> 全部已读
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table
+      v-loading="loading"
+      :data="list"
+      ref="tableRef"
+      row-key="id"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" :selectable="selectable" :reserve-selection="true" />
+      <el-table-column label="发送人" align="center" prop="templateNickname" width="180" />
+      <el-table-column
+        label="发送时间"
+        align="center"
+        prop="createTime"
+        width="200"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="类型" align="center" prop="templateType" width="180">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="scope.row.templateType" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="消息内容"
+        align="center"
+        prop="templateContent"
+        show-overflow-tooltip
+      />
+      <el-table-column label="是否已读" align="center" prop="readStatus" width="160">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.readStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="阅读时间"
+        align="center"
+        prop="readTime"
+        width="200"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="操作" align="center" width="160">
+        <template #default="scope">
+          <el-button
+            link
+            :type="scope.row.readStatus ? 'primary' : 'warning'"
+            @click="openDetail(scope.row)"
+          >
+            {{ scope.row.readStatus ? '详情' : '已读' }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：详情 -->
+  <MyNotifyMessageDetail ref="detailRef" />
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as NotifyMessageApi from '@/api/system/notify/message'
+import MyNotifyMessageDetail from './MyNotifyMessageDetail.vue'
+
+defineOptions({ name: 'SystemMyNotify' })
+
+const message = useMessage() // 消息
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  readStatus: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const tableRef = ref() // 表格的 Ref
+const selectedIds = ref<number[]>([]) // 表格的选中 ID 数组
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await NotifyMessageApi.getMyNotifyMessagePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  tableRef.value.clearSelection()
+  handleQuery()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (data: NotifyMessageApi.NotifyMessageVO) => {
+  if (!data.readStatus) {
+    handleReadOne(data.id)
+  }
+  detailRef.value.open(data)
+}
+
+/** 标记一条站内信已读 */
+const handleReadOne = async (id) => {
+  await NotifyMessageApi.updateNotifyMessageRead(id)
+  await getList()
+}
+
+/** 标记全部站内信已读 **/
+const handleUpdateAll = async () => {
+  await NotifyMessageApi.updateAllNotifyMessageRead()
+  message.success('全部已读成功！')
+  tableRef.value.clearSelection()
+  await getList()
+}
+
+/** 标记一些站内信已读 **/
+const handleUpdateList = async () => {
+  if (selectedIds.value.length === 0) {
+    return
+  }
+  await NotifyMessageApi.updateNotifyMessageRead(selectedIds.value)
+  message.success('批量已读成功！')
+  tableRef.value.clearSelection()
+  await getList()
+}
+
+/** 某一行，是否允许选中 */
+const selectable = (row) => {
+  return !row.readStatus
+}
+
+/** 当表格选择项发生变化时会触发该事件  */
+const handleSelectionChange = (array: NotifyMessageApi.NotifyMessageVO[]) => {
+  selectedIds.value = []
+  if (!array) {
+    return
+  }
+  array.forEach((row) => selectedIds.value.push(row.id))
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/notify/template/NotifyTemplateForm.vue b/src/views/system/notify/template/NotifyTemplateForm.vue
new file mode 100644
index 000000000..30399a481
--- /dev/null
+++ b/src/views/system/notify/template/NotifyTemplateForm.vue
@@ -0,0 +1,153 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="140px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="模版编码" prop="code">
+        <el-input v-model="formData.code" placeholder="请输入模版编码" />
+      </el-form-item>
+      <el-form-item label="模板名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入模版名称" />
+      </el-form-item>
+      <el-form-item label="发件人名称" prop="nickname">
+        <el-input v-model="formData.nickname" placeholder="请输入发件人名称" />
+      </el-form-item>
+      <el-form-item label="角色" prop="roleIds">
+        <el-select v-model="formData.roleIds" multiple placeholder="请选择角色">
+          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id" />
+          /></el-select> 
+      </el-form-item>
+      <el-form-item label="模板内容" prop="content">
+        <el-input type="textarea" v-model="formData.content" placeholder="请输入模板内容" />
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select v-model="formData.type" placeholder="请选择类型">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="开启状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value as string"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as NotifyTemplateApi from '@/api/system/notify/template'
+import { CommonStatusEnum } from '@/utils/constants'
+import * as RoleApi from '@/api/system/role'
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型
+const roleList = ref([]) // 角色的列表
+
+const formData = ref<NotifyTemplateApi.NotifyTemplateVO>({
+  id: null,
+  name: '',
+  nickname: '',
+  code: '',
+  content: '',
+  type: null,
+  roleIds: [],
+  params: '',
+  status: CommonStatusEnum.ENABLE,
+  remark: ''
+})
+const formRules = reactive({
+  type: [{ required: true, message: '消息类型不能为空', trigger: 'change' }],
+  status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }],
+  code: [{ required: true, message: '模板编码不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
+  roleIds: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
+  nickname: [{ required: true, message: '发件人姓名不能为空', trigger: 'blur' }],
+  content: [{ required: true, message: '模板内容不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = type
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await NotifyTemplateApi.getNotifyTemplate(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 获得角色列表
+  roleList.value = await RoleApi.getSimpleRoleList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as NotifyTemplateApi.NotifyTemplateVO
+    if (formType.value === 'create') {
+      await NotifyTemplateApi.createNotifyTemplate(data)
+      message.success('新增成功')
+    } else {
+      await NotifyTemplateApi.updateNotifyTemplate(data)
+      message.success('修改成功')
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: null,
+    name: '',
+    nickname: '',
+    code: '',
+    content: '',
+    type: null,
+    params: '',
+    status: CommonStatusEnum.ENABLE,
+    remark: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/notify/template/NotifyTemplateSendForm.vue b/src/views/system/notify/template/NotifyTemplateSendForm.vue
new file mode 100644
index 000000000..78103d716
--- /dev/null
+++ b/src/views/system/notify/template/NotifyTemplateSendForm.vue
@@ -0,0 +1,129 @@
+<template>
+  <Dialog v-model="dialogVisible" title="测试发送" :max-height="500">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="140px"
+    >
+      <el-form-item label="模板内容" prop="content">
+        <el-input
+          v-model="formData.content"
+          placeholder="请输入模板内容"
+          readonly
+          type="textarea"
+        />
+      </el-form-item>
+      <el-form-item label="接收人" prop="userId">
+        <el-select v-model="formData.userId" placeholder="请选择接收人">
+          <el-option
+            v-for="item in userOption"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-for="param in formData.params"
+        :key="param"
+        :label="'参数 {' + param + '}'"
+        :prop="'templateParams.' + param"
+      >
+        <el-input
+          v-model="formData.templateParams[param]"
+          :placeholder="'请输入 ' + param + ' 参数'"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as UserApi from '@/api/system/user'
+import * as NotifyTemplateApi from '@/api/system/notify/template'
+
+defineOptions({ name: 'SystemNotifyTemplateSendForm' })
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  content: '',
+  params: {},
+  userId: null,
+  templateCode: '',
+  templateParams: new Map()
+})
+const formRules = reactive({
+  userId: [{ required: true, message: '用户编号不能为空', trigger: 'change' }],
+  templateCode: [{ required: true, message: '模版编号不能为空', trigger: 'blur' }],
+  templateParams: {}
+})
+const formRef = ref() // 表单 Ref
+const userOption = ref<UserApi.UserVO[]>([])
+
+const open = async (id: number) => {
+  dialogVisible.value = true
+  resetForm()
+  // 设置数据
+  formLoading.value = true
+  try {
+    const data = await NotifyTemplateApi.getNotifyTemplate(id)
+    // 设置动态表单
+    formData.value.content = data.content
+    formData.value.params = data.params
+    formData.value.templateCode = data.code
+    formData.value.templateParams = data.params.reduce((obj, item) => {
+      obj[item] = '' // 给每个动态属性赋值，避免无法读取
+      return obj
+    }, {})
+    formRules.templateParams = data.params.reduce((obj, item) => {
+      obj[item] = { required: true, message: '参数 ' + item + ' 不能为空', trigger: 'blur' }
+      return obj
+    }, {})
+  } finally {
+    formLoading.value = false
+  }
+  // 加载用户列表
+  userOption.value = await UserApi.getSimpleUserList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as NotifyTemplateApi.NotifySendReqVO
+    const logId = await NotifyTemplateApi.sendNotify(data)
+    if (logId) {
+      message.success('提交发送成功！发送结果，见发送日志编号：' + logId)
+    }
+    dialogVisible.value = false
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    content: '',
+    params: {},
+    mobile: '',
+    templateCode: '',
+    templateParams: new Map()
+  } as any
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/notify/template/index.vue b/src/views/system/notify/template/index.vue
new file mode 100644
index 000000000..182cf8672
--- /dev/null
+++ b/src/views/system/notify/template/index.vue
@@ -0,0 +1,164 @@
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="模板名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入模板名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="模板编号" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入模版编码" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择开启状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['system:notify-template:create']">
+          <Icon icon="ep:plus" class="mr-5px" />新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="模板编码" align="center" prop="code" width="120" :show-overflow-tooltip="true" />
+      <el-table-column label="模板名称" align="center" prop="name" width="120" :show-overflow-tooltip="true" />
+      <el-table-column label="类型" align="center" prop="type">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="发送人名称" align="center" prop="nickname" />
+      <el-table-column label="模板内容" align="center" prop="content" width="200" :show-overflow-tooltip="true" />
+      <el-table-column label="开启状态" align="center" prop="status" width="80">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" width="210" fixed="right">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['system:notify-template:update']">
+            <Icon icon="ep:edit" />
+            修改
+          </el-button>
+          <el-button link type="primary" @click="openSendForm(scope.row)"
+            v-hasPermi="['system:notify-template:send-notify']">
+            <Icon icon="ep:cellphone" />
+            测试
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)"
+            v-hasPermi="['system:notify-template:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <NotifyTemplateForm ref="formRef" @success="getList" />
+  <!-- 表单弹窗：测试发送 -->
+  <NotifyTemplateSendForm ref="sendFormRef" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as NotifyTemplateApi from '@/api/system/notify/template'
+import NotifyTemplateForm from './NotifyTemplateForm.vue'
+import NotifyTemplateSendForm from './NotifyTemplateSendForm.vue'
+
+defineOptions({ name: 'NotifySmsTemplate' })
+
+const message = useMessage() // 消息弹窗
+
+const loading = ref(false) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  status: undefined,
+  code: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await NotifyTemplateApi.getNotifyTemplatePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await NotifyTemplateApi.deleteNotifyTemplate(id)
+    message.success('删除成功')
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 发送站内信按钮 */
+const sendFormRef = ref() // 表单 Ref
+const openSendForm = (row: NotifyTemplateApi.NotifyTemplateVO) => {
+  sendFormRef.value.open(row.id)
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/oauth2/client/ClientForm.vue b/src/views/system/oauth2/client/ClientForm.vue
new file mode 100644
index 000000000..d9b3c40e9
--- /dev/null
+++ b/src/views/system/oauth2/client/ClientForm.vue
@@ -0,0 +1,266 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" max-height="500px" scroll>
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="160px"
+    >
+      <el-form-item label="客户端编号" prop="secret">
+        <el-input v-model="formData.clientId" placeholder="请输入客户端编号" />
+      </el-form-item>
+      <el-form-item label="客户端密钥" prop="secret">
+        <el-input v-model="formData.secret" placeholder="请输入客户端密钥" />
+      </el-form-item>
+      <el-form-item label="应用名" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入应用名" />
+      </el-form-item>
+      <el-form-item label="应用图标">
+        <UploadImg v-model="formData.logo" :limit="1" :upData="upData"/>
+      </el-form-item>
+      <el-form-item label="应用描述">
+        <el-input v-model="formData.description" placeholder="请输入应用名" type="textarea" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="访问令牌的有效期" prop="accessTokenValiditySeconds">
+        <el-input-number v-model="formData.accessTokenValiditySeconds" placeholder="单位：秒" />
+      </el-form-item>
+      <el-form-item label="刷新令牌的有效期" prop="refreshTokenValiditySeconds">
+        <el-input-number v-model="formData.refreshTokenValiditySeconds" placeholder="单位：秒" />
+      </el-form-item>
+      <el-form-item label="授权类型" prop="authorizedGrantTypes">
+        <el-select
+          v-model="formData.authorizedGrantTypes"
+          filterable
+          multiple
+          placeholder="请输入授权类型"
+          style="width: 500px"
+        >
+          <el-option
+            v-for="dict in getDictOptions(DICT_TYPE.SYSTEM_OAUTH2_GRANT_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="授权范围" prop="scopes">
+        <el-select
+          v-model="formData.scopes"
+          filterable
+          multiple
+          allow-create
+          placeholder="请输入授权范围"
+          style="width: 500px"
+        >
+          <el-option v-for="scope in formData.scopes" :key="scope" :label="scope" :value="scope" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="自动授权范围" prop="autoApproveScopes">
+        <el-select
+          v-model="formData.autoApproveScopes"
+          filterable
+          multiple
+          placeholder="请输入授权范围"
+          style="width: 500px"
+        >
+          <el-option v-for="scope in formData.scopes" :key="scope" :label="scope" :value="scope" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="可重定向的 URI 地址" prop="redirectUris">
+        <el-select
+          v-model="formData.redirectUris"
+          allow-create
+          filterable
+          multiple
+          placeholder="请输入可重定向的 URI 地址"
+          style="width: 500px"
+        >
+          <el-option
+            v-for="redirectUri in formData.redirectUris"
+            :key="redirectUri"
+            :label="redirectUri"
+            :value="redirectUri"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="权限" prop="authorities">
+        <el-select
+          v-model="formData.authorities"
+          allow-create
+          filterable
+          multiple
+          placeholder="请输入权限"
+          style="width: 500px"
+        >
+          <el-option
+            v-for="authority in formData.authorities"
+            :key="authority"
+            :label="authority"
+            :value="authority"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="资源" prop="resourceIds">
+        <el-select
+          v-model="formData.resourceIds"
+          allow-create
+          filterable
+          multiple
+          placeholder="请输入资源"
+          style="width: 500px"
+        >
+          <el-option
+            v-for="resourceId in formData.resourceIds"
+            :key="resourceId"
+            :label="resourceId"
+            :value="resourceId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="附加信息" prop="additionalInformation">
+        <el-input
+          v-model="formData.additionalInformation"
+          placeholder="请输入附加信息，JSON 格式数据"
+          type="textarea"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getDictOptions, getIntDictOptions } from '@/utils/dict'
+import { CommonStatusEnum } from '@/utils/constants'
+import * as ClientApi from '@/api/system/oauth2/client'
+
+defineOptions({ name: 'SystemOAuth2ClientForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  clientId: undefined,
+  secret: undefined,
+  name: undefined,
+  logo: undefined,
+  description: undefined,
+  status: CommonStatusEnum.ENABLE,
+  accessTokenValiditySeconds: 30 * 60,
+  refreshTokenValiditySeconds: 30 * 24 * 60,
+  redirectUris: [],
+  authorizedGrantTypes: [],
+  scopes: [],
+  autoApproveScopes: [],
+  authorities: [],
+  resourceIds: [],
+  additionalInformation: undefined
+})
+const formRules = reactive({
+  clientId: [{ required: true, message: '客户端编号不能为空', trigger: 'blur' }],
+  secret: [{ required: true, message: '客户端密钥不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '应用名不能为空', trigger: 'blur' }],
+  logo: [{ required: true, message: '应用图标不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
+  accessTokenValiditySeconds: [
+    { required: true, message: '访问令牌的有效期不能为空', trigger: 'blur' }
+  ],
+  refreshTokenValiditySeconds: [
+    { required: true, message: '刷新令牌的有效期不能为空', trigger: 'blur' }
+  ],
+  redirectUris: [{ required: true, message: '可重定向的 URI 地址不能为空', trigger: 'blur' }],
+  authorizedGrantTypes: [{ required: true, message: '授权类型不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const upData = ref()
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    upData.value = {
+      tableId : id,
+      tableName:'systemOauth2Client'
+    }
+    try {
+      formData.value = await ClientApi.getOAuth2Client(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ClientApi.OAuth2ClientVO
+    if (formType.value === 'create') {
+      await ClientApi.createOAuth2Client(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ClientApi.updateOAuth2Client(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    clientId: undefined,
+    secret: undefined,
+    name: undefined,
+    logo: undefined,
+    description: undefined,
+    status: CommonStatusEnum.ENABLE,
+    accessTokenValiditySeconds: 30 * 60,
+    refreshTokenValiditySeconds: 30 * 24 * 60,
+    redirectUris: [],
+    authorizedGrantTypes: [],
+    scopes: [],
+    autoApproveScopes: [],
+    authorities: [],
+    resourceIds: [],
+    additionalInformation: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/oauth2/client/index.vue b/src/views/system/oauth2/client/index.vue
new file mode 100644
index 000000000..0f63901c2
--- /dev/null
+++ b/src/views/system/oauth2/client/index.vue
@@ -0,0 +1,150 @@
+<template>
+  <!-- 搜索 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="应用名" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入应用名" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['system:oauth2-client:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="客户端编号" align="center" prop="clientId" />
+      <el-table-column label="客户端密钥" align="center" prop="secret" />
+      <el-table-column label="应用名" align="center" prop="name" />
+      <el-table-column label="应用图标" align="center" prop="logo">
+        <template #default="scope">
+          <img width="40px" height="40px" :src="scope.row.logo" />
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="访问令牌的有效期" align="center" prop="accessTokenValiditySeconds">
+        <template #default="scope">{{ scope.row.accessTokenValiditySeconds }} 秒</template>
+      </el-table-column>
+      <el-table-column label="刷新令牌的有效期" align="center" prop="refreshTokenValiditySeconds">
+        <template #default="scope">{{ scope.row.refreshTokenValiditySeconds }} 秒</template>
+      </el-table-column>
+      <el-table-column label="授权类型" align="center" prop="authorizedGrantTypes">
+        <template #default="scope">
+          <el-tag :disable-transitions="true" :key="index"
+            v-for="(authorizedGrantType, index) in scope.row.authorizedGrantTypes" :index="index" class="mr-5px">
+            {{ authorizedGrantType }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" fixed="right" width="180">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['system:oauth2-client:update']">
+            <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['system:oauth2-client:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ClientForm ref="formRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as ClientApi from '@/api/system/oauth2/client'
+import ClientForm from './ClientForm.vue'
+
+defineOptions({ name: 'SystemOAuth2Client' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: null,
+  status: null
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ClientApi.getOAuth2ClientPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ClientApi.deleteOAuth2Client(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/oauth2/token/index.vue b/src/views/system/oauth2/token/index.vue
new file mode 100644
index 000000000..1b50039e6
--- /dev/null
+++ b/src/views/system/oauth2/token/index.vue
@@ -0,0 +1,122 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="90px">
+      <el-form-item label="用户编号" prop="userId">
+        <el-input v-model="queryParams.userId" placeholder="请输入用户编号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="用户类型" prop="userType">
+        <el-select v-model="queryParams.userType" placeholder="请选择用户类型" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.USER_TYPE)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="客户端编号" prop="clientId">
+        <el-input v-model="queryParams.clientId" placeholder="请输入客户端编号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="访问令牌" align="center" prop="accessToken" width="300" />
+      <el-table-column label="刷新令牌" align="center" prop="refreshToken" width="300" />
+      <el-table-column label="用户编号" align="center" prop="userId" />
+      <el-table-column label="用户类型" align="center" prop="userType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="过期时间" align="center" prop="expiresTime" :formatter="dateFormatter" width="180" />
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180" />
+      <el-table-column label="操作" align="center" fixed="right" width="120">
+        <template #default="scope">
+          <el-button link type="danger" @click="handleForceLogout(scope.row.accessToken)"
+            v-hasPermi="['system:oauth2-token:delete']">
+            <Icon icon="ep:switch-button" />
+            强退
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as OAuth2AccessTokenApi from '@/api/system/oauth2/token'
+
+defineOptions({ name: 'SystemTokenClient' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  userId: null,
+  userType: null,
+  clientId: null
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await OAuth2AccessTokenApi.getAccessTokenPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 强制退出操作 */
+const handleForceLogout = async (accessToken: string) => {
+  try {
+    // 删除的二次确认
+    await message.confirm('是否要强制退出用户')
+    // 发起删除
+    await OAuth2AccessTokenApi.deleteAccessToken(accessToken)
+    message.success(t('common.success'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/operatelog/OperateLogDetail.vue b/src/views/system/operatelog/OperateLogDetail.vue
new file mode 100644
index 000000000..3fc207e35
--- /dev/null
+++ b/src/views/system/operatelog/OperateLogDetail.vue
@@ -0,0 +1,82 @@
+<template>
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="详情" width="800">
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="日志主键" min-width="120">
+        {{ detailData.id }}
+      </el-descriptions-item>
+      <el-descriptions-item label="链路追踪">
+        {{ detailData.traceId }}
+      </el-descriptions-item>
+      <el-descriptions-item label="操作人编号">
+        {{ detailData.userId }}
+      </el-descriptions-item>
+      <el-descriptions-item label="操作人名字">
+        {{ detailData.userNickname }}
+      </el-descriptions-item>
+      <el-descriptions-item label="操作人 IP">
+        {{ detailData.userIp }}
+      </el-descriptions-item>
+      <el-descriptions-item label="操作人 UA">
+        {{ detailData.userAgent }}
+      </el-descriptions-item>
+      <el-descriptions-item label="操作模块">
+        {{ detailData.module }}
+      </el-descriptions-item>
+      <el-descriptions-item label="操作名">
+        {{ detailData.name }}
+      </el-descriptions-item>
+      <el-descriptions-item v-if="detailData.content" label="操作内容">
+        {{ detailData.content }}
+      </el-descriptions-item>
+      <el-descriptions-item v-if="detailData.exts" label="操作拓展参数">
+        {{ detailData.exts }}
+      </el-descriptions-item>
+      <el-descriptions-item label="请求 URL">
+        {{ detailData.requestMethod }} {{ detailData.requestUrl }}
+      </el-descriptions-item>
+      <el-descriptions-item label="Java 方法名">
+        {{ detailData.javaMethod }}
+      </el-descriptions-item>
+      <el-descriptions-item label="Java 方法参数">
+        {{ detailData.javaMethodArgs }}
+      </el-descriptions-item>
+      <el-descriptions-item label="操作时间">
+        {{ formatDate(detailData.startTime) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="执行时长">{{ detailData.duration }} ms</el-descriptions-item>
+      <el-descriptions-item label="操作结果">
+        <div v-if="detailData.resultCode === 0">正常</div>
+        <div v-else>失败({{ detailData.resultCode }})</div>
+      </el-descriptions-item>
+      <el-descriptions-item v-if="detailData.resultCode === 0" label="操作结果">
+        {{ detailData.resultData }}
+      </el-descriptions-item>
+      <el-descriptions-item v-if="detailData.resultCode > 0" label="失败提示">
+        {{ detailData.resultMsg }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { formatDate } from '@/utils/formatTime'
+import * as OperateLogApi from '@/api/system/operatelog'
+
+defineOptions({ name: 'SystemOperateLogDetail' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref() // 详情数据
+
+/** 打开弹窗 */
+const open = async (data: OperateLogApi.OperateLogVO) => {
+  dialogVisible.value = true
+  // 设置数据
+  detailLoading.value = true
+  try {
+    detailData.value = data
+  } finally {
+    detailLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/system/operatelog/index.vue b/src/views/system/operatelog/index.vue
new file mode 100644
index 000000000..3bfd3d20e
--- /dev/null
+++ b/src/views/system/operatelog/index.vue
@@ -0,0 +1,159 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="系统模块" prop="module">
+        <el-input v-model="queryParams.module" placeholder="请输入系统模块" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="操作人员" prop="userNickname">
+        <el-input v-model="queryParams.userNickname" placeholder="请输入操作人员" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="操作类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择操作类型" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_OPERATE_TYPE)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="操作状态" prop="success">
+        <el-select v-model="queryParams.success" placeholder="请选择操作状态" clearable class="!w-240px">
+          <el-option :key="true" label="成功" :value="true" />
+          <el-option :key="false" label="失败" :value="false" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="操作时间" prop="startTime">
+        <el-date-picker v-model="queryParams.startTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="success" @click="handleExport" :loading="exportLoading" v-hasPermi="['infra:config:export']">
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="日志编号" align="center" prop="id" />
+      <el-table-column label="操作模块" align="center" prop="module" width="180" />
+      <el-table-column label="操作名" align="center" prop="name" width="180" />
+      <el-table-column label="操作类型" align="center" prop="type">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_OPERATE_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作人" align="center" prop="userNickname" />
+      <el-table-column label="操作结果" align="center" prop="status">
+        <template #default="scope">
+          <span>{{ scope.row.resultCode === 0 ? '成功' : '失败' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作时间" align="center" prop="startTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="执行时长" align="center" prop="startTime">
+        <template #default="scope">
+          <span>{{ scope.row.duration }} ms</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" fixed="right" width="120">
+        <template #default="scope">
+          <el-button link type="primary" @click="openDetail(scope.row)" v-hasPermi="['infra:config:query']">
+            <Icon icon="ep:document-copy" />
+            详情
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：详情 -->
+  <OperateLogDetail ref="detailRef" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as OperateLogApi from '@/api/system/operatelog'
+import OperateLogDetail from './OperateLogDetail.vue'
+
+defineOptions({ name: 'SystemOperateLog' })
+
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  module: undefined,
+  userNickname: undefined,
+  type: undefined,
+  success: undefined,
+  startTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await OperateLogApi.getOperateLogPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (data: OperateLogApi.OperateLogVO) => {
+  detailRef.value.open(data)
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await OperateLogApi.exportOperateLog(queryParams)
+    download.excel(data, '操作日志.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/post/PostForm.vue b/src/views/system/post/PostForm.vue
new file mode 100644
index 000000000..1894e0cb7
--- /dev/null
+++ b/src/views/system/post/PostForm.vue
@@ -0,0 +1,125 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="800">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-form-item label="岗位标题" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入岗位标题" />
+      </el-form-item>
+      <el-form-item label="岗位编码" prop="code">
+        <el-input v-model="formData.code" placeholder="请输入岗位编码" />
+      </el-form-item>
+      <el-form-item label="岗位顺序" prop="sort">
+        <el-input v-model="formData.sort" placeholder="请输入岗位顺序" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="formData.status" clearable placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输备注" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { CommonStatusEnum } from '@/utils/constants'
+import * as PostApi from '@/api/system/post'
+
+defineOptions({ name: 'SystemPostForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: '',
+  code: '',
+  sort: 0,
+  status: CommonStatusEnum.ENABLE,
+  remark: ''
+})
+const formRules = reactive({
+  name: [{ required: true, message: '岗位标题不能为空', trigger: 'blur' }],
+  code: [{ required: true, message: '岗位编码不能为空', trigger: 'change' }],
+  status: [{ required: true, message: '岗位状态不能为空', trigger: 'change' }],
+  remark: [{ required: false, message: '岗位内容不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await PostApi.getPost(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as PostApi.PostVO
+    if (formType.value === 'create') {
+      await PostApi.createPost(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PostApi.updatePost(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: '',
+    code: '',
+    sort: undefined,
+    status: CommonStatusEnum.ENABLE,
+    remark: ''
+  } as any
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
new file mode 100644
index 000000000..6c2ae14ce
--- /dev/null
+++ b/src/views/system/post/index.vue
@@ -0,0 +1,157 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="岗位名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入岗位名称" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="岗位编码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入岗位编码" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['system:notice:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button type="success" @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['infra:config:export']">
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="岗位编号" align="center" prop="id" />
+      <el-table-column label="岗位名称" align="center" prop="name" />
+      <el-table-column label="岗位编码" align="center" prop="code" />
+      <el-table-column label="岗位顺序" align="center" prop="sort" />
+      <el-table-column label="岗位备注" align="center" prop="remark" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" fixed="right" width="180">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['system:post:update']">
+            <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['system:post:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <PostForm ref="formRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as PostApi from '@/api/system/post'
+import PostForm from './PostForm.vue'
+
+defineOptions({ name: 'SystemPost' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  code: '',
+  name: '',
+  status: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询岗位列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await PostApi.getPostPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PostApi.deletePost(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PostApi.exportPost(queryParams)
+    download.excel(data, '岗位列表.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/role/RoleAssignMenuForm.vue b/src/views/system/role/RoleAssignMenuForm.vue
new file mode 100644
index 000000000..9304532ce
--- /dev/null
+++ b/src/views/system/role/RoleAssignMenuForm.vue
@@ -0,0 +1,160 @@
+<template>
+  <Dialog v-model="dialogVisible" title="菜单权限">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+      <el-form-item label="角色名称">
+        <el-tag>{{ formData.name }}</el-tag>
+      </el-form-item>
+      <el-form-item label="角色标识">
+        <el-tag>{{ formData.code }}</el-tag>
+      </el-form-item>
+      <el-form-item label="菜单权限">
+        <el-card class="cardHeight">
+          <template #header>
+            全选/全不选:
+            <el-switch
+              v-model="treeNodeAll"
+              active-text="是"
+              inactive-text="否"
+              inline-prompt
+              @change="handleCheckedTreeNodeAll"
+            />
+            全部展开/折叠:
+            <el-switch
+              v-model="menuExpand"
+              active-text="展开"
+              inactive-text="折叠"
+              inline-prompt
+              @change="handleCheckedTreeExpand"
+            />
+          </template>
+          <el-tree
+            ref="treeRef"
+            :data="menuOptions"
+            :props="defaultProps"
+            empty-text="加载中，请稍候"
+            node-key="id"
+            show-checkbox
+          />
+        </el-card>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { defaultProps, handleTree } from '@/utils/tree'
+import * as RoleApi from '@/api/system/role'
+import * as MenuApi from '@/api/system/menu'
+import * as PermissionApi from '@/api/system/permission'
+
+defineOptions({ name: 'SystemRoleAssignMenuForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = reactive({
+  id: 0,
+  name: '',
+  code: '',
+  menuIds: []
+})
+const formRef = ref() // 表单 Ref
+const menuOptions = ref<any[]>([]) // 菜单树形结构
+const menuExpand = ref(false) // 展开/折叠
+const treeRef = ref() // 菜单树组件 Ref
+const treeNodeAll = ref(false) // 全选/全不选
+
+/** 打开弹窗 */
+const open = async (row: RoleApi.RoleVO) => {
+  dialogVisible.value = true
+  resetForm()
+  // 加载 Menu 列表。注意，必须放在前面，不然下面 setChecked 没数据节点
+  menuOptions.value = handleTree(await MenuApi.getSimpleMenusList())
+  // 设置数据
+  formData.id = row.id
+  formData.name = row.name
+  formData.code = row.code
+  formLoading.value = true
+  try {
+    formData.value.menuIds = await PermissionApi.getRoleMenuList(row.id)
+    // 设置选中
+    formData.value.menuIds.forEach((menuId: number) => {
+      treeRef.value.setChecked(menuId, true, false)
+    })
+  } finally {
+    formLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = {
+      roleId: formData.id,
+      menuIds: [
+        ...(treeRef.value.getCheckedKeys(false) as unknown as Array<number>), // 获得当前选中节点
+        ...(treeRef.value.getHalfCheckedKeys() as unknown as Array<number>) // 获得半选中的父节点
+      ]
+    }
+    await PermissionApi.assignRoleMenu(data)
+    message.success(t('common.updateSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  // 重置选项
+  treeNodeAll.value = false
+  menuExpand.value = false
+  // 重置表单
+  formData.value = {
+    id: 0,
+    name: '',
+    code: '',
+    menuIds: []
+  }
+  treeRef.value?.setCheckedNodes([])
+  formRef.value?.resetFields()
+}
+
+/** 全选/全不选 */
+const handleCheckedTreeNodeAll = () => {
+  treeRef.value.setCheckedNodes(treeNodeAll.value ? menuOptions.value : [])
+}
+
+/** 展开/折叠全部 */
+const handleCheckedTreeExpand = () => {
+  const nodes = treeRef.value?.store.nodesMap
+  for (let node in nodes) {
+    if (nodes[node].expanded === menuExpand.value) {
+      continue
+    }
+    nodes[node].expanded = menuExpand.value
+  }
+}
+</script>
+<style lang="scss" scoped>
+.cardHeight {
+  width: 100%;
+  max-height: 400px;
+  overflow-y: scroll;
+}
+</style>
diff --git a/src/views/system/role/RoleDataPermissionForm.vue b/src/views/system/role/RoleDataPermissionForm.vue
new file mode 100644
index 000000000..8747bd741
--- /dev/null
+++ b/src/views/system/role/RoleDataPermissionForm.vue
@@ -0,0 +1,167 @@
+<template>
+  <Dialog v-model="dialogVisible" title="菜单权限" width="800">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+      <el-form-item label="角色名称">
+        <el-tag>{{ formData.name }}</el-tag>
+      </el-form-item>
+      <el-form-item label="角色标识">
+        <el-tag>{{ formData.code }}</el-tag>
+      </el-form-item>
+      <el-form-item label="权限范围">
+        <el-select v-model="formData.dataScope">
+          <el-option
+            v-for="item in getIntDictOptions(DICT_TYPE.SYSTEM_DATA_SCOPE)"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <el-form-item
+      v-if="formData.dataScope === SystemDataScopeEnum.DEPT_CUSTOM"
+      label="权限范围"
+      style="display: flex"
+    >
+      <el-card class="card" shadow="never">
+        <template #header>
+          全选/全不选:
+          <el-switch
+            v-model="treeNodeAll"
+            active-text="是"
+            inactive-text="否"
+            inline-prompt
+            @change="handleCheckedTreeNodeAll()"
+          />
+          全部展开/折叠:
+          <el-switch
+            v-model="deptExpand"
+            active-text="展开"
+            inactive-text="折叠"
+            inline-prompt
+            @change="handleCheckedTreeExpand"
+          />
+          父子联动(选中父节点，自动选择子节点):
+          <el-switch v-model="checkStrictly" active-text="是" inactive-text="否" inline-prompt />
+        </template>
+        <el-tree
+          ref="treeRef"
+          :check-strictly="!checkStrictly"
+          :data="deptOptions"
+          :props="defaultProps"
+          default-expand-all
+          empty-text="加载中，请稍后"
+          node-key="id"
+          show-checkbox
+        />
+      </el-card>
+    </el-form-item>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { defaultProps, handleTree } from '@/utils/tree'
+import { SystemDataScopeEnum } from '@/utils/constants'
+import * as RoleApi from '@/api/system/role'
+import * as DeptApi from '@/api/system/dept'
+import * as PermissionApi from '@/api/system/permission'
+
+defineOptions({ name: 'SystemRoleDataPermissionForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = reactive({
+  id: 0,
+  name: '',
+  code: '',
+  dataScope: undefined,
+  dataScopeDeptIds: []
+})
+const formRef = ref() // 表单 Ref
+const deptOptions = ref<any[]>([]) // 部门树形结构
+const deptExpand = ref(false) // 展开/折叠
+const treeRef = ref() // 菜单树组件 Ref
+const treeNodeAll = ref(false) // 全选/全不选
+const checkStrictly = ref(true) // 是否严格模式，即父子不关联
+
+/** 打开弹窗 */
+const open = async (row: RoleApi.RoleVO) => {
+  dialogVisible.value = true
+  resetForm()
+  // 加载 Dept 列表。注意，必须放在前面，不然下面 setChecked 没数据节点
+  deptOptions.value = handleTree(await DeptApi.getSimpleDeptList())
+  // 设置数据
+  formData.id = row.id
+  formData.name = row.name
+  formData.code = row.code
+  formData.dataScope = row.dataScope
+  row.dataScopeDeptIds?.forEach((deptId: number) => {
+    treeRef.value.setChecked(deptId, true, false)
+  })
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  formLoading.value = true
+  try {
+    const data = {
+      roleId: formData.id,
+      dataScope: formData.dataScope,
+      dataScopeDeptIds:
+        formData.dataScope !== SystemDataScopeEnum.DEPT_CUSTOM
+          ? []
+          : treeRef.value.getCheckedKeys(false)
+    }
+    await PermissionApi.assignRoleDataScope(data)
+    message.success(t('common.updateSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  // 重置选项
+  treeNodeAll.value = false
+  deptExpand.value = false
+  checkStrictly.value = true
+  // 重置表单
+  formData.value = {
+    id: 0,
+    name: '',
+    code: '',
+    dataScope: undefined,
+    dataScopeDeptIds: []
+  }
+  treeRef.value?.setCheckedNodes([])
+  formRef.value?.resetFields()
+}
+
+/** 全选/全不选 */
+const handleCheckedTreeNodeAll = () => {
+  treeRef.value.setCheckedNodes(treeNodeAll.value ? deptOptions.value : [])
+}
+
+/** 展开/折叠全部 */
+const handleCheckedTreeExpand = () => {
+  const nodes = treeRef.value?.store.nodesMap
+  for (let node in nodes) {
+    if (nodes[node].expanded === deptExpand.value) {
+      continue
+    }
+    nodes[node].expanded = deptExpand.value
+  }
+}
+</script>
diff --git a/src/views/system/role/RoleForm.vue b/src/views/system/role/RoleForm.vue
new file mode 100644
index 000000000..01f29b8b4
--- /dev/null
+++ b/src/views/system/role/RoleForm.vue
@@ -0,0 +1,126 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-form-item label="角色名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入角色名称" />
+      </el-form-item>
+      <el-form-item label="角色标识" prop="code">
+        <el-input v-model="formData.code" placeholder="请输入角色标识" />
+      </el-form-item>
+      <el-form-item label="显示顺序" prop="sort">
+        <el-input v-model="formData.sort" placeholder="请输入显示顺序" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="formData.status" clearable placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输备注" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { CommonStatusEnum } from '@/utils/constants'
+import * as RoleApi from '@/api/system/role'
+
+defineOptions({ name: 'SystemRoleForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: '',
+  code: '',
+  sort: undefined,
+  status: CommonStatusEnum.ENABLE,
+  remark: ''
+})
+const formRules = reactive({
+  name: [{ required: true, message: '岗位标题不能为空', trigger: 'blur' }],
+  code: [{ required: true, message: '岗位编码不能为空', trigger: 'change' }],
+  sort: [{ required: true, message: '岗位顺序不能为空', trigger: 'change' }],
+  status: [{ required: true, message: '岗位状态不能为空', trigger: 'change' }],
+  remark: [{ required: false, message: '岗位内容不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await RoleApi.getRole(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: '',
+    code: '',
+    sort: undefined,
+    status: CommonStatusEnum.ENABLE,
+    remark: ''
+  }
+  formRef.value?.resetFields()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as RoleApi.RoleVO
+    if (formType.value === 'create') {
+      await RoleApi.createRole(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RoleApi.updateRole(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
new file mode 100644
index 000000000..22bc8f76a
--- /dev/null
+++ b/src/views/system/role/index.vue
@@ -0,0 +1,264 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="68px"
+    >
+      <el-form-item label="角色名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          class="!w-240px"
+          clearable
+          placeholder="请输入角色名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="角色标识" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          class="!w-240px"
+          clearable
+          placeholder="请输入角色标识"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button
+          v-hasPermi="['system:role:create']"
+          type="primary"
+          @click="openForm('create')"
+        >
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+        <el-button
+          v-hasPermi="['system:role:export']"
+          :loading="exportLoading"
+          type="success"
+          @click="handleExport"
+        >
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column align="center" label="角色编号" prop="id" :width="100"/>
+      <el-table-column align="center" label="角色名称" prop="name" />
+      <el-table-column align="center" label="角色类型" prop="type" :width="100"/>
+      <el-table-column align="center" label="角色标识" prop="code" />
+      <el-table-column align="center" label="显示顺序" prop="sort" :width="80"/>
+      <el-table-column align="center" label="备注" prop="remark" />
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="创建时间"
+        prop="createTime"
+        width="180"
+      />
+      <el-table-column :width="360" align="center" label="操作" fixed="right">
+        <template #default="scope">
+          <el-button
+            v-hasPermi="['system:role:update']"
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+          >
+          <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button
+            v-hasPermi="['system:permission:assign-role-menu']"
+            link
+            preIcon="ep:basketball"
+            title="菜单权限"
+            type="primary"
+            @click="openAssignMenuForm(scope.row)"
+          >
+            <Icon icon="ep:menu" />
+            菜单权限
+          </el-button>
+          <el-button
+            v-hasPermi="['system:permission:assign-role-data-scope']"
+            link
+            preIcon="ep:coin"
+            title="数据权限"
+            type="primary"
+            @click="openDataPermissionForm(scope.row)"
+          >
+            <Icon icon="fa:area-chart" />
+            数据权限
+          </el-button>
+          <el-button
+            v-hasPermi="['system:role:delete']"
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+          <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <RoleForm ref="formRef" @success="getList" />
+  <!-- 表单弹窗：菜单权限 -->
+  <RoleAssignMenuForm ref="assignMenuFormRef" @success="getList" />
+  <!-- 表单弹窗：数据权限 -->
+  <RoleDataPermissionForm ref="dataPermissionFormRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as RoleApi from '@/api/system/role'
+import RoleForm from './RoleForm.vue'
+import RoleAssignMenuForm from './RoleAssignMenuForm.vue'
+import RoleDataPermissionForm from './RoleDataPermissionForm.vue'
+
+defineOptions({ name: 'SystemRole' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  code: '',
+  name: '',
+  status: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询角色列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RoleApi.getRolePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 数据权限操作 */
+const dataPermissionFormRef = ref()
+const openDataPermissionForm = async (row: RoleApi.RoleVO) => {
+  dataPermissionFormRef.value.open(row)
+}
+
+/** 菜单权限操作 */
+const assignMenuFormRef = ref()
+const openAssignMenuForm = async (row: RoleApi.RoleVO) => {
+  assignMenuFormRef.value.open(row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RoleApi.deleteRole(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await RoleApi.exportRole(queryParams)
+    download.excel(data, '角色列表.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/sensitiveWord/SensitiveWordForm.vue b/src/views/system/sensitiveWord/SensitiveWordForm.vue
new file mode 100644
index 000000000..795b81486
--- /dev/null
+++ b/src/views/system/sensitiveWord/SensitiveWordForm.vue
@@ -0,0 +1,131 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-form-item label="敏感词" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入敏感词" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="description">
+        <el-input v-model="formData.description" placeholder="请输入内容" />
+      </el-form-item>
+      <el-form-item label="标签" prop="tags">
+        <el-select
+          v-model="formData.tags"
+          allow-create
+          filterable
+          multiple
+          placeholder="请选择文章标签"
+          style="width: 380px"
+        >
+          <el-option v-for="tag in tagList" :key="tag" :label="tag" :value="tag" />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as SensitiveWordApi from '@/api/system/sensitiveWord'
+import { CommonStatusEnum } from '@/utils/constants'
+
+defineOptions({ name: 'SystemSensitiveWordForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: '',
+  status: CommonStatusEnum.ENABLE,
+  description: '',
+  tags: []
+})
+const formRules = reactive({
+  name: [{ required: true, message: '敏感词不能为空', trigger: 'blur' }],
+  tags: [{ required: true, message: '标签不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const tagList = ref([]) // 标签数组
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await SensitiveWordApi.getSensitiveWord(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 获得 Tag 标签列表
+  tagList.value = await SensitiveWordApi.getSensitiveWordTagList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as SensitiveWordApi.SensitiveWordVO
+    if (formType.value === 'create') {
+      await SensitiveWordApi.createSensitiveWord(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SensitiveWordApi.updateSensitiveWord(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: '',
+    status: CommonStatusEnum.ENABLE,
+    description: '',
+    tags: []
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/sensitiveWord/SensitiveWordTestForm.vue b/src/views/system/sensitiveWord/SensitiveWordTestForm.vue
new file mode 100644
index 000000000..d83be843e
--- /dev/null
+++ b/src/views/system/sensitiveWord/SensitiveWordTestForm.vue
@@ -0,0 +1,91 @@
+<template>
+  <Dialog v-model="dialogVisible" title="检测敏感词">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-form-item label="文本" prop="text">
+        <el-input v-model="formData.text" placeholder="请输入测试文本" type="textarea" />
+      </el-form-item>
+      <el-form-item label="标签" prop="tags">
+        <el-select
+          v-model="formData.tags"
+          allow-create
+          filterable
+          multiple
+          placeholder="请选择标签"
+          style="width: 380px"
+        >
+          <el-option v-for="tag in tagList" :key="tag" :label="tag" :value="tag" />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">检 测</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as SensitiveWordApi from '@/api/system/sensitiveWord'
+
+defineOptions({ name: 'SystemSensitiveWordTestForm' })
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  text: '',
+  tags: []
+})
+const formRules = reactive({
+  text: [{ required: true, message: '测试文本不能为空', trigger: 'blur' }],
+  tags: [{ required: true, message: '标签不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const tagList = ref([]) // 标签数组
+
+/** 打开弹窗 */
+const open = async () => {
+  dialogVisible.value = true
+  resetForm()
+  // 获得 Tag 标签列表
+  tagList.value = await SensitiveWordApi.getSensitiveWordTagList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const form = formData.value as unknown as SensitiveWordApi.SensitiveWordTestReqVO
+    const data = await SensitiveWordApi.validateText(form)
+    if (data.length === 0) {
+      message.success('不包含敏感词！')
+      return
+    }
+    message.warning('包含敏感词：' + data.join(', '))
+    dialogVisible.value = false
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    text: '',
+    tags: []
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/sensitiveWord/index.vue b/src/views/system/sensitiveWord/index.vue
new file mode 100644
index 000000000..e01a3be2a
--- /dev/null
+++ b/src/views/system/sensitiveWord/index.vue
@@ -0,0 +1,191 @@
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form ref="queryFormRef" :inline="true" :model="queryParams" class="-mb-15px" label-width="68px">
+      <el-form-item label="敏感词" prop="name">
+        <el-input v-model="queryParams.name" class="!w-240px" clearable placeholder="请输入敏感词" @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="标签" prop="tag">
+        <el-select v-model="queryParams.tag" class="!w-240px" clearable placeholder="请选择标签" @keyup.enter="handleQuery">
+          <el-option v-for="tag in tagList" :key="tag" :label="tag" :value="tag" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" clearable placeholder="请选择启用状态">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" class="!w-240px" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" end-placeholder="结束日期" start-placeholder="开始日期" type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button v-hasPermi="['system:sensitive-word:create']" type="primary" @click="openForm('create')">
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+        <el-button v-hasPermi="['system:sensitive-word:export']" :loading="exportLoading" type="success"
+          @click="handleExport">
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
+        </el-button>
+        <el-button type="warning" @click="openTestForm">
+          <Icon class="mr-5px" icon="ep:document-checked" />
+          测试
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column align="center" label="编号" prop="id" />
+      <el-table-column align="center" label="敏感词" prop="name" />
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="描述" prop="description" />
+      <el-table-column align="center" label="标签" prop="tags">
+        <template #default="scope">
+          <el-tag v-for="tag in scope.row.tags" :key="tag" :disable-transitions="true" class="mr-5px">
+            {{ tag }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column :formatter="dateFormatter" align="center" label="创建时间" prop="createTime" width="180" />
+      <el-table-column align="center" label="操作" fixed="right" width="180">
+        <template #default="scope">
+          <el-button v-hasPermi="['infra:config:update']" link type="primary" @click="openForm('update', scope.row.id)">
+            <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button v-hasPermi="['infra:config:delete']" link type="danger" @click="handleDelete(scope.row.id)">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <SensitiveWordForm ref="formRef" @success="getList" />
+
+  <!-- 表单弹窗：测试敏感词 -->
+  <SensitiveWordTestForm ref="testFormRef" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as SensitiveWordApi from '@/api/system/sensitiveWord'
+import SensitiveWordForm from './SensitiveWordForm.vue'
+import SensitiveWordTestForm from './SensitiveWordTestForm.vue'
+
+defineOptions({ name: 'SystemSensitiveWord' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  tag: undefined,
+  status: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const tagList = ref([]) // 标签数组
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await SensitiveWordApi.getSensitiveWordPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 测试敏感词按钮操作 */
+const testFormRef = ref()
+const openTestForm = () => {
+  testFormRef.value.open()
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SensitiveWordApi.deleteSensitiveWord(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SensitiveWordApi.exportSensitiveWord(queryParams)
+    download.excel(data, '敏感词.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  // 获得 Tag 标签列表
+  tagList.value = await SensitiveWordApi.getSensitiveWordTagList()
+})
+</script>
diff --git a/src/views/system/serialNumber/SerialNumberForm.vue b/src/views/system/serialNumber/SerialNumberForm.vue
new file mode 100644
index 000000000..316c3acd0
--- /dev/null
+++ b/src/views/system/serialNumber/SerialNumberForm.vue
@@ -0,0 +1,124 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="150px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="规则编码" prop="ruleCode">
+        <el-input v-model="formData.ruleCode" placeholder="请输入规则编码" />
+      </el-form-item>
+      <el-form-item label="规则名称" prop="ruleName">
+        <el-input v-model="formData.ruleName" placeholder="请输入规则名称" />
+      </el-form-item>
+      <el-form-item label="编码前缀" prop="prefix">
+        <el-input v-model="formData.prefix" placeholder="请输入编码前缀" />
+      </el-form-item>
+      <el-form-item label="单据格式" prop="pattern">
+        <el-input v-model="formData.pattern" placeholder="请输入单据格式" />
+      </el-form-item>
+      <el-form-item label="单据流水长度" prop="length">
+        <el-input v-model="formData.length" placeholder="请输入单据流水长度" />
+      </el-form-item>
+      <el-form-item label="单据分隔符" prop="separator">
+        <el-input v-model="formData.separator" placeholder="请输入单据分隔符" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as SerialNumberApi from '@/api/system/serialNumber'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  ruleCode: undefined,
+  ruleName: undefined,
+  prefix: undefined,
+  pattern: undefined,
+  length: undefined,
+  separator: undefined,
+  remark: undefined
+})
+const formRules = reactive({
+  ruleCode: [{ required: true, message: '规则编码不能为空', trigger: 'blur' }],
+  ruleName: [{ required: true, message: '规则名称不能为空', trigger: 'blur' }],
+  prefix: [{ required: true, message: '编码前缀不能为空', trigger: 'blur' }],
+  length: [{ required: true, message: '单据流水长度不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await SerialNumberApi.getSerialNumber(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as SerialNumberApi.SerialNumberVO
+    if (formType.value === 'create') {
+      await SerialNumberApi.createSerialNumber(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SerialNumberApi.updateSerialNumber(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    ruleCode: undefined,
+    ruleName: undefined,
+    prefix: undefined,
+    pattern: undefined,
+    length: undefined,
+    separator: undefined,
+    remark: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/serialNumber/index.vue b/src/views/system/serialNumber/index.vue
new file mode 100644
index 000000000..0806906d5
--- /dev/null
+++ b/src/views/system/serialNumber/index.vue
@@ -0,0 +1,182 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="规则编码" prop="ruleCode">
+        <el-input
+          v-model="queryParams.ruleCode"
+          placeholder="请输入规则编码"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="规则名称" prop="ruleName">
+        <el-input
+          v-model="queryParams.ruleName"
+          placeholder="请输入规则名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['system:serial-number:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['system:serial-number:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="主键" align="center" prop="id" width="150px" />
+      <el-table-column label="规则编码" align="center" prop="ruleCode" width="150px" />
+      <el-table-column label="规则名称" align="center" prop="ruleName" width="150px" />
+      <el-table-column label="编码前缀" align="center" prop="prefix" width="150px" />
+      <el-table-column label="单据格式" align="center" prop="pattern" width="150px" />
+      <el-table-column label="单据流水长度" align="center" prop="length" width="150px" />
+      <el-table-column label="单据分隔符" align="center" prop="separator" width="150px" />
+      <el-table-column label="备注" align="center" prop="remark" width="150px" />
+      <el-table-column label="操作" align="center" width="150px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['system:serial-number:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['system:serial-number:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <SerialNumberForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as SerialNumberApi from '@/api/system/serialNumber'
+import SerialNumberForm from './SerialNumberForm.vue'
+
+defineOptions({ name: 'SerialNumber' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  ruleCode: null,
+  ruleName: null
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await SerialNumberApi.getSerialNumberPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SerialNumberApi.deleteSerialNumber(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SerialNumberApi.exportSerialNumber(queryParams)
+    download.excel(data, '流水号规则.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/sms/channel/SmsChannelForm.vue b/src/views/system/sms/channel/SmsChannelForm.vue
new file mode 100644
index 000000000..049868a3a
--- /dev/null
+++ b/src/views/system/sms/channel/SmsChannelForm.vue
@@ -0,0 +1,144 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="130px"
+    >
+      <el-form-item label="短信签名" prop="signature">
+        <el-input v-model="formData.signature" placeholder="请输入短信签名" />
+      </el-form-item>
+      <el-form-item label="渠道编码" prop="code">
+        <el-select v-model="formData.code" clearable placeholder="请选择渠道编码">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="启用状态">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="短信 API 的账号" prop="apiKey">
+        <el-input v-model="formData.apiKey" placeholder="请输入短信 API 的账号" />
+      </el-form-item>
+      <el-form-item label="短信 API 的密钥" prop="apiSecret">
+        <el-input v-model="formData.apiSecret" placeholder="请输入短信 API 的密钥" />
+      </el-form-item>
+      <el-form-item label="短信发送回调 URL" prop="callbackUrl">
+        <el-input v-model="formData.callbackUrl" placeholder="请输入短信发送回调 URL" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+import * as SmsChannelApi from '@/api/system/sms/smsChannel'
+import { CommonStatusEnum } from '@/utils/constants'
+
+defineOptions({ name: 'SystemSmsChannelForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  signature: '',
+  code: '',
+  status: CommonStatusEnum.ENABLE,
+  remark: '',
+  apiKey: '',
+  apiSecret: '',
+  callbackUrl: ''
+})
+const formRules = reactive({
+  signature: [{ required: true, message: '短信签名不能为空', trigger: 'blur' }],
+  code: [{ required: true, message: '渠道编码不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '启用状态不能为空', trigger: 'blur' }],
+  apiKey: [{ required: true, message: '短信 API 的账号不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await SmsChannelApi.getSmsChannel(id)
+      console.log(formData)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as SmsChannelApi.SmsChannelVO
+    if (formType.value === 'create') {
+      await SmsChannelApi.createSmsChannel(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SmsChannelApi.updateSmsChannel(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    signature: '',
+    code: '',
+    status: CommonStatusEnum.ENABLE,
+    remark: '',
+    apiKey: '',
+    apiSecret: '',
+    callbackUrl: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/sms/channel/index.vue b/src/views/system/sms/channel/index.vue
new file mode 100644
index 000000000..819c3d5e0
--- /dev/null
+++ b/src/views/system/sms/channel/index.vue
@@ -0,0 +1,144 @@
+<template>
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="短信签名" prop="signature">
+        <el-input v-model="queryParams.signature" placeholder="请输入短信签名" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="启用状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择启用状态" clearable>
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['system:sms-channel:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="短信签名" align="center" prop="signature" />
+      <el-table-column label="渠道编码" align="center" prop="code">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE" :value="scope.row.code" />
+        </template>
+      </el-table-column>
+      <el-table-column label="启用状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="短信 API 的账号" align="center" prop="apiKey" :show-overflow-tooltip="true" width="180" />
+      <el-table-column label="短信 API 的密钥" align="center" prop="apiSecret" :show-overflow-tooltip="true" width="180" />
+      <el-table-column label="短信发送回调 URL" align="center" prop="callbackUrl" :show-overflow-tooltip="true" width="180" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" fixed="right" width="180">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['system:sms-channel:update']">
+            <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['system:sms-channel:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <SmsChannelForm ref="formRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as SmsChannelApi from '@/api/system/sms/smsChannel'
+import SmsChannelForm from './SmsChannelForm.vue'
+
+defineOptions({ name: 'SystemSmsChannel' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(false) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryFormRef = ref() // 搜索的表单
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  signature: undefined,
+  status: undefined,
+  createTime: []
+})
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await SmsChannelApi.getSmsChannelPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SmsChannelApi.deleteSmsChannel(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/sms/log/SmsLogDetail.vue b/src/views/system/sms/log/SmsLogDetail.vue
new file mode 100644
index 000000000..34c5e58e5
--- /dev/null
+++ b/src/views/system/sms/log/SmsLogDetail.vue
@@ -0,0 +1,89 @@
+<template>
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="详情" width="800">
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="日志主键" min-width="120">
+        {{ detailData.id }}
+      </el-descriptions-item>
+      <el-descriptions-item label="短信渠道">
+        {{ channelList.find((channel) => channel.id === detailData.channelId)?.signature }}
+        <dict-tag :type="DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE" :value="detailData.channelCode" />
+      </el-descriptions-item>
+      <el-descriptions-item label="短信模板">
+        {{ detailData.templateId }} | {{ detailData.templateCode }}
+        <dict-tag :type="DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE" :value="detailData.templateType" />
+      </el-descriptions-item>
+      <el-descriptions-item label="API 的模板编号">
+        {{ detailData.apiTemplateId }}
+      </el-descriptions-item>
+      <el-descriptions-item label="用户信息">
+        {{ detailData.mobile }}
+        <span v-if="detailData.userType && detailData.userId">
+          <dict-tag :type="DICT_TYPE.USER_TYPE" :value="detailData.userType" />
+          ({{ detailData.userId }})
+        </span>
+      </el-descriptions-item>
+      <el-descriptions-item label="短信内容">
+        {{ detailData.templateContent }}
+      </el-descriptions-item>
+      <el-descriptions-item label="短信参数">
+        {{ detailData.templateParams }}
+      </el-descriptions-item>
+      <el-descriptions-item label="创建时间">
+        {{ formatDate(detailData.createTime) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="发送状态">
+        <dict-tag :type="DICT_TYPE.SYSTEM_SMS_SEND_STATUS" :value="detailData.sendStatus" />
+      </el-descriptions-item>
+      <el-descriptions-item label="发送时间">
+        {{ formatDate(detailData.sendTime) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="发送结果">
+        {{ detailData.sendCode }} | {{ detailData.sendMsg }}
+      </el-descriptions-item>
+      <el-descriptions-item label="API 发送结果">
+        {{ detailData.apiSendCode }} | {{ detailData.apiSendMsg }}
+      </el-descriptions-item>
+      <el-descriptions-item label="API 短信编号">
+        {{ detailData.apiSerialNo }}
+      </el-descriptions-item>
+      <el-descriptions-item label="API 请求编号">
+        {{ detailData.apiRequestId }}
+      </el-descriptions-item>
+      <el-descriptions-item label="API 接收状态">
+        <dict-tag :type="DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS" :value="detailData.receiveStatus" />
+        {{ formatDate(detailData.receiveTime) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="API 接收结果">
+        {{ detailData.apiReceiveCode }} | {{ detailData.apiReceiveMsg }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import * as SmsLogApi from '@/api/system/sms/smsLog'
+import * as SmsChannelApi from '@/api/system/sms/smsChannel'
+
+defineOptions({ name: 'SystemSmsLogDetail' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref() // 详情数据
+const channelList = ref([]) // 短信渠道列表
+
+/** 打开弹窗 */
+const open = async (data: SmsLogApi.SmsLogVO) => {
+  dialogVisible.value = true
+  // 设置数据
+  detailLoading.value = true
+  try {
+    detailData.value = data
+  } finally {
+    detailLoading.value = false
+  }
+  // 加载渠道列表
+  channelList.value = await SmsChannelApi.getSimpleSmsChannelList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/system/sms/log/index.vue b/src/views/system/sms/log/index.vue
new file mode 100644
index 000000000..bc7c3ff60
--- /dev/null
+++ b/src/views/system/sms/log/index.vue
@@ -0,0 +1,193 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="100px">
+      <el-form-item label="手机号" prop="mobile">
+        <el-input v-model="queryParams.mobile" placeholder="请输入手机号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="短信渠道" prop="channelId">
+        <el-select v-model="queryParams.channelId" placeholder="请选择短信渠道" clearable class="!w-240px">
+          <el-option v-for="channel in channelList" :key="channel.id" :value="channel.id" :label="channel.signature +
+            `【 ${getDictLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, channel.code)}】`
+            " />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="模板编号" prop="templateId">
+        <el-input v-model="queryParams.templateId" placeholder="请输入模板编号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="发送状态" prop="sendStatus">
+        <el-select v-model="queryParams.sendStatus" placeholder="请选择发送状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SMS_SEND_STATUS)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="发送时间" prop="sendTime">
+        <el-date-picker v-model="queryParams.sendTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="接收状态" prop="receiveStatus">
+        <el-select v-model="queryParams.receiveStatus" placeholder="请选择接收状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="接收时间" prop="receiveTime">
+        <el-date-picker v-model="queryParams.receiveTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="success" @click="handleExport" :loading="exportLoading" v-hasPermi="['system:sms-log:export']">
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="手机号" align="center" prop="mobile" width="120">
+        <template #default="scope">
+          <div>{{ scope.row.mobile }}</div>
+          <div v-if="scope.row.userType && scope.row.userId">
+            <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
+            {{ '(' + scope.row.userId + ')' }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="短信内容" align="center" prop="templateContent" width="300" />
+      <el-table-column label="发送状态" align="center" width="180">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_SMS_SEND_STATUS" :value="scope.row.sendStatus" />
+          <div>{{ formatDate(scope.row.sendTime) }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="接收状态" align="center" width="180">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS" :value="scope.row.receiveStatus" />
+          <div>{{ formatDate(scope.row.receiveTime) }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="短信渠道" align="center" width="120">
+        <template #default="scope">
+          <div>
+            {{ channelList.find((channel) => channel.id === scope.row.channelId)?.signature }}
+          </div>
+          <dict-tag :type="DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE" :value="scope.row.channelCode" />
+        </template>
+      </el-table-column>
+      <el-table-column label="模板编号" align="center" prop="templateId" />
+      <el-table-column label="短信类型" align="center" prop="templateType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE" :value="scope.row.templateType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" @click="openDetail(scope.row)" v-hasPermi="['system:sms-log:query']">
+            <Icon icon="ep:document-copy" />
+            详情
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：详情 -->
+  <SmsLogDetail ref="detailRef" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions, getDictLabel } from '@/utils/dict'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as SmsChannelApi from '@/api/system/sms/smsChannel'
+import * as SmsLogApi from '@/api/system/sms/smsLog'
+import SmsLogDetail from './SmsLogDetail.vue'
+
+defineOptions({ name: 'SystemSmsLog' })
+
+const message = useMessage() // 消息弹窗
+
+const loading = ref(false) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryFormRef = ref() // 搜索的表单
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  channelId: null,
+  templateId: null,
+  mobile: '',
+  sendStatus: null,
+  receiveStatus: null,
+  sendTime: [],
+  receiveTime: []
+})
+const exportLoading = ref(false) // 导出的加载中
+const channelList = ref([]) // 短信渠道列表
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await SmsLogApi.getSmsLogPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SmsLogApi.exportSmsLog(queryParams)
+    download.excel(data, '短信日志.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (data: SmsLogApi.SmsLogVO) => {
+  detailRef.value.open(data)
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  // 加载渠道列表
+  channelList.value = await SmsChannelApi.getSimpleSmsChannelList()
+})
+</script>
diff --git a/src/views/system/sms/template/SmsTemplateForm.vue b/src/views/system/sms/template/SmsTemplateForm.vue
new file mode 100644
index 000000000..83906cd42
--- /dev/null
+++ b/src/views/system/sms/template/SmsTemplateForm.vue
@@ -0,0 +1,163 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="140px"
+    >
+      <el-form-item label="短信渠道编号" prop="channelId">
+        <el-select v-model="formData.channelId" placeholder="请选择短信渠道编号">
+          <el-option
+            v-for="channel in channelList"
+            :key="channel.id"
+            :label="
+              channel.signature +
+              `【 ${getDictLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, channel.code)}】`
+            "
+            :value="channel.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="短信类型" prop="type">
+        <el-select v-model="formData.type" placeholder="请选择短信类型">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="模板编号" prop="code">
+        <el-input v-model="formData.code" placeholder="请输入模板编号" />
+      </el-form-item>
+      <el-form-item label="模板名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入模板名称" />
+      </el-form-item>
+      <el-form-item label="模板内容" prop="content">
+        <el-input v-model="formData.content" placeholder="请输入模板内容" type="textarea" />
+      </el-form-item>
+      <el-form-item label="开启状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="parseInt(dict.value as string)"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="短信 API 模板编号" prop="apiTemplateId">
+        <el-input v-model="formData.apiTemplateId" placeholder="请输入短信 API 的模板编号" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getDictLabel, getIntDictOptions } from '@/utils/dict'
+import * as SmsTemplateApi from '@/api/system/sms/smsTemplate'
+import * as SmsChannelApi from '@/api/system/sms/smsChannel'
+import { CommonStatusEnum } from '@/utils/constants'
+
+defineOptions({ name: 'SystemSmsTemplateForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型
+const formData = ref<SmsTemplateApi.SmsTemplateVO>({
+  id: null,
+  type: null,
+  status: CommonStatusEnum.ENABLE,
+  code: '',
+  name: '',
+  content: '',
+  remark: '',
+  apiTemplateId: '',
+  channelId: null
+})
+const formRules = reactive({
+  type: [{ required: true, message: '短信类型不能为空', trigger: 'change' }],
+  status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }],
+  code: [{ required: true, message: '模板编码不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
+  content: [{ required: true, message: '模板内容不能为空', trigger: 'blur' }],
+  apiTemplateId: [{ required: true, message: '短信 API 的模板编号不能为空', trigger: 'blur' }],
+  channelId: [{ required: true, message: '短信渠道编号不能为空', trigger: 'change' }]
+})
+const formRef = ref() // 表单 Ref
+const channelList = ref<SmsChannelApi.SmsChannelVO[]>([]) // 短信渠道列表
+
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await SmsTemplateApi.getSmsTemplate(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 加载渠道列表
+  channelList.value = await SmsChannelApi.getSimpleSmsChannelList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  formLoading.value = true
+  try {
+    const data = formData.value as SmsTemplateApi.SmsTemplateVO
+    if (formType.value === 'create') {
+      await SmsTemplateApi.createSmsTemplate(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SmsTemplateApi.updateSmsTemplate(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: null,
+    type: null,
+    status: CommonStatusEnum.ENABLE,
+    code: '',
+    name: '',
+    content: '',
+    remark: '',
+    apiTemplateId: '',
+    channelId: null
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/sms/template/SmsTemplateSendForm.vue b/src/views/system/sms/template/SmsTemplateSendForm.vue
new file mode 100644
index 000000000..b73ec4126
--- /dev/null
+++ b/src/views/system/sms/template/SmsTemplateSendForm.vue
@@ -0,0 +1,120 @@
+<template>
+  <Dialog v-model="dialogVisible" title="测试">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="140px"
+    >
+      <el-form-item label="模板内容" prop="content">
+        <el-input
+          v-model="formData.content"
+          placeholder="请输入模板内容"
+          readonly
+          type="textarea"
+        />
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input v-model="formData.mobile" placeholder="请输入手机号" />
+      </el-form-item>
+      <el-form-item
+        v-for="param in formData.params"
+        :key="param"
+        :label="'参数 {' + param + '}'"
+        :prop="'templateParams.' + param"
+      >
+        <el-input
+          v-model="formData.templateParams[param]"
+          :placeholder="'请输入 ' + param + ' 参数'"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as SmsTemplateApi from '@/api/system/sms/smsTemplate'
+
+defineOptions({ name: 'SystemSmsTemplateSendForm' })
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+
+// 发送短信表单相关
+const formData = ref({
+  content: '',
+  params: {},
+  mobile: '',
+  templateCode: '',
+  templateParams: new Map()
+})
+const formRules = reactive({
+  mobile: [{ required: true, message: '手机不能为空', trigger: 'blur' }],
+  templateCode: [{ required: true, message: '模版编码不能为空', trigger: 'blur' }],
+  templateParams: {}
+})
+const formRef = ref() // 表单 Ref
+
+const open = async (id: number) => {
+  dialogVisible.value = true
+  resetForm()
+  // 设置数据
+  formLoading.value = true
+  try {
+    const data = await SmsTemplateApi.getSmsTemplate(id)
+    // 设置动态表单
+    formData.value.content = data.content
+    formData.value.params = data.params
+    formData.value.templateCode = data.code
+    formData.value.templateParams = data.params.reduce((obj, item) => {
+      obj[item] = '' // 给每个动态属性赋值，避免无法读取
+      return obj
+    }, {})
+    formRules.templateParams = data.params.reduce((obj, item) => {
+      obj[item] = { required: true, message: '参数 ' + item + ' 不能为空', trigger: 'blur' }
+      return obj
+    }, {})
+  } finally {
+    formLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as SmsTemplateApi.SendSmsReqVO
+    const logId = await SmsTemplateApi.sendSms(data)
+    if (logId) {
+      message.success('提交发送成功！发送结果，见发送日志编号：' + logId)
+    }
+    dialogVisible.value = false
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    content: '',
+    params: {},
+    mobile: '',
+    templateCode: '',
+    templateParams: new Map()
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/sms/template/index.vue b/src/views/system/sms/template/index.vue
new file mode 100644
index 000000000..b9e478c60
--- /dev/null
+++ b/src/views/system/sms/template/index.vue
@@ -0,0 +1,213 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="150px">
+      <el-form-item label="短信类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择短信类型" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="开启状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择开启状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="模板编码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入模板编码" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="短信 API 的模板编号" prop="apiTemplateId">
+        <el-input v-model="queryParams.apiTemplateId" placeholder="请输入短信 API 的模板编号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="短信渠道" prop="channelId">
+        <el-select v-model="queryParams.channelId" placeholder="请选择短信渠道" clearable class="!w-240px">
+          <el-option v-for="channel in channelList" :key="channel.id" :value="channel.id" :label="channel.signature +
+            `【 ${getDictLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, channel.code)}】`
+            " />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['system:sms-template:create']">
+          <Icon icon="ep:plus" class="mr-5px" />新增
+        </el-button>
+        <el-button type="success" @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['system:sms-template:export']">
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="模板编码" align="center" prop="code" width="120" :show-overflow-tooltip="true" />
+      <el-table-column label="模板名称" align="center" prop="name" width="120" :show-overflow-tooltip="true" />
+      <el-table-column label="模板内容" align="center" prop="content" width="200" :show-overflow-tooltip="true" />
+      <el-table-column label="短信类型" align="center" prop="type">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" width="80">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="短信 API 的模板编号" align="center" prop="apiTemplateId" width="200"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="短信渠道" align="center" width="120">
+        <template #default="scope">
+          <div>
+            {{ channelList.find((channel) => channel.id === scope.row.channelId)?.signature }}
+          </div>
+          <dict-tag :type="DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE" :value="scope.row.channelCode" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" width="210" fixed="right">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['system:sms-template:update']">
+            <Icon icon="ep:edit" />
+            修改
+          </el-button>
+          <el-button link type="primary" @click="openSendForm(scope.row.id)"
+            v-hasPermi="['system:sms-template:send-sms']">
+            <Icon icon="ep:cellphone" />
+            测试
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['system:sms-template:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <SmsTemplateForm ref="formRef" @success="getList" />
+  <!-- 表单弹窗：测试发送 -->
+  <SmsTemplateSendForm ref="sendFormRef" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions, getDictLabel } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as SmsTemplateApi from '@/api/system/sms/smsTemplate'
+import * as SmsChannelApi from '@/api/system/sms/smsChannel'
+import download from '@/utils/download'
+import SmsTemplateForm from './SmsTemplateForm.vue'
+import SmsTemplateSendForm from './SmsTemplateSendForm.vue'
+
+defineOptions({ name: 'SystemSmsTemplate' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(false) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryFormRef = ref() // 搜索的表单
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  type: null,
+  status: null,
+  code: '',
+  content: '',
+  apiTemplateId: '',
+  channelId: null,
+  createTime: []
+})
+const exportLoading = ref(false) // 导出的加载中
+const channelList = ref<SmsChannelApi.SmsChannelVO[]>([]) // 短信渠道列表
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await SmsTemplateApi.getSmsTemplatePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 发送短信按钮 */
+const sendFormRef = ref()
+const openSendForm = (id: number) => {
+  sendFormRef.value.open(id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SmsTemplateApi.deleteSmsTemplate(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SmsTemplateApi.exportSmsTemplate(queryParams)
+    download.excel(data, '短信模板.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  // 加载渠道列表
+  channelList.value = await SmsChannelApi.getSimpleSmsChannelList()
+})
+</script>
diff --git a/src/views/system/tenant/TenantForm.vue b/src/views/system/tenant/TenantForm.vue
new file mode 100644
index 000000000..fb238561d
--- /dev/null
+++ b/src/views/system/tenant/TenantForm.vue
@@ -0,0 +1,188 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="50%">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-form-item label="租户名" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入租户名" />
+      </el-form-item>
+      <el-form-item label="租户套餐" prop="packageId">
+        <el-select v-model="formData.packageId" clearable placeholder="请选择租户套餐">
+          <el-option
+            v-for="item in packageList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="联系人" prop="contactName">
+        <el-input v-model="formData.contactName" placeholder="请输入联系人" />
+      </el-form-item>
+      <el-form-item label="联系手机" prop="contactMobile">
+        <el-input v-model="formData.contactMobile" placeholder="请输入联系手机" />
+      </el-form-item>
+      <el-form-item v-if="formData.id === undefined" label="用户账号" prop="username">
+        <el-input v-model="formData.username" placeholder="请输入用户账号" />
+      </el-form-item>
+      <el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
+        <el-input
+          v-model="formData.password"
+          placeholder="请输入用户密码"
+          show-password
+          type="password"
+        />
+      </el-form-item>
+      <el-form-item label="账号额度" prop="accountCount">
+        <el-input-number
+          v-model="formData.accountCount"
+          :min="0"
+          controls-position="right"
+          placeholder="请输入账号额度"
+        />
+      </el-form-item>
+      <el-form-item label="过期时间" prop="expireTime">
+        <el-date-picker
+          v-model="formData.expireTime"
+          clearable
+          placeholder="请选择过期时间"
+          :disabled-date="disabledDate"
+          type="date"
+          value-format="x"
+        />
+      </el-form-item>
+      <el-form-item label="绑定域名" prop="domain">
+        <el-input v-model="formData.domain" placeholder="请输入绑定域名" />
+      </el-form-item>
+      <el-form-item label="租户状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as TenantApi from '@/api/system/tenant'
+import { CommonStatusEnum } from '@/utils/constants'
+import * as TenantPackageApi from '@/api/system/tenantPackage'
+
+defineOptions({ name: 'SystemTenantForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  packageId: undefined,
+  contactName: undefined,
+  contactMobile: undefined,
+  accountCount: undefined,
+  expireTime: undefined,
+  domain: undefined,
+  status: CommonStatusEnum.ENABLE
+})
+const formRules = reactive({
+  name: [{ required: true, message: '租户名不能为空', trigger: 'blur' }],
+  packageId: [{ required: true, message: '租户套餐不能为空', trigger: 'blur' }],
+  contactName: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '租户状态不能为空', trigger: 'blur' }],
+  accountCount: [{ required: true, message: '账号额度不能为空', trigger: 'blur' }],
+  expireTime: [{ required: true, message: '过期时间不能为空', trigger: 'blur' }],
+  domain: [{ required: true, message: '绑定域名不能为空', trigger: 'blur' }],
+  username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
+  password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const packageList = ref([]) // 租户套餐
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await TenantApi.getTenant(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 加载套餐列表
+  packageList.value = await TenantPackageApi.getTenantPackageList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as TenantApi.TenantVO
+    if (formType.value === 'create') {
+      await TenantApi.createTenant(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await TenantApi.updateTenant(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    packageId: undefined,
+    contactName: undefined,
+    contactMobile: undefined,
+    accountCount: undefined,
+    expireTime: undefined,
+    domain: undefined,
+    status: CommonStatusEnum.ENABLE
+  }
+  formRef.value?.resetFields()
+}
+
+/**只能选取当前日期以后的日期 */
+const disabledDate =(time)  => {
+  if (time.getTime() < Date.now()) {
+    return true;
+  } else {
+    return false;
+  }
+}
+</script>
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
new file mode 100644
index 000000000..e2650dbe4
--- /dev/null
+++ b/src/views/system/tenant/index.vue
@@ -0,0 +1,192 @@
+<template>
+  <!-- 搜索 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="租户名" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入租户名" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="联系人" prop="contactName">
+        <el-input v-model="queryParams.contactName" placeholder="请输入联系人" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="联系手机" prop="contactMobile">
+        <el-input v-model="queryParams.contactMobile" placeholder="请输入联系手机" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="租户状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择租户状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" />
+          搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" />
+          重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['system:tenant:create']">
+          <Icon icon="ep:plus" class="mr-5px" />
+          新增
+        </el-button>
+        <el-button type="success" @click="handleExport" :loading="exportLoading" v-hasPermi="['system:tenant:export']">
+          <Icon icon="ep:download" class="mr-5px" />
+          导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="租户编号" align="center" prop="id" />
+      <el-table-column label="租户名" align="center" prop="name" />
+      <el-table-column label="租户套餐" align="center" prop="packageId">
+        <template #default="scope">
+          <el-tag v-if="scope.row.packageId === 0" type="danger">系统租户</el-tag>
+          <template v-else v-for="item in packageList">
+            <el-tag type="success" :key="item.id" v-if="item.id === scope.row.packageId">
+              {{ item.name }}
+            </el-tag>
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column label="联系人" align="center" prop="contactName" />
+      <el-table-column label="联系手机" align="center" prop="contactMobile" />
+      <el-table-column label="账号额度" align="center" prop="accountCount">
+        <template #default="scope">
+          <el-tag>{{ scope.row.accountCount }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="过期时间" align="center" prop="expireTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="绑定域名" align="center" prop="domain" width="180" />
+      <el-table-column label="租户状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" min-width="110" fixed="right">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['system:tenant:update']">
+            <Icon icon="ep:edit" />
+            编辑
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['system:tenant:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <TenantForm ref="formRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as TenantApi from '@/api/system/tenant'
+import * as TenantPackageApi from '@/api/system/tenantPackage'
+import TenantForm from './TenantForm.vue'
+
+defineOptions({ name: 'SystemTenant' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  contactName: undefined,
+  contactMobile: undefined,
+  status: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const packageList = ref([]) //租户套餐列表
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await TenantApi.getTenantPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await TenantApi.deleteTenant(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TenantApi.exportTenant(queryParams)
+    download.excel(data, '租户列表.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  packageList.value = await TenantPackageApi.getTenantPackageList()
+})
+</script>
diff --git a/src/views/system/tenantPackage/TenantPackageForm.vue b/src/views/system/tenantPackage/TenantPackageForm.vue
new file mode 100644
index 000000000..fed511182
--- /dev/null
+++ b/src/views/system/tenantPackage/TenantPackageForm.vue
@@ -0,0 +1,194 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-form-item label="套餐名" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入套餐名" />
+      </el-form-item>
+      <el-form-item label="菜单权限">
+        <el-card class="cardHeight">
+          <template #header>
+            全选/全不选:
+            <el-switch
+              v-model="treeNodeAll"
+              active-text="是"
+              inactive-text="否"
+              inline-prompt
+              @change="handleCheckedTreeNodeAll"
+            />
+            全部展开/折叠:
+            <el-switch
+              v-model="menuExpand"
+              active-text="展开"
+              inactive-text="折叠"
+              inline-prompt
+              @change="handleCheckedTreeExpand"
+            />
+          </template>
+          <el-tree
+            ref="treeRef"
+            :data="menuOptions"
+            :props="defaultProps"
+            empty-text="加载中，请稍候"
+            node-key="id"
+            show-checkbox
+          />
+        </el-card>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="parseInt(dict.value)"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { CommonStatusEnum } from '@/utils/constants'
+import { defaultProps, handleTree } from '@/utils/tree'
+import * as TenantPackageApi from '@/api/system/tenantPackage'
+import * as MenuApi from '@/api/system/menu'
+import { ElTree } from 'element-plus'
+
+defineOptions({ name: 'SystemTenantPackageForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: null,
+  name: null,
+  remark: null,
+  menuIds: [],
+  status: CommonStatusEnum.ENABLE
+})
+const formRules = reactive({
+  name: [{ required: true, message: '套餐名不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
+  menuIds: [{ required: true, message: '关联的菜单编号不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const menuOptions = ref<any[]>([]) // 树形结构数据
+const menuExpand = ref(false) // 展开/折叠
+const treeRef = ref<InstanceType<typeof ElTree>>() // 树组件 Ref
+const treeNodeAll = ref(false) // 全选/全不选
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 加载 Menu 列表。注意，必须放在前面，不然下面 setChecked 没数据节点
+  menuOptions.value = handleTree(await MenuApi.getSimpleMenusList())
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      const res = await TenantPackageApi.getTenantPackage(id)
+      // 设置选中
+      formData.value = res
+      // 设置选中
+      res.menuIds.forEach((menuId: number) => {
+        treeRef.value.setChecked(menuId, true, false)
+      })
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as TenantPackageApi.TenantPackageVO
+    data.menuIds = [
+      ...(treeRef.value.getCheckedKeys(false) as unknown as Array<number>), // 获得当前选中节点
+      ...(treeRef.value.getHalfCheckedKeys() as unknown as Array<number>) // 获得半选中的父节点
+    ]
+    if (formType.value === 'create') {
+      await TenantPackageApi.createTenantPackage(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await TenantPackageApi.updateTenantPackage(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  // 重置选项
+  treeNodeAll.value = false
+  menuExpand.value = false
+  // 重置表单
+  formData.value = {
+    id: null,
+    name: null,
+    remark: null,
+    menuIds: [],
+    status: CommonStatusEnum.ENABLE
+  }
+  treeRef.value?.setCheckedNodes([])
+  formRef.value?.resetFields()
+}
+
+/** 全选/全不选 */
+const handleCheckedTreeNodeAll = () => {
+  treeRef.value.setCheckedNodes(treeNodeAll.value ? menuOptions.value : [])
+}
+
+/** 展开/折叠全部 */
+const handleCheckedTreeExpand = () => {
+  const nodes = treeRef.value?.store.nodesMap
+  for (let node in nodes) {
+    if (nodes[node].expanded === menuExpand.value) {
+      continue
+    }
+    nodes[node].expanded = menuExpand.value
+  }
+}
+</script>
+<style lang="scss" scoped>
+.cardHeight {
+  width: 100%;
+  max-height: 400px;
+  overflow-y: scroll;
+}
+</style>
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
new file mode 100644
index 000000000..8bfe0f8fb
--- /dev/null
+++ b/src/views/system/tenantPackage/index.vue
@@ -0,0 +1,138 @@
+<template>
+  <!-- 搜索 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="套餐名" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入套餐名" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" type="daterange" value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="开始日期" end-placeholder="结束日期" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['system:tenant-package:create']">
+          <Icon icon="ep:plus" class="mr-5px" />
+          新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="套餐编号" align="center" prop="id" width="120" />
+      <el-table-column label="套餐名" align="center" prop="name" />
+      <el-table-column label="状态" align="center" prop="status" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"  fixed="right">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['system:tenant-package:update']">
+            <Icon icon="ep:edit" />
+            修改
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['system:tenant-package:delete']">
+            <Icon icon="ep:delete" />
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <TenantPackageForm ref="formRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as TenantPackageApi from '@/api/system/tenantPackage'
+import TenantPackageForm from './TenantPackageForm.vue'
+
+defineOptions({ name: 'SystemTenantPackage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: null,
+  status: null,
+  remark: null,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await TenantPackageApi.getTenantPackagePage(queryParams.value)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields()
+  getList()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await TenantPackageApi.deleteTenantPackage(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/system/user/DeptTree.vue b/src/views/system/user/DeptTree.vue
new file mode 100644
index 000000000..ab8ba06f1
--- /dev/null
+++ b/src/views/system/user/DeptTree.vue
@@ -0,0 +1,63 @@
+<template>
+  <div class="head-container">
+    <el-input v-model="deptName" class="mb-20px" clearable placeholder="请输入部门名称">
+      <template #prefix>
+        <Icon icon="ep:search" />
+      </template>
+    </el-input>
+  </div>
+  <div class="head-container">
+    <el-tree
+      ref="treeRef"
+      :data="deptList"
+      :expand-on-click-node="false"
+      :filter-node-method="filterNode"
+      :props="defaultProps"
+      default-expand-all
+      highlight-current
+      node-key="id"
+      @node-click="handleNodeClick"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ElTree } from 'element-plus'
+import * as DeptApi from '@/api/system/dept'
+import { defaultProps, handleTree } from '@/utils/tree'
+
+defineOptions({ name: 'SystemUserDeptTree' })
+
+const deptName = ref('')
+const deptList = ref<Tree[]>([]) // 树形结构
+const treeRef = ref<InstanceType<typeof ElTree>>()
+
+/** 获得部门树 */
+const getTree = async () => {
+  const res = await DeptApi.getSimpleDeptList()
+  deptList.value = []
+  deptList.value.push(...handleTree(res))
+}
+
+/** 基于名字过滤 */
+const filterNode = (name: string, data: Tree) => {
+  if (!name) return true
+  return data.name.includes(name)
+}
+
+/** 处理部门被点击 */
+const handleNodeClick = async (row: { [key: string]: any }) => {
+  emits('node-click', row)
+}
+const emits = defineEmits(['node-click'])
+
+/** 监听deptName */
+watch(deptName, (val) => {
+  treeRef.value!.filter(val)
+})
+
+/** 初始化 */
+onMounted(async () => {
+  await getTree()
+})
+</script>
diff --git a/src/views/system/user/UserAssignRoleForm.vue b/src/views/system/user/UserAssignRoleForm.vue
new file mode 100644
index 000000000..57d735374
--- /dev/null
+++ b/src/views/system/user/UserAssignRoleForm.vue
@@ -0,0 +1,96 @@
+<template>
+  <Dialog v-model="dialogVisible" title="分配角色">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+      <el-form-item label="用户名称">
+        <el-input v-model="formData.username" :disabled="true" />
+      </el-form-item>
+      <el-form-item label="用户昵称">
+        <el-input v-model="formData.nickname" :disabled="true" />
+      </el-form-item>
+      <el-form-item label="角色">
+        <el-select v-model="formData.roleIds" multiple placeholder="请选择角色">
+          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as PermissionApi from '@/api/system/permission'
+import * as UserApi from '@/api/system/user'
+import * as RoleApi from '@/api/system/role'
+
+defineOptions({ name: 'SystemUserAssignRoleForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  id: undefined,
+  nickname: '',
+  username: '',
+  roleIds: []
+})
+const formRef = ref() // 表单 Ref
+const roleList = ref([]) // 角色的列表
+
+/** 打开弹窗 */
+const open = async (row: UserApi.UserVO) => {
+  dialogVisible.value = true
+  resetForm()
+  // 设置数据
+  formData.value.id = row.id
+  formData.value.username = row.username
+  formData.value.nickname = row.nickname
+  // 获得角色拥有的菜单集合
+  formLoading.value = true
+  try {
+    formData.value.roleIds = await PermissionApi.getUserRoleList(row.id)
+  } finally {
+    formLoading.value = false
+  }
+  // 获得角色列表
+  roleList.value = await RoleApi.getSimpleRoleList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await PermissionApi.assignUserRole({
+      userId: formData.value.id,
+      roleIds: formData.value.roleIds
+    })
+    message.success(t('common.updateSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success', true)
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    nickname: '',
+    username: '',
+    roleIds: []
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/user/UserForm.vue b/src/views/system/user/UserForm.vue
new file mode 100644
index 000000000..60583b826
--- /dev/null
+++ b/src/views/system/user/UserForm.vue
@@ -0,0 +1,218 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="用户昵称" prop="nickname">
+            <el-input v-model="formData.nickname" placeholder="请输入用户昵称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="归属部门" prop="deptId">
+            <el-tree-select
+              v-model="formData.deptId"
+              :data="deptList"
+              :props="defaultProps"
+              check-strictly
+              node-key="id"
+              placeholder="请选择归属部门"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="手机号码" prop="mobile">
+            <el-input v-model="formData.mobile" maxlength="11" placeholder="请输入手机号码" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="邮箱" prop="email">
+            <el-input v-model="formData.email" maxlength="50" placeholder="请输入邮箱" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
+            <el-input v-model="formData.username" placeholder="请输入用户名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
+            <el-input
+              v-model="formData.password"
+              placeholder="请输入用户密码"
+              show-password
+              type="password"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="用户性别">
+            <el-select v-model="formData.sex" placeholder="请选择">
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="岗位">
+            <el-select v-model="formData.postIds" multiple placeholder="请选择">
+              <el-option
+                v-for="item in postList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input v-model="formData.remark" placeholder="请输入内容" type="textarea" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { CommonStatusEnum } from '@/utils/constants'
+import { defaultProps, handleTree } from '@/utils/tree'
+import * as PostApi from '@/api/system/post'
+import * as DeptApi from '@/api/system/dept'
+import * as UserApi from '@/api/system/user'
+
+defineOptions({ name: 'SystemUserForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  nickname: '',
+  deptId: '',
+  mobile: '',
+  email: '',
+  id: undefined,
+  username: '',
+  password: '',
+  sex: undefined,
+  postIds: [],
+  remark: '',
+  status: CommonStatusEnum.ENABLE,
+  roleIds: []
+})
+const formRules = reactive({
+  username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
+  nickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
+  password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
+  email: [
+    {
+      type: 'email',
+      message: '请输入正确的邮箱地址',
+      trigger: ['blur', 'change']
+    }
+  ],
+  mobile: [
+    {
+      pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
+      message: '请输入正确的手机号码',
+      trigger: 'blur'
+    }
+  ]
+})
+const formRef = ref() // 表单 Ref
+const deptList = ref<Tree[]>([]) // 树形结构
+const postList = ref([]) // 岗位列表
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await UserApi.getUser(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 加载部门树
+  deptList.value = handleTree(await DeptApi.getSimpleDeptList())
+  // 加载岗位列表
+  postList.value = await PostApi.getSimplePostList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as UserApi.UserVO
+    if (formType.value === 'create') {
+      await UserApi.createUser(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await UserApi.updateUser(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    nickname: '',
+    deptId: '',
+    mobile: '',
+    email: '',
+    id: undefined,
+    username: '',
+    password: '',
+    sex: undefined,
+    postIds: [],
+    remark: '',
+    status: CommonStatusEnum.ENABLE,
+    roleIds: []
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/user/UserImportForm.vue b/src/views/system/user/UserImportForm.vue
new file mode 100644
index 000000000..b391087a9
--- /dev/null
+++ b/src/views/system/user/UserImportForm.vue
@@ -0,0 +1,135 @@
+<template>
+  <Dialog v-model="dialogVisible" title="用户导入" width="400">
+    <el-upload
+      ref="uploadRef"
+      v-model:file-list="fileList"
+      :action="importUrl + '?updateSupport=' + updateSupport"
+      :auto-upload="false"
+      :disabled="formLoading"
+      :headers="uploadHeaders"
+      :limit="1"
+      :on-error="submitFormError"
+      :on-exceed="handleExceed"
+      :on-success="submitFormSuccess"
+      accept=".xlsx, .xls"
+      drag
+    >
+      <Icon icon="ep:upload" />
+      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      <template #tip>
+        <div class="el-upload__tip text-center">
+          <div class="el-upload__tip">
+            <el-checkbox v-model="updateSupport" />
+            是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入 xls、xlsx 格式文件。</span>
+          <el-link
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            type="primary"
+            @click="importTemplate"
+          >
+            下载模板
+          </el-link>
+        </div>
+      </template>
+    </el-upload>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as UserApi from '@/api/system/user'
+import { getAccessToken, getTenantId } from '@/utils/auth'
+import download from '@/utils/download'
+
+defineOptions({ name: 'SystemUserImportForm' })
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const uploadRef = ref()
+const importUrl =
+  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/import'
+const uploadHeaders = ref() // 上传 Header 头
+const fileList = ref([]) // 文件列表
+const updateSupport = ref(0) // 是否更新已经存在的用户数据
+
+/** 打开弹窗 */
+const open = () => {
+  dialogVisible.value = true
+  resetForm()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async () => {
+  if (fileList.value.length == 0) {
+    message.error('请上传文件')
+    return
+  }
+  // 提交请求
+  uploadHeaders.value = {
+    Authorization: 'Bearer ' + getAccessToken(),
+    'tenant-id': getTenantId()
+  }
+  formLoading.value = true
+  uploadRef.value!.submit()
+}
+
+/** 文件上传成功 */
+const emits = defineEmits(['success'])
+const submitFormSuccess = (response: any) => {
+  if (response.code !== 0) {
+    message.error(response.msg)
+    formLoading.value = false
+    return
+  }
+  // 拼接提示语
+  const data = response.data
+  let text = '上传成功数量：' + data.createUsernames.length + ';'
+  for (let username of data.createUsernames) {
+    text += '< ' + username + ' >'
+  }
+  text += '更新成功数量：' + data.updateUsernames.length + ';'
+  for (const username of data.updateUsernames) {
+    text += '< ' + username + ' >'
+  }
+  text += '更新失败数量：' + Object.keys(data.failureUsernames).length + ';'
+  for (const username in data.failureUsernames) {
+    text += '< ' + username + ': ' + data.failureUsernames[username] + ' >'
+  }
+  message.alert(text)
+  // 发送操作成功的事件
+  emits('success')
+}
+
+/** 上传错误提示 */
+const submitFormError = (): void => {
+  message.error('上传失败，请您重新上传！')
+  formLoading.value = false
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  // 重置上传状态和文件
+  formLoading.value = false
+  uploadRef.value?.clearFiles()
+}
+
+/** 文件数超出提示 */
+const handleExceed = (): void => {
+  message.error('最多只能上传一个文件！')
+}
+
+/** 下载模板操作 */
+const importTemplate = async () => {
+  console.log(await UserApi.importUserTemplate());
+  
+  const res = await UserApi.importUserTemplate()
+  download.excel(res, '用户导入模版.xlsx')
+}
+</script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
new file mode 100644
index 000000000..632aa0442
--- /dev/null
+++ b/src/views/system/user/index.vue
@@ -0,0 +1,260 @@
+<template>
+  <el-row :gutter="20">
+    <!-- 左侧部门树 -->
+    <el-col :span="4" :xs="24">
+      <ContentWrap class="h-1/1">
+        <DeptTree @node-click="handleDeptNodeClick" />
+      </ContentWrap>
+    </el-col>
+    <el-col :span="20" :xs="24">
+      <!-- 搜索 -->
+      <ContentWrap>
+        <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+          <el-form-item label="用户名称" prop="username">
+            <el-input v-model="queryParams.username" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery"
+              class="!w-240px" />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="mobile">
+            <el-input v-model="queryParams.mobile" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery"
+              class="!w-240px" />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="queryParams.status" placeholder="用户状态" clearable class="!w-240px">
+              <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="创建时间" prop="createTime">
+            <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange"
+              start-placeholder="开始日期" end-placeholder="结束日期" class="!w-240px" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="info" plain @click="handleQuery">
+              <Icon icon="ep:search" />搜索
+            </el-button>
+            <el-button type="info" plain @click="resetQuery">
+              <Icon icon="ep:refresh" />重置
+            </el-button>
+            <el-button type="primary" @click="openForm('create')" v-hasPermi="['system:user:create']">
+              <Icon icon="ep:plus" /> 新增
+            </el-button>
+            <el-button type="warning" @click="handleImport" v-hasPermi="['system:user:import']">
+              <Icon icon="ep:upload" /> 导入
+            </el-button>
+            <el-button type="success" @click="handleExport" :loading="exportLoading" v-hasPermi="['system:user:export']">
+              <Icon icon="ep:download" />导出
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </ContentWrap>
+      <ContentWrap>
+        <el-table v-loading="loading" :data="list">
+          <el-table-column label="用户编号" align="center" key="id" prop="id" />
+          <el-table-column label="用户名称" align="center" prop="username" :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="center" prop="nickname" :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.name" :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" prop="mobile" width="120" />
+          <el-table-column label="状态" align="center" key="status">
+            <template #default="scope">
+              <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1"
+                @change="handleStatusChange(scope.row)" />
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180" />
+          <el-table-column label="操作" align="center" width="300" fixed="right">
+            <template #default="scope">
+              <div class="flex items-center justify-center">
+                <el-button type="primary" link @click="openForm('update', scope.row.id)"
+                  v-hasPermi="['system:user:update']">
+                  <Icon icon="ep:edit" />修改
+                </el-button>
+                <el-button type="primary" link @click="handleResetPwd(scope.row)"
+                  v-hasPermi="['system:user:update-password']">
+                  <Icon icon="ep:key" />重置密码
+                </el-button>
+                 <el-button type="primary" link @click="handleRole(scope.row)"
+                    v-hasPermi="['system:permission:assign-user-role']">
+                    <Icon icon="ep:circle-check" />分配角色
+                  </el-button>
+                <el-button type="danger" link @click="handleDelete(scope.row.id)" v-hasPermi="['system:user:delete']">
+                  <Icon icon="ep:delete" />删除
+                </el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+          @pagination="getList" />
+      </ContentWrap>
+    </el-col>
+  </el-row>
+
+  <!-- 添加或修改用户对话框 -->
+  <UserForm ref="formRef" @success="getList" />
+  <!-- 用户导入对话框 -->
+  <UserImportForm ref="importFormRef" @success="getList" />
+  <!-- 分配角色 -->
+  <UserAssignRoleForm ref="assignRoleFormRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { checkPermi } from '@/utils/permission'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { CommonStatusEnum } from '@/utils/constants'
+import * as UserApi from '@/api/system/user'
+import UserForm from './UserForm.vue'
+import UserImportForm from './UserImportForm.vue'
+import UserAssignRoleForm from './UserAssignRoleForm.vue'
+import DeptTree from './DeptTree.vue'
+
+defineOptions({ name: 'SystemUser' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  username: undefined,
+  mobile: undefined,
+  status: undefined,
+  deptId: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await UserApi.getUserPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields()
+  handleQuery()
+}
+
+/** 处理部门被点击 */
+const handleDeptNodeClick = async (row) => {
+  queryParams.deptId = row.id
+  await getList()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 用户导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+/** 修改用户状态 */
+const handleStatusChange = async (row: UserApi.UserVO) => {
+  try {
+    // 修改状态的二次确认
+    const text = row.status === CommonStatusEnum.ENABLE ? '启用' : '停用'
+    await message.confirm('确认要"' + text + '""' + row.username + '"用户吗?')
+    // 发起修改状态
+    await UserApi.updateUserStatus(row.id, row.status)
+    // 刷新列表
+    await getList()
+  } catch {
+    // 取消后，进行恢复按钮
+    row.status =
+      row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE : CommonStatusEnum.ENABLE
+  }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false)
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await UserApi.exportUser(queryParams)
+    download.excel(data, '用户数据.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 操作分发 */
+const handleCommand = (command: string, row: UserApi.UserVO) => {
+  switch (command) {
+    case 'handleDelete':
+      handleDelete(row.id)
+      break
+    case 'handleResetPwd':
+      handleResetPwd(row)
+      break
+    case 'handleRole':
+      handleRole(row)
+      break
+    default:
+      break
+  }
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await UserApi.deleteUser(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 重置密码 */
+const handleResetPwd = async (row: UserApi.UserVO) => {
+  try {
+    // 重置的二次确认
+    const result = await message.prompt(
+      '请输入"' + row.username + '"的新密码',
+      t('common.reminder')
+    )
+    const password = result.value
+    // 发起重置
+    await UserApi.resetUserPwd(row.id, password)
+    message.success('修改成功，新密码是：' + password)
+  } catch { }
+}
+
+/** 分配角色 */
+const assignRoleFormRef = ref()
+const handleRole = (row: UserApi.UserVO) => {
+  assignRoleFormRef.value.open(row)
+}
+
+/** 初始化 */
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts
new file mode 100644
index 000000000..b66cbc76d
--- /dev/null
+++ b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts
@@ -0,0 +1,303 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+import {validateHanset,validateFax,validatePostCode,validateYS} from '@/utils/validator'
+
+/**
+ * @returns {Array} 客户
+ */
+export const Customer = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '名称',
+    field: 'name',
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '简称',
+    field: 'shortName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label:'地址',
+    field: 'address',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '国家',
+    field: 'country',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '城市',
+    field: 'city',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '电话',
+    field: 'phone',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '传真',
+    field: 'fax',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '邮编',
+    field: 'postId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人',
+    field: 'contacts',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '银行',
+    field: 'bank',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '币种',
+    field: 'currency',
+    dictType: DICT_TYPE.CURRENCY,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '税率',
+    field: 'taxRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+  },
+  {
+    label: '类型',
+    field: 'type',
+    dictType: DICT_TYPE.CUSTOMER_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const CustomerRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  shortName: [
+    { required: true, message: '请输入简称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  address: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  country: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  city: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  phone: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
+  ],
+  fax: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateFax, message: '请输入正确的传真', trigger: 'blur'}
+  ],
+  postId: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validatePostCode, message: '请输入正确的邮编', trigger: 'blur'}
+  ],
+  contacts: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  bank: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/customerManage/customer/index.vue b/src/views/wms/basicDataManage/customerManage/customer/index.vue
new file mode 100644
index 000000000..b955c988d
--- /dev/null
+++ b/src/views/wms/basicDataManage/customerManage/customer/index.vue
@@ -0,0 +1,266 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Customer.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Customer.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="CustomerRules" 
+    :formAllSchemas="Customer.allSchemas"
+    :searchTableAllSchemas="Itembasic.allSchemas"
+    :apiUpdate="CustomerApi.updateCustomer"
+    :apiCreate="CustomerApi.createCustomer"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Customer.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/customer/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as CustomerApi from '@/api/wms/customer'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
+import { Customer, CustomerRules } from './customer.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Customer' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Customer.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CustomerApi.getCustomerPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:customer:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:customer:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:customer:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:customer:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:customer:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await CustomerApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Customer.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'shortName') {
+              item.componentProps.disabled = true
+            }
+          })       
+          
+  }else {
+    Customer.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+      if (item.field == 'shortName') {
+              item.componentProps.disabled = false
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Customer.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await CustomerApi.createCustomer(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await CustomerApi.updateCustomer(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicCustomer')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    tableObject.loading = true
+    await CustomerApi.deleteCustomer(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    
+    // 发起导出
+    exportLoading.value = true
+    const data = await CustomerApi.exportCustomer(tableObject.params)
+    download.excel(data, '客户 .xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '客户导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await CustomerApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
new file mode 100644
index 000000000..910c8407c
--- /dev/null
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
@@ -0,0 +1,317 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+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'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '../../factoryModeling/location/location.data'
+
+const { t } = useI18n() // 国际化
+
+import {validateHanset,validateYS} from '@/utils/validator'
+
+/**
+ * @returns {Array} 客户月台
+ */
+export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    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: '名称',
+    field: 'name',
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '城市',
+    field: 'city',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '地址',
+    field: 'address',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人姓名',
+    field: 'contactPerson',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人电话',
+    field: 'contactPhone',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '仓库',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '默认库位',
+    field: 'defaultLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位基础信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const CustomerdockRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  description: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  city: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  address: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactPerson: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactPhone: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  customerCode: [
+    { required: true, message: '请输入客户代码', trigger: 'blur' }
+  ],
+  defaultLocationCode: [
+    { required: true, message: '请输入默认库位', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
new file mode 100644
index 000000000..efbb7f07b
--- /dev/null
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
@@ -0,0 +1,277 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Customerdock.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Customerdock.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="CustomerdockRules" 
+    :formAllSchemas="Customerdock.allSchemas"
+    :apiUpdate="CustomerdockApi.updateCustomerdock"
+    :apiCreate="CustomerdockApi.createCustomerdock"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Customerdock.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/customerdock/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as CustomerdockApi from '@/api/wms/customerdock'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Customerdock, CustomerdockRules } from './customerdock.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Customerdock' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Customerdock.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CustomerdockApi.getCustomerdockPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:customerdock:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:customerdock:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:customerdock:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:customerdock:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerdock:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await CustomerdockApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Customerdock.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+            if (item.field == 'customerCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+          
+  }else {
+    Customerdock.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+        item.componentProps.isSearchList = true
+      }
+      if (item.field == 'customerCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Customerdock.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await CustomerdockApi.createCustomerdock(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await CustomerdockApi.updateCustomerdock(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicCustomerdock')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    tableObject.loading = true
+    await CustomerdockApi.deleteCustomerdock(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CustomerdockApi.exportCustomerdock(tableObject.params)
+    download.excel(data, '客户月台.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '客户月台导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await CustomerdockApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
new file mode 100644
index 000000000..21b99adbc
--- /dev/null
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
@@ -0,0 +1,321 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '../customer/customer.data'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
+
+import {validateYS} from '@/utils/validator'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 客户物料
+ */
+export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户信息', // 查询弹窗标题
+        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    isSearch: true
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    isSearch: true
+  },
+  {
+    label: '客户物料代码',
+    field: 'customerItemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '客户计量单位',
+    field: 'customerUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '客户包装单位',
+    field: 'packUnit',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '客户包装量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '客户替代包装单位',
+    field: 'altPackUnit',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '客户替代包装量',
+    field: 'altPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '每器具包装数',
+    field: 'packQtyOfContainer',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    isSearch: true
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const CustomeritemRules = reactive({
+  customerCode: [
+    { required: true, message: '请输入客户代码', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择客户包装单位', trigger: 'change' }
+  ],
+  packQty: [
+    { required: true, message: '请输入客户包装量', trigger: 'blur' }
+  ],
+  packQtyOfContainer: [
+    { required: true, message: '请输入每器具包装数', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  customerItemCode: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validate: validateYS, message: '请输入正确的客户物料代码', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
new file mode 100644
index 000000000..b34ab2398
--- /dev/null
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
@@ -0,0 +1,282 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Customeritem.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Customeritem.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #customerCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '客户代码', row.customerCode)">
+          <span>{{ row.customerCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="CustomeritemRules" 
+    :formAllSchemas="Customeritem.allSchemas"
+    :apiUpdate="CustomeritemApi.updateCustomeritem"
+    :apiCreate="CustomeritemApi.createCustomeritem"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Customeritem.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/customeritem/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as CustomeritemApi from '@/api/wms/customeritem'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Customeritem, CustomeritemRules } from './customeritem.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Customeritem' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Customeritem.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CustomeritemApi.getCustomeritemPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:customeritem:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:customeritem:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:customeritem:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:customeritem:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:customeritem:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await CustomeritemApi.getItempackaging(row.id)
+    console.log(1111,row);
+    
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Customeritem.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'customerCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+            if (item.field == 'itemCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+  }else {
+    Customeritem.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'customerCode') {
+        item.componentProps.disabled = false
+        item.componentProps.isSearchList = true
+      }
+      if (item.field == 'itemCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Customeritem.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await CustomeritemApi.createCustomeritem(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await CustomeritemApi.updateCustomeritem(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'itemCode'){
+      console.log(val);
+      setV['customerUom'] = val[0]['uom']
+    }
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicCustomeritem')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await CustomeritemApi.deleteCustomeritem(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CustomeritemApi.exportCustomeritem(tableObject.params)
+    download.excel(data, '客户物料 .xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '客户物料导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await CustomeritemApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/customerManage/project/index.vue b/src/views/wms/basicDataManage/customerManage/project/index.vue
new file mode 100644
index 000000000..e5a4303fc
--- /dev/null
+++ b/src/views/wms/basicDataManage/customerManage/project/index.vue
@@ -0,0 +1,274 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Project.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Project.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="ProjectRules" 
+    :formAllSchemas="Project.allSchemas"
+    :apiUpdate="ProjectApi.updateProject"
+    :apiCreate="ProjectApi.createProject"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Project.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/project/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as ProjectApi from '@/api/wms/project'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Project, ProjectRules } from './project.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Project' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Project.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProjectApi.getProjectPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:project:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:project:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:project:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:project:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:project:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await ProjectApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Project.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'customerCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+            if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+          })       
+  }else {
+    Project.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'customerCode') {
+        item.componentProps.disabled = false
+        item.componentProps.isSearchList = true
+      }
+      if (item.field == 'code') {
+              item.componentProps.disabled = false
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Project.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await ProjectApi.createProject(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ProjectApi.updateProject(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicProject')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProjectApi.deleteProject(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProjectApi.exportProject(tableObject.params)
+    download.excel(data, '项目.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '项目导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await ProjectApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/customerManage/project/project.data.ts b/src/views/wms/basicDataManage/customerManage/project/project.data.ts
new file mode 100644
index 000000000..dd300c97a
--- /dev/null
+++ b/src/views/wms/basicDataManage/customerManage/project/project.data.ts
@@ -0,0 +1,182 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '../customer/customer.data'
+
+const { t } = useI18n() // 国际化
+
+import {validateYS} from '@/utils/validator'
+
+/**
+ * @returns {Array} 项目
+ */
+export const Project = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户信息', // 查询弹窗标题
+        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const ProjectRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validate: validateYS, message: '请输入正确的代码', trigger: 'blur' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue
new file mode 100644
index 000000000..70670b7ae
--- /dev/null
+++ b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue
@@ -0,0 +1,276 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Saleprice.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Saleprice.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #customerCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '客户代码', row.customerCode)">
+          <span>{{ row.customerCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="SalepriceRules" 
+    :formAllSchemas="Saleprice.allSchemas"
+    :apiUpdate="SalepriceApi.updateSaleprice"
+    :apiCreate="SalepriceApi.createSaleprice"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Saleprice.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/saleprice/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as SalepriceApi from '@/api/wms/saleprice'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Saleprice, SalepriceRules } from './saleprice.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Saleprice' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Saleprice.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SalepriceApi.getSalepricePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:saleprice:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:saleprice:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:saleprice:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:saleprice:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:saleprice:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await SalepriceApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Saleprice.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'customerCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+            if (item.field == 'itemCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+  }else {
+    Saleprice.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'customerCode') {
+        item.componentProps.disabled = false
+        item.componentProps.isSearchList = true
+      }
+      if (item.field == 'itemCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Saleprice.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await SalepriceApi.createSaleprice(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await SalepriceApi.updateSaleprice(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSaleprice')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await SalepriceApi.deleteSaleprice(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SalepriceApi.exportSaleprice(tableObject.params)
+    download.excel(data, '销售价格单.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '销售价格单导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await SalepriceApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
new file mode 100644
index 000000000..164257fd3
--- /dev/null
+++ b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
@@ -0,0 +1,236 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as CustomeritemApi from '@/api/wms/customeritem'
+import { Customeritem } from '../customeritem/customeritem.data'
+
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '../customer/customer.data'
+
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 销售价格单
+ */
+export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户信息', // 查询弹窗标题
+        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '客户物料信息', // 查询弹窗标题
+        searchAllSchemas: Customeritem.allSchemas, // 查询弹窗所需类
+        searchPage: CustomeritemApi.getCustomeritemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'customerCode',
+          value: 'customerCode',
+          message: '请填写客户代码！',
+          isMainValue: true
+        }]
+      }
+    },
+  },
+  {
+    label: '货币',
+    field: 'currency',
+    dictType: DICT_TYPE.CURRENCY,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '价格',
+    field: 'price',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const SalepriceRules = reactive({
+  customercode: [
+    { required: true, message: '请输入客户代码', trigger: 'blur' }
+  ],
+  itemcode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
+  currency: [
+    { required: true, message: '请选择货币', trigger: 'change' }
+  ],
+  price: [
+    { required: true, message: '请输入价格', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
new file mode 100644
index 000000000..71710f119
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
@@ -0,0 +1,379 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 业务类型
+ */
+export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  
+  {
+    label: '可用物料类型范围',
+    field: 'itemTypes',
+    dictType: DICT_TYPE.ITEM_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component:'Select',
+      componentProps: {
+        multiple: true,
+      },
+    }
+  },
+  {
+    label: '可用物料状态范围',
+    field: 'itemStatuses',
+    dictType: DICT_TYPE.ITEM_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '出库库区类型范围',
+    field: 'outAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component:'Select',
+      componentProps: {
+        multiple: true,
+      },
+    }
+  },
+  {
+    label: '入库库区类型范围',
+    field: 'inAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component:'Select',
+      componentProps: {
+        multiple: true,
+      },
+    }
+  },
+  {
+    label: '出库库区范围',
+    field: 'outAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区信息', // 查询弹窗标题
+        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+        searchPage: AreaApi.getAreaPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '入库库区范围',
+    field: 'inAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区信息', // 查询弹窗标题
+        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+        searchPage: AreaApi.getAreaPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '出库库存状态范围',
+    field: 'outInventoryStatuses',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component:'Select',
+      componentProps: {
+        multiple: true,
+      },
+    }
+  },
+  {
+    label: '入库库存状态范围',
+    field: 'inInventoryStatuses',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component:'Select',
+      componentProps: {
+        multiple: true,
+      },
+    }
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否使用在途库',
+    field: 'useOnTheWay',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '在途库区',
+    field: 'onTheWayArea',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTable: false, 
+    isForm: false,
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  { 
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  { 
+    label: '创建者', 
+    field: 'creator', 
+    isTable: false, 
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  { 
+    label: '是否可用', 
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const BusinesstypeRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { required: true, message: '请输入名称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  description: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  itemTypes: [
+    { required: true, message: '请选择可用物料类型范围', trigger: 'change' }
+  ],
+  itemStatuses: [
+    { required: true, message: '请选择可用物料状态范围', trigger: 'change' }
+  ],
+  // outTransactionType: [
+  //   { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  // ],
+  // inTransactionType: [
+  //   { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  // ],
+  useOnTheWay: [
+    { required: true, message: '请输入使用在途库', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  onTheWayArea: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
new file mode 100644
index 000000000..da20f22c5
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
@@ -0,0 +1,303 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="Businesstype.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :route-name="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Businesstype.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="BusinesstypeRules"
+    :formAllSchemas="Businesstype.allSchemas"
+    :apiUpdate="BusinesstypeApi.updateBusinesstype"
+    :apiCreate="BusinesstypeApi.createBusinesstype"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+    :basicFormWidth="75"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true"   :allSchemas="Businesstype.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/businesstype/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as BusinesstypeApi from '@/api/wms/businesstype'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Businesstype, BusinesstypeRules } from './businesstype.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+// 业务类型
+defineOptions({ name: 'Businesstype' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Businesstype.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BusinesstypeApi.getBusinesstypePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:businesstype:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:businesstype:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:businesstype:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), //刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:businesstype:update' }) // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:businesstype:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    const rowSplit = JSON.parse(JSON.stringify(row))
+    rowSplit.itemTypes = rowSplit.itemTypes.split(',')
+    rowSplit.outAreaTypes = rowSplit.outAreaTypes.split(',')
+    rowSplit.inAreaTypes = rowSplit.inAreaTypes.split(',')
+    rowSplit.outInventoryStatuses = rowSplit.outInventoryStatuses.split(',')
+    rowSplit.inInventoryStatuses = rowSplit.inInventoryStatuses.split(',')
+    openForm('update', rowSplit)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType, data) => {
+  var isHave = Businesstype.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime'
+  })
+  if (isHave) {
+    if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
+      message.error('失效时间要大于生效时间')
+      return
+    }
+  }
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+  data.itemTypes = data.itemTypes.join(',')
+  data.outAreaTypes = data.outAreaTypes.join(',')
+  data.inAreaTypes = data.inAreaTypes.join(',')
+  data.outInventoryStatuses = data.outInventoryStatuses.join(',')
+  data.inInventoryStatuses = data.inInventoryStatuses.join(',')
+  if (formType === 'create') {
+    await BusinesstypeApi.createBusinesstype(data)
+      .then(async () => {
+        message.success(t('common.createSuccess'))
+        basicFormRef.value.dialogVisible = false
+        await getList()
+      })
+      .catch(() => {
+        data.itemTypes = data.itemTypes.split(',')
+        data.outAreaTypes = data.outAreaTypes.split(',')
+        data.inAreaTypes = data.inAreaTypes.split(',')
+        data.outInventoryStatuses = data.outInventoryStatuses.split(',')
+        data.inInventoryStatuses = data.inInventoryStatuses.split(',')
+      })
+  } else {
+    await BusinesstypeApi.updateBusinesstype(data)
+      .then(async () => {
+        message.success(t('common.updateSuccess'))
+        basicFormRef.value.dialogVisible = false
+        await getList()
+      })
+      .catch(() => {
+        data.itemTypes = data.itemTypes.split(',')
+        data.outAreaTypes = data.outAreaTypes.split(',')
+        data.inAreaTypes = data.inAreaTypes.split(',')
+        data.outInventoryStatuses = data.outInventoryStatuses.split(',')
+        data.inInventoryStatuses = data.inInventoryStatuses.split(',')
+      })
+  }
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicBusinesstype')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await BusinesstypeApi.deleteBusinesstype(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BusinesstypeApi.exportBusinesstype(tableObject.params)
+    download.excel(data, '业务类型.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '业务类型导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  
+  importTemplateData.templateUrl = await BusinesstypeApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
new file mode 100644
index 000000000..403fd4ce6
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
@@ -0,0 +1,274 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 单据设置
+ */
+export const Documentsetting = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据类型',
+    field: 'type',
+    dictType: DICT_TYPE.DOCUMENT_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '号码前缀',
+    field: 'numberPrefix',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '号码时间格式',
+    field: 'dateFormat',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '号码流水长度',
+    field: 'serialLength',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        max: 50,
+        precision: 0
+      }
+    },
+  },
+  {
+    label: '号码分隔符',
+    field: 'separatorStr',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '流水重置周期',
+    field: 'resetPeriod',
+    dictType: DICT_TYPE.RESET_PERIOD,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: false,
+    formatter: dateFormatter,
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  { 
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  { 
+    label: '创建者', 
+    field: 'creator', 
+    isTable: false, 
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  { 
+    label: '是否可用', 
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const DocumentsettingRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { required: true, message: '请输入名称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  description: [
+    { required: true, message: '请输入描述', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  type: [
+    { required: true, message: '请选择单据类型', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  numberPrefix: [
+    { required: true, message: '请输入号码前缀', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  dateFormat: [
+    { required: true, message: '请输入号码时间格式', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  serialLength: [
+    { required: true, message: '请输入号码流水长度', trigger: 'blur' }
+  ],
+  resetPeriod: [
+    { required: true, message: '请选择流水重置周期', trigger: 'change' }
+  ],
+  separatorStr: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
new file mode 100644
index 000000000..6cab88afa
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
@@ -0,0 +1,243 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Documentsetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Documentsetting.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="DocumentsettingRules" 
+    :formAllSchemas="Documentsetting.allSchemas" 
+    :apiUpdate="DocumentsettingApi.updateDocumentsetting"
+    :apiCreate="DocumentsettingApi.createDocumentsetting"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Documentsetting.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/documentsetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as DocumentsettingApi from '@/api/wms/documentsetting'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Documentsetting, DocumentsettingRules } from './documentsetting.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Documentsetting' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Documentsetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: DocumentsettingApi.getDocumentsettingPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:documentsetting:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:documentsetting:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:documentsetting:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:documentsetting:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:documentsetting:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await DocumentsettingApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Documentsetting.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await DocumentsettingApi.createDocumentsetting(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await DocumentsettingApi.updateDocumentsetting(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicDocumentsetting')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await DocumentsettingApi.deleteDocumentsetting(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DocumentsettingApi.exportDocumentsetting(tableObject.params)
+    download.excel(data, '单据设置.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '单据设置导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await DocumentsettingApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
new file mode 100644
index 000000000..5b56549e4
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
@@ -0,0 +1,243 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Jobsetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Jobsetting.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="JobsettingRules"
+    :formAllSchemas="Jobsetting.allSchemas"
+    :apiUpdate="JobsettingApi.updateJobsetting"
+    :apiCreate="JobsettingApi.createJobsetting"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Jobsetting.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/jobsetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as JobsettingApi from '@/api/wms/jobsetting'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Jobsetting, JobsettingRules } from './jobsetting.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Jobsetting' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Jobsetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: JobsettingApi.getJobsettingPage // 分页接口 
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:jobsetting:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:jobsetting:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:jobsetting:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:jobsetting:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:jobsetting:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await JobsettingApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Jobsetting.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await JobsettingApi.createJobsetting(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await JobsettingApi.updateJobsetting(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicJobsetting')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await JobsettingApi.deleteJobsetting(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await JobsettingApi.exportJobsetting(tableObject.params)
+    download.excel(data, '任务单设置.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '任务单设置导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await JobsettingApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts
new file mode 100644
index 000000000..16eb4f37b
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts
@@ -0,0 +1,408 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 任务设置
+ */
+export const Jobsetting = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '有效分钟',
+    field: 'validMinutes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision:0
+      }
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBach',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '允许修改包装号',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '是否软删除',
+    field: 'isSoftDeleted',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    isForm: false,
+    isTable: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  { 
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  { 
+    label: '创建者', 
+    field: 'creator', 
+    isTable: false, 
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const JobsettingRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  validMinutes: [
+    { required: true, message: '请输入有效分钟', trigger: 'blur' }
+  ],
+  autoComplete: [
+    { required: true, message: '请选择是否自动完成', trigger: 'change' }
+  ],
+  allowModifyLocation: [
+    { required: true, message: '请选择是否允许修改库位', trigger: 'change' }
+  ],
+  allowModifyQty: [
+    { required: true, message: '请选择是否允许修改数量', trigger: 'change' }
+  ],
+  allowBiggerQty: [
+    { required: true, message: '请选择是否允许大于推荐数量', trigger: 'change' }
+  ],
+  allowSmallerQty: [
+    { required: true, message: '请选择是否允许小于推荐数量', trigger: 'change' }
+  ],
+  allowModifyInventoryStatus: [
+    { required: true, message: '请选择是否允许修改库存状态', trigger: 'change' }
+  ],
+  allowContinuousScanning: [
+    { required: true, message: '请选择是否允许连续扫描', trigger: 'change' }
+  ],
+  allowPartialComplete: [
+    { required: true, message: '请选择是否允许部分完成', trigger: 'change' }
+  ],
+  allowModifyBach: [
+    { required: true, message: '请选择是否允许修改批次', trigger: 'change' }
+  ],
+  allowModifyPackingNumber: [
+    { required: true, message: '请选择是否允许修改包装号', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
new file mode 100644
index 000000000..db0555ea9
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
@@ -0,0 +1,242 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Plansetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Plansetting.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="PlansettingRules" 
+    :formAllSchemas="Plansetting.allSchemas" 
+    :apiUpdate="PlansettingApi.updatePlansetting"
+    :apiCreate="PlansettingApi.createPlansetting"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Plansetting.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/plansetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as PlansettingApi from '@/api/wms/plansetting'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Plansetting, PlansettingRules } from './plansetting.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Plansetting' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Plansetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PlansettingApi.getPlansettingPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:plansetting:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:plansetting:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:plansetting:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:plansetting:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:plansetting:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Plansetting.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await PlansettingApi.createPlansetting(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await PlansettingApi.updatePlansetting(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicPlansetting')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await PlansettingApi.deletePlansetting(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PlansettingApi.exportPlansetting(tableObject.params)
+    download.excel(data, '计划单设置.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '计划单设置导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await PlansettingApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts b/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts
new file mode 100644
index 000000000..07ac11277
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts
@@ -0,0 +1,260 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 计划设置
+ */
+export const Plansetting = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请模式',
+    field: 'requestMode',
+    dictType: DICT_TYPE.REQEUST_MODE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '跳过任务生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    isTable: false,
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  { 
+    label: '备注',
+    field: 'remark',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  { 
+    label: '创建者', 
+    field: 'creator', 
+    isTable: false, 
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const PlansettingRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  requestMode: [
+    { required: true, message: '请选择申请模式', trigger: 'change' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
new file mode 100644
index 000000000..f56ca6181
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
@@ -0,0 +1,243 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Recordsetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Recordsetting.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="RecordsettingRules" 
+    :formAllSchemas="Recordsetting.allSchemas" 
+    :apiUpdate="RecordsettingApi.updateRecordsetting"
+    :apiCreate="RecordsettingApi.createRecordsetting"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Recordsetting.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/recordsetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as RecordsettingApi from '@/api/wms/recordsetting'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Recordsetting, RecordsettingRules } from './recordsetting.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Recordsetting' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Recordsetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: RecordsettingApi.getRecordsettingPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:recordsetting:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:recordsetting:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:recordsetting:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:recordsetting:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:recordsetting:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await RecordsettingApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Recordsetting.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await RecordsettingApi.createRecordsetting(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await RecordsettingApi.updateRecordsetting(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicRecordsetting')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await RecordsettingApi.deleteRecordsetting(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await RecordsettingApi.exportRecordsetting(tableObject.params)
+    download.excel(data, '记录单设置.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '记录单设置导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await RecordsettingApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts
new file mode 100644
index 000000000..83f73a421
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts
@@ -0,0 +1,143 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 记录设置
+ */
+export const Recordsetting = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 200,
+      fixed: 'left'
+    },
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: false,
+    formatter: dateFormatter,
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  { 
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  { 
+    label: '创建者', 
+    field: 'creator', 
+    isTable: false, 
+    isForm: false,
+    sort: 'custom',
+  },
+  { 
+    label: '是否可用', 
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const RecordsettingRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
new file mode 100644
index 000000000..a8dac16c9
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
@@ -0,0 +1,243 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Requestsetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Requestsetting.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="RequestsettingRules" 
+    :formAllSchemas="Requestsetting.allSchemas" 
+    :apiUpdate="RequestsettingApi.updateRequestsetting"
+    :apiCreate="RequestsettingApi.createRequestsetting"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Requestsetting.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/requestsetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as RequestsettingApi from '@/api/wms/requestsetting'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Requestsetting, RequestsettingRules } from './requestsetting.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Requestsetting' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Requestsetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: RequestsettingApi.getRequestsettingPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:requestsetting:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:requestsetting:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:requestsetting:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:requestsetting:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:requestsetting:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await RequestsettingApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Requestsetting.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await RequestsettingApi.createRequestsetting(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await RequestsettingApi.updateRequestsetting(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicRequestsetting')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await RequestsettingApi.deleteRequestsetting(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await RequestsettingApi.exportRequestsetting(tableObject.params)
+    download.excel(data, '申请单设置.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '申请单设置导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await RequestsettingApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts
new file mode 100644
index 000000000..9d776a2de
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts
@@ -0,0 +1,260 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 申请设置
+ */
+export const Requestsetting = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请模式',
+    field: 'requestMode',
+    dictType: DICT_TYPE.REQEUST_MODE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '跳过任务生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    isTable: false,
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  { 
+    label: '备注',
+    field: 'remark',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  { 
+    label: '创建者', 
+    field: 'creator', 
+    isTable: false, 
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const RequestsettingRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  requestMode: [
+    { required: true, message: '请选择申请模式', trigger: 'change' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue
new file mode 100644
index 000000000..1bdad471e
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/switch/index.vue
@@ -0,0 +1,219 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Switch.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Switch.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="SwitchRules" 
+    :formAllSchemas="Switch.allSchemas"
+    :apiUpdate="SwitchApi.updateSwitch"
+    :apiCreate="SwitchApi.createSwitch"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Switch.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/switch/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as SwitchApi from '@/api/wms/switch'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Switch, SwitchRules } from './switch.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Switch' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Switch.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SwitchApi.getSwitchPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:switch:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:switch:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:switch:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn(null), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:switch:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await SwitchApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSwitch')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await SwitchApi.deleteSwitch(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SwitchApi.exportSwitch(tableObject.params)
+    download.excel(data, '单据开关.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '单据开关导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  // importTemplateData.templateUrl = await SwitchApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts b/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts
new file mode 100644
index 000000000..7e39cc083
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts
@@ -0,0 +1,89 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+
+/**
+ * @returns {Array} 单据开关
+ */
+export const Switch = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      fixed: 'left'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '有效设置值',
+    field: 'effectiveSetValue',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const SwitchRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' }
+  ],
+  description: [
+    { required: true, message: '请输入描述', trigger: 'blur' }
+  ],
+  effectiveSetValue: [
+    { required: true, message: '请选择是否有效', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
new file mode 100644
index 000000000..2157545ea
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
@@ -0,0 +1,243 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Transactiontype.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Transactiontype.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="TransactiontypeRules" 
+    :formAllSchemas="Transactiontype.allSchemas" 
+    :apiUpdate="TransactiontypeApi.updateTransactiontype"
+    :apiCreate="TransactiontypeApi.createTransactiontype"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Transactiontype.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/transactiontype/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as TransactiontypeApi from '@/api/wms/transactiontype'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Transactiontype, TransactiontypeRules } from './transactiontype.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Transactiontype' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Transactiontype.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: TransactiontypeApi.getTransactiontypePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:transactiontype:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:transactiontype:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:transactiontype:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:transactiontype:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:transactiontype:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await TransactiontypeApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Transactiontype.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await TransactiontypeApi.createTransactiontype(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await TransactiontypeApi.updateTransactiontype(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicTransactiontype')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await TransactiontypeApi.deleteTransactiontype(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TransactiontypeApi.exportTransactiontype(tableObject.params)
+    download.excel(data, '事务类型.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '事务类型导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await TransactiontypeApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts b/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts
new file mode 100644
index 000000000..1bec72c46
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts
@@ -0,0 +1,200 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 事务类型
+ */
+export const Transactiontype = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      fixed: 'left'
+    },
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+  },
+  {
+    label: '库存动作',
+    field: 'inventoryAction',
+    dictType: DICT_TYPE.INVENTORY_ACTION,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+  },
+  {
+    label: '允许负数',
+    field: 'allowNegative',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: false,
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '是否软删除',
+    field: 'isSoftDeleted',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    isTable: false, 
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  { 
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  { 
+    label: '创建者', 
+    field: 'creator', 
+    isTable: false, 
+    isForm: false,
+    sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const TransactiontypeRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { required: true, message: '请输入名称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  inventoryAction: [
+    { required: true, message: '请选择库存动作', trigger: 'change' }
+  ],
+  allowNegative: [
+    { required: true, message: '请选择允许复数', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
new file mode 100644
index 000000000..630c69b7b
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
@@ -0,0 +1,231 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+import { validateYS } from '@/utils/validator'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 库区
+ */
+export const Area = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '类型',
+    field: 'type',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否是功能区',
+    field: 'isFunctional',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const AreaRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validate: validateYS, message: '请输入正确的代码', trigger: 'blur' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请输入仓库代码', trigger: 'change' }
+  ],
+  isFunctional: [
+    { required: true, message: '请选择是否是功能区', trigger: 'change' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  type: [
+    { required: true, message: '请选择类型', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
new file mode 100644
index 000000000..146392aff
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
@@ -0,0 +1,275 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Area.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Area.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="AreaRules" 
+    :formAllSchemas="Area.allSchemas"
+    :apiUpdate="AreaApi.updateArea"
+    :apiCreate="AreaApi.createArea"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Area.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/areabasic/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as AreaApi from '@/api/wms/areabasic'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Area, AreaRules } from './areabasic.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Area' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Area.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: AreaApi.getAreaPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:areabasic:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:areabasic:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:areabasic:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:areabasic:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:areabasic:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await AreaApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Area.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'warehouseCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+          
+  }else {
+    Area.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+      if (item.field == 'warehouseCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Area.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await AreaApi.createArea(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await AreaApi.updateArea(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicArea')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await AreaApi.deleteArea(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await AreaApi.exportArea(tableObject.params)
+    download.excel(data, '库区.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '库区导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await AreaApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
new file mode 100644
index 000000000..cbd6b2916
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
@@ -0,0 +1,284 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import {validateHanset,validateYS} from '@/utils/validator'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 月台
+ */
+export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '类型',
+    field: 'type',
+    dictType: DICT_TYPE.DOCK_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '默认库位代码',
+    field: 'defaultLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '城市',
+    field: 'city',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '地址',
+    field: 'address',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人姓名',
+    field: 'contactPerson',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人电话',
+    field: 'contactPhone',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const DockRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  city: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  address: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactPerson: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactPhone: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
+  ],
+  type: [
+    { required: true, message: '请输入类型', trigger: 'change' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请输入仓库代码', trigger: 'change' }
+  ],
+  defaultLocationCode: [
+    { required: true, message: '请输入默认库位代码', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
new file mode 100644
index 000000000..d8fc830ec
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
@@ -0,0 +1,267 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Dock.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Dock.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="DockRules" 
+    :formAllSchemas="Dock.allSchemas"
+    :apiUpdate="DockApi.updateDock"
+    :apiCreate="DockApi.createDock"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Dock.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/dock/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as DockApi from '@/api/wms/dock'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Dock, DockRules } from './dock.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Dock' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Dock.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: DockApi.getDockPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:dock:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:dock:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:dock:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:dock:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:dock:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await DockApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Dock.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+          })       
+          
+  }else {
+    Dock.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'baiscDock')
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Dock.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await DockApi.createDock(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await DockApi.updateDock(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await DockApi.deleteDock(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DockApi.exportDock(tableObject.params)
+    download.excel(data, '月台.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '月台导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await DockApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/factoryModeling/enterprise/enterprise.data.ts b/src/views/wms/basicDataManage/factoryModeling/enterprise/enterprise.data.ts
new file mode 100644
index 000000000..40d976f8d
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/enterprise/enterprise.data.ts
@@ -0,0 +1,156 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const EnterpriseRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  shortName: [
+    { required: true, message: '请输入简称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  address: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+export const Enterprise = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+     
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+     
+  },
+  {
+    label: '简称',
+    field: 'shortName',
+    sort: 'custom',
+     
+  },
+  {
+    label: '地址',
+    field: 'address',
+    sort: 'custom',
+     
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+     
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+     
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
new file mode 100644
index 000000000..2567a8018
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
@@ -0,0 +1,264 @@
+<template>
+  <!-- <ContentWrap>
+    <Search :schema="Enterprise.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap> -->
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Enterprise.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="EnterpriseRules" 
+    :formAllSchemas="Enterprise.allSchemas" 
+    :apiUpdate="EnterpriseApi.updateEnterprise"
+    :apiCreate="EnterpriseApi.createEnterprise"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Enterprise.allSchemas" />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Enterprise,EnterpriseRules } from './enterprise.data'
+import * as EnterpriseApi from '@/api/wms/enterprise'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'Enterprise' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Enterprise.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val,  basicFormRef ) => {
+  nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+       basicFormRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: EnterpriseApi.getEnterprisePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:enterprise:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:enterprise:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:enterprise:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:enterprise:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:enterprise:delete'}), // 删除
+]
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const  basicFormRef = ref()
+const openForm =async (type: string, row?: number) => {
+  if(type == "update"){
+    Enterprise.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'shortName') {
+              item.componentProps.disabled = true
+            }
+          })       
+  }else {
+    Enterprise.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+      if (item.field == 'shortName') {
+              item.componentProps.disabled = false
+            }
+    })  
+  }
+   basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  console.log(data);
+  
+      var isHave =Enterprise.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await EnterpriseApi.createEnterprise(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await EnterpriseApi.updateEnterprise(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'basicEnterprise')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await EnterpriseApi.deleteEnterprise(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await EnterpriseApi.exportEnterprise(tableObject.params)
+    download.excel(data, '企业.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/index.vue b/src/views/wms/basicDataManage/factoryModeling/location/index.vue
new file mode 100644
index 000000000..5b9c7b7a3
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/location/index.vue
@@ -0,0 +1,295 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Location.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Location.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="LocationRules" 
+    :formAllSchemas="Location.allSchemas"
+    :apiUpdate="LocationApi.updateLocation"
+    :apiCreate="LocationApi.createLocation"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Location.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/location/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as LocationApi from '@/api/wms/location'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Location, LocationRules } from './location.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+// 基础信息——库位
+defineOptions({ name: 'Location' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Location.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: LocationApi.getLocationPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:location:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:location:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:location:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:location:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:location:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await LocationApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Location.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'warehouseCode') {
+               // 编辑暂时可以修改
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+            if (item.field == 'areaCode') {
+              // 编辑暂时可以修改
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+            if (item.field == 'locationGroupCode') {
+              // 编辑暂时可以修改
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+          })       
+          
+  }else {
+    Location.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+      if (item.field == 'warehouseCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+            if (item.field == 'areaCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+            if (item.field == 'locationGroupCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Location.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await LocationApi.createLocation(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await LocationApi.updateLocation(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicLocation')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await LocationApi.deleteLocation(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await LocationApi.exportLocation(tableObject.params)
+    download.excel(data, '库位.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '库位导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await LocationApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
new file mode 100644
index 000000000..6bcc1d903
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
@@ -0,0 +1,408 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+import * as LocationgroupApi from '@/api/wms/locationgroup'
+import { Locationgroup } from '@/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data'
+
+import { validateYS } from '@/utils/validator'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 库位
+ */
+export const Location = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区信息', // 查询弹窗标题
+        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+        searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'warehouseCode',
+          value:'warehouseCode',
+          message: '请填写仓库代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位组代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位组信息', // 查询弹窗标题
+        searchAllSchemas: Locationgroup.allSchemas, // 查询弹窗所需类
+        searchPage: LocationgroupApi.getLocationgroupPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'areaCode',
+          value:'areaCode',
+          message: '请填写库区代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: 'ERP库位类型',
+    field: 'erpLocationCode',
+    dictType: DICT_TYPE.ERP_LOCATION,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  // {
+  //   label: '类型',
+  //   field: 'type',
+  //   dictType: DICT_TYPE.AREA_TYPE,
+  //   dictClass: 'string',
+  //   isSearch: true,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '巷道',
+    field: 'aisle',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货架',
+    field: 'shelf',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '行',
+    field: 'locationRow',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '列',
+    field: 'locationColum',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '备货优先级',
+    field: 'pickPriority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '最大承重',
+    field: 'maxWeight',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '最大面积',
+    field: 'maxArea',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '最大体积',
+    field: 'maxVolume',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const LocationRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  aisle: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  shelf: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请输入仓库代码', trigger: 'change' }
+  ],
+  areaCode: [
+    { required: true, message: '请输入库区代码', trigger: 'change' }
+  ],
+  locationGroupCode: [
+    { required: true, message: '请输入库位组代码', trigger: 'change' }
+  ],
+  erpLocationCode: [
+    { required: true, message: '请选择ERP库位类型', trigger: 'change' }
+  ],
+  // type: [
+  //   { required: true, message: '请选择类型', trigger: 'change' }
+  // ],
+  pickPriority: [
+    { required: true, message: '请输入备货优先级', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
new file mode 100644
index 000000000..cd7cb0667
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
@@ -0,0 +1,275 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Locationgroup.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Locationgroup.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="LocationgroupRules" 
+    :formAllSchemas="Locationgroup.allSchemas"
+    :apiUpdate="LocationgroupApi.updateLocationgroup"
+    :apiCreate="LocationgroupApi.createLocationgroup"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Locationgroup.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/locationgroup/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as LocationgroupApi from '@/api/wms/locationgroup'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Locationgroup, LocationgroupRules } from './locationgroup.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Locationgroup' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Locationgroup.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: LocationgroupApi.getLocationgroupPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:locationgroup:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:locationgroup:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:locationgroup:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:locationgroup:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:locationgroup:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await LocationgroupApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Locationgroup.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'warehouseCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+          
+  }else {
+    Locationgroup.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+      if (item.field == 'warehouseCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Locationgroup.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await LocationgroupApi.createLocationgroup(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await LocationgroupApi.updateLocationgroup(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicLocationgroup')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await LocationgroupApi.deleteLocationgroup(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await LocationgroupApi.exportLocationgroup(tableObject.params)
+    download.excel(data, '库位组.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '库位组导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await LocationgroupApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
new file mode 100644
index 000000000..11fead26e
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
@@ -0,0 +1,230 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+import { validateYS } from '@/utils/validator'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 库位组
+ */
+export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区信息', // 查询弹窗标题
+        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+        searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'warehouseCode',
+          value:'warehouseCode',
+          message: '请填写仓库代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 180,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const LocationgroupRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请输入仓库代码', trigger: 'change' }
+  ],
+  areaCode: [
+    { required: true, message: '请输入库区代码', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/factoryModeling/process/index.vue b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
new file mode 100644
index 000000000..b3f70053f
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
@@ -0,0 +1,283 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Process.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Process.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="ProcessRules" 
+    :formAllSchemas="Process.allSchemas"
+    :apiUpdate="ProcessApi.updateProcess"
+    :apiCreate="ProcessApi.createProcess"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Process.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/process/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as ProcessApi from '@/api/wms/process'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Process, ProcessRules } from './process.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Process' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Process.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProcessApi.getProcessPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:process:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:process:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:process:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:process:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:process:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await ProcessApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Process.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'workshopCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+            if (item.field == 'productionLineCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+          
+  }else {
+    Process.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+      if (item.field == 'workshopCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+            if (item.field == 'productionLineCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Process.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await ProcessApi.createProcess(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ProcessApi.updateProcess(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicProcess')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProcessApi.deleteProcess(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProcessApi.exportProcess(tableObject.params)
+    download.excel(data, '工序.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '工序导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await ProcessApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
new file mode 100644
index 000000000..7b9c924d1
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
@@ -0,0 +1,241 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import { validateYS } from '@/utils/validator'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 工序
+ */
+export const Process = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '类型',
+    field: 'type',
+    dictType: DICT_TYPE.PROCESS_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'workshopCode',
+          value:'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTable: false,
+    isForm: false
+  },
+  { 
+    label: '备注', 
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  { 
+    label: '创建者', 
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单检验
+export const ProcessRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  workshopCode: [
+    { required: true, message: '请输入车间代码', trigger: 'change' }
+  ],
+  productionLineCode: [
+    { required: true, message: '请输入生产线代码', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
new file mode 100644
index 000000000..3f895df9e
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
@@ -0,0 +1,276 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Productionline.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Productionline.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="ProductionlineRules" 
+    :formAllSchemas="Productionline.allSchemas"
+    :apiUpdate="ProductionlineApi.updateProductionline"
+    :apiCreate="ProductionlineApi.createProductionline"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Productionline.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productionline/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as ProductionlineApi from '@/api/wms/productionline'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Productionline, ProductionlineRules } from './productionline.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+// 生产线
+defineOptions({ name: 'Productionline' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Productionline.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionlineApi.getProductionlinePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productionline:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productionline:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productionline:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:productionline:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionline:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await ProductionlineApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Productionline.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'workshopCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+          
+  }else {
+    Productionline.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+      if (item.field == 'workshopCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Productionline.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await ProductionlineApi.createProductionline(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ProductionlineApi.updateProductionline(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicProductionline')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductionlineApi.deleteProductionline(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionlineApi.exportProductionline(tableObject.params)
+    download.excel(data, '生产线.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '生产线导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await ProductionlineApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
new file mode 100644
index 000000000..3ff8f8bd0
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
@@ -0,0 +1,257 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import { validateYS } from '@/utils/validator'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 生产线
+ */
+export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '类型',
+    field: 'type',
+    dictType: DICT_TYPE.PRODUCTION_LINE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  // {
+  //   label: '原料库位',
+  //   field: 'rawLocationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '库位信息', // 查询弹窗标题
+  //       searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+  //       searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '成品库位',
+  //   field: 'fgLocationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '库位信息', // 查询弹窗标题
+  //       searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+  //       searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTable: false,
+    isForm: false
+  },
+  { 
+    label: '备注', 
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  { 
+    label: '创建者', 
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 180,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const ProductionlineRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  workshopCode: [
+    { required: true, message: '请输入车间代码', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
new file mode 100644
index 000000000..1986c81ab
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
@@ -0,0 +1,256 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Warehouse.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Warehouse.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="WarehouseRules" 
+    :formAllSchemas="Warehouse.allSchemas"
+    :apiUpdate="WarehouseApi.updateWarehouse"
+    :apiCreate="WarehouseApi.createWarehouse"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Warehouse.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/warehouse/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as WarehouseApi from '@/api/wms/warehouse'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Warehouse, WarehouseRules } from './warehouse.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Warehouse' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Warehouse.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: WarehouseApi.getWarehousePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:warehouse:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:warehouse:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:warehouse:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:warehouse:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:warehouse:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await WarehouseApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Warehouse.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+          })       
+  }else {
+    Warehouse.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Warehouse.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await WarehouseApi.createWarehouse(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await WarehouseApi.updateWarehouse(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicWarehouse')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await WarehouseApi.deleteWarehouse(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await WarehouseApi.exportWarehouse(tableObject.params)
+    download.excel(data, '仓库.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '仓库导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await WarehouseApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
new file mode 100644
index 000000000..cdf170b44
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
@@ -0,0 +1,187 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import { validateYS } from '@/utils/validator'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 仓库
+ */
+export const Warehouse = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 200,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    table: {
+      width: 200
+    },
+    isSearch: true
+  },
+  {
+    label: '类型',
+    field: 'type',
+    dictType: DICT_TYPE.WAREHOUSE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 200
+    },
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 200
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 200
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const WarehouseRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  description: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
new file mode 100644
index 000000000..3ad008ccb
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
@@ -0,0 +1,257 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Workshop.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Workshop.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="WorkshopRules" 
+    :formAllSchemas="Workshop.allSchemas"
+    :apiUpdate="WorkshopApi.updateWorkshop"
+    :apiCreate="WorkshopApi.createWorkshop"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Workshop.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/workshop/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as WorkshopApi from '@/api/wms/workshop'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Workshop, WorkshopRules } from './workshop.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Workshop' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Workshop.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: WorkshopApi.getWorkshopPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:workshop:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:workshop:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:workshop:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:workshop:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:workshop:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await WorkshopApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Workshop.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+          })       
+          
+  }else {
+    Workshop.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Workshop.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await WorkshopApi.createWorkshop(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await WorkshopApi.updateWorkshop(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkshop')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await WorkshopApi.deleteWorkshop(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await WorkshopApi.exportWorkshop(tableObject.params)
+    download.excel(data, '车间.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '车间导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await WorkshopApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
new file mode 100644
index 000000000..9290a46a0
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
@@ -0,0 +1,150 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import { validateYS } from '@/utils/validator'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 车间
+ */
+export const Workshop = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '类型',
+    field: 'type',
+    dictType: DICT_TYPE.WORKSHOP_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  { 
+    label: '备注', 
+    field: 'remark',
+    sort: 'custom',
+  },
+  { 
+    label: '创建者', 
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const WorkshopRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
new file mode 100644
index 000000000..406313909
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
@@ -0,0 +1,284 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Workstation.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Workstation.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="WorkstationRules" 
+    :formAllSchemas="Workstation.allSchemas"
+    :apiUpdate="WorkstationApi.updateWorkstation"
+    :apiCreate="WorkstationApi.createWorkstation"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Workstation.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/workstation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as WorkstationApi from '@/api/wms/workstation'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Workstation, WorkstationRules } from './workstation.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+// 工位
+defineOptions({ name: 'Workstation' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Workstation.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: WorkstationApi.getWorkstationPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:workstation:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:workstation:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:workstation:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:workstation:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:workstation:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await WorkstationApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Workstation.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'workshopCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+            if (item.field == 'productionLineCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+          
+  }else {
+    Workstation.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+      if (item.field == 'workshopCode') {
+          item.componentProps.disabled = false
+          item.componentProps.isSearchList = true
+        }
+        if (item.field == 'productionLineCode') {
+          item.componentProps.disabled = false
+          item.componentProps.isSearchList = true
+        }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Workstation.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await WorkstationApi.createWorkstation(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await WorkstationApi.updateWorkstation(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await WorkstationApi.deleteWorkstation(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await WorkstationApi.exportWorkstation(tableObject.params)
+    download.excel(data, '工位.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '工位导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await WorkstationApi.importWorkstationTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
new file mode 100644
index 000000000..3b96a657c
--- /dev/null
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -0,0 +1,315 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as confgiApi  from '@/api/infra/config'
+
+import * as WorkstationApi from '@/api/wms/workstation'
+
+import { validateYS } from '@/utils/validator'
+
+
+const { t } = useI18n() // 国际化
+const confgiDataOne = await confgiApi.queryByKey("WorkStation-IN")
+const confgiDataTwo = await confgiApi.queryByKey("WorkStation-OUT")
+
+/**
+ * @returns {Array} 工位
+ */
+export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  // {
+  //   label: '类型',
+  //   field: 'type',
+  //   dictType: DICT_TYPE.WORK_STATION_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'workshopCode',
+          value:'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+
+  {
+    label: '原料库位',
+    field: 'rawLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'areaType',
+          value: confgiDataOne.areaType,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '成品库位',
+    field: 'fgLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'areaType',
+          value: confgiDataTwo.areaType,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTable: false,
+  },
+  { 
+    label: '备注', 
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  { 
+    label: '创建者', 
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单检验
+export const WorkstationRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  workshopCode: [
+    { required: true, message: '请输入车间代码', trigger: 'change' }
+  ],
+  productionLineCode: [
+    { required: true, message: '请输入生产线代码', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  rawLocationCode: [
+    { required: true, message: '请选择原料库位', trigger: 'change' }
+  ],
+  fgLocationCode: [
+    { required: true, message: '请选择成品库位', trigger: 'change' }
+  ],
+})
diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
new file mode 100644
index 000000000..ed90ce54a
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
@@ -0,0 +1,264 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from './../itembasic/itembasic.data'
+
+import * as ProcessApi from '@/api/wms/process'
+import { Process } from '../../factoryModeling/process/process.data'
+
+const { t } = useI18n() // 国际化
+
+/** 
+ * @returns {Array} 基础物料清单
+*/
+export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '父物料代码',
+    field: 'productItemCode',
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.selectItembasicPageToFgAndSemibasicPage, // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '子物料代码',
+    field: 'componentItemCode',
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.selectTypeToItembasic, // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '子物料计量单位',
+    field: 'componentUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '子物料数量',
+    field: 'componentQty',
+    isSearch: true,
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    table: {
+      width: 120
+    }
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择工序代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工序信息', // 查询弹窗标题
+        searchAllSchemas: Process.allSchemas, // 查询弹窗所需类
+        searchPage: ProcessApi.getProcessPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '版本',
+    field: 'version',
+    sort: 'custom',
+    form: {
+      labelMessage: '子物料要和父物料版本相同',
+    }
+  },
+  {
+    label: '层级',
+    field: 'layer',
+    sort: 'custom',
+    // form: {
+    //   component: 'Input',
+    //   componentProps: {
+    //     // focus: ()=>{console.log('111111111111111111111')},
+    //     modelValue: '11111'
+    //   }
+    // }
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    sort: 'custom',
+    formatter : dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isForm: false,
+    isTable: false
+  },
+  { label: '备注', field: 'remark', isTable: false },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const BomRules = reactive({
+  productItemCode: [
+    { required: true, message: '请输入父物料代码', trigger: 'change' }
+  ],
+  componentItemCode: [
+    { required: true, message: '请输入子物料代码', trigger: 'change' }
+  ],
+  componentUom: [
+    { required: true, message: '请选择子物料计量单位', trigger: 'change' }
+  ],
+  componentQty: [
+    { required: true, message: '请输入子物料数量', trigger: 'blur' }
+  ],
+  processCode: [
+    { required: true, message: '请输入工序代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'change' },
+  ],
+  version: [
+    { required: true, message: '请输入版本', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'change' }
+  ],
+  layer: [
+    { required: true, message: '请输入层级', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'change' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/itemManage/bom/index.vue b/src/views/wms/basicDataManage/itemManage/bom/index.vue
new file mode 100644
index 000000000..f0db0a426
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/bom/index.vue
@@ -0,0 +1,286 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Bom.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead 
+    :HeadButttondata="HeadButttondata" 
+    @button-base-click="buttonBaseClick" 
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Bom.allSchemas" 
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #productItemCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '物料代码', row.productItemCode)">
+          <span>{{ row.productItemCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="BomRules" 
+    :formAllSchemas="Bom.allSchemas" 
+    :apiUpdate="BomApi.updateBom"
+    :apiCreate="BomApi.createBom"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Bom.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/bom/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as BomApi from '@/api/wms/bom'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Bom, BomRules } from './bom.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+// 物料清单bom
+defineOptions({ name: 'Bom' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Bom.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BomApi.getBomPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:bom:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:bom:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:bom:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:bom:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:bom:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await BomApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Bom.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'productItemCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+            if (item.field == 'componentItemCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+          
+  }else {
+    Bom.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'productItemCode') {
+        item.componentProps.disabled = false
+        item.componentProps.isSearchList = true
+      }
+      if (item.field == 'componentItemCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+
+      var isHave =Bom.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (data.productItemCode == data.componentItemCode) {
+          message.error('父物料代码和子物料代码不能相同！')
+          return
+      }
+      if (formType === 'create') {
+        await BomApi.createBom(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await BomApi.updateBom(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  console.log(153, formField)
+  console.log(153, searchField)
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicBom')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await BomApi.deleteBom(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BomApi.exportBom(tableObject.params)
+    download.excel(data, '物料清单信息 .xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '物料清单信息导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await BomApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
new file mode 100644
index 000000000..e78f9d9cb
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -0,0 +1,383 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Itemarea.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Itemarea.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #itemCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '物料号', row.itemCode)">
+          <span>{{ row.itemCode }}</span>
+        </el-button>
+        
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ItemareaRules"
+    :formAllSchemas="Itemarea.allSchemas"
+    :tableAllSchemas="ItemareaDetail.allSchemas"
+    :tableFormRules="ItemareaDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ItemareaApi.updateItemarea"
+    :apiCreate="ItemareaApi.createItemarea"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    :isShowButton = isShowButton
+    :basicFormWidth="75"
+    :tableFormDataLength="false"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="Itemarea.allSchemas"
+    :detailAllSchemas="ItemareaDetail.allSchemas"
+    :detailAllSchemasRules="ItemareaDetailRules"
+    :apiCreate="ItemareaDetailApi.createItemareaDetail"
+    :apiUpdate="ItemareaDetailApi.updateItemareaDetail"
+    :apiPage="ItemareaDetailApi.getItemareaDetailPage"
+    :apiDelete="ItemareaDetailApi.deleteItemareaDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="true"
+    :detailButtonIsShowDelete="true"
+    @detailOpenForm="detailOpenForm"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/itemarea/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+  <script setup lang="ts">
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+  import download from '@/utils/download'
+  import { Itemarea,ItemareaRules,ItemareaDetail,ItemareaDetailRules } from './itemarea.data'
+  import * as ItemareaApi from '@/api/wms/itemarea'
+  import * as ItemareaDetailApi from '@/api/wms/itemareaDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+  import Detail from '@/components/Detail/src/Detail.vue'
+  
+
+// 发货申请
+defineOptions({ name: 'Itemarea' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Itemarea.allSchemas.tableColumns)
+
+const isShowButton = ref(true)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      if(formField == 'locationCode') {
+        row['locationCode'] = val[0]['code']
+      }else{ 
+        row[formField] = val[0][searchField]
+      }
+    }else{
+      const setV = {}      
+      if(formField == 'areaCode') {
+        console.log(val[0]);
+        setV['areaCode'] = val[0]['code']
+        setV['areaType'] = val[0]['type']
+      }else  if(formField == 'inPackUnit') {
+        setV['inPackUnit'] = val[0]['code']
+      }else  if(formField == 'outPackUnit') {
+        setV['outPackUnit'] = val[0]['code']
+      }else  if(formField == 'itemCode') {
+        setV['itemCode'] = val[0]['code']
+      }else{ 
+        setV[formField] = setV[0][searchField]
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ItemareaApi.getItemareaPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:itemarea:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:itemarea:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:itemarea:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// /**
+//  * 监听改变事件
+//  * @param field 当前操作字段
+//  * @param cur 改变后值
+//  */
+//  const onChangeArea = (field, cur) => {
+//   console.log(field,cur);
+//   if(field == "maxQty" && cur == "0"){
+//     Itemarea.allSchemas.formSchema.forEach((item) => {
+//       if (item.field == 'allowIssueRequest') {
+//               cur.value = "FALSE"
+//               item.componentProps.disabled = true
+//             }})
+//   }
+// }
+
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  row.status = "1"
+    return [
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:itemarea:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:itemarea:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+ if (val == 'edit') { // 编辑 
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  if(type == "update"){
+    Itemarea.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'areaCode') {
+              item.componentProps.isSearchList = false,
+              item.componentProps.disabled = true
+            }})
+          }else {
+              Itemarea.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'areaCode') {
+        item.componentProps.isSearchList = true
+      }
+    })  
+  }
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/**
+ * 详情 编辑页面打开
+ * @param row 
+ */
+ const detailOpenForm = (type) => {
+
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  row.status = "1";
+  detailRef.value.openDetail(row, titleName, titleValue,'itemarea')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ItemareaDetailApi.deleteItemareaDetail(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ItemareaApi.exportItemarea(tableObject.params)
+    download.excel(data, '物料库区配置管理主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ItemareaDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await ItemareaApi.createItemarea(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ItemareaApi.updateItemarea(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '物料库区配置导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ItemareaApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
new file mode 100644
index 000000000..43e97c5fd
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -0,0 +1,730 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '../itembasic/itembasic.data'
+
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '../../factoryModeling/areabasic/areabasic.data'
+
+import * as LocationgroupApi from '@/api/wms/locationgroup'
+import { Locationgroup } from '../../factoryModeling/locationgroup/locationgroup.data'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '../../factoryModeling/location/location.data'
+
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Packageunit } from '../packageunit/packageunit.data'
+
+export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '区域代码',
+    field: 'areaCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区基础信息', // 查询弹窗标题
+        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+        searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '库区类型',
+    field: 'areaType',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '入库包装规格',
+    field: 'inPackUnit',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格基础信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '出库包装规格',
+    field: 'outPackUnit',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格基础信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '管理精度',
+    field: 'manageMode',
+    sort: 'custom',
+    isSearch: false,
+    dictType: DICT_TYPE.MANAGEMENT_MODE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最高库存数量',
+    field: 'maxQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '最低库存数量',
+    field: 'minQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '安全预警库存数量',
+    field: 'safeQty',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '是否自动补料',
+    field: 'autoRepleinsh',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 140
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '补料来源库区',
+    field: 'repleinshFromArea',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区基础信息', // 查询弹窗标题
+        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+        searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '补料数量',
+    field: 'repleinshQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+  },
+ 
+  {
+    label: '入库自动转为出库包装规格',
+    field: 'newlyToOutpackunit',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isTable:false
+  },
+  {
+    label: '出库自动转为出库包装规格',
+    field: 'surplusToOutpackunit',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isTable:false
+  },
+  {
+    label: '需要接收确认',
+    field: 'needReceive',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isSearch: false,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '出库后剩余库存自动转换为出库包装规格',
+    field: 'surplusToOutpackunit',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isTable:false
+  },
+  {
+    label: '超过高储是否允许叫料',
+    field: 'allowIssueRequest',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isTable:false
+  },
+  {
+    label: '优先空库位',
+    field: 'emptyLocationFirst',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '优先非空库位',
+    field: 'notEmptyLocationFirst',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混批次',
+    field: 'enableMixLot',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混物品',
+    field: 'enableMixItem',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混状态',
+    field: 'enableMixStatus',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '巷道排序方向',
+    field: 'aisleOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货架排序方向',
+    field: 'sheIfOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '行排序方向',
+    field: 'rowOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '列排序方向',
+    field: 'columOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 150
+    } ,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 150
+    } ,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    isTable: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 120
+    } ,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ItemareaRules = reactive({
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  areaCode: [
+    { required: true, message: '请选择到区域代码', trigger: 'change' }
+  ],
+  inPackUnit: [
+    { required: true, message: '请选择入库包装规格', trigger: 'change' }
+  ],
+  outPackUnit: [
+    { required: true, message: '请选择出库包装规格', trigger: 'change' }
+  ],
+  needReceive: [
+    { required: true, message: '请选择需要接受确认', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ], 
+  manageMode: [
+    { required: true, message: '请选择管理精度', trigger: 'change' }
+  ],
+})
+
+/**
+ * @returns {Array} 库存转移申请子表
+ */
+export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '库位组',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+  },
+
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位基础信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'areaCode',
+        value: 'areaCode',
+        message: '请选择区域代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位基础信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'areaCode',
+          value: 'areaCode',
+          message: '请选择区域代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ItemareaDetailRules = reactive({
+
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
new file mode 100644
index 000000000..2810c290b
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
@@ -0,0 +1,347 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Itembasic.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead 
+    :HeadButttondata="HeadButttondata" 
+    @button-base-click="buttonBaseClick" 
+    :tableColumns="tableColumns"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Itembasic.allSchemas" 
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage">
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase
+          :Butttondata="butttondata"
+          @button-base-click="buttonTableClick($event,row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="rules" 
+    :formAllSchemas="Itembasic.allSchemas" 
+    :apiUpdate="ItembasicApi.updateItembasic"
+    :apiCreate="ItembasicApi.createItembasic"
+    :isBusiness="false"
+    @onChange="onChange"
+  />
+
+  <!-- 详情 -->
+  <Detail 
+    ref="detailRef" 
+    :tabs="ItemBasicTabsList" 
+    :isBasic="true" 
+    :allSchemas="allSchemas" 
+    @changeTabs="changeTabs"
+    :detailAllSchemas="detailAllSchemas" 
+    :apiPage="apiPage"
+    :tabsExtend="tabsExtend"
+    :tableObjectExtend="tableObjectExtend"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" :url="ItembasicApi.importUrl" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import Detail from '@/components/Detail/src/Detail.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import { Itembasic, rules } from './itembasic.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { ItemBasicTabsList } from '@/utils/disposition/tabsList'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data'
+import * as CustomeritemApi from '@/api/wms/customeritem'
+import { PurchaseMain } from '@/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import { PurchasePlanMain } from '@/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data'
+import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+import * as BalanceApi from '@/api/wms/balance'
+import { Expectout } from '@/views/wms/inventoryManage/expectout/expectout.data'
+import * as ExpectoutApi from '@/api/wms/expectout'
+import { Expectin } from '@/views/wms/inventoryManage/expectin/expectin.data'
+import * as ExpectinApi from '@/api/wms/expectin'
+
+
+//物料基础信息
+defineOptions({ name: 'Itembasic' })
+
+const tabsExtend = ref(false)
+const allSchemas = ref(Itembasic.allSchemas)
+const detailAllSchemas = ref()
+const apiPage = ref()
+const itemCodeRow = ref() 
+const tableObjectExtend = ref()
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ItembasicApi.getItembasicPage // 分页接口
+})
+const importFormRef = ref()
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Itembasic.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const exportLoading = ref(false) // 导出的加载中
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:itembasic:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:itembasic:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+onMounted(async () => {
+  importTemplateData.templateUrl = await ItembasicApi.importTemplate()
+})
+
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '物料基础信息导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, id?: number) => {
+  if(type == "update"){
+    Itembasic.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+          })       
+  }else {
+    Itembasic.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+    })  
+  }
+  basicFormRef.value.open(type, id)
+}
+
+/**
+ * 监听改变事件
+ * @param field 当前操作字段
+ * @param cur 改变后值
+ */
+const onChange = (field, cur) => {
+  // 当有效天数 和 生效时间 发生变化
+  if (field == 'validityDays' || field == 'activeTime') {
+    // 根据 有效天数 和 生效时间 计算 失效时间
+    basicFormRef.value.formRef.formModel.expireTime = basicFormRef.value.formRef.formModel.activeTime + basicFormRef.value.formRef.formModel.validityDays  * 24 * 60 * 60 * 1000
+  }
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =Itembasic.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  })
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await ItembasicApi.createItembasic(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ItembasicApi.updateItembasic(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  itemCodeRow.value = row.code
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicItembasic')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ItembasicApi.deleteItembasic(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ItembasicApi.exportItembasic(tableObject.params)
+    download.excel(data, '物料基本信息.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// tabs 切换事件
+const changeTabs = (item) => {
+  if(item.prop == 'SupplierItems'){
+    tabsExtend.value = true
+    apiPage.value = SupplieritemApi.getSupplieritemPage
+    detailAllSchemas.value = Supplieritem.allSchemas  
+  } else if(item.prop == 'CustomerItems'){
+    tabsExtend.value = true
+    apiPage.value = CustomeritemApi.getCustomeritemPage
+    detailAllSchemas.value = Customeritem.allSchemas  
+  }  else if(item.prop == 'PurchaseOrder'){
+    tabsExtend.value = true
+    apiPage.value = PurchaseDetailApi.getPurchaseDetailPage
+    detailAllSchemas.value = PurchaseMain.allSchemas  
+  } else if(item.prop == 'PurchasingPlan'){
+    tabsExtend.value = true
+    apiPage.value = PurchasePlanDetailApi.getPurchasePlanDetailPage
+    detailAllSchemas.value = PurchasePlanMain.allSchemas  
+  } else if(item.prop == 'InventoryBalance'){
+    tabsExtend.value = true
+    apiPage.value = BalanceApi.getBalancePage
+    detailAllSchemas.value = Balance.allSchemas  
+  } else if(item.prop == 'ExpectedIn'){
+    tabsExtend.value = true
+    apiPage.value = ExpectinApi.getExpectinPage
+    detailAllSchemas.value = Expectin.allSchemas  
+  } else if(item.prop == 'ExpectedOut'){
+    tabsExtend.value = true
+    apiPage.value = ExpectoutApi.getExpectoutPage
+    detailAllSchemas.value = Expectout.allSchemas  
+  } else {
+    tabsExtend.value = false
+    allSchemas.value = Itembasic.allSchemas
+  }
+  detailAllSchemas.value.tableColumns.map((item,index) => {
+    if (item.field == 'action') {
+      detailAllSchemas.value.tableColumns.splice(index,1)
+    }
+  })
+  // 当前物料代码作为条件
+  tableObjectExtend.value = [{
+    key: 'itemCode',
+    value: itemCodeRow.value
+  }]
+}
+
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
new file mode 100644
index 000000000..c5e1778db
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -0,0 +1,481 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+import {validateYS} from '@/utils/validator'
+
+/**
+ * @returns {Array} 基础物料信息
+ */
+export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
+  { 
+    label: '代码', 
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+  { 
+    label: '名称', 
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  { 
+    label: '描述1', 
+    field: 'desc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    } ,
+    // isTableForm:false
+  },
+  { 
+    label: '描述2', 
+    field: 'desc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    } ,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_STATUS,
+    dictClass: 'string',
+    isForm: true,
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+    form: {
+      component: 'Switch',
+      value: 'ENABLE',
+      componentProps: {
+        inactiveValue: 'DISABLE',
+        activeValue: 'ENABLE'
+      }
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 120
+    }
+  },
+  {
+    label: '替代计量单位',
+    field: 'altUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    } ,
+  },
+  {
+    label: '是否标包',
+    field: 'isStdPack',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    // tableForm:{
+    //   width: 180,
+    //   type:'Radio',
+    // }
+  },
+  {
+    label: '可采购',
+    field: 'enableBuy',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可制造',
+    field: 'enableMake',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可委外加工',
+    field: 'enableOutsourcing',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 120
+    } ,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '回收件',
+    field: 'isRecycled',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '虚零件',
+    field: 'isPhantom',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: 'ABC类',
+    field: 'abcClass',
+    sort: 'custom',
+    dictType: DICT_TYPE.ABC_CLASS,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+  },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+  },
+  {
+    label: '种类',
+    field: 'category',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_CATEGORY,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+  },
+  {
+    label: '分组',
+    field: 'itemGroup',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_GROUP,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+  },
+  {
+    label: '颜色',
+    field: 'color',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_COLOR,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+  },
+  {
+    label: '配置',
+    field: 'configuration',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_CONFIGURATION,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+  },
+  { 
+    label: '结算方式', 
+    field: 'settlementType', 
+    dictType: DICT_TYPE.SETTLEMENT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 120
+    } ,
+  },
+  { 
+    label: '项目', 
+    field: 'project', 
+    sort: 'custom',
+    table: {
+      width: 100
+    } ,
+  },
+  {
+    label: '质量等级',
+    field: 'eqLevel',
+    sort: 'custom',
+    dictType: DICT_TYPE.EQ_LEVEL,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 120
+    } ,
+  },
+  { 
+    label: '有效天数', 
+    field: 'validityDays', 
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 0
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    } ,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    // tableForm:{
+    //   width: 200,
+    //   type:'FormDateTime',
+    // }
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    } ,
+    form: {
+      component: 'DatePicker',
+      value:'activeTime',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    isTable: true,
+    formatter: dateFormatter,
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isForm: false,
+    isTable: false
+  },
+  { label: '备注', field: 'remark', sort: 'custom', isTable: false},
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+  }
+]))
+// 表单校验
+export const rules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 30, message: '不得超过30个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name:  [
+    { required: true, message: '请输入名称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' },
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' },
+  ],
+  altUom:  [
+    { required: true, message: '请选择替代计量单位', trigger: 'change' },
+  ],
+  isStdPack:  [
+    { required: true, message: '请选择是否标包', trigger: 'change' },
+  ],
+  enableBuy:  [
+    { required: true, message: '请选择是否可采购', trigger: 'change' },
+  ],
+  enableMake:  [
+    { required: true, message: '请选择是否可制造', trigger: 'change' },
+  ],
+  enableOutsourcing:  [
+    { required: true, message: '请选择是否可委外加工', trigger: 'change' },
+  ],
+  isRecycled:  [
+    { required: true, message: '请选择回收件', trigger: 'change' },
+  ],
+  isPhantom:  [
+    { required: true, message: '请选择虚零件', trigger: 'change' },
+  ],
+  abcClass:  [
+    { required: true, message: '请选择ABC类', trigger: 'change' },
+  ],
+  type:  [
+    { required: true, message: '请选择类型', trigger: 'change' },
+  ],
+  validityDays:  [
+    { required: true, message: '请输入有效天数', trigger: 'change' },
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' },
+  ],
+})
+console.log(Itembasic)
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
new file mode 100644
index 000000000..35721bc60
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -0,0 +1,284 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="Itempackaging.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Itempackaging.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #itemCode="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
+          <span>{{ row.itemCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ItempackagingRules"
+    :formAllSchemas="Itempackaging.allSchemas"
+    :apiUpdate="ItempackagingApi.updateItempackaging"
+    :apiCreate="ItempackagingApi.createItempackaging"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Itempackaging.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/itempackage/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as ItempackagingApi from '@/api/wms/itempackage'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Itempackaging, ItempackagingRules } from './itempackage.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Itempackaging' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Itempackaging.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ItempackagingApi.getItempackagingPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:itempackage:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:itempackage:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:itempackage:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  console.log(104, val)
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itempackage:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackage:delete' }) // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    // const res = await ItempackagingApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Itempackaging.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'itemCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+  }else {
+    Itempackaging.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'itemCode') {
+        item.componentProps.disabled = false
+        item.componentProps.isSearchList = true
+      }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+const formsSuccess = async (formType, data) => {
+  var isHave = Itempackaging.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime'
+  })
+  if (isHave) {
+    if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
+      message.error('失效时间要大于生效时间')
+      return
+    }
+  }
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+  if (formType === 'create') {
+    await ItempackagingApi.createItempackaging(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ItempackagingApi.updateItempackaging(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicItempackaging')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ItempackagingApi.deleteItempackaging(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ItempackagingApi.exportItempackaging(tableObject.params)
+    download.excel(data, '物料包装信息.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '物料包装信息导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ItempackagingApi.importTemplate()
+})
+</script>
+@/api/wms/itempackage
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
new file mode 100644
index 000000000..f1ca43fe7
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -0,0 +1,239 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '../itembasic/itembasic.data'
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Packageunit } from '../packageunit/packageunit.data'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 基础包装信息
+ */
+export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
+  { 
+    label: '物料代码', 
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 120
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  { 
+    label: '包装数量', 
+    field: 'packQty',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ItempackagingRules = reactive({
+  itemCode: [{ required: true, message: '物料代码不能为空', trigger: 'change' }],
+  uom: [{ required: true, message: '计量单位不能为空', trigger: 'change' }],
+  packUnit: [{ required: true, message: '包装单位不能为空', trigger: 'change' }],
+  packQty: [{ required: true, message: '包装数量不能为空', trigger: 'change' }],
+  available: [{ required: true, message: '是否可用不能为空', trigger: 'change' }]
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
new file mode 100644
index 000000000..e6a2262e1
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Itemwarehouse.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Itemwarehouse.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #itemCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.itemCode)">
+          <span>{{ row.itemCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ItemwarehouseRules"
+    :formAllSchemas="Itemwarehouse.allSchemas"
+    :apiUpdate="ItemwarehouseApi.updateItemwarehouse"
+    :apiCreate="ItemwarehouseApi.createItemwarehouse"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Itemwarehouse.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/itemwarehouse/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Itemwarehouse,ItemwarehouseRules } from './itemwarehouse.data'
+import * as ItemwarehouseApi from '@/api/wms/itemwarehouse'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Itemwarehouse' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Itemwarehouse.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ItemwarehouseApi.getItemwarehousePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:itemwarehouse:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:itemwarehouse:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:itemwarehouse:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:itemwarehouse:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:itemwarehouse:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =Itemwarehouse.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await ItemwarehouseApi.createItemwarehouse(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ItemwarehouseApi.updateItemwarehouse(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicItemwarehouse')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ItemwarehouseApi.deleteItemwarehouse(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ItemwarehouseApi.exportItemwarehouse(tableObject.params)
+    download.excel(data, '物料仓库默认配置.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '物料仓库默认配置导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ItemwarehouseApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts
new file mode 100644
index 000000000..d9a08a586
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts
@@ -0,0 +1,215 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '../itembasic/itembasic.data'
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '../../factoryModeling/areabasic/areabasic.data'
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Packageunit } from '../packageunit/packageunit.data'
+
+export const Itemwarehouse = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table:{
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '区域代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    isSearch: true,
+    table:{
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区基础信息', // 查询弹窗标题
+        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+        searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '管理精度',
+    field: 'manageMode',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.MANAGEMENT_MODE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 120
+    }
+  },
+  {
+    label: '入库包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table:{
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格基础信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '删除者ID',
+    field: 'deleterId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ItemwarehouseRules = reactive({
+  itemCode: [required],
+  warehouseCode: [required],
+  manageMode: [required],
+  packUnit: [required],
+  available: [required],
+})
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
new file mode 100644
index 000000000..ff1fc3745
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Packageunit.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Packageunit.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="PackageunitRules"
+    :formAllSchemas="Packageunit.allSchemas"
+    :apiUpdate="PackageunitApi.updatePackageunit"
+    :apiCreate="PackageunitApi.createPackageunit"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Packageunit.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/packageunit/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Packageunit,PackageunitRules } from './packageunit.data'
+import * as PackageunitApi from '@/api/wms/packageunit'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Packageunit' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Packageunit.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PackageunitApi.getPackageunitPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:packageunit:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:packageunit:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:packageunit:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:packageunit:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:packageunit:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =Packageunit.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await PackageunitApi.createPackageunit(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await PackageunitApi.updatePackageunit(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicPackageunit')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PackageunitApi.deletePackageunit(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PackageunitApi.exportPackageunit(tableObject.params)
+    download.excel(data, '物品包装规格信息 .xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '物品包装规格信息导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await PackageunitApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
new file mode 100644
index 000000000..5775eec34
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -0,0 +1,585 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import { fa } from 'element-plus/es/locale'
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Select } from '@element-plus/icons-vue/dist/types'
+
+//新增时针对父包装代码copy出的实体
+export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '父包装代码',
+    field: 'parentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '包装名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装类型',
+    field: 'type',
+    dictType: DICT_TYPE.PACK_UNIT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '长',
+    field: 'length',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '宽',
+    field: 'width',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '高',
+    field: 'height',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '重量',
+    field: 'weight',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '单位',
+    field: 'unit',
+    sort: 'custom',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装描述',
+    field: 'desc',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否重复使用',
+    field: 'reuse',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否管理包装库存',
+    field: 'manageBalance',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '删除者',
+    field: 'deleterId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '地点',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '父包装代码',
+    field: 'parentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择父包装代码',
+        searchField: 'code',
+        searchTitle: '包装规格信息',
+        searchAllSchemas: PackageunitCopy.allSchemas,
+        searchPage: PackageunitApi.getPackageunitPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '包装名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装类型',
+    field: 'type',
+    dictType: DICT_TYPE.PACK_UNIT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '长',
+    field: 'length',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '宽',
+    field: 'width',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '高',
+    field: 'height',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '重量',
+    field: 'weight',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '单位',
+    field: 'unit',
+    sort: 'custom',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
+    isSearch: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装描述',
+    field: 'desc',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否重复使用',
+    field: 'reuse',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否管理包装库存',
+    field: 'manageBalance',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '删除者',
+    field: 'deleterId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '地点',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const PackageunitRules = reactive({
+  code: [
+    { required: true, message: '请输入包装代码', trigger: 'change' }
+  ],
+  name: [
+    { required: true, message: '请输入包装名称', trigger: 'change' }
+  ],
+  type: [
+    { required: true, message: '请选择包装类型', trigger: 'change' }
+  ],
+  desc: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { required: true, message: '请输入包装描述', trigger: 'change' }
+  ],
+})
+
diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
new file mode 100644
index 000000000..e56f44ef0
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
@@ -0,0 +1,278 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Productionlineitem.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead 
+    :HeadButttondata="HeadButttondata" 
+    @button-base-click="buttonBaseClick" 
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Productionlineitem.allSchemas" 
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #productionLineCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '产线代码', row.productionLineCode)">
+          <span>{{ row.productionLineCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="ProductionlineitemRules" 
+    :formAllSchemas="Productionlineitem.allSchemas" 
+    :apiUpdate="ProductionlineitemApi.updateProductionlineitem"
+    :apiCreate="ProductionlineitemApi.createProductionlineitem"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Productionlineitem.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productionlineitem/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Productionlineitem, ProductionlineitemRules } from './productionlineitem.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+//生产线物料关系管理
+defineOptions({ name: 'Productionlineitem' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Productionlineitem.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionlineitemApi.getProductionlineitemPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productionlineitem:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productionlineitem:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productionlineitem:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:productionlineitem:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionlineitem:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await ProductionlineitemApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Productionlineitem.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'productionLineCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+            if (item.field == 'itemCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+          
+  }else {
+    Productionlineitem.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'productionLineCode') {
+        item.componentProps.disabled = false
+        item.componentProps.isSearchList = true
+      }
+      if (item.field == 'itemCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Productionlineitem.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await ProductionlineitemApi.createProductionlineitem(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ProductionlineitemApi.updateProductionlineitem(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicProductionlineitem')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductionlineitemApi.deleteProductionlineitem(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionlineitemApi.exportProductionlineitem(tableObject.params)
+    download.excel(data, '生产线物料关系.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '生产线物料关系导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductionlineitemApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
new file mode 100644
index 000000000..1d3ce0f67
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
@@ -0,0 +1,247 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as ProductionLineCodeApi from '@/api/wms/productionline'
+import { Productionline } from './../../factoryModeling/productionline/productionline.data'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from './../itembasic/itembasic.data'
+import * as confgiApi  from '@/api/infra/config'
+const { t } = useI18n() // 国际化
+
+
+const confgiData = await confgiApi.queryByKey("Productionlineitem")
+
+/**
+ * @returns {Array} 生产线物料关系
+ */
+export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: '完工收货库位',
+  //   field: 'fgLocationCode',
+  //   isSearch: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //     fixed: 'left'
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择库位代码',
+  //       searchField: 'code',
+  //       searchTitle: '库位信息',
+  //       searchAllSchemas: Location.allSchemas,
+  //       searchPage: LocationApi.getLocationPage,
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '原料库位',
+  //   field: 'rawLocationCode',
+  //   isSearch: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //     fixed: 'left'
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择库位代码',
+  //       searchField: 'code',
+  //       searchTitle: '库位信息',
+  //       searchAllSchemas: Location.allSchemas,
+  //       searchPage: LocationApi.getLocationPage
+  //     }
+  //   }
+  // },
+  {
+    label: '产线代码' ,
+    field: 'productionLineCode',
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionLineCodeApi.getProductionlinePage
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'code',
+        searchTitle: '物料信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        searchCondition: [
+        {
+          key:'enableMake',
+          value:'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        },
+        {
+          key:'type',
+          value:confgiData.itemType,
+          action: 'notin',
+          isSearch: true,
+          isMainValue: false
+        },
+        {
+          key:'available',
+          value:'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }
+      ]
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: false,
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    formatter : dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    formatter : dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label:'备注',
+    field: 'remark',
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const ProductionlineitemRules = reactive({
+  // fgLocationCode: [
+  //   { required: true, message: '请输入完工收货库位', trigger: 'change' }
+  // ],
+  productionLineCode: [
+    { required: true, message: '请输入产线代码', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
new file mode 100644
index 000000000..3649edc77
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
@@ -0,0 +1,270 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Stdcostprice.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead 
+    :HeadButttondata="HeadButttondata" 
+    @button-base-click="buttonBaseClick" 
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Stdcostprice.allSchemas" 
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #itemCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
+          <span>{{ row.itemCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="StdcostpriceRules" 
+    :formAllSchemas="Stdcostprice.allSchemas" 
+    :apiUpdate="StdcostpriceApi.updateStdcostprice"
+    :apiCreate="StdcostpriceApi.createStdcostprice"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Stdcostprice.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/stdcostprice/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as StdcostpriceApi from '@/api/wms/stdcostprice'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Stdcostprice, StdcostpriceRules } from './stdcostprice.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+// 标准成本价格单
+defineOptions({ name: 'Stdcostprice' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Stdcostprice.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: StdcostpriceApi.getStdcostpricePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:stdcostprice:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:stdcostprice:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:stdcostprice:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:stdcostprice:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:stdcostprice:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await StdcostpriceApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Stdcostprice.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'itemCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+          
+  }else {
+    Stdcostprice.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'itemCode') {
+        item.componentProps.disabled = false
+        item.componentProps.isSearchList = true
+      }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Stdcostprice.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await StdcostpriceApi.createStdcostprice(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await StdcostpriceApi.updateStdcostprice(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicStdcostprice')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await StdcostpriceApi.deleteStdcostprice(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await StdcostpriceApi.exportStdcostprice(tableObject.params)
+    download.excel(data, '标准成本价格单 .xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '标准成本价格单导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await StdcostpriceApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
new file mode 100644
index 000000000..2f0843376
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
@@ -0,0 +1,223 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
+
+// import * as SupplierApi from '@/api/wms/supplier'
+// import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 基础标准成本价格单
+ */
+export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: '供应商代码',
+  //   field: 'supplierCode',
+  //   isSearch: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //     fixed: 'left'
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '供应商信息', // 查询弹窗标题
+  //       searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+  //       searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         action: '==',
+  //         isSearch: true,
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [
+        //   {
+        //   key:'supplierCode',
+        //   value:'supplierCode',
+        //   isMainValue: true
+        // },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }] 
+      }
+    }
+  },
+  {
+    label: '货币',
+    field: 'currency',
+    dictType: DICT_TYPE.CURRENCY,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch : true,
+    isTable : true
+  },
+  {
+    label: '价格',
+    field: 'price',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    sort: 'custom',
+    formatter : dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    sort: 'custom',
+    formatter : dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    isTable: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const StdcostpriceRules = reactive({
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'change' }
+  ],
+  currency: [
+    { required: true, message: '请选择货币', trigger: 'change' }
+  ],
+  price: [
+    { required: true, message: '请输入价格', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/labelManage/barbasic/barbasic.data.ts b/src/views/wms/basicDataManage/labelManage/barbasic/barbasic.data.ts
new file mode 100644
index 000000000..894f33e4c
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/barbasic/barbasic.data.ts
@@ -0,0 +1,101 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const BarbasicRules = reactive({
+  number: [required],
+  type: [required],
+  template: [required],
+  status: [required],
+  barcodeString: [required],
+  printTimes: [required],
+})
+
+export const Barbasic = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '标签号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      fixed: 'left'
+    }
+  },
+  {
+    label: '标签类型',
+    field: 'type',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_TYPE,
+    dictClass: 'string'
+  },
+  {
+    label: '标签模板',
+    field: 'template',
+    sort: 'custom',
+  },
+  {
+    label: '标签状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_STATUS,
+    dictClass: 'string'
+  },
+  {
+    label: '关联号',
+    field: 'relateNumber',
+    sort: 'custom',
+  },
+  {
+    label: '标签条码字符串',
+    field: 'barcodeString',
+    sort: 'custom',
+  },
+  {
+    label: '打印次数',
+    field: 'printTimes',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+      value: 0
+    },
+  },
+  {
+    label: '最后打印时间',
+    field: 'lastPrintTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后打印人ID',
+    field: 'lastPrintUserId',
+    sort: 'custom'
+  },
+  {
+    label: '最后打印人用户名',
+    field: 'lastPrintUserName',
+    sort: 'custom',
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isForm: false,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   }
+  // }
+]))
diff --git a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue
new file mode 100644
index 000000000..def5b33c9
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue
@@ -0,0 +1,239 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Barbasic.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Barbasic.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '标签号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="BarbasicRules"
+    :formAllSchemas="Barbasic.allSchemas"
+    :searchTableParams="searchTableParams"
+    :apiUpdate="BarbasicApi.updateBarbasic"
+    :apiCreate="BarbasicApi.createBarbasic"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Barbasic.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/barbasic/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Barbasic,BarbasicRules } from './barbasic.data'
+import * as BarbasicApi from '@/api/wms/barbasic'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Barbasic' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Barbasic.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BarbasicApi.getBarbasicPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:barbasic:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:barbasic:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:barbasic:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:barbasic:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:barbasic:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicBarbasic')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await BarbasicApi.deleteBarbasic(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BarbasicApi.exportBarbasic(tableObject.params)
+    download.excel(data, '条码实体基类.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '条码实体基类导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await BarbasicApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts
new file mode 100644
index 000000000..f8b2e383e
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts
@@ -0,0 +1,155 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+
+// 表单校验
+export const BarcodeRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  description: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  order: [required],
+  length: [required],
+  prefixLenght: [required],
+  prefixChar: [
+    { required: true, message: '请输入前缀字符', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  entityProperties: [
+    { required: true, message: '请输入实体属性', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  encyptMethod: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  trimEnd: [
+    { required: true, message: '请输入截断尾部空格', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  labelType:[
+    { required: true, message: '请选择标签类型', trigger: 'blur' }
+  ],
+  isEncypt: [required],
+})
+
+export const Barcode = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: 'id',
+  //   field: 'id',
+  //   sort: 'custom',
+  //   isForm: false,
+  // },
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      fixed: 'left'
+    }
+  },
+  {
+    label: '标签类型',
+    field: 'labelType',
+    sort: 'custom',
+    dictType: DICT_TYPE.LABEL_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+  },
+  {
+    label: '顺序',
+    field: 'order',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+      value: 0
+    },
+  },
+  {
+    label: '长度',
+    field: 'length',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+      },
+      value: 0
+    },
+  },
+  {
+    label: '前缀长度',
+    field: 'prefixLenght',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+      value: 0
+    },
+  },
+  {
+    label: '前缀字符',
+    field: 'prefixChar',
+    sort: 'custom',
+  },
+  {
+    label: '实体属性',
+    field: 'entityProperties',
+    sort: 'custom',
+  },
+  {
+    label: '加密方法',
+    field: 'encyptMethod',
+    sort: 'custom',
+  },
+  {
+    label: '截断尾部空格',
+    field: 'trimEnd',
+    sort: 'custom',
+  },
+  {
+    label: '是否加密',
+    field: 'isEncypt',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/basicDataManage/labelManage/barcode/index.vue b/src/views/wms/basicDataManage/labelManage/barcode/index.vue
new file mode 100644
index 000000000..b9b9d5093
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/barcode/index.vue
@@ -0,0 +1,248 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Barcode.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Barcode.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="BarcodeRules" 
+    :formAllSchemas="Barcode.allSchemas"
+    :apiUpdate="BarcodeApi.updateBarcode"
+    :apiCreate="BarcodeApi.createBarcode"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Barcode.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/barcode/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as BarcodeApi from '@/api/wms/barcode'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Barcode, BarcodeRules } from './barcode.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Barcode' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Barcode.allSchemas.tableColumns)
+console.log(tableColumns.value);
+
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BarcodeApi.getBarcodePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:barcode:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:barcode:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:barcode:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:barcode:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:barcode:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await BarcodeApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Barcode.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+          })       
+  }else {
+    Barcode.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+ if (formType === 'create') {
+  await BarcodeApi.createBarcode(data)
+  message.success(t('common.createSuccess'))
+  } else {
+  await BarcodeApi.updateBarcode(data)
+  message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicBarcode')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await BarcodeApi.deleteBarcode(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BarcodeApi.exportBarcode(tableObject.params)
+    download.excel(data, '条码片段.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '条码片段导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await BarcodeApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
new file mode 100644
index 000000000..d8e3e1f7a
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
@@ -0,0 +1,333 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Packageunit } from '@/views/wms/basicDataManage/itemManage/packageunit/packageunit.data'
+
+import * as WarehouseApi  from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as WorkStationApi from '@/api/wms/workstation'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+
+// 表单校验
+export const CallmaterialsRules = reactive({
+  itemCode: [required],
+  itemName: [required],
+  barcodeString: [required]
+})
+
+export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '库位',
+    field: 'location',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      }
+    },
+    isSearch: true
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        style: {width:'100%'},
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'  
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '车间',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '生产线',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '工位',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择工位', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key:'workshopCode',
+          value:'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key:'available',
+          value:'TRUE',
+          isMainValue: false
+        }] 
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key:'workshopCode',
+          value:'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key:'available',
+          value:'TRUE',
+          isMainValue: false
+        }] 
+    },
+  },
+  {
+    label: '是否确认接收',
+    field: 'isRecive',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '创建者id',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180,
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180,
+    }
+  },
+  {
+    label: '最后更新者id',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180,
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180,
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 180,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
new file mode 100644
index 000000000..93a27d450
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
@@ -0,0 +1,269 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Callmaterials.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Callmaterials.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #itemCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.itemCode)">
+          <span>{{ row.itemCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="CallmaterialsRules"
+    :formAllSchemas="Callmaterials.allSchemas"
+    :apiUpdate="CallmaterialsApi.updateCallmaterials"
+    :apiCreate="CallmaterialsApi.createCallmaterials"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Callmaterials.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/callmaterials/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Callmaterials,CallmaterialsRules } from './callmaterials.data'
+import * as CallmaterialsApi from '@/api/wms/callmaterials'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { formatTime } from '@/utils/index'
+import { getAccessToken } from '@/utils/auth'
+
+defineOptions({ name: 'Callmaterials' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Callmaterials.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    if (formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+      setV['uom'] = val[0]['uom']
+    } else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CallmaterialsApi.getCallmaterialsPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:callmaterials:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:callmaterials:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:callmaterials:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:callmaterials:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:callmaterials:delete'}), // 删除
+  defaultButtons.mainListPointBtn(null), // 标签打印
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  
+  basicFormRef.value.open(type, row)
+  if (type == 'create') {
+    nextTick(() => {
+      basicFormRef.value.formRef.formModel.batch = formatTime(new Date(), 'yyyyMMdd')
+    })
+  }
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =Callmaterials.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await CallmaterialsApi.createCallmaterials(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await CallmaterialsApi.updateCallmaterials(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicCallmaterials')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await CallmaterialsApi.deleteCallmaterials(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CallmaterialsApi.exportCallmaterials(tableObject.params)
+    download.excel(data, '叫料标签.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/924811818898698240?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&relateNumber='+row.id)
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '叫料标签导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await CallmaterialsApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue
new file mode 100644
index 000000000..eb3974a17
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Labeltype.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Labeltype.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #labelCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '标签代码', row.labelCode)">
+          <span>{{ row.labelCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="LabeltypeRules"
+    :formAllSchemas="Labeltype.allSchemas"
+    :searchTableParams="searchTableParams"
+    :apiUpdate="LabeltypeApi.updateLabeltype"
+    :apiCreate="LabeltypeApi.createLabeltype"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Labeltype.allSchemas" />
+
+  </template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Labeltype,LabeltypeRules } from './labeltype.data'
+import * as LabeltypeApi from '@/api/wms/labeltype'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Labeltype' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Labeltype.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: LabeltypeApi.getLabeltypePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:labeltype:import'}), // 导入
+  // defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn(null), // 编辑
+  defaultButtons.mainListDeleteBtn(null), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Labeltype.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'labelCode') {
+              item.componentProps.disabled = true
+            }
+          })       
+  }else {
+    Labeltype.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'labelCode') {
+        item.componentProps.disabled = false
+      }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+ if (formType === 'create') {
+  await LabeltypeApi.createLabeltype(data)
+  message.success(t('common.createSuccess'))
+  } else {
+  await LabeltypeApi.updateLabeltype(data)
+  message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicLabeltype')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await LabeltypeApi.deleteLabeltype(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await LabeltypeApi.exportLabeltype(tableObject.params)
+    download.excel(data, '标签定义.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts b/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts
new file mode 100644
index 000000000..86cae88d4
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts
@@ -0,0 +1,190 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+
+// 表单校验
+export const LabeltypeRules = reactive({
+  labelCode: [
+    { required: true, message: '请输入标签代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  labelType: [required],
+  description: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  dataProtocol: [
+    { required: true, message: '请输入数据协议', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  splitMehod: [
+    { required: true, message: '请输入拆分方法', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  header: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  version: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  separators: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  validateMethod: [
+    { required: true, message: '请输入校验方法', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  encyptEthod: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  compressMethod: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  templateName: [
+    { required: true, message: '请输入模板名称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  templateFile: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  isEncypt: [required],
+  isCompress: [required],
+})
+
+export const Labeltype = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: 'id',
+  //   field: 'id',
+  //   sort: 'custom',
+  //   isForm: false,
+  // },
+  {
+    label: '标签代码',
+    field: 'labelCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '标签类型',
+    field: 'labelType',
+    sort: 'custom',
+    dictType: DICT_TYPE.LABEL_TYPE,
+    dictClass:'string',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    table: {
+      width:100
+    },
+  },
+  {
+    label: '数据协议',
+    field: 'dataProtocol',
+    sort: 'custom',
+  },
+  {
+    label: '拆分方法',
+    field: 'splitMehod',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数据头',
+    field: 'header',
+    sort: 'custom',
+  },
+  {
+    label: '版本号',
+    field: 'version',
+    sort: 'custom',
+  },
+  {
+    label: '分隔符',
+    field: 'separators',
+    sort: 'custom',
+  },
+  {
+    label: '校验方法',
+    field: 'validateMethod',
+    sort: 'custom',
+  },
+  {
+    label: '校验数',
+    field: 'validateNumber',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+    },
+  },
+  {
+    label: '加密方法',
+    field: 'encyptEthod',
+    sort: 'custom',
+  },
+  {
+    label: '压缩方法',
+    field: 'compressMethod',
+    sort: 'custom',
+  },
+  {
+    label: '模板名称',
+    field: 'templateName',
+    sort: 'custom',
+  },
+  {
+    label: '模板文件',
+    field: 'templateFile',
+    sort: 'custom',
+  },
+  {
+    label: '是否加密',
+    field: 'isEncypt',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '是否压缩',
+    field: 'isCompress',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
new file mode 100644
index 000000000..5336031b4
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
@@ -0,0 +1,203 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Package.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Package.allSchemas" />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { Package,PackageRules  } from './locationLabel.data'
+import * as BarbasicApi from '@/api/wms/barbasic'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as PackageApi from '@/api/wms/package'
+import { formatTime } from '@/utils/index'
+import * as Itempackaging from '@/api/wms/itempackaging'
+
+// 库位标签
+defineOptions({ name: 'LocationLabel' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Package.allSchemas.tableColumns)
+
+
+/**
+ * PurchasePackage type = PurchaseLabel 采购件标签记录页面   
+ * ManufacturePackage type = MakeLabel  制造件标签记录页面
+ * UtensilPackage type = ContainerLabel  器具标签记录页面
+ * SupplierPackage type = PurchaseLabel  供应商发货标签记录(用采购标签)
+ * LocationLabel type = LocationLabel  库位标签记录页面
+ */
+ const type = ref('LocationLabel')
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BarbasicApi.getBarbasicPage // 分页接口
+})
+tableObject.params.type = type.value
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListPointBtn(null), // 标签打印
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: number) => {
+  basicFormRef.value.open(type, row)
+  if (type == 'create') {
+    nextTick(() => {
+      basicFormRef.value.formRef.formModel.batch = formatTime(new Date(), 'yyyyMMdd')
+    })
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await BarbasicApi.deleteBarbasic(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BarbasicApi.exportBarbasic(tableObject.params)
+    download.excel(data, '库位标签.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/929174607016689664?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&id='+row.id)
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters,
+    type:type.value
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts
new file mode 100644
index 000000000..43008e207
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts
@@ -0,0 +1,103 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const PackageRules = reactive({
+  number: [required],
+  itemCode: [required],
+  itemName: [required],
+})
+export const Package = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '标签号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      fixed: 'left'
+    }
+  },
+  {
+    label: '标签类型',
+    field: 'type',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_TYPE,
+    dictClass: 'string'
+  },
+  // {
+  //   label: '标签模板',
+  //   field: 'template',
+  //   sort: 'custom',
+  // },
+  {
+    label: '标签状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_STATUS,
+    dictClass: 'string'
+  },
+  {
+    label: '关联号',
+    field: 'relateNumber',
+    sort: 'custom',
+  },
+  {
+    label: '标签条码字符串',
+    field: 'barcodeString',
+    sort: 'custom',
+    table: {
+      width: 170,
+    }
+  },
+  {
+    label: '打印次数',
+    field: 'printTimes',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+      value: 0
+    },
+  },
+  {
+    label: '最后打印时间',
+    field: 'lastPrintTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后打印人ID',
+    field: 'lastPrintUserId',
+    sort: 'custom'
+  },
+  {
+    label: '最后打印人用户名',
+    field: 'lastPrintUserName',
+    sort: 'custom',
+    table: {
+      width: 170,
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
new file mode 100644
index 000000000..ae604311c
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
@@ -0,0 +1,307 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Package.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="PackageRulesInventor" 
+    :formAllSchemas="PackageInventory.allSchemas" 
+    :apiUpdate="PackageApi.updatePackage"
+    :apiCreate="PackageApi.createPackageLabel"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Package.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/package/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { Package,PackageRules,PackageInventory,PackageRulesInventor  } from './manufacturePackage.data'
+import * as BarbasicApi from '@/api/wms/barbasic'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as PackageApi from '@/api/wms/package'
+import { formatTime } from '@/utils/index'
+import * as Itempackaging from '@/api/wms/itempackage'
+
+// 采购标签
+defineOptions({ name: 'PurchasePackage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Package.allSchemas.tableColumns)
+
+
+/**
+ * PurchasePackage type = PurchaseLabel 采购件标签记录页面   
+ * ManufacturePackage type = MakeLabel  制造件标签记录页面
+ * UtensilPackage type = ContainerLabel  器具标签记录页面
+ * SupplierPackage type = PurchaseLabel  供应商发货标签记录(用采购标签)
+ */
+ const type = ref(route.name == 'PurchasePackage'?'PurchaseLabel':route.name == 'ManufacturePackage'?'MakeLabel':route.name == 'UtensilPackage'?'ContainerLabel':route.name == 'SupplierPackage'?'PurchaseLabel':'')
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => {
+  nextTick(async () => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      if (formField == 'itemCode') {
+        setV['itemCode'] = val[0]['code']
+        setV['itemName'] = val[0]['name']
+        setV['itemDesc1'] = val[0]['desc1']
+        setV['itemDesc2'] = val[0]['desc2']
+        setV['uom'] = val[0]['uom']
+        setV['produceDate'] = val[0]['activeTime']
+        setV['expireDate'] = val[0]['expireTime']
+        setV['validityDays'] = val[0]['validityDays']
+        await Itempackaging.getItempackagingPage({
+          itemCode: val[0]['code']
+        }).then(res => {
+          if (res) {
+            if (res.list.length > 0) {
+              setV['packQty'] = res.list[0].packQty
+              setV['packUnit'] = res.list[0].packUnit
+            }
+          }
+        })
+      }
+      basicFormRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BarbasicApi.getBarbasicPage // 分页接口
+})
+tableObject.params.type = type.value
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+// const isShowMainButton = (row,val) => {
+//   if (val.indexOf(row.status) > -1) {
+//     return false
+//   } else {
+//     return true
+//   }
+// }
+
+// 列表-操作按钮
+// const butttondata = (row) => {
+//     return [
+//         defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+//         defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+//         defaultButtons.mainListPointBtn(null), // 标签打印
+//     ]
+// }
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+  defaultButtons.mainListPointBtn(null), // 标签打印
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: number) => {
+  basicFormRef.value.open(type, row)
+  if (type == 'create') {
+    nextTick(() => {
+      basicFormRef.value.formRef.formModel.batch = formatTime(new Date(), 'yyyyMMdd')
+    })
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await BarbasicApi.deleteBarbasic(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BarbasicApi.exportBarbasic(tableObject.params)
+    download.excel(data, '制造件件标签.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&number='+row.relateNumber)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  if (formType === 'create') {
+    await PackageApi.createPackageLabel(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await PackageApi.updatePackage(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '包装导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters,
+    type:type.value
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
+@/api/wms/itempackage
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
new file mode 100644
index 000000000..0e2e2c11e
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
@@ -0,0 +1,508 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+import { Itembasic } from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
+import * as ItembasicApi from "@/api/wms/itembasic";
+import { Productionline } from "@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data";
+import * as ProductionlineApi from "@/api/wms/productionline";
+import { Shift } from "@/views/wms/basicDataManage/orderManage/shift/shift.data";
+import * as ShiftApi from "@/api/wms/shift";
+import { Team } from "@/views/wms/basicDataManage/orderManage/team/team.data";
+import * as TeamApi from "@/api/wms/team";
+
+// 表单校验
+export const PackageRules = reactive({
+  number: [required],
+  itemCode: [required],
+  itemName: [required],
+})
+
+export const Package = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '标签号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      fixed: 'left'
+    }
+  },
+  {
+    label: '标签类型',
+    field: 'type',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_TYPE,
+    dictClass: 'string'
+  },
+  {
+    label: '标签模板',
+    field: 'template',
+    sort: 'custom',
+  },
+  {
+    label: '标签状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_STATUS,
+    dictClass: 'string'
+  },
+  {
+    label: '关联号',
+    field: 'relateNumber',
+    sort: 'custom',
+  },
+  {
+    label: '标签条码字符串',
+    field: 'barcodeString',
+    sort: 'custom',
+    table: {
+      width: 180,
+    }
+  },
+  {
+    label: '打印次数',
+    field: 'printTimes',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+      value: 0
+    },
+  },
+  {
+    label: '最后打印时间',
+    field: 'lastPrintTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后打印人ID',
+    field: 'lastPrintUserId',
+    sort: 'custom'
+  },
+  {
+    label: '最后打印人用户名',
+    field: 'lastPrintUserName',
+    sort: 'custom',
+    table: {
+      width: 180,
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'code',
+        searchTitle: '物料信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    isForm:false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    isForm:false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    isForm:false
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')],
+        disabled: true
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        disabled: true
+      }
+    },
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '有效期(日)',
+    field: 'validityDays',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 0,
+        disabled: true
+      },
+      value: 0
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '失效日期',
+    field: 'expireDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')],
+        disabled: true
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        disabled: true
+      }
+    },
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'Select'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      },
+      value: 0
+    },
+  },
+  {
+    label: '替代计量单位',
+    field: 'altUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'Select'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代数量',
+    field: 'altQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      },
+      value: 0
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'Select',
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  // {
+  //   label: '生产订单号',
+  //   field: 'woNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择物料代码',
+  //       searchField: 'code',
+  //       searchTitle: '物料信息',
+  //       searchAllSchemas: Itembasic.allSchemas,
+  //       searchPage: ItembasicApi.getItembasicPage,
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '生产订单行',
+  //   field: 'woLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  {
+    label: '生产线代码',
+    field: 'productionLineCodePackage',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线代码',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组代码',
+    field: 'teamCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线代码',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班次代码',
+    field: 'shiftCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线代码',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const PackageRulesInventor = reactive({
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  validityDays: [
+    { required: true, message: '请输入有效期(日)', trigger: 'blur' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择失效日期', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  qty: [
+    { required: true, message: '请输入数量', trigger: 'blur' }
+  ],
+  woNumber: [
+    { required: true, message: '请选择生产订单号', trigger: 'change' }
+  ],
+  woLine: [
+    { required: true, message: '请选择生产订单行', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
new file mode 100644
index 000000000..b4fd7909f
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
@@ -0,0 +1,307 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Package.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="PackageRulesInventor" 
+    :formAllSchemas="PackageInventory.allSchemas" 
+    :apiUpdate="PackageApi.updatePackage"
+    :apiCreate="PackageApi.createPackageLabel"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Package.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/package/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { Package,PackageRules,PackageInventory,PackageRulesInventor  } from './purchasePackage.data'
+import * as BarbasicApi from '@/api/wms/barbasic'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as PackageApi from '@/api/wms/package'
+import { formatTime } from '@/utils/index'
+import * as Itempackaging from '@/api/wms/itempackage'
+
+// 采购标签
+defineOptions({ name: 'PurchasePackage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Package.allSchemas.tableColumns)
+
+
+/**
+ * PurchasePackage type = PurchaseLabel 采购件标签记录页面   
+ * ManufacturePackage type = MakeLabel  制造件标签记录页面
+ * UtensilPackage type = ContainerLabel  器具标签记录页面
+ * SupplierPackage type = PurchaseLabel  供应商发货标签记录(用采购标签)
+ */
+ const type = ref(route.name == 'PurchasePackage'?'PurchaseLabel':route.name == 'ManufacturePackage'?'MakeLabel':route.name == 'UtensilPackage'?'ContainerLabel':route.name == 'SupplierPackage'?'PurchaseLabel':'')
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => {
+  nextTick(async () => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      if (formField == 'itemCode') {
+        setV['itemCode'] = val[0]['code']
+        setV['itemName'] = val[0]['name']
+        setV['itemDesc1'] = val[0]['desc1']
+        setV['itemDesc2'] = val[0]['desc2']
+        setV['uom'] = val[0]['uom']
+        setV['produceDate'] = val[0]['activeTime']
+        setV['expireDate'] = val[0]['expireTime']
+        setV['validityDays'] = val[0]['validityDays']
+        await Itempackaging.getItempackagingPage({
+          itemCode: val[0]['code']
+        }).then(res => {
+          if (res) {
+            if (res.list.length > 0) {
+              setV['packQty'] = res.list[0].packQty
+              setV['packUnit'] = res.list[0].packUnit
+            }
+          }
+        })
+      }
+      basicFormRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BarbasicApi.getBarbasicPage // 分页接口
+})
+tableObject.params.type = type.value
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+// const isShowMainButton = (row,val) => {
+//   if (val.indexOf(row.status) > -1) {
+//     return false
+//   } else {
+//     return true
+//   }
+// }
+
+// 列表-操作按钮
+// const butttondata = (row) => {
+//     return [
+//         defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+//         defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+//         defaultButtons.mainListPointBtn(null), // 标签打印
+//     ]
+// }
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+  defaultButtons.mainListPointBtn(null), // 标签打印
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: number) => {
+  basicFormRef.value.open(type, row)
+  if (type == 'create') {
+    nextTick(() => {
+      basicFormRef.value.formRef.formModel.batch = formatTime(new Date(), 'yyyyMMdd')
+    })
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await BarbasicApi.deleteBarbasic(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BarbasicApi.exportBarbasic(tableObject.params)
+    download.excel(data, '采购件标签.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&number='+row.relateNumber)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  if (formType === 'create') {
+    await PackageApi.createPackageLabel(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await PackageApi.updatePackage(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '包装导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters,
+    type:type.value
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
+@/api/wms/itempackage
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
new file mode 100644
index 000000000..b841eb41f
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
@@ -0,0 +1,659 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+import { Itembasic } from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
+import * as ItembasicApi from "@/api/wms/itembasic";
+import { Warehouse } from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+import { Dock } from "@/views/wms/basicDataManage/factoryModeling/dock/dock.data";
+import * as DockApi from "@/api/wms/dock";
+import { Location } from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
+import * as LocationApi from "@/api/wms/location";
+import { Supplier } from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data";
+import * as SupplierApi from "@/api/wms/supplier";
+import { PurchaseMain } from "@/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data";
+import * as PurchaseMainApi from "@/api/wms/purchaseMain";
+import { PurchaseDetail } from "@/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data";
+import * as PurchaseDetailApi from "@/api/wms/purchaseDetail";
+import { PurchasePlanMain } from "@/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data";
+import * as PurchasePlanMainApi from "@/api/wms/purchasePlanMain";
+import { SupplierdeliverRecordMain } from "@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data";
+import * as SupplierdeliverRecordMainApi from "@/api/wms/supplierdeliverRecordMain";
+
+// 表单校验
+export const PackageRules = reactive({
+  number: [required],
+  itemCode: [required],
+  itemName: [required],
+})
+export const Package = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '标签号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      fixed: 'left'
+    }
+  },
+  {
+    label: '标签类型',
+    field: 'type',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_TYPE,
+    dictClass: 'string'
+  },
+  {
+    label: '标签模板',
+    field: 'template',
+    sort: 'custom',
+  },
+  {
+    label: '标签状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_STATUS,
+    dictClass: 'string'
+  },
+  {
+    label: '关联号',
+    field: 'relateNumber',
+    sort: 'custom',
+  },
+  {
+    label: '标签条码字符串',
+    field: 'barcodeString',
+    sort: 'custom',
+    table: {
+      width: 180,
+    }
+  },
+  {
+    label: '打印次数',
+    field: 'printTimes',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+      value: 0
+    },
+  },
+  {
+    label: '最后打印时间',
+    field: 'lastPrintTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后打印人ID',
+    field: 'lastPrintUserId',
+    sort: 'custom'
+  },
+  {
+    label: '最后打印人用户名',
+    field: 'lastPrintUserName',
+    sort: 'custom',
+    table: {
+      width: 180,
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'code',
+        searchTitle: '物料信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    isForm:false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    isForm:false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    isForm:false
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        disabled: true,
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        disabled: true
+      }
+    },
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '有效期(日)',
+    field: 'validityDays',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 0,
+        disabled: true
+      },
+      value: 0
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '失效日期',
+    field: 'expireDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        disabled: true,
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        disabled: true,
+      }
+    },
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'Select'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      },
+      value: 0
+    },
+  },
+  {
+    label: '替代计量单位',
+    field: 'altUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'Select'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代数量',
+    field: 'altQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      },
+      value: 0
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'Select',
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择仓库代码',
+        searchField: 'code',
+        searchTitle: '仓库信息',
+        searchAllSchemas: Warehouse.allSchemas,
+        searchPage: WarehouseApi.getWarehousePage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择仓库代码',
+        searchField: 'code',
+        searchTitle: '仓库信息',
+        searchAllSchemas: Dock.allSchemas,
+        searchPage: DockApi.getDockPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.getLocationPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择供应商代码',
+        searchField: 'code',
+        searchTitle: '供应商信息',
+        searchAllSchemas: Supplier.allSchemas,
+        searchPage: SupplierApi.getSupplierPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '供应商物料代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择采购订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [
+          {
+            key: 'supplierCode',
+            value: 'supplierCode',
+            message: '请填写供应商代码！',
+            isMainValue: true
+          },
+          {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '采购订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择采购订单行',
+        searchField: 'lineNumber',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage,
+        searchCondition: [
+          {
+            key: 'number',
+            value: 'poNumber',
+            message: '请填写采购订单号！',
+            isMainValue: true
+          },
+          {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '采购计划单号',
+    field: 'rpNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择采购订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchasePlanMain.allSchemas,
+        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage,
+        searchCondition: [
+          {
+            key: 'supplierCode',
+            value: 'supplierCode',
+            message: '请填写供应商代码！',
+            isMainValue: true
+          },
+          {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 182,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择发货单号',
+        searchField: 'asnNumber',
+        searchTitle: '发货信息',
+        searchAllSchemas: SupplierdeliverRecordMain.allSchemas,
+        searchPage: SupplierdeliverRecordMainApi.getSupplierdeliverRecordMainPage,
+        searchCondition: [
+          {
+            key: 'supplierCode',
+            value: 'supplierCode',
+            message: '请填写供应商代码！',
+            isMainValue: true
+          },
+          {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const PackageRulesInventor = reactive({
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  validityDays: [
+    { required: true, message: '请输入有效期(日)', trigger: 'blur' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择失效日期', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  qty: [
+    { required: true, message: '请输入数量', trigger: 'blur' }
+  ],
+  // toWarehouseCode: [
+  //   { required: true, message: '请选择仓库代码', trigger: 'change' }
+  // ],
+  // toDockCode: [
+  //   { required: true, message: '请选择月台代码', trigger: 'change' }
+  // ],
+  // toLocationCode: [
+  //   { required: true, message: '请选择库位代码', trigger: 'change' }
+  // ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  // supplierItemCode: [
+  //   { required: true, message: '请选择供应商物料代码', trigger: 'change' }
+  // ],
+  // poNumber: [
+  //   { required: true, message: '请选择采购订单号', trigger: 'change' }
+  // ],
+  // poLine: [
+  //   { required: true, message: '请选择采购订单行', trigger: 'change' }
+  // ],
+  // rpNumber: [
+  //   { required: true, message: '请选择采购计划单号', trigger: 'change' }
+  // ],
+  asnNumber: [
+    { required: true, message: '请选择发货单号', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
new file mode 100644
index 000000000..ddd7e921c
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
@@ -0,0 +1,277 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Package.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="PackageRules" 
+    :formAllSchemas="Package.allSchemas" 
+    :searchTableParams="searchTableParams"
+    :apiUpdate="BarbasicApi.updateBarbasic"
+    :apiCreate="BarbasicApi.createBarbasic"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Package.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/package/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { Package,PackageRules } from './utensilPackage.data'
+import * as BarbasicApi from '@/api/wms/barbasic'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 器具标签
+defineOptions({ name: 'UtensilPackage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Package.allSchemas.tableColumns)
+
+
+/**
+ * PurchasePackage type = PurchaseLabel 采购件标签记录页面   
+ * ManufacturePackage type = MakeLabel  制造件标签记录页面
+ * UtensilPackage type = ContainerLabel  器具标签记录页面
+ * SupplierPackage type = PurchaseLabel  供应商发货标签记录(用采购标签)
+ */
+ const type = ref(route.name == 'PurchasePackage'?'PurchaseLabel':route.name == 'ManufacturePackage'?'MakeLabel':route.name == 'UtensilPackage'?'ContainerLabel':route.name == 'SupplierPackage'?'PurchaseLabel':'')
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => {
+  nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      basicFormRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BarbasicApi.getBarbasicPage // 分页接口
+})
+tableObject.params.type = type.value
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+// const isShowMainButton = (row,val) => {
+//   if (val.indexOf(row.status) > -1) {
+//     return false
+//   } else {
+//     return true
+//   }
+// }
+
+// 列表-操作按钮
+// const butttondata = (row) => {
+//     return [
+//         defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+//         defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+//         defaultButtons.mainListPointBtn(null), // 标签打印
+//     ]
+// }
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+  defaultButtons.mainListPointBtn(null), // 标签打印
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm =async (type: string, row?: number) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await BarbasicApi.deleteBarbasic(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BarbasicApi.exportBarbasic(tableObject.params)
+    download.excel(data, '器具标签.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const BASE_URL = 'http://dev.ccwin-in.com:25110'
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&number='+row.relateNumber)
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '包装导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters,
+    type:type.value
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts
new file mode 100644
index 000000000..75716a2f4
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts
@@ -0,0 +1,115 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const PackageRules = reactive({
+  number: [required],
+  itemCode: [required],
+  itemName: [required],
+})
+export const Package2 = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+]))
+export const Package = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '标签号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      fixed: 'left'
+    }
+  },
+  {
+    label: '标签类型',
+    field: 'type',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_TYPE,
+    dictClass: 'string'
+  },
+  {
+    label: '标签模板',
+    field: 'template',
+    sort: 'custom',
+  },
+  {
+    label: '标签状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_STATUS,
+    dictClass: 'string'
+  },
+  {
+    label: '关联号',
+    field: 'relateNumber',
+    sort: 'custom',
+  },
+  {
+    label: '标签条码字符串',
+    field: 'barcodeString',
+    sort: 'custom',
+    table: {
+      width: 180,
+    }
+  },
+  {
+    label: '打印次数',
+    field: 'printTimes',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+      value: 0
+    },
+  },
+  {
+    label: '最后打印时间',
+    field: 'lastPrintTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后打印人ID',
+    field: 'lastPrintUserId',
+    sort: 'custom'
+  },
+  {
+    label: '最后打印人用户名',
+    field: 'lastPrintUserName',
+    sort: 'custom',
+    table: {
+      width: 180,
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts b/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts
new file mode 100644
index 000000000..ed31a233b
--- /dev/null
+++ b/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts
@@ -0,0 +1,301 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+import {validateHanset,validateFax,validatePostCode,validateYS} from '@/utils/validator'
+
+/**
+ * @returns {Array} 承运商
+ */
+export const Carrier = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '简称',
+    field: 'shortName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '地址',
+    field: 'address',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '国家',
+    field: 'country',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '城市',
+    field: 'city',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '电话',
+    field: 'phone',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '传真',
+    field: 'fax',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '邮编',
+    field: 'postId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人',
+    field: 'contacts',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '银行',
+    field: 'bank',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '币种',
+    field: 'currency',
+    dictType: DICT_TYPE.CURRENCY,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '税率',
+    field: 'taxRate',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '类型',
+    field: 'type',
+    dictType: DICT_TYPE.CARRIER_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const CarrierRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  shortName: [
+    { required: true, message: '请输入简称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  address: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  country: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  city: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  phone: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
+  ],
+  fax: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateFax, message: '请输入正确的传真', trigger: 'blur'}
+  ],
+  postId: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validatePostCode, message: '请输入正确的邮编', trigger: 'blur'}
+  ],
+  contacts: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  bank: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/orderManage/carrier/index.vue b/src/views/wms/basicDataManage/orderManage/carrier/index.vue
new file mode 100644
index 000000000..06eda0a91
--- /dev/null
+++ b/src/views/wms/basicDataManage/orderManage/carrier/index.vue
@@ -0,0 +1,262 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Carrier.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Carrier.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="CarrierRules" 
+    :formAllSchemas="Carrier.allSchemas"
+    :apiUpdate="CarrierApi.updateCarrier"
+    :apiCreate="CarrierApi.createCarrier"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Carrier.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/carrier/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as CarrierApi from '@/api/wms/carrier'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Carrier, CarrierRules } from './carrier.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Carrier' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Carrier.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CarrierApi.getCarrierPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:carrier:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:carrier:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:carrier:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:carrier:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:carrier:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await CarrierApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Carrier.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'shortName') {
+              item.componentProps.disabled = true
+            }
+          })       
+  }else {
+    Carrier.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+      if (item.field == 'shortName') {
+              item.componentProps.disabled = false
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Carrier.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await CarrierApi.createCarrier(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await CarrierApi.updateCarrier(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicCarrier')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await CarrierApi.deleteCarrier(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CarrierApi.exportCarrier(tableObject.params)
+    download.excel(data, '承运商.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '承运商导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await CarrierApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/orderManage/owner/index.vue b/src/views/wms/basicDataManage/orderManage/owner/index.vue
new file mode 100644
index 000000000..9fd790f1d
--- /dev/null
+++ b/src/views/wms/basicDataManage/orderManage/owner/index.vue
@@ -0,0 +1,262 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Owner.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Owner.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="OwnerRules" 
+    :formAllSchemas="Owner.allSchemas"
+    :apiUpdate="OwnerApi.updateOwner"
+    :apiCreate="OwnerApi.createOwner"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Owner.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/owner/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as OwnerApi from '@/api/wms/owner'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Owner, OwnerRules } from './owner.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Owner' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Owner.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: OwnerApi.getOwnerPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:owner:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:owner:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:owner:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:owner:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:owner:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await OwnerApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Owner.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'shortName') {
+              item.componentProps.disabled = true
+            }
+          })       
+  }else {
+    Owner.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+      if (item.field == 'shortName') {
+              item.componentProps.disabled = false
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Owner.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await OwnerApi.createOwner(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await OwnerApi.updateOwner(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicOwner')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await OwnerApi.deleteOwner(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await OwnerApi.exportOwner(tableObject.params)
+    download.excel(data, '货主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '货主导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await OwnerApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts b/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts
new file mode 100644
index 000000000..42c9ed7f8
--- /dev/null
+++ b/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts
@@ -0,0 +1,301 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+import {validateHanset,validateFax,validatePostCode,validateYS} from '@/utils/validator'
+
+/**
+ * @returns {Array} 货主
+ */
+export const Owner = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '简称',
+    field: 'shortName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '地址',
+    field: 'address',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '国家',
+    field: 'country',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '城市',
+    field: 'city',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '电话',
+    field: 'phone',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '传真',
+    field: 'fax',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '邮编',
+    field: 'postId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人',
+    field: 'contacts',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '银行',
+    field: 'bank',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '币种',
+    field: 'currency',
+    dictType: DICT_TYPE.CURRENCY,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '税率',
+    field: 'taxRate',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '类型',
+    field: 'type',
+    dictType: DICT_TYPE.OWNER_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const OwnerRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  shortName: [
+    { required: true, message: '请输入简称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  address: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  country: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  city: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  phone: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
+  ],
+  fax: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateFax, message: '请输入正确的传真', trigger: 'blur'}
+  ],
+  postId: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validatePostCode, message: '请输入正确的邮编', trigger: 'blur'}
+  ],
+  contacts: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  bank: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/orderManage/shift/index.vue b/src/views/wms/basicDataManage/orderManage/shift/index.vue
new file mode 100644
index 000000000..f1eefbc97
--- /dev/null
+++ b/src/views/wms/basicDataManage/orderManage/shift/index.vue
@@ -0,0 +1,267 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Shift.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Shift.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="ShiftRules" 
+    :formAllSchemas="Shift.allSchemas"
+    :apiUpdate="ShiftApi.updateShift"
+    :apiCreate="ShiftApi.createShift"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Shift.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/shift/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as ShiftApi from '@/api/wms/shift'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Shift, ShiftRules } from './shift.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Shift' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Shift.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ShiftApi.getShiftPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:shift:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:shift:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:shift:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:shift:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:shift:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await ShiftApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Shift.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+          })       
+  }else {
+    Shift.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Shift.allSchemas.formSchema.some(function (item) {
+        return item.field === 'beginTime' || item.field === 'entTime';
+      });
+      if(isHave){
+        if(data.beginTime && data.entTime && data.beginTime >=data.entTime){
+          message.error('开始时间要大于结束时间')
+          return;
+        }
+      }
+      if(data.beginTime==0)data.beginTime = null;
+      if(data.entTime==0)data.entTime = null;
+      var isHave =Shift.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('生效时间要大于失效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await ShiftApi.createShift(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ShiftApi.updateShift(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicShift')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ShiftApi.deleteShift(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ShiftApi.exportShift(tableObject.params)
+    download.excel(data, '班次.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '班次导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await ShiftApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
new file mode 100644
index 000000000..f48755d9e
--- /dev/null
+++ b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
@@ -0,0 +1,252 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+import {validateYS} from '@/utils/validator'
+
+/**
+ * @returns {Array} 班次
+ */
+export const Shift = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'HH:mm:ss'
+    },
+    sort: 'custom', 
+    table: {
+      width: 180,
+    },
+    form: {
+      component: 'TimePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'time',
+        dateFormat: 'HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isSearch: true,
+    search: {
+      show: true,
+      component: 'TimePicker',
+      componentProps: {
+        valueFormat: 'HH:mm:ss',
+        type: 'timeSelect',
+      }
+    }
+  },
+  {
+    label: '结束时间',
+    field: 'entTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'HH:mm:ss',
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'TimePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'time',
+        dateFormat: 'HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isSearch: true,
+    search: {
+      show: true,
+      component: 'TimePicker',
+      componentProps: {
+        valueFormat: 'HH:mm:ss',
+        type: 'timeSelect',
+      }
+    }
+  },
+  {
+    label: '是否跨天',
+    field: 'endAtNextDay',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const ShiftRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  beginTime: [
+    { required: true, message: '请输入开始时间', trigger: 'blur' }
+  ],
+  entTime: [
+    { required: true, message: '请输入结束时间', trigger: 'blur' }
+  ],
+  endAtNextDay: [
+    { required: true, message: '请选择是否跨天', trigger: 'change' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/orderManage/team/index.vue b/src/views/wms/basicDataManage/orderManage/team/index.vue
new file mode 100644
index 000000000..6543ab854
--- /dev/null
+++ b/src/views/wms/basicDataManage/orderManage/team/index.vue
@@ -0,0 +1,256 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Team.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Team.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="TeamRules" 
+    :formAllSchemas="Team.allSchemas"
+    :apiUpdate="TeamApi.updateTeam"
+    :apiCreate="TeamApi.createTeam"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Team.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/team/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as TeamApi from '@/api/wms/team'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Team, TeamRules } from './team.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Team' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Team.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: TeamApi.getTeamPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:team:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:team:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:team:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:team:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:team:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await TeamApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Team.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+          })       
+  }else {
+    Team.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Team.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await TeamApi.createTeam(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await TeamApi.updateTeam(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicTeam')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await TeamApi.deleteTeam(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TeamApi.exportTeam(tableObject.params)
+    download.excel(data, '班组.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '班组导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await TeamApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/orderManage/team/team.data.ts b/src/views/wms/basicDataManage/orderManage/team/team.data.ts
new file mode 100644
index 000000000..0bc377788
--- /dev/null
+++ b/src/views/wms/basicDataManage/orderManage/team/team.data.ts
@@ -0,0 +1,158 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+import {validateYS} from '@/utils/validator'
+
+/**
+ * @returns {Array} 班组
+ */
+export const Team = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '成员',
+    field: 'members',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const TeamRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  members: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/condition/condition.data.ts b/src/views/wms/basicDataManage/strategySetting/condition/condition.data.ts
new file mode 100644
index 000000000..bf8a26734
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/condition/condition.data.ts
@@ -0,0 +1,91 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 条件
+ */
+export const Condition = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '策略代码',
+    field: 'strategyCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '规则代码',
+    field: 'ruleCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '参数',
+    field: 'paramCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作符',
+    field: 'operator',
+    dictType: DICT_TYPE.STRATEGY_PARAM_OPEARTOR,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '值',
+    field: 'value',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '条件分组',
+    field: 'groupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const ConditionRules = reactive({
+  strategyCode: [
+    { required: true, message: '请输入策略代码', trigger: 'blur' }
+  ],
+  ruleCode:  [
+    { required: true, message: '请输入规则代码', trigger: 'blur' }
+  ],
+  paramCode: [
+    { required: true, message: '请输入参数', trigger: 'blur' }
+  ],
+  operator: [
+    { required: true, message: '请选择操作符', trigger: 'change' }
+  ],
+  value: [
+    { required: true, message: '请输入值', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/condition/index.vue b/src/views/wms/basicDataManage/strategySetting/condition/index.vue
new file mode 100644
index 000000000..a6baf7f12
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/condition/index.vue
@@ -0,0 +1,219 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Condition.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Condition.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #strategyCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '策略代码', row.strategyCode)">
+          <span>{{ row.strategyCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="ConditionRules" 
+    :formAllSchemas="Condition.allSchemas" 
+    :apiUpdate="ConditionApi.updateCondition"
+    :apiCreate="ConditionApi.createCondition"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Condition.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/condition/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as ConditionApi from '@/api/wms/condition'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Condition, ConditionRules } from './condition.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Condition' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Condition.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ConditionApi.getConditionPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:condition:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:condition:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:condition:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:condition:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:condition:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await ConditionApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicCondition')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ConditionApi.deleteCondition(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ConditionApi.exportCondition(tableObject.params)
+    download.excel(data, '条件.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '条件导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await ConditionApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/configuration/configuration.data.ts b/src/views/wms/basicDataManage/strategySetting/configuration/configuration.data.ts
new file mode 100644
index 000000000..b5d4938cd
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/configuration/configuration.data.ts
@@ -0,0 +1,84 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 配置
+ */
+export const Configuration = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '策略代码',
+    field: 'strategyCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '规则代码',
+    field: 'ruleCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '配置名称',
+    field: 'configurationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '配置值',
+    field: 'configurationValue',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '配置分组',
+    field: 'groupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const ConfigurationRules = reactive({
+  strategyCode: [
+    { required: true, message: '请输入策略代码', trigger: 'blur' }
+  ],
+  ruleCode:  [
+    { required: true, message: '请输入规则代码', trigger: 'blur' }
+  ],
+  configurationCode: [
+    { required: true, message: '请输入配置名称', trigger: 'blur' }
+  ],
+  configurationValue: [
+    { required: true, message: '请输入配置值', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/configuration/index.vue b/src/views/wms/basicDataManage/strategySetting/configuration/index.vue
new file mode 100644
index 000000000..5abe735fd
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/configuration/index.vue
@@ -0,0 +1,219 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Configuration.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Configuration.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #strategyCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '策略代码', row.strategyCode)">
+          <span>{{ row.strategyCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="ConfigurationRules" 
+    :formAllSchemas="Configuration.allSchemas" 
+    :apiUpdate="ConfigurationApi.updateConfiguration"
+    :apiCreate="ConfigurationApi.createConfiguration"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Configuration.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/configuration/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as ConfigurationApi from '@/api/wms/configuration'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Configuration, ConfigurationRules } from './configuration.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Configuration' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Configuration.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ConfigurationApi.getConfigurationPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:configuration:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:configuration:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:configuration:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:configuration:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:configuration:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await ConfigurationApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicConfiguration')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ConfigurationApi.deleteConfiguration(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ConfigurationApi.exportConfiguration(tableObject.params)
+    download.excel(data, '配置.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '配置导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await ConfigurationApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/configurationsetting.data.ts b/src/views/wms/basicDataManage/strategySetting/configurationsetting/configurationsetting.data.ts
new file mode 100644
index 000000000..d4e801eb2
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/configurationsetting.data.ts
@@ -0,0 +1,104 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 配置设置
+ */
+export const Configurationsetting = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '策略类型',
+    field: 'strategyType',
+    dictType: DICT_TYPE.STRATEGY_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      fixed: 'left'
+    },
+  },
+  {
+    label: '配置代码',
+    field: 'configurationCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '配置名称',
+    field: 'configurationName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '数据类型',
+    field: 'dataType',
+    dictType: DICT_TYPE.DATA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+  },
+  {
+    label: '值范围',
+    field: 'valueScope',
+    sort: 'custom',
+  },
+  {
+    label: '关联到',
+    field: 'relatedTo',
+    sort: 'custom',
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+  },
+  {
+    label: '必填',
+    field: 'isRequired',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const ConfigurationsettingRules = reactive({
+  strategyType: [
+    { required: true, message: '请选择策略类型', trigger: 'change' }
+  ],
+  configurationCode:  [
+    { required: true, message: '请输入配置代码', trigger: 'blur' }
+  ],
+  configurationName: [
+    { required: true, message: '请输入配置名称', trigger: 'blur' }
+  ],
+  isRequired: [
+    { required: true, message: '请选择必填', trigger: 'change' }
+  ],
+  dataType: [
+    { required: true, message: '请选择数据类型', trigger: 'change' }
+  ],
+  valueScope: [
+    { required: true, message: '请输入值范围', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
new file mode 100644
index 000000000..c4737a072
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
@@ -0,0 +1,252 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="Configurationsetting.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :route-name="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Configurationsetting.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #strategyType="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '策略类型', row.strategyType)">
+          <span>{{ formatter(row.strategyType) }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ConfigurationsettingRules"
+    :formAllSchemas="Configurationsetting.allSchemas"
+    :apiUpdate="ConfigurationsettingApi.updateConfigurationsetting"
+    :apiCreate="ConfigurationsettingApi.createConfigurationsetting"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Configurationsetting.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/configurationsetting/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as ConfigurationsettingApi from '@/api/wms/configurationsetting'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Configurationsetting, ConfigurationsettingRules } from './configurationsetting.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
+defineOptions({ name: 'Configurationsetting' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Configurationsetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ConfigurationsettingApi.getConfigurationsettingPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:configurationsetting:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:configurationsetting:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:configurationsetting:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), //刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:configurationsetting:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:configurationsetting:delete' }) // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    // const res = await ConfigurationsettingApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+// form表单提交
+const formsSuccess = async (formType, data) => {
+  if (formType === 'create') {
+    await ConfigurationsettingApi.createConfigurationsetting(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ConfigurationsettingApi.updateConfigurationsetting(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicConfigurationsetting')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ConfigurationsettingApi.deleteConfigurationsetting(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ConfigurationsettingApi.exportConfigurationsetting(tableObject.params)
+    download.excel(data, '配置设置.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '配置设置导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+const formatter = (type) => {
+  let str = getStrDictOptions(DICT_TYPE.STRATEGY_TYPE).filter((item) => type == item.value)[0].label
+  return str
+}
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ConfigurationsettingApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
new file mode 100644
index 000000000..7638fafb5
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
@@ -0,0 +1,223 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Paramsetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Paramsetting.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #strategyType="{row}">
+        <el-button type="primary" link @click="openDetail(row, '策略类型', row.strategyType)">
+          <span>{{ formatter(row.strategyType) }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="ParamsettingRules" 
+    :formAllSchemas="Paramsetting.allSchemas" 
+    :apiUpdate="ParamsettingApi.updateParamsetting"
+    :apiCreate="ParamsettingApi.createParamsetting"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Paramsetting.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/paramsetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as ParamsettingApi from '@/api/wms/paramsetting'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Paramsetting, ParamsettingRules } from './paramsetting.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
+defineOptions({ name: 'Paramsetting' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Paramsetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ParamsettingApi.getParamsettingPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:paramsetting:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:paramsetting:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:paramsetting:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:paramsetting:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:paramsetting:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await ParamsettingApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicParamsetting')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ParamsettingApi.deleteParamsetting(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ParamsettingApi.exportParamsetting(tableObject.params)
+    download.excel(data, '参数设置.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '参数设置导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+const formatter = (type)=>{
+ let str =  getStrDictOptions(DICT_TYPE.STRATEGY_TYPE).filter(item=>type==item.value)[0].label;
+ return str
+}
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await ParamsettingApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/paramsetting/paramsetting.data.ts b/src/views/wms/basicDataManage/strategySetting/paramsetting/paramsetting.data.ts
new file mode 100644
index 000000000..424ca6315
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/paramsetting/paramsetting.data.ts
@@ -0,0 +1,137 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 参数设置
+ */
+export const Paramsetting = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '策略类型',
+    field: 'strategyType',
+    dictType: DICT_TYPE.STRATEGY_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '参数代码',
+    field: 'paramCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '参数名称',
+    field: 'paramName',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '可用操作符',
+    field: 'usableOpeartors',
+    dictType: DICT_TYPE.STRATEGY_PARAM_OPEARTOR,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数据类型',
+    field: 'dataType',
+    dictType: DICT_TYPE.DATA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '值范围',
+    field: 'valueScope',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '关联到',
+    field: 'relatedTo',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '必填',
+    field: 'isRequired',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const ParamsettingRules = reactive({
+  strategyType: [
+    { required: true, message: '请选择策略类型', trigger: 'change' }
+  ],
+  paramCode:  [
+    { required: true, message: '请输入参数代码', trigger: 'blur' }
+  ],
+  usableOpeartors: [
+    { required: true, message: '请选择可用操作符', trigger: 'change' }
+  ],
+  isRequired: [
+    { required: true, message: '请选择必填', trigger: 'change' }
+  ],
+  dataType: [
+    { required: true, message: '请选择数据类型', trigger: 'change' }
+  ],
+  valueScope: [
+    { required: true, message: '请输入值范围', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/rule/index.vue b/src/views/wms/basicDataManage/strategySetting/rule/index.vue
new file mode 100644
index 000000000..7a4deb781
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/rule/index.vue
@@ -0,0 +1,247 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="Rule.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :route-name="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Rule.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #strategyCode="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '策略代码', row.strategyCode)">
+          <span>{{ row.strategyCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="RuleRules"
+    :formAllSchemas="Rule.allSchemas"
+    :apiUpdate="RuleApi.updateRule"
+    :apiCreate="RuleApi.createRule"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Rule.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/rule/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as RuleApi from '@/api/wms/rule'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Rule, RuleRules } from './rule.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Rule' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Rule.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: RuleApi.getRulePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({ hasPermi: 'wms:rule:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:rule:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:rule:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), //刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:rule:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:rule:delete' }) // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    // const res = await RuleApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+// form表单提交
+const formsSuccess = async (formType, data) => {
+  if (formType === 'create') {
+    await RuleApi.createRule(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await RuleApi.updateRule(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicRule')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await RuleApi.exportRule(tableObject.params)
+    download.excel(data, '规则.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '规则导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts b/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts
new file mode 100644
index 000000000..ebd689dc1
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts
@@ -0,0 +1,77 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 规则
+ */
+export const Rule = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '策略代码',
+    field: 'strategyCode',
+    sort: 'custom',
+    table: {
+      fixed: 'left'
+    },
+    isSearch:true
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   isSearch:true
+  // },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch:true
+  },
+  {
+    label: '条件',
+    field: 'condition',
+    sort: 'custom',
+  },
+  {
+    label: '配置',
+    field: 'configuration',
+    sort: 'custom',
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   }
+  // }
+]))
+
+//表单校验
+export const RuleRules = reactive({
+  strategyCode: [
+    { required: true, message: '请输入策略代码', trigger: 'blur' }
+  ],
+  priority:  [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  // code: [
+  //   { required: true, message: '请输入代码', trigger: 'blur' }
+  // ],
+  configuration: [
+    { required: true, message: '请输入配置', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
new file mode 100644
index 000000000..1998ec241
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
@@ -0,0 +1,449 @@
+<!-- 到货验货任务拆分策略弹出层 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <!-- 规则 -->
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="140px"
+        label-position="left"
+      >
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <!-- 规则条件 -->
+        <div class="item mt-20px">
+          <div class="title">规则条件</div>
+          <el-row gutter="10">
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 供应商类型 -->
+              <el-form-item
+                v-if="item.ParamCode == 'SupplierType'"
+                label="供应商类型"
+                class="flex-top err-120"
+              >
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.supplierTypeRangeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择供应商类型"
+                  style="flex: 1"
+                  clearable
+                  @change="changeSupplierType"
+                >
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 供应商 -->
+              <el-form-item
+                v-else-if="item.ParamCode == 'SupplierCode'"
+                label="供应商"
+                class="err-120"
+              >
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.supplierRangeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择供应商"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="cur in options.supplierList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <!-- 规则配置 -->
+        <div class="item mt-20px">
+          <div class="title">规则配置</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <!-- 按零件拆分 -->
+              <el-form-item label="按零件拆分">
+                <el-switch v-model="formData.configuration.ByItem"  active-value="TRUE" inactive-value="FALSE"/>
+              </el-form-item>
+            </el-col>
+            <!-- 按批次拆分 -->
+            <el-col :span="24">
+              <el-form-item label="按批次拆分">
+                <el-switch v-model="formData.configuration.ByBatch"  active-value="TRUE" inactive-value="FALSE"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'SupplieDeliveryStrategyAddForm' })
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { getSupplierList } from '@/api/wms/supplier'
+import * as RuleApi from '@/api/wms/rule'
+import { isString } from '@/utils/is'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+
+const formStrategyCode = ref('')
+// form表单数据
+const formData = ref({
+  id: '',
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
+  //规则条件集合
+  condition: [
+    // 供应商类型
+    { ParamCode: 'SupplierType', Operator: '==', Value: '' },
+    // 供应商
+    { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }
+  ],
+  configuration: {
+    // 按零件拆分
+    ByItem: 'FALSE',
+    // 按批次拆分
+    ByBatch: 'FALSE'
+  }
+})
+
+// 验证规则
+const rules = ref({
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+})
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' }
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
+  return result
+}
+// 下拉框列表集合
+const options = reactive({
+  // 供应商类型范围下拉框列表
+  supplierTypeRangeOptions: formatRangeOptions('=='),
+  // 供应商列表
+  supplierTypeOptions: [
+    { value: 1, label: '标准' },
+    { value: 2, label: '委外' },
+    { value: 3, label: '其他' }
+  ],
+  // 供应商范围下拉框列表
+  supplierRangeOptions: formatRangeOptions('IN', 'NOT IN'),
+  //供应商列表
+  supplierList: [
+    { value: 1, label: '供应商1' },
+    { value: 2, label: '供应商2' },
+    { value: 3, label: '供应商3' }
+  ]
+})
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+// 获取供应商列表的参数
+const querySupplierParams = ref({
+  type: ''
+})
+// 获取供应商列表
+const getFormSupplierList = async () => {
+  options.supplierList = await getSupplierList(querySupplierParams.value)
+}
+
+// 选择供应商类型
+const changeSupplierType = (e) => {
+  querySupplierParams.value.type = e
+  formData.value.condition[1].Value = []
+  getFormSupplierList()
+}
+
+getFormSupplierList()
+
+/** 打开弹窗 */
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
+
+      querySupplierParams.value.type = formData.value?.condition[0]?.Value || ''
+      getFormSupplierList()
+    } finally {
+      formLoading.value = false
+    }
+  }else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
+  let list = Object.values(formData.value.configuration)
+  let onlyOne = list.filter((item) => {
+    return item == 'TRUE'
+  })
+  if (onlyOne?.length != 1) {
+    message.error('只能选择一种拆分方式')
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const arr = formData.value.condition.map(item=> {
+       let str = item.Value
+       if(isString(item.Value)){
+        if(item.Value.indexOf('，'>-1)){
+        str = item.Value.split('，').join(',')
+        }
+      }
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+     
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
+      //规则条件集合
+      condition: JSON.stringify(arr),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    strategyCode: formStrategyCode.value, //策略代码
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
+    //规则条件集合
+    condition: [
+      // 供应商类型
+      { ParamCode: 'SupplierType', Operator: '==', Value: '' },
+      // 供应商
+      { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }
+    ],
+    configuration: {
+      // 按零件拆分
+      ByItem: 'FALSE',
+      // 按批次拆分
+      ByBatch: 'FALSE'
+    }
+  }
+}
+
+
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+</style>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue
new file mode 100644
index 000000000..4c236c314
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue
@@ -0,0 +1,172 @@
+<!-- 到货验货任务拆分策略 -->
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="策略名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入策略名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" sortable/>
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'PurchaseReceiptStrategy' })
+const queryFormRef = ref() // 搜索的表单
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S004',
+})
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create', queryParams.strategyCode)
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示 
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', queryParams.strategyCode, row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
new file mode 100644
index 000000000..d3c0436e3
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
@@ -0,0 +1,636 @@
+<!-- 批次策略弹窗 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="120px"
+        label-position="left"
+      >
+        <!-- 规则 -->
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则条件 -->
+        <div class="item mt-20px">
+          <div class="title">规则条件</div>
+          <el-row>
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 选择供应商和客户 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeSupplierCustomer"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.typeOptions"
+                    :key="index"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="cur in options.supplierList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 选择物料类型 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  @change="changeItemsType"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="item.label"
+                    :value="item.value"
+                    v-for="item in options.itemTypeOptions"
+                    :key="item.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择物料类型"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-if="item.ParamCode == 'ItemType'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择ABC类"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-else-if="item.ParamCode == 'AbcClass'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料分组，多个物料分组以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemGroup'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入项目，多个项目以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'Project'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料，多个物料以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemCode'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <!-- 规则配置 -->
+        <div class="item mt-20px">
+          <div class="title">规则配置</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <!-- 存储类型 -->
+              <el-form-item label="" label-width="0" class="flex-top" prop="configurationRules">
+                <div
+                  style="width: 100%; display: flex; align-items: center; margin-bottom: 10px"
+                  v-for="(cur, key) in formData.configuration.ManagementPrecision"
+                  :key="key"
+                >
+                  <div style="width: 26px; display: flex">
+                    <Icon
+                      icon="ep:remove"
+                      color="#757575"
+                      size="26"
+                      style="cursor: pointer"
+                      @click="
+                        handleDeleteTable(formData.configuration.ManagementPrecision, cur, key)
+                      "
+                      v-if="formData?.configuration?.ManagementPrecision?.length > 1"
+                    />
+                  </div>
+                  <div class="flex w-[28%]">
+                    <div class="ml-10px mr-10px">批次类型</div>
+                    <el-select v-model="cur.BatchType" placeholder="请选择批次类型" style="flex: 1">
+                      <el-option
+                        v-for="it in getStrDictOptions(DICT_TYPE.BATCH_TYPE)"
+                        :key="it.value"
+                        :label="it.label"
+                        :value="it.value"
+                      />
+                    </el-select>
+                  </div>
+                  <div class="flex w-[28%]">
+                    <div class="ml-10px mr-10px">批次格式</div>
+                    <el-input
+                      v-model="cur.BatchFormat"
+                      placeholder="yyyyMMDD"
+                      clearable
+                      style="flex: 1"
+                      @blur="inputBlur"
+                    />
+                  </div>
+                  <div class="flex" style="flex: 1">
+                    <div class="ml-10px mr-10px">批次方向</div>
+                    <div class="checkbox">
+                      <el-radio-group v-model="cur.BatchDirection">
+                        <el-radio
+                          :label="cur.value"
+                          v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
+                          :key="cur.value"
+                          >{{ cur.label }}</el-radio
+                        >
+                      </el-radio-group>
+                    </div>
+                  </div>
+                </div>
+                <div class="button flex">
+                  <div @click="handleAddTable(formData.configuration.ManagementPrecision)">
+                    <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" />
+                    <div>添加条件</div>
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'UpShelfStrategyAddForm' })
+import { getSupplierList } from '@/api/wms/supplier'
+import { getCustomerList } from '@/api/wms/customer'
+import * as RuleApi from '@/api/wms/rule'
+import { isString } from '@/utils/is'
+
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { json } from 'stream/consumers'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+
+const formStrategyCode = ref('')
+// form表单数据
+const formData = ref({
+  id: '',
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
+  //规则条件集合
+  condition: [
+    // 供应商
+    { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
+    // 物料类型/物料分组/物料/abc类/项目/
+    { ParamCode: 'ItemType', Operator: 'IN', Value: '' }
+  ],
+  configuration: {
+    // 管理精度
+    ManagementPrecision: [
+      {
+        BatchType: 'ARRIVE_TIME',
+        BatchFormat: '',
+        BatchDirection: 'ASC'
+      }
+    ]
+  },
+  configurationRules: '1' //规则配置验证
+})
+// 验证规则
+const rules = ref({
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
+  configurationRules: [{ required: true, message: '规则配置请填写完全', trigger: 'blur' }]
+})
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' }
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
+  return result
+}
+
+// 下拉框列表集合
+const options = reactive({
+  //范围下拉框列表
+  rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
+  rangeOptions2: formatRangeOptions('IN'),
+  // 供应商客户下拉框列表
+  typeOptions: [
+    { value: 'SupplierCode', label: '供应商' },
+    { value: 'CustomerCode', label: '客户' }
+  ],
+  //供应商列表
+  supplierList: [],
+  // 物料类型列表
+  itemTypeOptions: [
+    { value: 'ItemType', label: '物料类型' },
+    { value: 'ItemGroup', label: '物料分组' },
+    { value: 'ItemCode', label: '物料' },
+    { value: 'Project', label: '项目' },
+    { value: 'AbcClass', label: 'ABC类' }
+  ]
+})
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+// 获取供应商列表
+const getFormSupplierList = async () => {
+  options.supplierList = await getSupplierList()
+}
+// 获取客户列表
+const getFormCustomerList = async () => {
+  options.supplierList = await getCustomerList()
+}
+// 选择客户还是承运商
+const changeSupplierCustomer = (e) => {
+  formData.value.condition[0].Value = ''
+  if (e == 'CustomerCode') {
+    getFormCustomerList()
+  } else if (e == 'SupplierCode') {
+    getFormSupplierList()
+  }
+}
+getFormSupplierList()
+// 选择物料类型/物料分组/abc类/物料/项目
+const changeItemsType = () => {
+  formData.value.condition[1].Value = ''
+}
+
+/** 打开弹窗 */
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({ disabled: true }), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
+      // 判断是获取客户列表还是供应上列表
+      if (formData.value.condition[0].ParamCode == 'SupplierCode') {
+        getFormSupplierList()
+      } else {
+        getFormCustomerList()
+      }
+    } finally {
+      formLoading.value = false
+    }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const hasSameData = (array)=>{
+  const set = new Set(array.map(JSON.stringify))
+  return set.size !== array.length
+}
+const submitForm = async () => {
+  // 校验表单
+  inputBlur()
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  if (formData.value.priority == 0) {
+    message.error('优先级不可以为0')
+    return
+  }
+  if (hasSameData( formData.value.configuration.ManagementPrecision)) {
+    message.error('规则配置数据重复，请重新填写')
+    return;
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const arr = formData.value.condition.map(item=> {
+       let str = item.Value
+       if(isString(item.Value)){
+        if(item.Value.indexOf('，'>-1)){
+        str = item.Value.split('，').join(',')
+        }
+      }
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+     
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
+
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
+      //规则条件集合
+      condition: JSON.stringify(arr),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    strategyCode: formStrategyCode.value, //策略代码id
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
+    //规则条件集合
+    condition: [
+      // 供应商
+      { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
+      // 物料类型/物料分组/物料/abc类/项目/
+      { ParamCode: 'ItemType', Operator: 'IN', Value: '' }
+    ],
+    configuration: {
+      // 管理精度
+      ManagementPrecision: [
+        {
+          BatchType: 'ARRIVE_TIME',
+          BatchFormat: '',
+          BatchDirection: 'ASC'
+        }
+      ]
+    },
+    configurationRules: '1' //规则配置验证
+  }
+}
+
+// 添加规则配置
+const handleAddTable = (item) => {
+  item.push({
+    BatchType: 'ARRIVE_TIME',
+    BatchFormat: '',
+    BatchDirection: 'ASC'
+  })
+}
+// 删除规则配置
+const handleDeleteTable = (item, cur, key) => {
+  item.splice(key, 1)
+}
+//失去焦点的时候验证
+const inputBlur = () => {
+  let arr = []
+  formData.value.configuration.ManagementPrecision.forEach((item) => {
+    let bol = false
+    if (!item.BatchFormat) {
+      bol = false
+    } else {
+      bol = true
+    }
+    arr.push(bol)
+  })
+  const isEmpty = arr.some((cur) => {
+    return !cur
+  })
+  if (isEmpty) {
+    formData.value.configurationRules = ''
+    return
+  } else {
+    formData.value.configurationRules = '1'
+  }
+}
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-240 .el-form-item__error {
+  padding-left: 240px !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+
+.button {
+  > div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+
+    > div {
+      margin-left: 6px;
+      text-decoration: underline;
+      color: #409eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue
new file mode 100644
index 000000000..197c67ff9
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue
@@ -0,0 +1,172 @@
+<!-- 批次策略 -->
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="策略名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入策略名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" sortable/>
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'SupplieDeliveryStrategy' })
+const queryFormRef = ref() // 搜索的表单
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S010',
+})
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create', queryParams.strategyCode)
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', queryParams.strategyCode, row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
new file mode 100644
index 000000000..80baf7b2b
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -0,0 +1,1022 @@
+<!-- 下架策略弹窗 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="120px"
+        label-position="left"
+      >
+        <!-- 规则 -->
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则条件 -->
+
+        <div class="item mt-20px">
+          <div class="title">规则条件</div>
+          <el-row gutter="10">
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 选择供应商和客户 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeSupplierCustomer"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.typeOptions"
+                    :key="index"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="cur in options.supplierList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 选择物料类型 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  @change="changeItemsType"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="item.label"
+                    :value="item.value"
+                    v-for="item in options.itemTypeOptions"
+                    :key="item.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择物料类型"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-if="item.ParamCode == 'ItemType'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择ABC类"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-else-if="item.ParamCode == 'AbcClass'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料分组，多个物料分组以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemGroup'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入项目，多个项目以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'Project'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料，多个物料以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemCode'"
+                />
+              </el-form-item>
+              <!-- 选择重量体积还是面积 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 2">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  @change="changeCalculation"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.calculationTypeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions2"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-input
+                  v-model="item.Value"
+                  :placeholder="`请输入${
+                    item.ParamCode == 'Weight' ? '重量' : item.ParamCode == 'Area' ? '面积' : '体积'
+                  }`"
+                  clearable
+                  style="flex: 1"
+                />
+              </el-form-item>
+              <!-- 库存状态 -->
+              <el-form-item label="库存状态" class="err-120" v-if="index == 3">
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择库存状态"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 存储类型 -->
+              <el-form-item label="存储类型" class="err-120" v-if="index == 4">
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择存储类型"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 库存事务 -->
+              <el-form-item label="库存事务" class="err-120" v-if="index == 5">
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入库存事务，多个库存事务以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则配置 -->
+        <div class="item mt-20px">
+          <div class="title">规则配置</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <el-form-item label="" label-width="0" prop="warehouse" class="err-120">
+                <el-select
+                  v-model="warehouseType"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeWarehouse"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.warehouseTypeOptions"
+                    :key="index"
+                  />
+                </el-select>
+                <el-select
+                  v-model="formData.configuration.WarehouseCode"
+                  v-if="warehouseType == 'WarehouseCode'"
+                  placeholder="请选择仓库"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+                <el-select
+                  v-model="formData.configuration.AreaCode"
+                  v-if="warehouseType == 'AreaCode'"
+                  placeholder="请选择库区"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+                <el-select
+                  v-model="formData.configuration.LocationGroupCode"
+                  v-if="warehouseType == 'LocationGroupCode'"
+                  placeholder="请选择库位组"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+
+                <el-select
+                  v-model="formData.configuration.LocationCode"
+                  v-if="warehouseType == 'LocationCode'"
+                  placeholder="请选择库位"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- 数量排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="数量排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.QtyOrderDirection">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in options.sortOptions"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 巷道排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="巷道排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.AisleOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in options.sortOptions"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 货架排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="货架排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.ShelfOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in options.sortOptions"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 行排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="行排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.RowOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in options.sortOptions"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 列排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="列排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.ColumOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in options.sortOptions"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 优先整包 -->
+            <el-col :span="24">
+              <el-form-item label="优先整包">
+                <el-switch
+                  v-model="formData.configuration.EntirePackageFirst"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 发料包装类型 -->
+            <el-col :span="24">
+              <el-form-item label="发料包装类型">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.IssueStorageType">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 多次发料 -->
+            <el-col :span="7">
+              <el-form-item label="多次发料">
+                <el-switch
+                  v-model="formData.configuration.IsSplit"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 拆分次数 -->
+            <el-col :span="8">
+              <el-form-item label="拆分次数" label-width="70px">
+                <el-input-number
+                  v-model="formData.configuration.EachTimeQty"
+                  :min="0"
+                  controls-position="right"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 时间间隔 -->
+            <el-col :span="9">
+              <el-form-item label="时间间隔" label-width="70px">
+                <el-input-number
+                  v-model="formData.configuration.TimeInterval"
+                  :min="0"
+                  style="flex: 1; margin-right: 10px"
+                  controls-position="right"
+                />小时
+              </el-form-item>
+            </el-col>
+            <!-- 使用整理库位-->
+            <el-col :span="24">
+              <el-form-item label="使用整理库位">
+                <el-switch
+                  v-model="formData.configuration.UseOrganizeLocation"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 使用在途库位 -->
+            <el-col :span="24">
+              <el-form-item label="使用在途库位">
+                <el-switch
+                  v-model="formData.configuration.UseTransportLocation"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 生成接收任务 -->
+            <el-col :span="24">
+              <el-form-item label="生成接收任务">
+                <el-switch
+                  v-model="formData.configuration.CreateReceiptJob"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'UpShelfStrategyAddForm' })
+import { getSupplierList } from '@/api/wms/supplier'
+import { getCustomerList } from '@/api/wms/customer'
+import { getWarehouseList } from '@/api/wms/warehouse'
+import { getAreaList } from '@/api/wms/areabasic'
+import { getLocationgroupList } from '@/api/wms/locationgroup'
+import { getLocationList } from '@/api/wms/location'
+import * as RuleApi from '@/api/wms/rule'
+
+import { isString } from '@/utils/is'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+
+const formStrategyCode = ref('')
+// 仓库类型
+const warehouseType = ref('WarehouseCode')
+
+// form表单数据
+const formData = ref({
+  id: '',
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
+  //规则条件集合
+  condition: [
+    // 供应商
+    { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
+    // 物料类型/物料分组/物料/abc类/项目/
+    { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
+    // 重量/体积/面积
+    { ParamCode: 'Weight', Operator: '>', Value: [] },
+    // 库存状态
+    { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
+    // 存储类型
+    { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
+    // 库存事务
+    { ParamCode: 'TransactionType', Operator: 'IN', Value: [] }
+  ],
+  configuration: {
+    // 仓库代码
+    WarehouseCode: '',
+    // 库区代码
+    AreaCode: '',
+    // 库位组代码
+    LocationGroupCode: '',
+    // 库位代码
+    LocationCode: '',
+    // 数量排序方向
+    QtyOrderDirection: 'ASC',
+    // 巷道排序方向
+    AisleOrder: 'ASC',
+    // 货架排序方向
+    ShelfOrder: 'ASC',
+    // 行排序方向
+    RowOrder: 'ASC',
+    // 列排序方向
+    ColumOrder: 'ASC',
+    // 优先整包
+    EntirePackageFirst: 'FALSE',
+    // 发料包装类型
+    IssueStorageType: 'SINGLE',
+    // 是否拆分发料
+    IsSplit: '',
+    // 拆分数量
+    EachTimeQty: '',
+    // 时间间隔
+    TimeInterval: '',
+    // 是否使用整理库位
+    UseOrganizeLocation: 'FALSE',
+    // 是否使用在途库位
+    UseTransportLocation: 'FALSE',
+    // 是否生成发料接收任务
+    CreateReceiptJob: 'FALSE'
+  }
+})
+// 验证规则
+const rules = ref({
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+})
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' }
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
+  return result
+}
+
+// 下拉框列表集合
+const options = reactive({
+  //范围下拉框列表
+  rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
+  rangeOptions2: formatRangeOptions('>', '<', '>=', '<='),
+  // 供应商客户下拉框列表
+  typeOptions: [
+    { value: 'SupplierCode', label: '供应商' },
+    { value: 'CustomerCode', label: '客户' }
+  ],
+  //供应商列表
+  supplierList: [],
+  // 物料类型列表
+  itemTypeOptions: [
+    { value: 'ItemType', label: '物料类型' },
+    { value: 'ItemGroup', label: '物料分组' },
+    { value: 'ItemCode', label: '物料' },
+    { value: 'Project', label: '项目' },
+    { value: 'AbcClass', label: 'ABC类' }
+  ],
+  // 重量体积面积类型列表
+  calculationTypeOptions: [
+    { value: 'Weight', label: '重量' },
+    { value: 'Volume', label: '体积' },
+    { value: 'Area', label: '面积' }
+  ],
+  //仓库列表
+  warehouseTypeOptions: [
+    { value: 'WarehouseCode', label: '仓库' },
+    { value: 'AreaCode', label: '库区' },
+    { value: 'LocationGroupCode', label: '库位组' },
+    { value: 'LocationCode', label: '库位' }
+  ],
+  warehouseList: [],
+  // 排列方式
+  sortOptions: [
+    { value: 'ASC', label: '从小到大' },
+    { value: 'DESC', label: '从大到小' }
+  ]
+})
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
+// 获取供应商列表
+const getFormSupplierList = async () => {
+  options.supplierList = await getSupplierList()
+}
+// 获取客户列表
+const getFormCustomerList = async () => {
+  options.supplierList = await getCustomerList()
+}
+// 选择客户还是承运商
+const changeSupplierCustomer = (e) => {
+  formData.value.condition[0].Value = ''
+  if (e == 'CustomerCode') {
+    getFormCustomerList()
+  } else if (e == 'SupplierCode') {
+    getFormSupplierList()
+  }
+}
+getFormSupplierList()
+// 选择物料类型/物料分组/abc类/物料/项目
+const changeItemsType = () => {
+  formData.value.condition[1].Value = ''
+}
+// 选择重量/体积/面积
+const changeCalculation = () => {
+  formData.value.condition[2].Value = ''
+}
+// 获取仓库列表
+const getFormWarehouseList = async () => {
+  options.warehouseList = await getWarehouseList()
+}
+// 获取库区列表
+const getFormAreaList = async () => {
+  options.warehouseList = await getAreaList()
+}
+// 获取库位组列表
+const getFormLocationgrouList = async () => {
+  options.warehouseList = await getLocationgroupList()
+}
+// 获取库位列表
+const getFormLocationList = async () => {
+  options.warehouseList = await getLocationList()
+}
+getFormLocationList()
+// 选择仓库/库位/库位组/库区
+const changeWarehouse = (e) => {
+  formData.value.configuration.WarehouseCode = ''
+  formData.value.configuration.AreaCode = ''
+  formData.value.configuration.LocationGroupCode = ''
+  formData.value.configuration.LocationCode = ''
+  if (e == 'WarehouseCode') {
+    getFormWarehouseList()
+  } else if (e == 'AreaCode') {
+    getFormAreaList()
+  } else if (e == 'LocationGroupCode') {
+    getFormLocationgrouList()
+  } else if (e == 'LocationCode') {
+    getFormLocationList()
+  }
+}
+/** 打开弹窗 */
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  warehouseType.value = 'WarehouseCode'
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({ disabled: true }), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
+      // 判断是获取客户列表还是供应上列表
+      if (formData.value.condition[0].ParamCode == 'SupplierCode') {
+        getFormSupplierList()
+      } else {
+        getFormCustomerList()
+      }
+      // 判断是获取仓库/库位/库位组/库区列表
+      if (
+        'WarehouseCode' in formData.value.configuration &&
+        formData.value.configuration.WarehouseCode
+      ) {
+        warehouseType.value = 'WarehouseCode'
+        getFormWarehouseList()
+      } else if (
+        'AreaCode' in formData.value.configuration &&
+        formData.value.configuration.AreaCode
+      ) {
+        warehouseType.value = 'AreaCode'
+        getFormAreaList()
+      } else if (
+        'LocationGroupCode' in formData.value.configuration &&
+        formData.value.configuration.LocationGroupCode
+      ) {
+        warehouseType.value = 'LocationGroupCode'
+        getFormLocationgrouList()
+      } else if (
+        'LocationCode' in formData.value.configuration &&
+        formData.value.configuration.LocationCode
+      ) {
+        warehouseType.value = 'LocationCode'
+        getFormLocationList()
+      }
+    } finally {
+      formLoading.value = false
+    }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  if (formData.value.priority == 0) {
+    message.error('优先级不可以为0')
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const arr = formData.value.condition.map(item=> {
+       let str = item.Value
+       if(isString(item.Value)){
+        if(item.Value.indexOf('，'>-1)){
+        str = item.Value.split('，').join(',')
+        }
+      }
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+     
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
+      //规则条件集合
+      condition: JSON.stringify(arr),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    strategyCode: formStrategyCode.value, //策略代码id
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
+    //规则条件集合
+    condition: [
+      // 供应商
+      { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
+      // 物料类型/物料分组/物料/abc类/项目/
+      { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
+      // /重量/体积/面积
+      { ParamCode: 'Weight', Operator: '>', Value: [] },
+      // 库存状态
+      { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
+      // 存储类型
+      { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
+      // 库存事务
+      { ParamCode: 'TransactionType', Operator: 'IN', Value: [] }
+    ],
+
+    configuration: {
+      // 仓库代码
+      WarehouseCode: '',
+      // 库区代码
+      AreaCode: '',
+      // 库位组代码
+      LocationGroupCode: '',
+      // 库位代码
+      LocationCode: '',
+      // 数量排序方向
+      QtyOrderDirection: 'ASC',
+      // 巷道排序方向
+      AisleOrder: 'ASC',
+      // 货架排序方向
+      ShelfOrder: 'ASC',
+      // 行排序方向
+      RowOrder: 'ASC',
+      // 列排序方向
+      ColumOrder: 'ASC',
+      // 优先整包
+      EntirePackageFirst: 'FALSE',
+      // 发料包装类型
+      IssueStorageType: 'SINGLE',
+      // 是否拆分发料
+      IsSplit: '',
+      // 拆分数量
+      EachTimeQty: '',
+      // 时间间隔
+      TimeInterval: '',
+      // 是否使用整理库位
+      UseOrganizeLocation: 'FALSE',
+      // 是否使用在途库位
+      UseTransportLocation: 'FALSE',
+      // 是否生成发料接收任务
+      CreateReceiptJob: 'FALSE'
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-240 .el-form-item__error {
+  padding-left: 240px !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+</style>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue
new file mode 100644
index 000000000..8a202a9b7
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue
@@ -0,0 +1,174 @@
+<!-- 下架策略 -->
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="策略名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入策略名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" sortable/>
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'SupplieDeliveryStrategy' })
+
+const queryFormRef = ref() // 搜索的表单
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S007',
+})
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create', queryParams.strategyCode)
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', queryParams.strategyCode, row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
new file mode 100644
index 000000000..243fb7e38
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
@@ -0,0 +1,633 @@
+
+<!-- 检验策略弹窗 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="120px"
+        label-position="left"
+      >
+        <!-- 规则 -->
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <!-- 规则条件 -->
+        <div class="item mt-20px">
+          <div class="title">规则条件</div>
+          <el-row>
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 供应商类型 -->
+              <el-form-item v-if="index == 0" label="供应商类型" class="flex-top err-120">
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.supplierTypeRangeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择供应商类型"
+                  style="flex: 1"
+                  clearable
+                  @change="changeSupplierType"
+                >
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 供应商 -->
+              <el-form-item
+                v-else-if="index == 1"
+                label="供应商"
+                class="err-120"
+                :prop="'condition.' + index + '.Value'"
+                :rules="{
+                  required: false,
+                  message: '请选择供应商',
+                  trigger: 'change'
+                }"
+              >
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.supplierRangeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择供应商"
+                  style="flex: 1"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in options.supplierList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 物料 -->
+              <el-form-item v-else-if="index == 2" label="物料" class="flex-top err-120">
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.ItemCodeRangeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料，多个物料以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <!-- 规则配置 -->
+        <div class="item mt-20px">
+          <div class="title">规则配置</div>
+          <el-row>
+            <!-- 开始时间 -->
+            <el-col :span="24">
+              <!-- 检验方式 -->
+              <el-form-item label="检验方式" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group
+                    v-model="formData.configuration.InspectType"
+                    @change="changeInspectType"
+                  >
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.INSPECT_TYPE)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 抽检方式 -->
+            <el-col :span="24" v-if="formData.configuration.InspectType == 'SAMPLING'">
+              <el-form-item label="抽检方式" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.SampleMethod">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.SAMPLE_METHOD)"
+                      @change="changeSampleMethod"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 抽检规则 -->
+            <el-col :span="24" v-if="formData.configuration.InspectType == 'SAMPLING'">
+              <el-form-item label="抽检规则" class="flex-top" prop="configurationRules">
+                <div
+                  style="flex: 1; display: flex; align-items: center; margin-bottom: 10px"
+                  v-for="(cur, key) in formData.configuration.AqlList"
+                  :key="key"
+                >
+                  <div style="width: 26px; display: flex">
+                    <Icon
+                      icon="ep:remove"
+                      color="#757575"
+                      size="26"
+                      style="cursor: pointer"
+                      @click="handleDeleteTable(formData.configuration.AqlList, cur, key)"
+                      v-if="formData.configuration.AqlList?.length > 1"
+                    />
+                  </div>
+                  <el-input-number
+                    v-model="cur.FloorQty"
+                    :min="1"
+                    :max="cur.CeilingQty - 1"
+                    class="ml-20px mr-20px"
+                    style="width: 100px"
+                    controls-position="right"
+                    @blur="inputNumberBlur"
+                  />
+                  <div>至</div>
+                  <el-input-number
+                    v-model="cur.CeilingQty"
+                    :min="cur.FloorQty + 1"
+                    class="ml-20px mr-20px"
+                    style="width: 100px"
+                    controls-position="right"
+                    @blur="inputNumberBlur"
+                  />
+                  <div>抽样数</div>
+                  <el-input-number
+                    v-model="cur.SampleValue"
+                    :min="1"
+                    :max="formData.configuration.SampleMethod == 'QTY' ? Infinity : 100"
+                    class="ml-20px mr-20px"
+                    style="width: 100px"
+                    controls-position="right"
+                    @blur="inputNumberBlur"
+                  />
+                  <div>{{ formData.configuration.SampleMethod == 'QTY' ? 'EA' : '%' }}</div>
+                </div>
+                <div class="button flex">
+                  <div @click="handleAddTable(formData.configuration.AqlList)">
+                    <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" />
+                    <div>添加条件</div>
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'SupplieDeliveryStrategyAddForm' })
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { getSupplierList } from '@/api/wms/supplier'
+import * as RuleApi from '@/api/wms/rule'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+
+const formStrategyCode = ref('')
+// form表单数据
+const formData = ref({
+  id: '',
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
+  //规则条件集合
+  condition: [
+    // 供应商类型
+    { ParamCode: 'SupplierType', Operator: '==', Value: '' },
+    // 供应商
+    { ParamCode: 'SupplierCode', Operator: '==', Value: '' },
+    // 物料代码
+    { ParamCode: 'ItemCode', Operator: 'IN', Value: [] }
+  ],
+  configuration: {
+    // 检验方式
+    InspectType: 'EXEMPT',
+    // 抽检方式
+    SampleMethod: 'QTY',
+    // 抽检规则列表
+    AqlList: [
+      {
+        FloorQty: 1,
+        CeilingQty: 2,
+        SampleValue: 1
+      }
+    ]
+  },
+  configurationRules: '1' //规则配置验证
+})
+
+// 验证规则
+const rules = ref({
+  strategyCode: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { required: true, message: '请输入名字', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  description: [
+    { required: true, message: '请输入描述', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
+  configurationRules: [{ required: true, message: '抽奖规则请填写完全', trigger: 'blur' }]
+})
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' }
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
+  return result
+}
+// 下拉框列表集合
+const options = reactive({
+  // 供应商类型范围下拉框列表
+  supplierTypeRangeOptions: formatRangeOptions('=='),
+  // 供应商列表
+  supplierTypeOptions: [],
+  // 供应商范围下拉框列表
+  supplierRangeOptions: formatRangeOptions('=='),
+  //供应商列表
+  supplierList: [],
+  // 物料范围下拉框列表
+  ItemCodeRangeOptions: formatRangeOptions('IN', 'NOT IN')
+})
+// 获取供应商列表的参数
+const querySupplierParams = ref({
+  type: ''
+})
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
+// 获取供应商列表
+const getFormSupplierList = async () => {
+  options.supplierList = await getSupplierList(querySupplierParams.value)
+}
+
+// 选择供应商类型
+const changeSupplierType = (e) => {
+  querySupplierParams.value.type = e
+  formData.value.condition[1].Value = []
+  getFormSupplierList()
+}
+getFormSupplierList()
+// 改变检验方式的时候
+function changeInspectType(e) {
+  if (e == 'SAMPLING') {
+    formData.value.configuration.SampleMethod = 'QTY'
+    formData.value.configuration.AqlList = [
+      {
+        FloorQty: 1,
+        CeilingQty: 2,
+        SampleValue: 1
+      }
+    ]
+  }
+}
+// 改变抽检方式的时候
+function changeSampleMethod(e) {
+  if (e == 'PERCENT') {
+    formData.value.configuration.AqlList.forEach((cur) => {
+      if (cur.SampleValue > 100) {
+        cur.SampleValue = 100
+      }
+    })
+  }
+}
+/** 打开弹窗 */
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({ disabled: true }), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
+
+      querySupplierParams.value.type = formData.value?.condition[0]?.Value || ''
+      getFormSupplierList()
+    } finally {
+      formLoading.value = false
+    }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const hasSameData = (array) => {
+  for (let k = 0; k < array.length; k++) {
+    for (let n = k + 1; n < array.length; n++) {
+      if(array[k].FloorQty <= array[n].FloorQty && array[n].FloorQty<=array[k].CeilingQty){
+        return true
+      }
+    }
+  }
+  return false
+}
+const submitForm = async () => {
+  // 校验表单
+  inputNumberBlur()
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  if (formData.value.priority == 0) {
+    message.error('优先级不可以为0')
+    return
+  }
+  if (hasSameData(formData.value.configuration.AqlList)) {
+    message.error('抽检规则数据范围重叠，请重新填写')
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  if (formData.value.configuration.InspectType != 'SAMPLING') {
+    formData.value.configuration.SampleMethod = ''
+    formData.value.configuration.AqlList = []
+  }
+  try {
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
+      //规则条件集合
+      condition: JSON.stringify(formData.value.condition),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    strategyCode: formStrategyCode.value, //策略代码
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
+    //规则条件集合
+    condition: [
+      // 供应商类型
+      { ParamCode: 'SupplierType', Operator: '==', Value: '' },
+      // 供应商
+      { ParamCode: 'SupplierCode', Operator: '==', Value: '' },
+      // 物料代码
+      { ParamCode: 'ItemCode', Operator: 'IN', Value: [] }
+    ],
+    configuration: {
+      // 检验方式
+      InspectType: 'EXEMPT',
+      // 抽检方式
+      SampleMethod: 'QTY',
+      // 抽检规则列表
+      AqlList: [
+        {
+          FloorQty: 1,
+          CeilingQty: 2,
+          SampleValue: 1
+        }
+      ]
+    },
+    configurationRules: '1' //规则配置验证
+  }
+}
+
+// 添加抽查规则
+const handleAddTable = (item) => {
+  item.push({
+    FloorQty: 1,
+    CeilingQty: 2,
+    SampleValue: 1
+  })
+}
+// 删除抽查规则
+const handleDeleteTable = (item, cur, key) => {
+  item.splice(key, 1)
+}
+//失去焦点的时候验证
+const inputNumberBlur = () => {
+  let arr = []
+  formData.value.configuration.AqlList.forEach((item) => {
+    let bol = false
+    if (!item.FloorQty || !item.CeilingQty || !item.SampleValue) {
+      bol = false
+    } else {
+      bol = true
+    }
+    arr.push(bol)
+  })
+  const isEmpty = arr.some((cur) => {
+    return !cur
+  })
+  if (isEmpty) {
+    formData.value.configurationRules = ''
+    return
+  } else {
+    formData.value.configurationRules = '1'
+  }
+}
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+.button {
+  > div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+
+    > div {
+      margin-left: 6px;
+      text-decoration: underline;
+      color: #409eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue
new file mode 100644
index 000000000..592a96872
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue
@@ -0,0 +1,170 @@
+<!-- 检验策略策略 -->
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="策略名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入策略名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" sortable/>
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'SupplieDeliveryStrategy' })
+
+const queryFormRef = ref() // 搜索的表单
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S003',
+})
+
+/** 查询字典类型列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+]
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create', queryParams.strategyCode)
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示 
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', queryParams.strategyCode, row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
new file mode 100644
index 000000000..7e348f673
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
@@ -0,0 +1,685 @@
+<!-- 管理精度策略弹窗 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="120px"
+        label-position="left"
+      >
+        <!-- 规则 -->
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则条件 -->
+        <div class="item mt-20px">
+          <div class="title">规则条件</div>
+          <el-row>
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 选择供应商和客户 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeSupplierCustomer"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.typeOptions"
+                    :key="index"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="cur in options.supplierList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 选择物料类型 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  @change="changeItemsType"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="item.label"
+                    :value="item.value"
+                    v-for="item in options.itemTypeOptions"
+                    :key="item.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择物料类型"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-if="item.ParamCode == 'ItemType'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择ABC类"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-else-if="item.ParamCode == 'AbcClass'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料分组，多个物料分组以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemGroup'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入项目，多个项目以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'Project'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料，多个物料以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemCode'"
+                />
+              </el-form-item>
+              <!-- 仓库 库区  库位组 库位 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 2">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeWarehouse"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.warehouseTypeOptions"
+                    :key="index"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  :placeholder="`请选择${
+                    item.ParamCode == 'WarehouseCode'
+                      ? '仓库'
+                      : item.ParamCode == 'AreaCode'
+                      ? '库区'
+                      : item.ParamCode == 'LocationGroupCode'
+                      ? '库位组'
+                      : item.ParamCode == 'LocationCode'
+                      ? '库位'
+                      : ''
+                  }`"
+                  clearable
+                  multiple
+                  collapse-tags
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 忽略物料 -->
+              <el-form-item label="忽略物料" class="err-120" v-if="index == 3">
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions2"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入忽略物料，多个忽略物料以逗号分隔"
+                  clearable
+                  multiple
+                  collapse-tags
+                  style="flex: 1"
+                />
+              </el-form-item>
+              <!-- 忽略库位 -->
+              <el-form-item label="忽略库位" class="err-120" v-if="index == 4">
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions2"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入忽略库位，多个忽略库位以逗号分隔"
+                  clearable
+                  multiple
+                  collapse-tags
+                  style="flex: 1"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <!-- 规则配置 -->
+        <div class="item mt-20px">
+          <div class="title">规则配置</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <!-- 存储类型 -->
+              <el-form-item label="管理精度">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.ManagementPrecision">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.MANAGEMENT_MODE)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'UpShelfStrategyAddForm' })
+import { getSupplierList } from '@/api/wms/supplier'
+import { getCustomerList } from '@/api/wms/customer'
+import { getWarehouseList } from '@/api/wms/warehouse'
+import { getAreaList } from '@/api/wms/areabasic'
+import { getLocationgroupList } from '@/api/wms/locationgroup'
+import { getLocationList } from '@/api/wms/location'
+import * as RuleApi from '@/api/wms/rule'
+import { isString } from '@/utils/is'
+
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+
+const formStrategyCode = ref('')
+// form表单数据
+const formData = ref({
+  id: '',
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
+  //规则条件集合
+  condition: [
+    // 供应商
+    { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
+    // 物料类型/物料分组/物料/abc类/项目/
+    { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
+    // 仓库
+    { ParamCode: 'LocationCode', Operator: 'IN', Value: '' },
+    // 忽略物料
+    { ParamCode: 'IgnoreListOfItem', Operator: 'IN', Value: '' },
+    // 忽略库位
+    { ParamCode: 'IgnoreListOfLocation', Operator: 'IN', Value: '' }
+  ],
+  configuration: {
+    // 管理精度
+    ManagementPrecision: 'BY_PACKAGING'
+  }
+})
+// 验证规则
+const rules = ref({
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+})
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' }
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
+  return result
+}
+
+// 下拉框列表集合
+const options = reactive({
+  //范围下拉框列表
+  rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
+  rangeOptions2: formatRangeOptions('IN'),
+  // 供应商客户下拉框列表
+  typeOptions: [
+    { value: 'SupplierCode', label: '供应商' },
+    { value: 'CustomerCode', label: '客户' }
+  ],
+  //供应商列表
+  supplierList: [],
+  // 物料类型列表
+  itemTypeOptions: [
+    { value: 'ItemType', label: '物料类型' },
+    { value: 'ItemGroup', label: '物料分组' },
+    { value: 'ItemCode', label: '物料' },
+    { value: 'Project', label: '项目' },
+    { value: 'AbcClass', label: 'ABC类' }
+  ],
+
+  // 重量体积面积类型列表
+  calculationTypeOptions: [
+    { value: 'Weight', label: '重量' },
+    { value: 'Volume', label: '体积' },
+    { value: 'Area', label: '面积' }
+  ],
+
+  warehouseTypeOptions: [
+    { value: 'WarehouseCode', label: '仓库' },
+    { value: 'AreaCode', label: '库区' },
+    { value: 'LocationGroupCode', label: '库位组' },
+    { value: 'LocationCode', label: '库位' }
+  ],
+  //仓库列表
+  warehouseList: []
+})
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+// 获取供应商列表
+const getFormSupplierList = async () => {
+  options.supplierList = await getSupplierList()
+}
+// 获取客户列表
+const getFormCustomerList = async () => {
+  options.supplierList = await getCustomerList()
+}
+// 选择客户还是承运商
+const changeSupplierCustomer = (e) => {
+  formData.value.condition[0].Value = ''
+  if (e == 'CustomerCode') {
+    getFormCustomerList()
+  } else if (e == 'SupplierCode') {
+    getFormSupplierList()
+  }
+}
+getFormSupplierList()
+// 选择物料类型/物料分组/abc类/物料/项目
+const changeItemsType = () => {
+  formData.value.condition[1].Value = ''
+}
+
+// 获取仓库列表
+const getFormWarehouseList = async () => {
+  options.warehouseList = await getWarehouseList()
+}
+// 获取库区列表
+const getFormAreaList = async () => {
+  options.warehouseList = await getAreaList()
+}
+// 获取库位组列表
+const getFormLocationgrouList = async () => {
+  options.warehouseList = await getLocationgroupList()
+}
+// 获取库位列表
+const getFormLocationList = async () => {
+  options.warehouseList = await getLocationList()
+}
+getFormLocationList()
+// 选择仓库/库位/库位组/库区
+const changeWarehouse = (e) => {
+  formData.value.condition[2].Value = ''
+  if (e == 'WarehouseCode') {
+    getFormWarehouseList()
+  } else if (e == 'AreaCode') {
+    getFormAreaList()
+  } else if (e == 'LocationGroupCode') {
+    getFormLocationgrouList()
+  } else if (e == 'LocationCode') {
+    getFormLocationList()
+  }
+}
+/** 打开弹窗 */
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({ disabled: true }), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+        console.log(formData.value.condition)
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
+      // 判断是获取客户列表还是供应上列表
+      if (formData.value.condition[0].ParamCode == 'SupplierCode') {
+        getFormSupplierList()
+      } else {
+        getFormCustomerList()
+      }
+      // 判断是获取仓库/库位/库位组/库区列表
+      if (formData.value.condition[2].ParamCode == 'WarehouseCode') {
+        getFormWarehouseList()
+      } else if (formData.value.condition[2].ParamCode == 'AreaCode') {
+        getFormAreaList()
+      } else if (formData.value.condition[2].ParamCode == 'LocationGroupCode') {
+        getFormLocationgrouList()
+      } else if (formData.value.condition[2].ParamCode == 'LocationCode') {
+        getFormLocationList()
+      }
+    } finally {
+      formLoading.value = false
+    }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  if (formData.value.priority == 0) {
+    message.error('优先级不可以为0')
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const arr = formData.value.condition.map(item=> {
+       let str = item.Value
+       if(isString(item.Value)){
+        if(item.Value.indexOf('，'>-1)){
+        str = item.Value.split('，').join(',')
+        }
+      }
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+     
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
+      //规则条件集合
+      condition: JSON.stringify(arr),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    strategyCode: formStrategyCode.value, //策略代码id
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
+    //规则条件集合
+    condition: [
+      // 供应商
+      { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
+      // 物料类型/物料分组/物料/abc类/项目/
+      { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
+      // 仓库
+      { ParamCode: 'LocationCode', Operator: 'IN', Value: '' },
+      // 忽略物料
+      { ParamCode: 'IgnoreListOfItem', Operator: 'IN', Value: '' },
+      // 忽略库位
+      { ParamCode: 'IgnoreListOfLocation', Operator: 'IN', Value: '' }
+    ],
+    configuration: {
+      // 管理精度
+      ManagementPrecision: 'BY_PACKAGING'
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-240 .el-form-item__error {
+  padding-left: 240px !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+</style>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue
new file mode 100644
index 000000000..e250778fc
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue
@@ -0,0 +1,172 @@
+<!-- 管理精度策略 -->
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="策略名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入策略名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list"  :default-sort="{ prop: 'priority', order: 'null' }">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" sortable/>
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'SupplieDeliveryStrategy' })
+const queryFormRef = ref() // 搜索的表单
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S009',
+})
+
+/** 查询字典类型列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create', queryParams.strategyCode)
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', queryParams.strategyCode, row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
new file mode 100644
index 000000000..8803a29f9
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
@@ -0,0 +1,491 @@
+
+<!-- 采购收货任务拆分策略弹出层 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <!-- 规则 -->
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="140px"
+        label-position="left"
+      >
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <!-- 规则条件 -->
+        <div class="item mt-20px">
+          <div class="title">规则条件</div>
+          <el-row gutter="10">
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 供应商类型 -->
+              <el-form-item
+                v-if="item.ParamCode == 'SupplierType'"
+                label="供应商类型"
+                class="flex-top err-120"
+              >
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.supplierTypeRangeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择供应商类型"
+                  style="flex: 1"
+                  clearable
+                  @change="changeSupplierType"
+                >
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 供应商 -->
+              <el-form-item
+                v-else-if="item.ParamCode == 'SupplierCode'"
+                label="供应商"
+                class="err-120"
+              >
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.supplierRangeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择供应商"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="cur in options.supplierList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <!-- 规则配置 -->
+        <div class="item mt-20px">
+          <div class="title">规则配置</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <el-form-item label="不拆分">
+                <el-switch  v-model="formData.configuration.NotGroup"  active-value="TRUE" inactive-value="FALSE" @change="changeGroup"/>
+              </el-form-item>
+              <!-- 按零件拆分 -->
+              <el-form-item  label="按零件拆分">
+                <el-switch v-model="formData.configuration.ByItem"  active-value="TRUE" inactive-value="FALSE" @change="changeGroup"/>
+              </el-form-item>
+              <!-- 按库位拆分 -->
+              <el-form-item  label="按库位拆分">
+                <el-switch v-model="formData.configuration.ByLocation"  active-value="TRUE" inactive-value="FALSE" @change="changeGroup"/>
+              </el-form-item>
+              <!--按器具拆分-->
+              <el-form-item label="按器具拆分">
+                <el-switch  v-model="formData.configuration.ByContainer"  active-value="TRUE" inactive-value="FALSE" @change="changeGroup"/>
+              </el-form-item>
+              <!-- 每个任务明细数量 -->
+              <el-form-item label="每个任务明细数量" v-show="false">
+                <el-input-number v-model="formData.configuration.JobDetailCount" :min="0" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'SupplieDeliveryStrategyAddForm' })
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { getSupplierList } from '@/api/wms/supplier'
+import * as RuleApi from '@/api/wms/rule'
+import { object } from 'vue-types'
+import { isString } from '@/utils/is'
+import { log } from 'console';
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+
+const formStrategyCode = ref('')
+// form表单数据
+const formData = ref({
+  id: '',
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
+  //规则条件集合
+  condition: [
+    // 供应商类型
+    { ParamCode: 'SupplierType', Operator: '==', Value: '' },
+    // 供应商
+    { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }
+  ],
+  configuration: {
+    // 不拆分
+    NotGroup: 'FALSE',
+    // 按零件拆分
+    ByItem: 'FALSE',
+    // 按库位拆分
+    ByLocation: 'TRUE',
+    // 按器具拆分
+    ByContainer: 'FALSE',
+    // 每个任务明细数量
+    JobDetailCount: 0
+  }
+})
+
+// 验证规则
+const rules = ref({
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+})
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' }
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
+  return result
+}
+// 下拉框列表集合
+const options = reactive({
+  // 供应商类型范围下拉框列表
+  supplierTypeRangeOptions: formatRangeOptions('=='),
+  // 供应商列表
+  supplierTypeOptions: [
+    { value: 1, label: '标准' },
+    { value: 2, label: '委外' },
+    { value: 3, label: '其他' }
+  ],
+  // 供应商范围下拉框列表
+  supplierRangeOptions: formatRangeOptions('IN', 'NOT IN'),
+  //供应商列表
+  supplierList: [
+    { value: 1, label: '供应商1' },
+    { value: 2, label: '供应商2' },
+    { value: 3, label: '供应商3' }
+  ]
+})
+// 弹窗按钮
+const Butttondata =ref( [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+// 获取供应商列表的参数
+const querySupplierParams = ref({
+  type: ''
+})
+// 获取供应商列表
+const getFormSupplierList = async () => {
+  options.supplierList = await getSupplierList(querySupplierParams.value)
+}
+
+// 选择供应商类型
+const changeSupplierType = (e) => {
+  querySupplierParams.value.type = e
+  formData.value.condition[1].Value = []
+  getFormSupplierList()
+}
+
+const changeGroup = () =>{
+  if(formData.value.configuration.NotGroup == 'TRUE'){
+    formData.value.configuration.ByItem = 'FALSE'
+    formData.value.configuration.ByLocation = 'FALSE'
+    formData.value.configuration.ByContainer = 'FALSE'
+  }else{
+    if(formData.value.configuration.ByItem == 'TRUE'){
+      formData.value.configuration.NotGroup == 'FALSE'
+    }
+    if(formData.value.configuration.ByLocation == 'TRUE'){
+      formData.value.configuration.NotGroup == 'FALSE'
+    }
+    if(formData.value.configuration.ByContainer == 'TRUE'){
+      formData.value.configuration.NotGroup == 'FALSE'
+    }
+  }
+}
+getFormSupplierList()
+
+/** 打开弹窗 */
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+        console.log(Butttondata)
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
+
+      querySupplierParams.value.type = formData.value?.condition[0]?.Value || ''
+      getFormSupplierList()
+    } finally {
+      formLoading.value = false
+    }
+  }else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
+  let list = Object.values(formData.value.configuration)
+  let onlyOne = list.filter((item) => {
+    return item == 'TRUE'
+  })
+  if (onlyOne?.length != 1) {
+    message.error('只能选择一种拆分方式')
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const arr = formData.value.condition.map(item=> {
+       let str = item.Value
+       if(isString(item.Value)){
+        if(item.Value.indexOf('，'>-1)){
+        str = item.Value.split('，').join(',')
+        }
+      }
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+     
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
+      //规则条件集合
+      condition: JSON.stringify(arr),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    strategyCode: formStrategyCode.value, //策略代码
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
+    //规则条件集合
+    condition: [
+      // 供应商类型
+      { ParamCode: 'SupplierType', Operator: '==', Value: '' },
+      // 供应商
+      { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }
+    ],
+    configuration: {
+      // 不拆分
+      NotGroup: 'FALSE',
+      // 按零件拆分
+      ByItem: 'FALSE',
+      // 按库位拆分
+      ByLocation: 'TRUE',
+      // 按器具拆分
+      ByContainer: 'FALSE',
+      // 每个任务明细数量
+      JobDetailCount: 0
+    }
+  }
+}
+
+
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+</style>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue
new file mode 100644
index 000000000..510034c5c
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue
@@ -0,0 +1,173 @@
+
+<!-- 采购收货任务拆分策略 -->
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="策略名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入策略名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list"  :default-sort="{ prop: 'priority', order: 'null' }">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" sortable/>
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'PurchaseReceiptStrategy' })
+const queryFormRef = ref() // 搜索的表单
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S002',
+})
+
+/** 查询字典类型列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create', queryParams.strategyCode)
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', queryParams.strategyCode, row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
new file mode 100644
index 000000000..92c82e6bb
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
@@ -0,0 +1,644 @@
+<!-- 补料策略弹窗 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="120px"
+        label-position="left"
+      >
+        <!-- 规则 -->
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则条件 -->
+        <div class="item mt-20px">
+          <div class="title">规则条件</div>
+          <el-row gutter="10">
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 选择物料类型 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  @change="changeItemsType"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.itemTypeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择物料类型"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-if="item.ParamCode == 'ItemType'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择ABC类"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-else-if="item.ParamCode == 'AbcClass'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料分组，多个物料分组以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemGroup'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入项目，多个项目以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'Project'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料，多个物料以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemCode'"
+                />
+              </el-form-item>
+              <!-- 仓库 库区  库位组 库位 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeWarehouse"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.warehouseTypeOptions"
+                    :key="index"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  :placeholder="`请选择${
+                    item.ParamCode == 'WarehouseCode'
+                      ? '仓库'
+                      : item.ParamCode == 'AreaCode'
+                      ? '库区'
+                      : item.ParamCode == 'LocationGroupCode'
+                      ? '库位组'
+                      : item.ParamCode == 'LocationCode'
+                      ? '库位'
+                      : ''
+                  }`"
+                  clearable
+                  multiple
+                  collapse-tags
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则配置 -->
+        <div class="item mt-20px">
+          <div class="title">规则配置</div>
+          <el-row gutter="10">
+            <!-- 最大库存 -->
+            <el-col :span="24">
+              <el-form-item
+                label="最大库存"
+                prop="configuration.MaxQty"
+                :rules="[{ required: true, message: '请输入最小库存', trigger: 'change' }]"
+              >
+                <el-input-number
+                  v-model="formData.configuration.MaxQty"
+                  :min="-1"
+                  controls-position="right"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 最小库存 -->
+            <el-col :span="24">
+              <el-form-item
+                label="最小库存"
+                prop="configuration.MinQty"
+                :rules="[
+                  { required: true, message: '请输入最小库存', trigger: 'change' },
+                  { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change' }
+                ]"
+              >
+                <el-input-number
+                  v-model="formData.configuration.MinQty"
+                  :min="0"
+                  :max="
+                    formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity
+                  "
+                  controls-position="right"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 安全库存 -->
+            <el-col :span="24">
+              <el-form-item
+                label="安全库存"
+                prop="configuration.SafetyQty"
+                :rules="[
+                  { required: true, message: '请输入安全库存', trigger: 'change' },
+                  { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change' }
+                ]"
+              >
+                <el-input-number
+                  v-model="formData.configuration.SafetyQty"
+                  :min="0"
+                  :max="
+                    formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity
+                  "
+                  controls-position="right"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 补料数量 -->
+            <el-col :span="24">
+              <el-form-item
+                label="补料数量"
+                prop="configuration.FeedQty"
+                :rules="[
+                  { required: true, message: '请输入补料数量', trigger: 'change' },
+                  { validator: validatorNum, message: '不可以大于最大库存', trigger: 'change' }
+                ]"
+              >
+                <el-input-number
+                  v-model="formData.configuration.FeedQty"
+                  :min="0"
+                  :max="
+                    formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity
+                  "
+                  controls-position="right"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'UpShelfStrategyAddForm' })
+import { getWarehouseList } from '@/api/wms/warehouse'
+import { getAreaList } from '@/api/wms/areabasic'
+import { getLocationgroupList } from '@/api/wms/locationgroup'
+import { getLocationList } from '@/api/wms/location'
+import * as RuleApi from '@/api/wms/rule'
+import { isString } from '@/utils/is'
+
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+
+const formStrategyCode = ref('')
+// form表单数据
+const formData = ref({
+  id: '',
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
+  //规则条件集合
+  condition: [
+    // 物料类型/物料分组/物料/abc类/项目/
+    { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' },
+    // 仓库
+    { ParamCode: 'LocationCode', Operator: 'IN', Value: '' }
+  ],
+  configuration: {
+    // 最大库存
+    MaxQty: 0,
+    // 最小库存
+    MinQty: 0,
+    // 安全库存
+    SafetyQty: 0,
+    // 补料数量
+    FeedQty: 0
+  }
+})
+
+// 验证规则
+const rules = ref({
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+})
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' }
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
+  return result
+}
+
+// 下拉框列表集合
+const options = reactive({
+  //范围下拉框列表
+  rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
+
+  // 物料类型列表
+  itemTypeOptions: [
+    { value: 'ItemGroup', label: '物料分组' },
+    { value: 'ItemCode', label: '物料' },
+    { value: 'Project', label: '项目' }
+  ],
+
+  //仓库列表
+  warehouseTypeOptions: [
+    { value: 'WarehouseCode', label: '仓库' },
+    { value: 'AreaCode', label: '库区' },
+    { value: 'LocationGroupCode', label: '库位组' },
+    { value: 'LocationCode', label: '库位' }
+  ],
+  warehouseList: [],
+  // 溢流库位列表
+  overflowWarehouseList: []
+})
+
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+// 选择物料类型/物料分组/abc类/物料/项目
+const changeItemsType = () => {
+  formData.value.condition[0].Value = ''
+}
+
+// 获取仓库列表
+const getFormWarehouseList = async () => {
+  options.warehouseList = await getWarehouseList()
+}
+// 获取库区列表
+const getFormAreaList = async () => {
+  options.warehouseList = await getAreaList()
+}
+// 获取库位组列表
+const getFormLocationgrouList = async () => {
+  options.warehouseList = await getLocationgroupList()
+}
+// 获取库位列表
+const getFormLocationList = async (queryParms) => {
+  if (queryParms) {
+    options.overflowWarehouseList = await getLocationList(queryParms)
+  } else {
+    options.warehouseList = await getLocationList()
+  }
+}
+getFormLocationList()
+// 获取溢流库位
+const queryParms = {
+  type: 'OVERFLOW'
+}
+getFormLocationList(queryParms)
+// 选择仓库/库位/库位组/库区
+const changeWarehouse = (e) => {
+  formData.value.condition[1].Value = ''
+  if (e == 'WarehouseCode') {
+    getFormWarehouseList()
+  } else if (e == 'AreaCode') {
+    getFormAreaList()
+  } else if (e == 'LocationGroupCode') {
+    getFormLocationgrouList()
+  } else if (e == 'LocationCode') {
+    getFormLocationList()
+  }
+}
+/** 打开弹窗 */
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({ disabled: true }), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+        console.log(formData.value.condition)
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
+
+      // 判断是获取仓库/库位/库位组/库区列表
+      if (formData.value.condition[1].ParamCode == 'WarehouseCode') {
+        getFormWarehouseList()
+      } else if (formData.value.condition[1].ParamCode == 'AreaCode') {
+        getFormAreaList()
+      } else if (formData.value.condition[1].ParamCode == 'LocationGroupCode') {
+        getFormLocationgrouList()
+      } else if (formData.value.condition[1].ParamCode == 'LocationCode') {
+        getFormLocationList()
+      }
+    } finally {
+      formLoading.value = false
+    }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  if (formData.value.priority == 0) {
+    message.error('优先级不可以为0')
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const arr = formData.value.condition.map(item=> {
+       let str = item.Value
+       if(isString(item.Value)){
+        if(item.Value.indexOf('，'>-1)){
+        str = item.Value.split('，').join(',')
+        }
+      }
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+     
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
+    console.log(arr)
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
+      //规则条件集合
+      condition: JSON.stringify(arr),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    strategyCode: formStrategyCode.value, //策略代码id
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
+    //规则条件集合
+    condition: [
+      // 物料类型/物料分组/物料/abc类/项目/
+      { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' },
+      // 仓库
+      { ParamCode: 'LocationCode', Operator: 'IN', Value: '' }
+    ],
+    configuration: {
+      // 最大库存
+      MaxQty: 0,
+      // 最小库存
+      MinQty: 0,
+      // 安全库存
+      SafetyQty: 0,
+      // 补料数量
+      FeedQty: 0
+    }
+  }
+}
+
+const validatorNum = (rule: any, value: any, callback: any) => {
+  if (value && formData.value.configuration.MaxQty != -1) {
+    if (value > formData.value.configuration.MaxQty) {
+      callback(new Error('11'))
+    } else {
+      callback()
+    }
+  } else {
+    callback()
+  }
+}
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-240 .el-form-item__error {
+  padding-left: 240px !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+
+::v-deep .err-130 .el-form-item__error {
+  padding-left: 130px !important;
+}
+</style>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue
new file mode 100644
index 000000000..bdf874b67
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue
@@ -0,0 +1,172 @@
+<!-- 补料策略 -->
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="策略名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入策略名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list"  :default-sort="{ prop: 'priority', order: 'null' }">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" sortable/>
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'SupplieDeliveryStrategy' })
+const queryFormRef = ref() // 搜索的表单
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S008',
+})
+
+/** 查询字典类型列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create', queryParams.strategyCode)
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', queryParams.strategyCode, row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
new file mode 100644
index 000000000..bf94f6038
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
@@ -0,0 +1,635 @@
+<!-- 存储容量策略弹窗 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="120px"
+        label-position="left"
+      >
+        <!-- 规则 -->
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则条件 -->
+        <div class="item mt-20px">
+          <div class="title">规则条件</div>
+          <el-row gutter="10">
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 选择物料类型 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  @change="changeItemsType"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.itemTypeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择物料类型"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-if="item.ParamCode == 'ItemType'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择ABC类"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-else-if="item.ParamCode == 'AbcClass'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料分组，多个物料分组以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemGroup'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入项目，多个项目以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'Project'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料，多个物料以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemCode'"
+                />
+              </el-form-item>
+              <!-- 仓库 库区  库位组 库位 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeWarehouse"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.warehouseTypeOptions"
+                    :key="index"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  :placeholder="`请选择${
+                    item.ParamCode == 'WarehouseCode'
+                      ? '仓库'
+                      : item.ParamCode == 'AreaCode'
+                      ? '库区'
+                      : item.ParamCode == 'LocationGroupCode'
+                      ? '库位组'
+                      : item.ParamCode == 'LocationCode'
+                      ? '库位'
+                      : ''
+                  }`"
+                  clearable
+                  multiple
+                  collapse-tags
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则配置 -->
+        <div class="item mt-20px">
+          <div class="title">规则配置</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <!-- 存储类型 -->
+              <el-form-item label="存储类型">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.StorageType">
+                    <el-radio label="NOTLIMIT">不限制</el-radio>
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 存储容量 -->
+            <el-col :span="24">
+              <el-form-item label="存储容量">
+                <el-input
+                  v-model="formData.configuration.StorageQty"
+                  placeholder="请输入存储容量"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 替代存储类型 -->
+            <el-col :span="24">
+              <el-form-item label="替代存储类型">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.AltStorageType">
+                    <el-radio label="NOTLIMIT">不限制</el-radio>
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 替代容量 -->
+            <el-col :span="24">
+              <el-form-item label="替代容量">
+                <el-input
+                  v-model="formData.configuration.AltStorageQty"
+                  placeholder="请输入替代容量"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 固定位置 -->
+            <el-col :span="24">
+              <el-form-item label="固定位置">
+                <el-switch
+                  v-model="formData.configuration.IsFixed"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 占用相邻库位 -->
+            <el-col :span="24">
+              <el-form-item label="占用相邻库位">
+                <el-switch
+                  v-model="formData.configuration.IsOccupyAdjacent"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'UpShelfStrategyAddForm' })
+import { getWarehouseList } from '@/api/wms/warehouse'
+import { getAreaList } from '@/api/wms/areabasic'
+import { getLocationgroupList } from '@/api/wms/locationgroup'
+import { getLocationList } from '@/api/wms/location'
+import * as RuleApi from '@/api/wms/rule'
+import { isString } from '@/utils/is'
+
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+
+const formStrategyCode = ref('')
+// form表单数据
+const formData = ref({
+  id: '',
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
+  //规则条件集合
+  condition: [
+    // 物料类型/物料分组/物料/abc类/项目/
+    { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' },
+    // 仓库
+    { ParamCode: 'LocationCode', Operator: 'IN', Value: '' }
+  ],
+  configuration: {
+    // 存储类型
+    StorageType: 'NOTLIMIT',
+    // 存储容量
+    StorageQty: '',
+    // 替代存储类型
+    AltStorageType: 'NOTLIMIT',
+    // 替代容量
+    AltStorageQty: '',
+    // 是否定制位置
+    IsFixed: 'FALSE',
+    // 是否占用相邻库位
+    IsOccupyAdjacent: 'FALSE'
+  }
+})
+// 验证规则
+const rules = ref({
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+})
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' }
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
+  return result
+}
+
+// 下拉框列表集合
+const options = reactive({
+  //范围下拉框列表
+  rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
+
+  // 物料类型列表
+  itemTypeOptions: [
+    { value: 'ItemGroup', label: '物料分组' },
+    { value: 'ItemCode', label: '物料' },
+    { value: 'Project', label: '项目' }
+  ],
+
+  //仓库列表
+  warehouseTypeOptions: [
+    { value: 'WarehouseCode', label: '仓库' },
+    { value: 'AreaCode', label: '库区' },
+    { value: 'LocationGroupCode', label: '库位组' },
+    { value: 'LocationCode', label: '库位' }
+  ],
+  warehouseList: [],
+  // 溢流库位列表
+  overflowWarehouseList: []
+})
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+// 选择物料类型/物料分组/abc类/物料/项目
+const changeItemsType = () => {
+  formData.value.condition[0].Value = ''
+}
+
+// 获取仓库列表
+const getFormWarehouseList = async () => {
+  options.warehouseList = await getWarehouseList()
+}
+// 获取库区列表
+const getFormAreaList = async () => {
+  options.warehouseList = await getAreaList()
+}
+// 获取库位组列表
+const getFormLocationgrouList = async () => {
+  options.warehouseList = await getLocationgroupList()
+}
+// 获取库位列表
+const getFormLocationList = async (queryParms) => {
+  if (queryParms) {
+    options.overflowWarehouseList = await getLocationList(queryParms)
+  } else {
+    options.warehouseList = await getLocationList()
+  }
+}
+getFormLocationList()
+// 获取溢流库位
+const queryParms = {
+  type: 'OVERFLOW'
+}
+getFormLocationList(queryParms)
+// 选择仓库/库位/库位组/库区
+const changeWarehouse = (e) => {
+  formData.value.condition[1].Value = ''
+  if (e == 'WarehouseCode') {
+    getFormWarehouseList()
+  } else if (e == 'AreaCode') {
+    getFormAreaList()
+  } else if (e == 'LocationGroupCode') {
+    getFormLocationgrouList()
+  } else if (e == 'LocationCode') {
+    getFormLocationList()
+  }
+}
+/** 打开弹窗 */
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
+
+      // 判断是获取仓库/库位/库位组/库区列表
+      if (formData.value.condition[1].ParamCode == 'WarehouseCode') {
+        getFormWarehouseList()
+      } else if (formData.value.condition[1].ParamCode == 'AreaCode') {
+        getFormAreaList()
+      } else if (formData.value.condition[1].ParamCode == 'LocationGroupCode') {
+        getFormLocationgrouList()
+      } else if (formData.value.condition[1].ParamCode == 'LocationCode') {
+        getFormLocationList()
+      }
+    } finally {
+      formLoading.value = false
+    }
+  }else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const arr = formData.value.condition.map(item=> {
+       let str = item.Value
+       if(isString(item.Value)){
+        if(item.Value.indexOf('，'>-1)){
+        str = item.Value.split('，').join(',')
+        }
+      }
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+     
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
+      //规则条件集合
+      condition: JSON.stringify(arr),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    strategyCode: formStrategyCode.value, //策略代码id
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
+    //规则条件集合
+    condition: [
+      // 物料类型/物料分组/物料/abc类/项目/
+      { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' },
+      // 仓库
+      { ParamCode: 'LocationCode', Operator: 'IN', Value: '' }
+    ],
+    configuration: {
+      // 存储类型
+      StorageType: 'NOTLIMIT',
+      // 存储容量
+      StorageQty: '',
+      // 替代存储类型
+      AltStorageType: 'NOTLIMIT',
+      // 替代容量
+      AltStorageQty: '',
+      // 是否定制位置
+      IsFixed: 'FALSE',
+      // 是否占用相邻库位
+      IsOccupyAdjacent: 'FALSE'
+    }
+  }
+}
+
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-240 .el-form-item__error {
+  padding-left: 240px !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+
+::v-deep .err-130 .el-form-item__error {
+  padding-left: 130px !important;
+}
+</style>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue
new file mode 100644
index 000000000..c85449469
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue
@@ -0,0 +1,172 @@
+<!-- 存储容量策略 -->
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="策略名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入策略名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" sortable/>
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'SupplieDeliveryStrategy' })
+const queryFormRef = ref() // 搜索的表单
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S006',
+})
+
+/** 查询字典类型列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create', queryParams.strategyCode)
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', queryParams.strategyCode, row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
new file mode 100644
index 000000000..d4e869471
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -0,0 +1,584 @@
+
+<!-- 采购计划策略弹出层 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="120px"
+        label-position="left"
+      >
+        <!-- 规则 -->
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <!-- 规则条件 -->
+        <div class="item mt-20px">
+          <div class="title">规则条件</div>
+          <el-row>
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 供应商类型 -->
+              <el-form-item
+                v-if="item.ParamCode == 'SupplierType'"
+                label="供应商类型"
+                class="flex-top err-120"
+              >
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.supplierTypeRangeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择供应商类型"
+                  style="flex: 1"
+                  clearable
+                  @change="changeSupplierType"
+                >
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 供应商 -->
+              <el-form-item
+                v-else-if="item.ParamCode == 'SupplierCode'"
+                label="供应商"
+                class="err-120"
+              >
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.supplierRangeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择供应商"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="cur in options.supplierList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 星期几 -->
+              <el-form-item
+                v-else-if="item.ParamCode == 'Weekday'"
+                label="星期几"
+                class="flex-top err-120"
+              >
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.weekRangeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <div class="checkbox">
+                  <el-checkbox-group v-model="item.Value">
+                    <el-checkbox
+                      :label="cur.label"
+                      v-for="cur in options.weekOptions"
+                      :key="cur.value"
+                    />
+                  </el-checkbox-group>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <!-- 规则配置 -->
+        <div class="item mt-20px">
+          <div class="title">规则配置</div>
+          <el-row>
+            <!-- 开始时间 -->
+            <el-col :span="24">
+              <!-- 开始时间 -->
+              <el-form-item label="开始时间" prop="BeginTime">
+                <el-time-select
+                  v-model="formData.configuration.BeginTime"
+                  start="00:00"
+                  end="23:59"
+                  step="00:15"
+                  placeholder="请选择开始时间"
+                  style="width: 100%"
+                />
+              </el-form-item>
+              <!-- 结束时间 -->
+              <el-form-item label="结束时间" prop="EndTime">
+                <el-time-select
+                  v-model="formData.configuration.EndTime"
+                  start="00:00"
+                  end="23:59"
+                  step="00:15"
+                  placeholder="请选择结束时间"
+                  style="width: 100%"
+                />
+              </el-form-item>
+              <!-- 仓库 -->
+              <el-form-item label="仓库" prop="WarehouseCode">
+                <el-select
+                  v-model="formData.configuration.WarehouseCode"
+                  :placeholder="`请选择${
+                    formData.configuration.WarehouseCode == 'WarehouseCode'
+                      ? '仓库'
+                      : formData.configuration.WarehouseCode == 'AreaCode'
+                      ? '库区'
+                      : formData.configuration.WarehouseCode == 'LocationGroupCode'
+                      ? '库位组'
+                      : formData.configuration.WarehouseCode == 'LocationCode'
+                      ? '库位'
+                      : ''
+                  }`"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 月台 -->
+              <el-form-item label="月台" prop="DockCode">
+                <el-select
+                  v-model="formData.configuration.DockCode"
+                  placeholder="请选择月台"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in options.dockList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 在途库位 -->
+              <el-form-item label="在途库位" prop="OnTheWayLocationCode">
+                <el-select
+                  v-model="formData.configuration.OnTheWayLocationCode"
+                  placeholder="请选择在途库位"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in options.locationList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'SupplieDeliveryStrategyAddForm' })
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { getSupplierList } from '@/api/wms/supplier'
+import { getWarehouseList } from '@/api/wms/warehouse'
+import { getDockList } from '@/api/wms/dock'
+import { getLocationList } from '@/api/wms/location'
+import * as RuleApi from '@/api/wms/rule'
+import { isString } from '@/utils/is'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+
+const formStrategyCode = ref('')
+// form表单数据
+const formData = ref({
+  id: '',
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
+  //规则条件集合
+  condition: [
+    // 供应商类型
+    { ParamCode: 'SupplierType', Operator: '==', Value: '' },
+    // 供应商
+    { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
+    // 星期几
+    { ParamCode: 'Weekday', Operator: 'IN', Value: [] }
+  ],
+  configuration: {
+    // 开始时间
+    BeginTime: '',
+    // 结束时间
+    EndTime: '',
+    // 仓库代码
+    WarehouseCode: '',
+    // 月台代码
+    DockCode: '',
+    // 在途库位代码
+    OnTheWayLocationCode: ''
+  }
+})
+
+// 验证规则
+const rules = ref({
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+})
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' }
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
+  return result
+}
+// 下拉框列表集合
+const options = reactive({
+  // 供应商类型范围下拉框列表
+  supplierTypeRangeOptions: formatRangeOptions('=='),
+  // 供应商列表
+  supplierTypeOptions: [],
+  // 供应商范围下拉框列表
+  supplierRangeOptions: formatRangeOptions('IN', 'NOT IN'),
+  //供应商列表
+  supplierList: [],
+  // 星期几范围下拉框列表
+  weekRangeOptions: formatRangeOptions('IN', 'NOT IN'),
+  //星期几列表
+  weekOptions: [
+    { value: 1, label: '星期一' },
+    { value: 2, label: '星期二' },
+    { value: 3, label: '星期三' },
+    { value: 4, label: '星期四' },
+    { value: 5, label: '星期五' },
+    { value: 6, label: '星期六' },
+    { value: 7, label: '星期日' }
+  ],
+  //仓库列表
+  warehouseList: [],
+  //月台列表
+  dockList: [],
+  //在途库位列表
+  locationList: []
+})
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
+// 获取供应商列表的参数
+const querySupplierParams = ref({
+  type: ''
+})
+
+// 获取供应商列表
+const getFormSupplierList = async () => {
+  options.supplierList = await getSupplierList(querySupplierParams.value)
+}
+
+// 选择供应商类型
+const changeSupplierType = (e) => {
+  querySupplierParams.value.type = e
+  formData.value.condition[1].Value = []
+  getFormSupplierList()
+}
+
+// 获取仓库列表
+const getFormWarehouseList = async () => {
+  options.warehouseList = await getWarehouseList()
+}
+// 获取月台列表
+const getFormDockList = async () => {
+  options.dockList = await getDockList()
+}
+// 获取库位列表
+const getFormLocationList = async () => {
+  options.locationList = await getLocationList({ type: 'TRANSPORT' })
+}
+
+getFormSupplierList()
+getFormWarehouseList()
+getFormDockList()
+getFormLocationList()
+
+/** 打开弹窗 */
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({ disabled: true }), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
+      querySupplierParams.value.type = formData.value?.condition[0]?.Value || ''
+      getFormSupplierList()
+    } finally {
+      formLoading.value = false
+    }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  if (formData.value.priority == 0) {
+    message.error('优先级不可以为0')
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const arr = formData.value.condition.map(item=> {
+       let str = item.Value
+       if(isString(item.Value)){
+        if(item.Value.indexOf('，'>-1)){
+        str = item.Value.split('，').join(',')
+        }
+      }
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+     
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
+      //规则条件集合
+      condition: JSON.stringify(arr),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    strategyCode: formStrategyCode.value, //策略代码
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
+    //规则条件集合
+    condition: [
+      // 供应商类型
+      { ParamCode: 'SupplierType', Operator: '==', Value: '' },
+      // 供应商
+      { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
+      // 星期几
+      { ParamCode: 'Weekday', Operator: 'IN', Value: [] }
+    ],
+    configuration: {
+      // 开始时间
+      BeginTime: '',
+      // 结束时间
+      EndTime: '',
+      // 仓库代码
+      WarehouseCode: '',
+      // 月台代码
+      DockCode: '',
+      // 在途库位代码
+      OnTheWayLocationCode: ''
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+</style>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
new file mode 100644
index 000000000..0bd00e4c3
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
@@ -0,0 +1,173 @@
+
+<!-- 采购计划策略 -->
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="策略名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入策略名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" sortable/>
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'SupplieDeliveryStrategy' })
+const queryFormRef = ref() // 搜索的表单
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S001',
+})
+
+/** 查询字典类型列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create', queryParams.strategyCode)
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', queryParams.strategyCode, row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
new file mode 100644
index 000000000..1151aaf81
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -0,0 +1,954 @@
+<!-- 上架策略弹窗 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="120px"
+        label-position="left"
+      >
+        <!-- 规则 -->
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority"  :min="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则条件 -->
+
+        <div class="item mt-20px">
+          <div class="title">规则条件</div>
+          <el-row>
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 选择供应商和客户 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeSupplierCustomer"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.typeOptions"
+                    :key="index"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="cur in options.supplierList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 选择物料类型 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  @change="changeItemsType"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="item.label"
+                    :value="item.value"
+                    v-for="item in options.itemTypeOptions"
+                    :key="item.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择物料类型"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-if="item.ParamCode == 'ItemType'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择ABC类"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-else-if="item.ParamCode == 'AbcClass'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料分组，多个物料分组以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemGroup'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入项目，多个项目以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'Project'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料，多个物料以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemCode'"
+                />
+              </el-form-item>
+              <!-- 选择重量体积还是面积 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 2">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  @change="changeCalculation"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.calculationTypeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions2"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-input
+                  v-model="item.Value"
+                  :placeholder="`请输入${
+                    item.ParamCode == 'Weight' ? '重量' : item.ParamCode == 'Area' ? '面积' : '体积'
+                  }`"
+                  clearable
+                  style="flex: 1"
+                />
+              </el-form-item>
+              <!-- 库存状态 -->
+              <el-form-item label="库存状态" class="err-120" v-if="index == 3">
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择库存状态"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 存储类型 -->
+              <el-form-item label="存储类型" class="err-120" v-if="index == 4">
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择存储类型"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 库存事务 -->
+              <el-form-item label="库存事务" class="err-120" v-if="index == 5">
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入库存事务，多个库存事务以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则配置 -->
+        <div class="item mt-20px">
+          <div class="title">规则配置</div>
+          <el-row>
+            <!-- 仓库 库区  库位组 库位 -->
+            <el-col :span="24">
+              <el-form-item label="" label-width="0" prop="warehouse" class="err-120">
+                <el-select
+                  v-model="warehouseType"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeWarehouse"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.warehouseTypeOptions"
+                    :key="index"
+                  />
+                </el-select>
+                <el-select
+                  v-model="formData.configuration.WarehouseCode"
+                  v-if="warehouseType == 'WarehouseCode'"
+                  placeholder="请选择仓库"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+                <el-select
+                  v-model="formData.configuration.AreaCode"
+                  v-if="warehouseType == 'AreaCode'"
+                  placeholder="请选择库区"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+                <el-select
+                  v-model="formData.configuration.LocationGroupCode"
+                  v-if="warehouseType == 'LocationGroupCode'"
+                  placeholder="请选择库位组"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+
+                <el-select
+                  v-model="formData.configuration.LocationCode"
+                  v-if="warehouseType == 'LocationCode'"
+                  placeholder="请选择库位"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- 优先空位库 -->
+            <el-col :span="24">
+              <el-form-item label="优先空位库">
+                <el-switch
+                  v-model="formData.configuration.EmptyLocationFirst"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 优先非空位库 -->
+            <el-col :span="24">
+              <el-form-item label="优先非空位库">
+                <el-switch
+                  v-model="formData.configuration.NotEmptyLocationFirst"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 可以混物料 -->
+            <el-col :span="24">
+              <el-form-item label="可以混物料">
+                <el-switch
+                  v-model="formData.configuration.EnableMixItem"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 可以混批次 -->
+            <el-col :span="24">
+              <el-form-item label="可以混批次">
+                <el-switch
+                  v-model="formData.configuration.EnableMixLot"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 可以混状态 -->
+            <el-col :span="24">
+              <el-form-item label="可以混状态">
+                <el-switch
+                  v-model="formData.configuration.EnableMixStatus"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 巷道排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="巷道排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.AisleOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 货架排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="货架排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.ShelfOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 货架排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="货架排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.RowOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 列排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="列排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.ColumOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'UpShelfStrategyAddForm' })
+import { getSupplierList } from '@/api/wms/supplier'
+import { getCustomerList } from '@/api/wms/customer'
+import { getWarehouseList } from '@/api/wms/warehouse'
+import { getAreaList } from '@/api/wms/areabasic'
+import { getLocationgroupList } from '@/api/wms/locationgroup'
+import { getLocationList } from '@/api/wms/location'
+import * as RuleApi from '@/api/wms/rule'
+
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { isString } from '@/utils/is'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+
+const formStrategyCode = ref('')
+
+// 仓库类型
+const warehouseType = ref('WarehouseCode')
+
+// form表单数据
+const formData = ref({
+  id: '',
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
+  //规则条件集合
+  condition: [
+    // 供应商
+    { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
+    // 物料类型/物料分组/物料/abc类/项目/
+    { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
+    // 重量/体积/面积
+    { ParamCode: 'Weight', Operator: '>', Value: [] },
+    // 库存状态
+    { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
+    // 存储类型
+    { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
+    // 库存事务
+    { ParamCode: 'TransactionType', Operator: 'IN', Value: [] }
+  ],
+  configuration: {
+    // 仓库代码
+    WarehouseCode: '',
+    // 库区代码
+    AreaCode: '',
+    // 库位组代码
+    LocationGroupCode: '',
+    // 库位代码
+    LocationCode: '',
+    // 优先空库位
+    EmptyLocationFirst: 'FALSE',
+    // 优先非空库位
+    NotEmptyLocationFirst: 'FALSE',
+    // 可以混物料
+    EnableMixItem: 'TRUE',
+    // 可以混批次
+    EnableMixLot: 'TRUE',
+    // 可以混状态
+    EnableMixStatus: 'TRUE',
+    // 巷道排序方向
+    AisleOrder: 'ASC',
+    // 货架排序方向
+    ShelfOrder: 'ASC',
+    // 行排序方向
+    RowOrder: 'ASC',
+    // 列排序方向
+    ColumOrder: 'ASC'
+  }
+})
+// 验证规则
+const rules = ref({
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+})
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' }
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
+  return result
+}
+
+// 下拉框列表集合
+const options = reactive({
+  //范围下拉框列表
+  rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
+  rangeOptions2: formatRangeOptions('>', '<', '>=', '<='),
+  // 供应商客户下拉框列表
+  typeOptions: [
+    { value: 'SupplierCode', label: '供应商' },
+    { value: 'CustomerCode', label: '客户' }
+  ],
+  //供应商列表
+  supplierList: [],
+  // 物料类型列表
+  itemTypeOptions: [
+    { value: 'ItemType', label: '物料类型' },
+    { value: 'ItemGroup', label: '物料分组' },
+    { value: 'ItemCode', label: '物料' },
+    { value: 'Project', label: '项目' },
+    { value: 'AbcClass', label: 'ABC类' }
+  ],
+
+  // 重量体积面积类型列表
+  calculationTypeOptions: [
+    { value: 'Weight', label: '重量' },
+    { value: 'Volume', label: '体积' },
+    { value: 'Area', label: '面积' }
+  ],
+
+  warehouseTypeOptions: [
+    { value: 'WarehouseCode', label: '仓库' },
+    { value: 'AreaCode', label: '库区' },
+    { value: 'LocationGroupCode', label: '库位组' },
+    { value: 'LocationCode', label: '库位' }
+  ],
+  //仓库列表
+  warehouseList: []
+})
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+// 获取供应商列表
+const getFormSupplierList = async () => {
+  options.supplierList = await getSupplierList()
+}
+// 获取客户列表
+const getFormCustomerList = async () => {
+  options.supplierList = await getCustomerList()
+}
+// 选择客户还是承运商
+const changeSupplierCustomer = (e) => {
+  formData.value.condition[0].Value = ''
+  if (e == 'CustomerCode') {
+    getFormCustomerList()
+  } else if (e == 'SupplierCode') {
+    getFormSupplierList()
+  }
+}
+getFormSupplierList()
+// 选择物料类型/物料分组/abc类/物料/项目
+const changeItemsType = () => {
+  formData.value.condition[1].Value = ''
+}
+// 选择重量/体积/面积
+const changeCalculation = () => {
+  formData.value.condition[2].Value = ''
+}
+// 获取仓库列表
+const getFormWarehouseList = async () => {
+  options.warehouseList = await getWarehouseList()
+}
+// 获取库区列表
+const getFormAreaList = async () => {
+  options.warehouseList = await getAreaList()
+}
+// 获取库位组列表
+const getFormLocationgrouList = async () => {
+  options.warehouseList = await getLocationgroupList()
+}
+// 获取库位列表
+const getFormLocationList = async () => {
+  options.warehouseList = await getLocationList()
+}
+getFormLocationList()
+// 选择仓库/库位/库位组/库区
+const changeWarehouse = (e) => {
+  formData.value.configuration.WarehouseCode = ''
+  formData.value.configuration.AreaCode = ''
+  formData.value.configuration.LocationGroupCode = ''
+  formData.value.configuration.LocationCode = ''
+  if (e == 'WarehouseCode') {
+    getFormWarehouseList()
+  } else if (e == 'AreaCode') {
+    getFormAreaList()
+  } else if (e == 'LocationGroupCode') {
+    getFormLocationgrouList()
+  } else if (e == 'LocationCode') {
+    getFormLocationList()
+  }
+}
+/** 打开弹窗 */
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  warehouseType.value = 'WarehouseCode'
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+        console.log(Butttondata)
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
+      // 判断是获取客户列表还是供应上列表
+      if (formData.value.condition[0].ParamCode == 'SupplierCode') {
+        getFormSupplierList()
+      } else {
+        getFormCustomerList()
+      }
+      // 判断是获取仓库/库位/库位组/库区列表
+      if (
+        'WarehouseCode' in formData.value.configuration &&
+        formData.value.configuration.WarehouseCode
+      ) {
+        warehouseType.value = 'WarehouseCode'
+        getFormWarehouseList()
+      } else if (
+        'AreaCode' in formData.value.configuration &&
+        formData.value.configuration.AreaCode
+      ) {
+        warehouseType.value = 'AreaCode'
+        getFormAreaList()
+      } else if (
+        'LocationGroupCode' in formData.value.configuration &&
+        formData.value.configuration.LocationGroupCode
+      ) {
+        warehouseType.value = 'LocationGroupCode'
+        getFormLocationgrouList()
+      } else if (
+        'LocationCode' in formData.value.configuration &&
+        formData.value.configuration.LocationCode
+      ) {
+        warehouseType.value = 'LocationCode'
+        getFormLocationList()
+      }
+    } finally {
+      formLoading.value = false
+    }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const arr = formData.value.condition.map(item=> {
+       let str = item.Value
+       if(isString(item.Value)){
+        if(item.Value.indexOf('，'>-1)){
+        str = item.Value.split('，').join(',')
+        }
+      }
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+     
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
+      //规则条件集合
+      condition: JSON.stringify(arr),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    strategyCode: formStrategyCode.value, //策略代码id
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
+    //规则条件集合
+    condition: [
+      // 供应商
+      { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
+      // 物料类型/物料分组/物料/abc类/项目/
+      { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
+      // /重量/体积/面积
+      { ParamCode: 'Weight', Operator: '>', Value: [] },
+      // 库存状态
+      { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
+      // 存储类型
+      { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
+      // 库存事务
+      { ParamCode: 'TransactionType', Operator: 'IN', Value: [] }
+    ],
+    configuration: {
+      // 仓库代码
+      WarehouseCode: '',
+      // 库区代码
+      AreaCode: '',
+      // 库位组代码
+      LocationGroupCode: '',
+      // 库位代码
+      LocationCode: '',
+      // 优先空库位
+      EmptyLocationFirst: 'FALSE',
+      // 优先非空库位
+      NotEmptyLocationFirst: 'FALSE',
+      // 可以混物料
+      EnableMixItem: 'TRUE',
+      // 可以混批次
+      EnableMixLot: 'TRUE',
+      // 可以混状态
+      EnableMixStatus: 'TRUE',
+      // 巷道排序方向
+      AisleOrder: 'ASC',
+      // 货架排序方向
+      ShelfOrder: 'ASC',
+      // 行排序方向
+      RowOrder: 'ASC',
+      // 列排序方向
+      ColumOrder: 'ASC'
+    }
+  }
+}
+
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-240 .el-form-item__error {
+  padding-left: 240px !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+</style>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
new file mode 100644
index 000000000..5b08f93b7
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
@@ -0,0 +1,175 @@
+
+<!-- 上架策略 -->
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="策略名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入策略名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" sortable/>
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'SupplieDeliveryStrategy' })
+const queryFormRef = ref() // 搜索的表单
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S005',
+})
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create', queryParams.strategyCode)
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', queryParams.strategyCode, row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
new file mode 100644
index 000000000..499539ab3
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
@@ -0,0 +1,490 @@
+<!-- 器具容量策略弹窗 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="120px"
+        label-position="left"
+      >
+        <!-- 规则 -->
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则条件 -->
+        <div class="item mt-20px">
+          <div class="title">规则条件</div>
+          <el-row gutter="10">
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 器具类型 -->
+              <el-form-item
+                label="器具类型"
+                class="err-120"
+                v-if="index == 0"
+                :prop="'condition.' + index + '.Value'"
+                :rules="{
+                  required: true,
+                  message: '请选择器具类型',
+                  trigger: 'change'
+                }"
+              >
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择器具类型"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.CONTAINER_TYPE)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 选择物料类型 -->
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  @change="changeItemsType"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.itemTypeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择物料类型"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-if="item.ParamCode == 'ItemType'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择ABC类"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-else-if="item.ParamCode == 'AbcClass'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料分组，多个物料分组以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemGroup'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入项目，多个项目以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'Project'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物料，多个物料以逗号分隔"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemCode'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则配置 -->
+        <div class="item mt-20px">
+          <div class="title">规则配置</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <!-- 容纳数量 -->
+              <el-form-item
+                label="容纳数量"
+                prop="configuration.ContentCount"
+                :rules="[{ required: true, message: '请输入容纳数量', trigger: 'change' }]"
+              >
+                <el-input-number
+                  v-model="formData.configuration.ContentCount"
+                  :min="-1"
+                  controls-position="right"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'UpShelfStrategyAddForm' })
+import * as RuleApi from '@/api/wms/rule'
+import { isString } from '@/utils/is'
+
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+
+const formStrategyCode = ref('')
+// form表单数据
+const formData = ref({
+  id: '',
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
+  //规则条件集合
+  condition: [
+    // 器具类型
+    { ParamCode: 'ContainerType', Operator: 'IN', Value: '' },
+    // 物料类型/物料分组/物料/abc类/项目/
+    { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' }
+  ],
+  configuration: {
+    // 容纳数量
+    ContentCount: 0
+  }
+})
+// 验证规则
+const rules = ref({
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+})
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' }
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
+  return result
+}
+
+// 下拉框列表集合
+const options = reactive({
+  //范围下拉框列表
+  rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
+
+  // 物料类型列表
+  itemTypeOptions: [
+    { value: 'ItemGroup', label: '物料分组' },
+    { value: 'ItemCode', label: '物料' },
+    { value: 'Project', label: '项目' }
+  ]
+})
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
+// 选择物料类型/物料分组/abc类/物料/项目
+const changeItemsType = () => {
+  formData.value.condition[1].Value = ''
+}
+/** 打开弹窗 */
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({ disabled: true }), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
+    } finally {
+      formLoading.value = false
+    }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  if (formData.value.priority == 0) {
+    message.error('优先级不可以为0')
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const arr = formData.value.condition.map(item=> {
+       let str = item.Value
+       if(isString(item.Value)){
+        if(item.Value.indexOf('，'>-1)){
+        str = item.Value.split('，').join(',')
+        }
+      }
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+     
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
+      //规则条件集合
+      condition: JSON.stringify(arr),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    strategyCode: formStrategyCode.value, //策略代码id
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
+    //规则条件集合
+    condition: [
+      // 器具类型
+      { ParamCode: 'ContainerType', Operator: 'IN', Value: '' },
+      // 物料类型/物料分组/物料/abc类/项目/
+      { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' }
+    ],
+    configuration: {
+      // 容纳数量
+      ContentCount: 0
+    }
+  }
+}
+
+const validatorNum = (rule: any, value: any, callback: any) => {
+  if (value && formData.value.configuration[0].Value != -1) {
+    if (value > formData.value.configuration[0].Value) {
+      callback(new Error('11'))
+    } else {
+      callback()
+    }
+  } else {
+    callback()
+  }
+}
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-240 .el-form-item__error {
+  padding-left: 240px !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+
+::v-deep .err-130 .el-form-item__error {
+  padding-left: 130px !important;
+}
+</style>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue
new file mode 100644
index 000000000..ebe81b58d
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue
@@ -0,0 +1,172 @@
+<!-- 器具容量策略 -->
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="策略名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入策略名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" sortable/>
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'SupplieDeliveryStrategy' })
+const queryFormRef = ref() // 搜索的表单
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S012',
+})
+
+/** 查询字典类型列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create', queryParams.strategyCode)
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', queryParams.strategyCode, row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
new file mode 100644
index 000000000..2dcd7642c
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
@@ -0,0 +1,611 @@
+<!-- 库位存储策略弹窗弹窗 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="130px"
+        label-position="left"
+      >
+        <!-- 规则 -->
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则条件 -->
+
+        <div class="item mt-20px">
+          <div class="title">规则条件</div>
+          <el-row gutter="10">
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 仓库 库区  库位组 库位 -->
+              <el-form-item label="" label-width="0" class="err-130" v-if="index == 0">
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  style="width: 120px; margin-right: 10px"
+                  @change="changeWarehouse"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.warehouseTypeOptions"
+                    :key="index"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.RangeOptions"
+                    :key="cur.value"
+                  />
+                </el-select>
+                <el-select
+                  v-model="item.Value"
+                  :placeholder="`请选择${
+                    item.ParamCode == 'WarehouseCode'
+                      ? '仓库'
+                      : item.ParamCode == 'AreaCode'
+                      ? '库区'
+                      : item.ParamCode == 'LocationGroupCode'
+                      ? '库位组'
+                      : item.ParamCode == 'LocationCode'
+                      ? '库位'
+                      : ''
+                  }`"
+                  clearable
+                  style="flex: 1"
+                  multiple
+                  collapse-tags
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 规则配置 -->
+        <div class="item mt-20px">
+          <div class="title">规则配置</div>
+          <el-row gutter="10">
+            <el-col :span="24">
+              <!-- 默认库存状态 -->
+              <el-form-item label="默认库存状态" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.DefaultInventoryStatus">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 溢流库位 -->
+            <el-col :span="24">
+              <el-form-item label="溢流库位">
+                <el-select
+                  v-model="formData.configuration.OverflowLocationCode"
+                  placeholder="请选择溢流库位"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in options.overflowWarehouseList"
+                    :key="cur.code"
+                    :label="cur.code"
+                    :value="cur.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- 允许负库存 -->
+            <el-col :span="12">
+              <el-form-item label="允许负库存">
+                <el-switch v-model="formData.configuration.EnableNegative" active-value="TRUE" inactive-value="FALSE"/>
+              </el-form-item>
+            </el-col>
+            <!-- 保留零库存 -->
+            <el-col :span="12">
+              <el-form-item label="保留零库存">
+                <el-switch v-model="formData.configuration.EnableKeepZero" active-value="TRUE" inactive-value="FALSE"/>
+              </el-form-item>
+            </el-col>
+            <!-- 允许领料 -->
+            <el-col :span="12">
+              <el-form-item label="允许领料">
+                <el-switch v-model="formData.configuration.EnablePick" active-value="TRUE" inactive-value="FALSE"/>
+              </el-form-item>
+            </el-col>
+            <!-- 允许过量领料 -->
+            <el-col :span="12">
+              <el-form-item label="允许过量领料">
+                <el-switch v-model="formData.configuration.EnableOverPick" active-value="TRUE" inactive-value="FALSE"/>
+              </el-form-item>
+            </el-col>
+            <!-- 允许整包存储 -->
+            <el-col :span="12">
+              <el-form-item label="允许整包存储">
+                <el-switch v-model="formData.configuration.EnableWholeStore" active-value="TRUE" inactive-value="FALSE"/>
+              </el-form-item>
+            </el-col>
+            <!-- 允许散量存储 -->
+            <el-col :span="12">
+              <el-form-item label="允许散量存储">
+                <el-switch v-model="formData.configuration.EnableBreakStore" active-value="TRUE" inactive-value="FALSE"/>
+              </el-form-item>
+            </el-col>
+            <!-- 允许出库 -->
+            <el-col :span="12">
+              <el-form-item label="允许出库">
+                <el-switch v-model="formData.configuration.EnableShip" active-value="TRUE" inactive-value="FALSE"/>
+              </el-form-item>
+            </el-col>
+            <!-- 允许入库 -->
+            <el-col :span="12">
+              <el-form-item label="允许入库">
+                <el-switch v-model="formData.configuration.EnableReceive" active-value="TRUE" inactive-value="FALSE"/>
+              </el-form-item>
+            </el-col>
+            <!-- 允许退货到供应商 -->
+            <el-col :span="12">
+              <el-form-item label="允许退货到供应商">
+                <el-switch v-model="formData.configuration.EnableReturnToSupplier" active-value="TRUE" inactive-value="FALSE"/>
+              </el-form-item>
+            </el-col>
+            <!-- 允许接收客户退货 -->
+            <el-col :span="12">
+              <el-form-item label="允许接收客户退货">
+                <el-switch v-model="formData.configuration.EnableReturnFromCustomer" active-value="TRUE" inactive-value="FALSE"/>
+              </el-form-item>
+            </el-col>
+
+            <!-- 允许拆箱 -->
+            <el-col :span="12">
+              <el-form-item label="允许拆箱">
+                <el-switch v-model="formData.configuration.EnableSplitBox" active-value="TRUE" inactive-value="FALSE"/>
+              </el-form-item>
+            </el-col>
+
+            <!-- 允许拆托 -->
+            <el-col :span="12">
+              <el-form-item label="允许拆托">
+                <el-switch v-model="formData.configuration.EnableSplitPallet" active-value="TRUE" inactive-value="FALSE"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'UpShelfStrategyAddForm' })
+import { getWarehouseList } from '@/api/wms/warehouse'
+import { getAreaList } from '@/api/wms/areabasic'
+import { getLocationgroupList } from '@/api/wms/locationgroup'
+import { getLocationList } from '@/api/wms/location'
+import * as RuleApi from '@/api/wms/rule'
+import { isString } from '@/utils/is'
+
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+
+const formStrategyCode = ref('')
+// form表单数据
+const formData = ref({
+  id: '',
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
+  //规则条件集合
+  condition: [
+    { ParamCode: 'WarehouseCode', Operator: 'IN', Value: '' },
+    { ParamCode: 'AreaCode', Operator: 'IN', Value: '' },
+    { ParamCode: 'LocationGroupCode', Operator: 'IN', Value: '' },
+    { ParamCode: 'LocationCode', Operator: 'IN', Value: '' }
+  ],
+  configuration: {
+    // 默认库存状态
+    DefaultInventoryStatus: 'OK',
+    // 溢流库位
+    OverflowLocationCode: '',
+    // 可以负库存
+    EnableNegative: 'TRUE',
+    // 可以保留零库存
+    EnableKeepZero: 'TRUE',
+    // 可以领料
+    EnablePick: 'TRUE',
+    // 可以过量领料
+    EnableOverPick: 'TRUE',
+    // 可以整包存储
+    EnableWholeStore: 'TRUE',
+    // 可以散件存储
+    EnableBreakStore: 'TRUE',
+    // 可以发出
+    EnableShip: 'TRUE',
+    // 可以接收
+    EnableReceive: 'TRUE',
+    // 可以退货给供应商
+    EnableReturnToSupplier: 'TRUE',
+    // 可以接收客户退货
+    EnableReturnFromCustomer: 'TRUE',
+    // 是否可以拆箱
+    EnableSplitBox: 'TRUE',
+    // 是否可以拆托
+    EnableSplitPallet: 'TRUE'
+  }
+})
+// 验证规则
+const rules = ref({
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+})
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' }
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
+  return result
+}
+
+// 下拉框列表集合
+const options = reactive({
+  //范围下拉框列表
+  RangeOptions: formatRangeOptions('IN', 'NOT IN'),
+  // rangeOptions2: formatRangeOptions('>', '<', '>=', '<='),
+
+  //仓库列表
+  warehouseTypeOptions: [
+    { value: 'WarehouseCode', label: '仓库' },
+    { value: 'AreaCode', label: '库区' },
+    { value: 'LocationGroupCode', label: '库位组' },
+    { value: 'LocationCode', label: '库位' }
+  ],
+  warehouseList: [],
+  // 溢流库位列表
+  overflowWarehouseList: []
+})
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
+// 获取仓库列表
+const getFormWarehouseList = async () => {
+  options.warehouseList = await getWarehouseList()
+}
+// 获取库区列表
+const getFormAreaList = async () => {
+  options.warehouseList = await getAreaList()
+}
+// 获取库位组列表
+const getFormLocationgrouList = async () => {
+  options.warehouseList = await getLocationgroupList()
+}
+// 获取库位列表
+const getFormLocationList = async (queryParms) => {
+  if (queryParms) {
+    options.overflowWarehouseList = await getLocationList(queryParms)
+  } else {
+    options.warehouseList = await getLocationList()
+  }
+}
+getFormWarehouseList()
+// 获取溢流库位
+const queryParms = {
+  type: 'OVERFLOW'
+}
+getFormLocationList(queryParms)
+// 选择仓库/库位/库位组/库区
+const changeWarehouse = (e) => {
+  formData.value.condition[0].Value = ''
+  if (e == 'WarehouseCode') {
+    getFormWarehouseList()
+  } else if (e == 'AreaCode') {
+    getFormAreaList()
+  } else if (e == 'LocationGroupCode') {
+    getFormLocationgrouList()
+  } else if (e == 'LocationCode') {
+    getFormLocationList()
+  }
+}
+/** 打开弹窗 */
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
+
+      // 判断是获取仓库/库位/库位组/库区列表
+      if (formData.value.condition[0].ParamCode == 'WarehouseCode') {
+        getFormWarehouseList()
+      } else if (formData.value.condition[0].ParamCode == 'AreaCode') {
+        getFormAreaList()
+      } else if (formData.value.condition[0].ParamCode == 'LocationGroupCode') {
+        getFormLocationgrouList()
+      } else if (formData.value.condition[0].ParamCode == 'LocationCode') {
+        getFormLocationList()
+      }
+    } finally {
+      formLoading.value = false
+    }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const arr = formData.value.condition.map(item=> {
+       let str = item.Value
+       if(isString(item.Value)){
+        if(item.Value.indexOf('，'>-1)){
+        str = item.Value.split('，').join(',')
+        }
+      }
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+     
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
+      //规则条件集合
+      condition: JSON.stringify(arr),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    strategyCode: formStrategyCode.value, //策略代码id
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
+    //规则条件集合
+    condition: [
+      // 仓库
+      { ParamCode: 'WarehouseCode', Operator: 'IN', Value: '' }
+    ],
+
+    configuration: {
+      // 默认库存状态
+      DefaultInventoryStatus: 'OK',
+      // 溢流库位
+      OverflowLocationCode: '',
+      // 可以负库存
+      EnableNegative: 'TRUE',
+      // 可以保留零库存
+      EnableKeepZero: 'TRUE',
+      // 可以领料
+      EnablePick: 'TRUE',
+      // 可以过量领料
+      EnableOverPick: 'TRUE',
+      // 可以整包存储
+      EnableWholeStore: 'TRUE',
+      // 可以散件存储
+      EnableBreakStore: 'TRUE',
+      // 可以发出
+      EnableShip: 'TRUE',
+      // 可以接收
+      EnableReceive: 'TRUE',
+      // 可以退货给供应商
+      EnableReturnToSupplier: 'TRUE',
+      // 可以接收客户退货
+      EnableReturnFromCustomer: 'TRUE',
+      // 是否可以拆箱
+      EnableSplitBox: 'TRUE',
+      // 是否可以拆托
+      EnableSplitPallet: 'TRUE'
+    }
+  }
+}
+
+
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-240 .el-form-item__error {
+  padding-left: 240px !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+
+::v-deep .err-130 .el-form-item__error {
+  padding-left: 130px !important;
+}
+</style>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue
new file mode 100644
index 000000000..ac82727d2
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue
@@ -0,0 +1,173 @@
+
+<!-- 上架策略 -->
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="策略名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入策略名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input v-model.number="queryParams.priority" type="number" oninput ="value=value.replace(/[^\d]/g,'')" placeholder="请输入优先级" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button type="info" plain @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" sortable/>
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'SupplieDeliveryStrategy' })
+const queryFormRef = ref() // 搜索的表单
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S011',
+})
+
+/** 查询字典类型列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create', queryParams.strategyCode)
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', queryParams.strategyCode, row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
new file mode 100644
index 000000000..0e8828cae
--- /dev/null
+++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
@@ -0,0 +1,278 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Purchaseprice.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Purchaseprice.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+    :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #supplierCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '供应商代码', row.supplierCode)">
+          <span>{{ row.supplierCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="PurchasepriceRules" 
+    :formAllSchemas="Purchaseprice.allSchemas"
+    :apiUpdate="PurchasepriceApi.updatePurchaseprice"
+    :apiCreate="PurchasepriceApi.createPurchaseprice"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Purchaseprice.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/purchaseprice/import" :importTemplateData="importTemplateData" @success="importSuccess" 
+   />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as PurchasepriceApi from '@/api/wms/purchaseprice'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Purchaseprice, PurchasepriceRules } from './purchaseprice.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Purchaseprice' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Purchaseprice.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasepriceApi.getPurchasepricePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:purchaseprice:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:purchaseprice:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchaseprice:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:purchaseprice:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:purchaseprice:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await PurchasepriceApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Purchaseprice.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'supplierCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+            if (item.field == 'itemCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+          
+  }else {
+    Purchaseprice.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'supplierCode') {
+        item.componentProps.disabled = false
+        item.componentProps.isSearchList = true
+      }
+      if (item.field == 'itemCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Purchaseprice.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await PurchasepriceApi.createPurchaseprice(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await PurchasepriceApi.updatePurchaseprice(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicPurchaseprice')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await PurchasepriceApi.deletePurchaseprice(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchasepriceApi.exportPurchaseprice(tableObject.params)
+    download.excel(data, '采购价格单.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '采购价格单导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await PurchasepriceApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
new file mode 100644
index 000000000..8c4897667
--- /dev/null
+++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
@@ -0,0 +1,236 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { Supplieritem } from '../supplieritem/supplieritem.data'
+
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 采购价格单
+ */
+export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 190,
+      fixed: 'left'
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 190
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '供应商物料信息', // 查询弹窗标题
+        searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+        searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }] 
+      }
+    }
+  },
+  {
+    label: '货币',
+    field: 'currency',
+    dictType: DICT_TYPE.CURRENCY,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '价格',
+    field: 'price',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: false,
+    isForm:false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isTable: false,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 190,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const PurchasepriceRules = reactive({
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'change' }
+  ],
+  currency: [
+    { required: true, message: '请选择货币', trigger: 'change' }
+  ],
+  price: [
+    { required: true, message: '请输入价格', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue
new file mode 100644
index 000000000..a6d653fe8
--- /dev/null
+++ b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue
@@ -0,0 +1,260 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Supplier.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Supplier.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="SupplierRules" 
+    :formAllSchemas="Supplier.allSchemas"
+    :apiUpdate="SupplierApi.updateSupplier"
+    :apiCreate="SupplierApi.createSupplier"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Supplier.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/supplier/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as SupplierApi from '@/api/wms/supplier'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Supplier, SupplierRules } from './supplier.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Supplier' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Supplier.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierApi.getSupplierPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:supplier:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:supplier:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:supplier:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:supplier:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplier:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await SupplierApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Supplier.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'shortName') {
+              item.componentProps.disabled = true
+            }
+          })       
+  }else {
+    Supplier.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'code') {
+        item.componentProps.disabled = false
+      }
+      if (item.field == 'shortName') {
+        item.componentProps.disabled = false
+      }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+const formsSuccess = async (formType, data) => {
+  var isHave = Supplier.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime'
+  })
+  if (isHave) {
+    if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
+      message.error('失效时间要大于生效时间')
+      return
+    }
+  }
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+  if (formType === 'create') {
+    await SupplierApi.createSupplier(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    
+    await SupplierApi.updateSupplier(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplier')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await SupplierApi.deleteSupplier(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SupplierApi.exportSupplier(tableObject.params)
+    download.excel(data, '供应商.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '供应商导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await SupplierApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
new file mode 100644
index 000000000..29733915b
--- /dev/null
+++ b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
@@ -0,0 +1,310 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+import {validateHanset,validateFax,validatePostCode,validateEmail,validateYS} from '@/utils/validator'
+
+/**
+ * @returns {Array} 供应商
+ */
+export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+      fixed: 'left'
+    }
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '简称',
+    field: 'shortName',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '地址',
+    field: 'address',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '国家',
+    field: 'country',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '城市',
+    field: 'city',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '电话',
+    field: 'phone',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '传真',
+    field: 'fax',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '邮编',
+    field: 'postId',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '联系人',
+    field: 'contacts',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '联系人邮件',
+    field: 'email',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label:'银行',
+    field: 'bank',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '币种',
+    field: 'currency',
+    sort: 'custom',
+    dictType: DICT_TYPE.CURRENCY,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '税率',
+    field: 'taxRate',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.SUPPLIER_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const SupplierRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  shortName: [
+    { required: true, message: '请输入简称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  address: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  country: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  city: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  phone: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
+  ],
+  fax: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateFax, message: '请输入正确的传真', trigger: 'blur'}
+  ],
+  postId: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validatePostCode, message: '请输入正确的邮编', trigger: 'blur'}
+  ],
+  contacts: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  email:  [
+    { max: 128, message: '不得超过128个字符', trigger: 'blur' },
+    { validator:validateEmail, message: '请输入正确的邮箱格式', trigger: 'blur'}
+  ],
+  bank: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
new file mode 100644
index 000000000..bc789431a
--- /dev/null
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
@@ -0,0 +1,277 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Supplieritem.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName"
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Supplieritem.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #supplierCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '供应商代码', row.supplierCode)">
+          <span>{{ row.supplierCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="SupplieritemRules" 
+    :formAllSchemas="Supplieritem.allSchemas"
+    :apiUpdate="SupplieritemApi.updateSupplieritem"
+    :apiCreate="SupplieritemApi.createSupplieritem"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Supplieritem.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/supplieritem/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Supplieritem, SupplieritemRules } from './supplieritem.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Supplieritem' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Supplieritem.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplieritemApi.getSupplieritemPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:supplieritem:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:supplieritem:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:supplieritem:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:supplieritem:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplieritem:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await SupplieritemApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "update"){
+    Supplieritem.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'supplierCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+            if (item.field == 'itemCode') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
+          })       
+          
+  }else {
+    Supplieritem.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'supplierCode') {
+        item.componentProps.disabled = false
+        item.componentProps.isSearchList = true
+      }
+      if (item.field == 'itemCode') {
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
+            }
+    })  
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Supplieritem.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await SupplieritemApi.createSupplieritem(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await SupplieritemApi.updateSupplieritem(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplieritem')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await SupplieritemApi.deleteSupplieritem(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SupplieritemApi.exportSupplieritem(tableObject.params)
+    download.excel(data, '供应商物料.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '供应商物料导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await SupplieritemApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
new file mode 100644
index 000000000..1e891afbf
--- /dev/null
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
@@ -0,0 +1,336 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import {validateYS} from '@/utils/validator'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 供应商物料
+ */
+export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '供应商物料代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+  },
+  // {
+  //   label: '供应商包装单位',
+  //   field: 'packUnit',
+  //   dictType: DICT_TYPE.PACK_UNIT,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   }
+  // },
+  // {
+  //   label: '供应商包装量',
+  //   field: 'packQty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 1,
+  //       precision: 6
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '默认收货仓库',
+  //   field: 'defaultWarehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '仓库信息', // 查询弹窗标题
+  //       searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+  //       searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  {
+    label: '默认收货库位',
+    field: 'defaultLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  // {
+  //   label: '结算方式',
+  //   field: 'settlementType',
+  //   dictType: DICT_TYPE.SETTLEMENT_TYPE,
+  //   dictClass: 'string',
+  //   isSearch: true,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   }
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    formatter: dateFormatter,
+    isTable: true,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    isForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isTable: true,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const SupplieritemRules = reactive({
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'change' }
+  ],
+  supplierItemCode: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    // { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+  ],
+  // packUnit: [
+  //   { required: true, message: '请选择供应商包装单位', trigger: 'change' }
+  // ],
+  // packQty: [
+  //   { required: true, message: '请输入供应商包装量', trigger: 'blur' }
+  // ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts b/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts
new file mode 100644
index 000000000..38b2b2720
--- /dev/null
+++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts
@@ -0,0 +1,292 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+const monthList = [{ label:'01', value:'01' },{ label:'02', value:'02' },{ label:'03', value:'03' },{ label:'04', value:'04' },{ label:'05', value:'05' },{ label:'06', value:'06' },{ label:'07', value:'07' },{ label:'08', value:'08' },{ label:'09', value:'09' },{ label:'10', value:'10' },{ label:'11', value:'11' },{ label:'12', value:'12' }]
+/**
+ * @returns {Array} 账期日历
+ */
+export const Accountcalendar = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '年',
+    field: 'year',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'year',
+        dateFormat: 'YYYY',
+        valueFormat: 'YYYY',
+      }
+    },
+  },
+  {
+    label: '月',
+    field: 'month',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Select',
+      api: () => monthList,
+      componentProps: {
+        style: {width:'100%'},
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        }
+      },
+      
+    },
+  },
+  {
+    label: '描述',
+    field: 'descriiption',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isSearch: true,
+    search: {
+      show: true,
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+      }
+    }
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isSearch: true,
+    search: {
+      show: true,
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+      }
+    }
+  },
+  {
+    label: '转换生效时间',
+    field: 'converttotime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isSearch: true,
+    search: {
+      show: true,
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTable: false,
+    isForm: false
+  },
+  { 
+    label: '备注', 
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  { 
+    label: '创建者', 
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const AccountcalendarRules = reactive({
+  year: [
+    { required: true, message: '请输入年', trigger: 'blur' }
+  ],
+  month: [
+    { required: true, message: '请输入月', trigger: 'blur' }
+  ],
+  descriiption: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  beginTime: [
+    { required: true, message: '请输入开始时间', trigger: 'blur' }
+  ],
+  endTime: [
+    { required: true, message: '请输入结束时间', trigger: 'blur' }
+  ],
+  converttotime: [
+    { required: true, message: '请输入转换生效时间', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
new file mode 100644
index 000000000..56068f65b
--- /dev/null
+++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
@@ -0,0 +1,243 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Accountcalendar.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Accountcalendar.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #year="{row}">
+        <el-button type="primary" link @click="openDetail(row, '年', row.year)">
+          <span>{{ row.year }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="AccountcalendarRules" 
+    :formAllSchemas="Accountcalendar.allSchemas"
+    :apiUpdate="AccountcalendarApi.updateAccountcalendar"
+    :apiCreate="AccountcalendarApi.createAccountcalendar"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Accountcalendar.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/accountcalendar/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as AccountcalendarApi from '@/api/wms/accountcalendar'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Accountcalendar, AccountcalendarRules } from './accountcalendar.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Accountcalendar' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Accountcalendar.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: AccountcalendarApi.getAccountcalendarPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:accountcalendar:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:accountcalendar:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:accountcalendar:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:accountcalendar:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:accountcalendar:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await AccountcalendarApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Accountcalendar.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await AccountcalendarApi.createAccountcalendar(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await AccountcalendarApi.updateAccountcalendar(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicAccountcalendar')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await AccountcalendarApi.deleteAccountcalendar(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await AccountcalendarApi.exportAccountcalendar(tableObject.params)
+    download.excel(data, '账期日历.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '账期日历导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await AccountcalendarApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
new file mode 100644
index 000000000..3be3297ed
--- /dev/null
+++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
@@ -0,0 +1,192 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 货币转换
+ */
+export const Currencyexchange = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '货币',
+    field: 'currency',
+    dictType: DICT_TYPE.CURRENCY,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '基础货币',
+    field: 'basiccurrency',
+    dictType: DICT_TYPE.BASIC_CURRENCY,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '比率',
+    field: 'rate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision:6
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isSearch: true,
+    search: {
+      show: true,
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+      }
+    }
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTable: false,
+  },
+  { 
+    label: '备注', 
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  { 
+    label: '创建者', 
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const CurrencyexchangeRules = reactive({
+  currency: [
+    { required: true, message: '请选择货币', trigger: 'change' }
+  ],
+  basiccurrency: [
+    { required: true, message: '请选择基础货币', trigger: 'change' }
+  ],
+  rate: [
+    { required: true, message: '请输入比率', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
new file mode 100644
index 000000000..87c268c02
--- /dev/null
+++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
@@ -0,0 +1,247 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Currencyexchange.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Currencyexchange.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #currency="{row}">
+        <el-button type="primary" link @click="openDetail(row, '货币', row.currency)">
+          <span>{{ formatter(row.currency) }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="CurrencyexchangeRules" 
+    :formAllSchemas="Currencyexchange.allSchemas"
+    :apiUpdate="CurrencyexchangeApi.updateCurrencyexchange"
+    :apiCreate="CurrencyexchangeApi.createCurrencyexchange"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Currencyexchange.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/currencyexchange/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as CurrencyexchangeApi from '@/api/wms/currencyexchange'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Currencyexchange, CurrencyexchangeRules } from './currencyexchange.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
+defineOptions({ name: 'Currencyexchange' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Currencyexchange.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CurrencyexchangeApi.getCurrencyexchangePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:currencyexchange:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:currencyexchange:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:currencyexchange:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:currencyexchange:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:currencyexchange:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await CurrencyexchangeApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Currencyexchange.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await CurrencyexchangeApi.createCurrencyexchange(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await CurrencyexchangeApi.updateCurrencyexchange(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicCurrencyexchange')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await CurrencyexchangeApi.deleteCurrencyexchange(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CurrencyexchangeApi.exportCurrencyexchange(tableObject.params)
+    download.excel(data, '货币转换.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '货币转换导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+const formatter = (type)=>{
+ let str =  getStrDictOptions(DICT_TYPE.CURRENCY).filter(item=>type==item.value)[0].label;
+ return str
+}
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await CurrencyexchangeApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
new file mode 100644
index 000000000..4daa71e6a
--- /dev/null
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
@@ -0,0 +1,254 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SupplierUser.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SupplierUser.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #id="{row}">
+        <el-button type="primary" link @click="openDetail(row, 'ID', row.id)">
+          <span>{{ row.id }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="SupplierUserRules"
+    :formAllSchemas="SupplierUser.allSchemas"
+    :searchTableParams="searchTableParams"
+    :apiUpdate="SupplierUserApi.updateSupplierUser"
+    :apiCreate="SupplierUserApi.createSupplierUser"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierUser.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/supplier-user/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SupplierUser,SupplierUserRules } from './supplierUser.data'
+import * as SupplierUserApi from '@/api/wms/supplierUser'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
+import * as ItembasicApi from "@/api/wms/itembasic";
+
+defineOptions({ name: 'SupplierUser' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SupplierUser.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierUserApi.getSupplierUserPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:supplier-user:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:supplier-user:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:supplier-user:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:supplier-user:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplier-user:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplierUser')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await SupplierUserApi.deleteSupplierUser(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SupplierUserApi.exportSupplierUser(tableObject.params)
+    download.excel(data, '供应商用户关联信息.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '供应商用户关联信息导入模版.xls'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  if (formType === 'create') {
+    await SupplierUserApi.createSupplierUser(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await SupplierUserApi.updateSupplierUser(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await SupplierUserApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
new file mode 100644
index 000000000..cb37abf69
--- /dev/null
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
@@ -0,0 +1,169 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as UserApi from "@/api/system/user";
+import * as SupplierApi from '@/api/wms/supplier'
+import {Supplier} from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data";
+
+export const User = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'ID',
+    field: 'id',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '用户名称',
+    field: 'username',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '昵称',
+    field: 'nickname',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '部门',
+    field: 'deptId',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '邮箱',
+    field: 'email',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '电话',
+    field: 'mobile',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  }
+]))
+
+
+// 表单校验
+export const SupplierUserRules = reactive({
+  userId: [required],
+  supplierCode: [required],
+  status: [required],
+  concurrencyStamp: [required],
+})
+
+export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'ID',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '用户ID',
+    field: 'userId',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选用户信息',
+      searchField: 'id',
+      searchTitle: '用户信息',
+      searchAllSchemas: User.allSchemas,
+      searchPage: UserApi.getUserPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选用户信息',
+        searchField: 'id',
+        searchTitle: '用户信息',
+        searchAllSchemas: User.allSchemas,
+        searchPage: UserApi.getUserPage
+      }
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选供应商信息',
+      searchField: 'code',
+      searchTitle: '供应商信息',
+      searchAllSchemas: Supplier.allSchemas,
+      searchPage: SupplierApi.getSupplierPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选供应商信息',
+        searchField: 'code',
+        searchTitle: '供应商信息',
+        searchAllSchemas: Supplier.allSchemas,
+        searchPage: SupplierApi.getSupplierPage
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_STATUS,
+    dictClass: 'string',
+    isSearch: false,
+    form: {
+      component: 'Switch',
+      value: 'ENABLE',
+      componentProps: {
+        inactiveValue: 'DISABLE',
+        activeValue: 'ENABLE'
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+
+
diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
new file mode 100644
index 000000000..bf3cd3f82
--- /dev/null
+++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
@@ -0,0 +1,243 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Systemcalendar.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Systemcalendar.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #module="{row}">
+        <el-button type="primary" link @click="openDetail(row, '模块', row.module)">
+          <span>{{ row.module }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="SystemcalendarRules" 
+    :formAllSchemas="Systemcalendar.allSchemas"
+    :apiUpdate="SystemcalendarApi.updateSystemcalendar"
+    :apiCreate="SystemcalendarApi.createSystemcalendar"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Systemcalendar.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/systemcalendar/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as SystemcalendarApi from '@/api/wms/systemcalendar'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Systemcalendar, SystemcalendarRules } from './systemcalendar.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Systemcalendar' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Systemcalendar.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SystemcalendarApi.getSystemcalendarPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:systemcalendar:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:systemcalendar:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:systemcalendar:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:systemcalendar:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:systemcalendar:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await SystemcalendarApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Systemcalendar.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await SystemcalendarApi.createSystemcalendar(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await SystemcalendarApi.updateSystemcalendar(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSystemcalendar')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await SystemcalendarApi.deleteSystemcalendar(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SystemcalendarApi.exportSystemcalendar(tableObject.params)
+    download.excel(data, '系统日历.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '系统日历导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await SystemcalendarApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts b/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts
new file mode 100644
index 000000000..ff2b24dda
--- /dev/null
+++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts
@@ -0,0 +1,211 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 系统日历
+ */
+export const Systemcalendar = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '模块',
+    field: 'module',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '开始时间',
+    field: 'startTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isSearch: true,
+    search: {
+      show: true,
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        // defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    }
+  },
+  {
+    label: '结束时间',
+    field: 'stopTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isSearch: true,
+    search: {
+      show: true,
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTable: false,
+    isForm: false
+  },
+  { 
+    label: '备注', 
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  { 
+    label: '创建者', 
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const SystemcalendarRules = reactive({
+  module: [
+    { required: true, message: '请输入模块', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
new file mode 100644
index 000000000..edaecb60f
--- /dev/null
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -0,0 +1,734 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 盘点任务主表
+ */
+export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '计划单号',
+    field: 'planNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '阶段',
+    field: 'stage',
+    dictType: DICT_TYPE.COUNT_STAGE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
+]))
+
+//表单校验
+export const CountJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  stage: [
+    { required: true, message: '请选择阶段', trigger: 'change' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 盘点任务子表
+ */
+export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '盘点明细号',
+    field: 'countDetailNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const CountJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  countDetailNumber: [
+    { required: true, message: '输入盘点明细号', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
new file mode 100644
index 000000000..79a78d5cb
--- /dev/null
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -0,0 +1,251 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="CountJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="CountJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="CountJobMainRules"
+    :formAllSchemas="CountJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="CountJobDetail.allSchemas"
+    :tableFormRules="CountJobDetailRules"
+    :apiUpdate="CountJobMainApi.updateCountJobMain"
+    :apiCreate="CountJobMainApi.createCountJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CountJobMain.allSchemas"
+    :detailAllSchemas="CountJobDetail.allSchemas"
+    :detailAllSchemasRules="CountJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="CountJobDetailApi.getCountJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CountJobMain,CountJobMainRules,CountJobDetail,CountJobDetailRules } from './countJobMain.data'
+import * as CountJobMainApi from '@/api/wms/countJobMain'
+import * as CountJobDetailApi from '@/api/wms/countJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 盘点任务主
+defineOptions({ name: 'CountJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(CountJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CountJobMainApi.getCountJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:count-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:count-job-main:close'}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+  } else if (val == 'mainJobClo') { // 关闭
+    handleClose(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await CountJobMainApi.closeCountJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CountJobMainApi.exportCountJobMain(tableObject.params)
+    download.excel(data, '盘点任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
new file mode 100644
index 000000000..a82d33cf7
--- /dev/null
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -0,0 +1,749 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'CountPlan'
+}
+ const data = await getPlansettingApi.getPlansettingPage(queryParams)
+ const plansettingData =data?.list[0]||{}
+
+/**
+ * @returns {Array} 盘点计划主表
+ */
+export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '盘点类型',
+    field: 'type',
+    dictType: DICT_TYPE.COUNT_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '执行周期',
+    field: 'crontab',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '维度',
+    field: 'dimension',
+    dictType: DICT_TYPE.COUNT_DIMENSION,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '限值',
+    field: 'limitedValue',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '物料忽略名单',
+    field: 'ignoreListOfItem',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        multiple:true,//是否可以多选
+        searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '库位忽略名单',
+    field: 'ignoreListOfLocation',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        multiple:true,//是否可以多选
+        searchListPlaceholder: '请选择库位忽略名单', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
+        
+      }
+    }
+  },
+  // {
+  //   label: '盘点范围列表',
+  //   field: 'scopeList',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '快照盘点',
+    field: 'isSnapshot',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '冻结盘点',
+    field: 'isFreeze',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '盘点空库位',
+    field: 'isCountEmptyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '盘点零库存',
+    field: 'isCountZeroInventory',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '盘点负库存',
+    field: 'isCountNegativeInventory',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '明盘',
+    field: 'isOpenCount',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'Count',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const CountPlanMainRules = reactive({
+  type: [
+    { required: true, message: '请选择盘点类型', trigger: 'change' }
+  ],
+  crontab:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  isSnapshot: [
+    { required: true, message: '请选择快照盘点', trigger: 'change' }
+  ],
+  isFreeze: [
+    { required: true, message: '请选择冻结盘点', trigger: 'change' }
+  ],
+  isCountEmptyLocation: [
+    { required: true, message: '请选择盘点空库位', trigger: 'change' }
+  ],
+  isCountZeroInventory: [
+    { required: true, message: '请选择盘点零库存', trigger: 'change' }
+  ],
+  isCountNegativeInventory: [
+    { required: true, message: '请选择盘点负库存', trigger: 'change' }
+  ],
+  isOpenCount: [
+    { required: true, message: '请选择明盘', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 盘点计划子表
+ */
+// export const CountPlanDetail = useCrudSchemas(<CrudSchema[]>([
+//   {
+//     label: '盘点范围类型',
+//     field: 'type',
+//     dictType: DICT_TYPE.COUNT_TYPE,
+//     dictClass: 'string',
+//     isTable: true,
+//     sort: 'custom',
+//     table: {
+//       width: 150
+//     },
+//     tableForm: {
+//       type: 'Select'
+//     }
+//   },
+//   {
+//     label: '盘点范围值',
+//     field: 'value',
+//     sort: 'custom',
+//     table: {
+//       width: 150
+//     },
+//   },
+//   {
+//     label: '单据号',
+//     field: 'number',
+//     sort: 'custom',
+//     table: {
+//       width: 150,
+//     },
+//     isTableForm: false,
+//     form: {
+//       componentProps: {
+//         disabled: true
+//       }
+//     }
+//   },
+//   {
+//     label: '物料代码',
+//     field: 'itemCode',
+//     sort: 'custom',
+//     table: {
+//       width: 150
+//     },
+//   },
+//   {
+//     label: '备注',
+//     field: 'remark',
+//     sort: 'custom',
+//     table: {
+//       width: 150
+//     },
+//   },
+//   {
+//     label: '创建者',
+//     field: 'creator',
+//     sort: 'custom',
+//     table: {
+//       width: 150
+//     },
+//     isTableForm: false,
+//     isForm: false,
+//   },
+//   {
+//     label: '创建时间',
+//     field: 'createTime',
+//     formatter: dateFormatter,
+//     detail: {
+//       dateFormat: 'YYYY-MM-DD HH:mm:ss'
+//     },
+//     sort: 'custom',
+//     table: {
+//       width: 180
+//     },
+//     form: {
+//       component: 'DatePicker',
+//       componentProps: {
+//         style: {width:'100%'},
+//         type: 'datetime',
+//         dateFormat: 'YYYY-MM-DD HH:mm:ss',
+//         valueFormat: 'x',
+//       }
+//     },
+//     isTableForm: false,
+//     isForm: false,
+//   },
+//   {
+//     label: '最后更新时间',
+//     field: 'updateTime',
+//     formatter: dateFormatter,
+//     detail: {
+//       dateFormat: 'YYYY-MM-DD HH:mm:ss'
+//     },
+//     sort: 'custom',
+//     table: {
+//       width: 180
+//     },
+//     form: {
+//       component: 'DatePicker',
+//       componentProps: {
+//         style: {width:'100%'},
+//         type: 'datetime',
+//         dateFormat: 'YYYY-MM-DD HH:mm:ss',
+//         valueFormat: 'x',
+//       }
+//     },
+//     isTableForm: false,
+//     isForm: false,
+//   },
+//   {
+//     label: '最后更新者',
+//     field: 'updater',
+//     sort: 'custom',
+//     table: {
+//       width: 150
+//     },
+//     isTableForm: false,
+//     isForm: false,
+//   },
+//   {
+//     label: '计划数量',
+//     field: 'planQty',
+//     sort: 'custom',
+//     table: {
+//       width: 150
+//     },
+//     form: {
+//       component: 'InputNumber',
+//       componentProps: {
+//         min: 1,
+//         precision: 6
+//       }
+//     },
+//     tableForm: {
+//       type: 'InputNumber',
+//       min: 1,
+//       precision: 6
+//     }
+//   },
+//   {
+//     label: '计量单位',
+//     field: 'uom',
+//     dictType: DICT_TYPE.UOM,
+//     dictClass: 'string',
+//     isTable: true,
+//     sort: 'custom',
+//     table: {
+//       width: 150
+//     },
+//     tableForm: {
+//       type: 'Select'
+//     }
+//   },
+//   {
+//     label: '是否可用',
+//     field: 'available',
+//     dictType: DICT_TYPE.TRUE_FALSE,
+//     dictClass: 'string',
+//     isTable: true,
+//     form: {
+//       component: 'Switch',
+//       value: 'TRUE',
+//       componentProps: {
+//         inactiveValue: 'FALSE',
+//         activeValue: 'TRUE'
+//       }
+//     },
+//     sort: 'custom',
+//     table: {
+//       width: 150
+//     },
+//     tableForm: {
+//       type: 'Select'
+//     }
+//   },
+//   {
+//     label: '操作',
+//     field: 'action',
+//     isDetail: false,
+//     isForm: false ,
+//     table: {
+//       width: 150,
+//       fixed: 'right'
+//     },
+//     isTableForm:false,
+//   }
+// ]))
+
+//表单校验
+export const CountPlanDetail = useCrudSchemas(<CrudSchema[]>([
+  {
+    label: '盘点范围类型',
+    field: 'type',
+    dictType: DICT_TYPE.COUNT_SCOPE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 300
+    },
+    tableForm: {
+      type: 'Select',
+      width: '300'
+    }
+  },
+  {
+    label: '盘点范围值',
+    field: 'value',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 300
+    },
+    tableForm: {
+      width: '300',
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+export const CountPlanDetailRules = reactive({
+  type: [
+    { required: true, message: '请选择盘点范围类型', trigger: 'change' }
+  ],
+  value: [
+    { required: true, message: '请选择盘点范围值', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
new file mode 100644
index 000000000..10239dd80
--- /dev/null
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -0,0 +1,803 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="CountPlanMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="CountPlanMain.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="CountPlanMainRules"
+    :formAllSchemas="CountPlanMain.allSchemas"
+    :tableAllSchemas="CountPlanDetail.allSchemas"
+    :tableFormRules="CountPlanDetailRules"
+    :tableData="tableData"
+    :apiUpdate="CountPlanMainApi.updateCountPlanMain"
+    :apiCreate="CountPlanMainApi.createCountPlanMain"
+    fromeWhere="countPlan"
+    :countScopeType="getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @formSelectChange="formSelectChange"
+    @formSelectvVisibleChange="formSelectvVisibleChange"
+    @selectChange="selectChange"
+    @tableFormChange="tableFormChange"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CountPlanMain.allSchemas"
+    :detailAllSchemas="CountPlanDetail.allSchemas"
+    :detailAllSchemasRules="CountPlanDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiCreate="CountPlanDetailApi.createCountPlanDetail"
+    :apiUpdate="CountPlanDetailApi.updateCountPlanDetail"
+    :apiPage="CountPlanDetailApi.getCountPlanDetailPage"
+    :apiDelete="CountPlanDetailApi.deleteCountPlanDetail"
+    :allList="allList"
+    :countScopeType="getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)"
+    :Echo="Echo"
+    @selectChangeDetail="selectChangeDetail"
+    fromeWhere="countPlan"
+    :formTypeDetail="formTypeDetail"
+    :countPlanAllList="countPlanAllList"
+    @detailOpenForm="detailOpenForm"
+    :detailButtonIsShowFilter="false"
+  />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/count-plan-main/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import {
+  CountPlanMain,
+  CountPlanMainRules,
+  CountPlanDetail,
+  CountPlanDetailRules
+} from './countPlanMain.data'
+import * as CountPlanMainApi from '@/api/wms/countPlanMain'
+import * as CountPlanDetailApi from '@/api/wms/countPlanDetail'
+import * as OwnerApi from '@/api/wms/owner'
+import * as SupplierApi from '@/api/wms/supplier'
+import * as CustomerApi from '@/api/wms/customer'
+import * as WarehouseApi from '@/api/wms/warehouse'
+import * as AreaApi from '@/api/wms/areabasic'
+import * as LocationgroupApi from '@/api/wms/locationgroup'
+import * as LocationpApi from '@/api/wms/location'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+
+// 盘点计划主
+defineOptions({ name: 'CountPlanMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(CountPlanMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+  {
+    formField: 'productItemCode',
+    searchTableTitle: '物料信息',
+    searchTableAllSchemas: Itembasic.allSchemas,
+    searchTablePage: ItembasicApi.getItembasicPage
+  }
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      // setV[formField] = val[0][searchField]
+      setV[formField] = val.map((item) => item.code).join(',')
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo = []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CountPlanMainApi.getCountPlanMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:count-plan-main:create' }), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:count-plan-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:count-plan-main:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListPlanOpeBtn({
+      hide: isShowMainButton(row, ['5']),
+      hasPermi: 'wms:count-plan-main:open'
+    }), // 打开
+    defaultButtons.mainListPlanCloBtn({
+      hide: isShowMainButton(row, ['1', '2', '3', '4']),
+      hasPermi: 'wms:count-plan-main:close'
+    }), // 关闭
+    defaultButtons.mainListPlanSubBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'wms:count-plan-main:submit'
+    }), // 提交审批
+    defaultButtons.mainListPlanTurBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'wms:count-plan-main:reject'
+    }), // 驳回
+    defaultButtons.mainListPlanAppBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'wms:count-plan-main:agree'
+    }), // 审批通过
+    defaultButtons.mainListPlanPubBtn({
+      hide: isShowMainButton(row, ['3']),
+      hasPermi: 'wms:count-plan-main:publish'
+    }), // 发布
+    defaultButtons.mainListPlanResBtn({
+      hide: isShowMainButton(row, ['4']),
+      hasPermi: 'wms:count-plan-main:resetting'
+    }), // 重置
+    defaultButtons.mainListEditBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'wms:count-plan-main:update'
+    }) // 编辑
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainPlanOpe') { // 打开
+    tableObject.loading = true
+    CountPlanMainApi.open(row.id).then(() => {
+      message.success(t('打开成功'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanClo') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    CountPlanMainApi.close(row.id).then(() => {
+      message.success(t('关闭成功'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanSub') { // 提交审批
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await CountPlanMainApi.submit(row.id)
+    message.success(t('提交审批成功'))
+    tableObject.loading = false
+    await getList()
+  } else if (val == 'mainPlanTur') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    CountPlanMainApi.reject(row.id).then(() => {
+      message.success(t('驳回成功'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanApp') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    CountPlanMainApi.agree(row.id).then(() => {
+      message.success(t('审批已通过'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanPub') { // 发布
+    await message.confirm('确认要发布吗？')
+    tableObject.loading = true
+    CountPlanMainApi.publish(row.id).then(() => {
+      message.success(t('发布成功'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanRes') { // 重置
+    await message.confirm('确认要重置吗？')
+    tableObject.loading = true
+    CountPlanMainApi.resetting(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = async (type: string, row?: number) => {
+  tableData.value = [
+    {
+      type: '',
+      value: ''
+    }
+  ] // 重置明细数据
+  formRef.value.open(type, row)
+
+  getOwnerAllList()
+  getSupplierAllList()
+  getCustomerAllList()
+  getItembasicAllList()
+  getWarehouseAllList()
+  getAreaAllList()
+  getLocationgroupAllList()
+  getLocationAllList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  getOwnerAllList()
+  getSupplierAllList()
+  getCustomerAllList()
+  getItembasicAllList()
+  getWarehouseAllList()
+  getAreaAllList()
+  getLocationgroupAllList()
+  getLocationAllList()
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+// 详情打开的编辑的时候设置盘点范围值列表
+const detailOpenForm = (type, row) => {
+  console.log(row)
+  if (type == 'update' ) {
+    if (
+      row.type == 'OWNER' ||
+      row.type == 'SUPPLIER' ||
+      row.type == 'CUSTOMER' ||
+      row.type == 'ABC' ||
+      row.type == 'ITEMS_TYPE' ||
+      row.type == 'ITEMS_GROUP' ||
+      row.type == 'ITEMS_CODE' ||
+      row.type == 'WAREHOUSE_CODE' ||
+      row.type == 'AREABASIC_CODE' ||
+      row.type == 'LOCATIONGROUP_CODE' ||
+      row.type == 'LOCATION_CODE'
+    ) {
+      formTypeDetail.value = 'Select'
+      switch (row.type) {
+        case 'OWNER':
+          countPlanAllList.value = allList.value.ownerAllList
+          break
+        case 'SUPPLIER':
+          countPlanAllList.value = allList.value.supplierAllList
+          break
+        case 'CUSTOMER':
+          countPlanAllList.value = allList.value.customerAllList
+          break
+        case 'ABC':
+          countPlanAllList.value = getStrDictOptions(DICT_TYPE.ABC_CLASS)
+          break
+        case 'ITEMS_TYPE':
+          countPlanAllList.value = getStrDictOptions(DICT_TYPE.ITEM_TYPE)
+          break
+        case 'ITEMS_GROUP':
+          countPlanAllList.value = getStrDictOptions(DICT_TYPE.ITEM_GROUP)
+          break
+        case 'ITEMS_CODE':
+          countPlanAllList.value = allList.value.itembasicAllList
+          break
+        case 'WAREHOUSE_CODE':
+          countPlanAllList.value = allList.value.warehouseAllList
+          break
+        case 'AREABASIC_CODE':
+          countPlanAllList.value = allList.value.areaAllList
+          break
+        case 'LOCATIONGROUP_CODE':
+          countPlanAllList.value = allList.value.locationgroupAllList
+          break
+        case 'LOCATION_CODE':
+          countPlanAllList.value = allList.value.locationAllList
+          break
+      }
+    } else if (val == 'PROJECT') {
+      formTypeDetail.value = 'InputString'
+    }
+  }
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await CountPlanMainApi.deleteCountPlanMain(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CountPlanMainApi.exportCountPlanMain(tableObject.params)
+    download.excel(data, '盘点计划主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+ * tableForm方法
+ */
+let tableFormKeys = {}
+CountPlanDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([
+  {
+    type: '',
+    value: ''
+  }
+])
+
+// 添加明细
+const handleAddTable = () => {
+  // tableFormKeys.formType=''
+  tableFormKeys = {
+    type: '',
+    value: ''
+  }
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value.map((item) => {
+    return {
+      type: item.type,
+      value: item.value
+    }
+  }) // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await CountPlanMainApi.createCountPlanMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await CountPlanMainApi.updateCountPlanMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '盘点计划主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+// 选择盘点类型的时候针对限值的操作
+const selectChange = (field, val) => {
+  if (field == 'type') {
+    if (val == 'DYNAMIC') {
+      CountPlanMain.allSchemas.formSchema[3].label = '限值（%）'
+      CountPlanMain.allSchemas.formSchema[3].componentProps.min = 0
+      CountPlanMain.allSchemas.formSchema[3].componentProps.max = 100
+      CountPlanMain.allSchemas.formSchema[3].componentProps.disabled = false
+    } else if (val == 'LOW' || val == 'RANDOM') {
+      CountPlanMain.allSchemas.formSchema[3].label = '限值'
+      CountPlanMain.allSchemas.formSchema[3].componentProps.min = 0
+      CountPlanMain.allSchemas.formSchema[3].componentProps.max = Infinity
+      CountPlanMain.allSchemas.formSchema[3].componentProps.disabled = false
+    } else {
+      CountPlanMain.allSchemas.formSchema[3].componentProps.disabled = true
+    }
+  }
+}
+const formTypeDetail = ref('InputString') //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
+const countPlanAllList = ref([]) //盘点详情子表新增的时候判断盘点范围值的下拉列表
+// 详情新增的时候选择盘点范围类型的时候针对限值的操作
+const selectChangeDetail = (field, val) => {
+  if (field == 'type') {
+    // CountPlanDetail.allSchemas.formSchema[1].value = ''
+    if (
+      val == 'OWNER' ||
+      val == 'SUPPLIER' ||
+      val == 'CUSTOMER' ||
+      val == 'ABC' ||
+      val == 'ITEMS_TYPE' ||
+      val == 'ITEMS_GROUP' ||
+      val == 'ITEMS_CODE' ||
+      val == 'WAREHOUSE_CODE' ||
+      val == 'AREABASIC_CODE' ||
+      val == 'LOCATIONGROUP_CODE' ||
+      val == 'LOCATION_CODE'
+    ) {
+      formTypeDetail.value = 'Select'
+      switch (val) {
+        case 'OWNER':
+          countPlanAllList.value = allList.value.ownerAllList
+          break
+        case 'SUPPLIER':
+          countPlanAllList.value = allList.value.supplierAllList
+          break
+        case 'CUSTOMER':
+          countPlanAllList.value = allList.value.customerAllList
+          break
+        case 'ABC':
+          countPlanAllList.value = getStrDictOptions(DICT_TYPE.ABC_CLASS)
+          break
+        case 'ITEMS_TYPE':
+          countPlanAllList.value = getStrDictOptions(DICT_TYPE.ITEM_TYPE)
+          break
+        case 'ITEMS_GROUP':
+          countPlanAllList.value = getStrDictOptions(DICT_TYPE.ITEM_GROUP)
+          break
+        case 'ITEMS_CODE':
+          countPlanAllList.value = allList.value.itembasicAllList
+          break
+        case 'WAREHOUSE_CODE':
+          countPlanAllList.value = allList.value.warehouseAllList
+          break
+        case 'AREABASIC_CODE':
+          countPlanAllList.value = allList.value.areaAllList
+          break
+        case 'LOCATIONGROUP_CODE':
+          countPlanAllList.value = allList.value.locationgroupAllList
+          break
+        case 'LOCATION_CODE':
+          countPlanAllList.value = allList.value.locationAllList
+          break
+      }
+    } else if (val == 'PROJECT') {
+      formTypeDetail.value = 'InputString'
+    }
+  }
+}
+// 选择盘点范围类型
+const tableFormChange = async (field, val, row) => {
+  if (field == 'type') {
+    row.value = ''
+    if (
+      row.type == 'OWNER' ||
+      row.type == 'SUPPLIER' ||
+      row.type == 'CUSTOMER' ||
+      row.type == 'ABC' ||
+      row.type == 'ITEMS_TYPE' ||
+      row.type == 'ITEMS_GROUP' ||
+      row.type == 'ITEMS_CODE' ||
+      row.type == 'WAREHOUSE_CODE' ||
+      row.type == 'AREABASIC_CODE' ||
+      row.type == 'LOCATIONGROUP_CODE' ||
+      row.type == 'LOCATION_CODE'
+    ) {
+      row.formType = 'Select'
+      switch (row.type) {
+        case 'OWNER':
+          row.initOptions = allList.value.ownerAllList
+          break
+        case 'SUPPLIER':
+          row.initOptions = allList.value.supplierAllList
+          break
+        case 'CUSTOMER':
+          row.initOptions = allList.value.customerAllList
+          break
+        case 'ABC':
+          row.initOptions = getStrDictOptions(DICT_TYPE.ABC_CLASS)
+          break
+        case 'ITEMS_TYPE':
+          row.initOptions = getStrDictOptions(DICT_TYPE.ITEM_TYPE)
+          break
+        case 'ITEMS_GROUP':
+          row.initOptions = getStrDictOptions(DICT_TYPE.ITEM_GROUP)
+          break
+        case 'ITEMS_CODE':
+          row.initOptions = allList.value.itembasicAllList
+          break
+        case 'WAREHOUSE_CODE':
+          row.initOptions = allList.value.warehouseAllList
+          break
+        case 'AREABASIC_CODE':
+          row.initOptions = allList.value.areaAllList
+          break
+        case 'LOCATIONGROUP_CODE':
+          row.initOptions = allList.value.locationgroupAllList
+          break
+        case 'LOCATION_CODE':
+          row.initOptions = allList.value.locationAllList
+          break
+      }
+    } else if (row.type == 'PROJECT') {
+      row.formType = 'InputString'
+    }
+  }
+}
+
+const allList = ref({
+  ownerAllList: [],
+  supplierAllList: [],
+  customerAllList: [],
+  itembasicAllList: [],
+  warehouseAllList: [],
+  areaAllList: [],
+  locationgroupAllList: [],
+  locationAllList: [],
+  abcList: getStrDictOptions(DICT_TYPE.ABC_CLASS),
+  itemTypeList: getStrDictOptions(DICT_TYPE.ITEM_TYPE),
+  itemGroupList: getStrDictOptions(DICT_TYPE.ITEM_GROUP)
+})
+// 获取货主列表
+const getOwnerAllList = async () => {
+  await OwnerApi.getOwnerList().then((res) => {
+    allList.value.ownerAllList = res.map((element) => {
+      return {
+        value: element.code,
+        label: element.name
+      }
+    })
+  })
+}
+// 获取供应商列表
+const getSupplierAllList = async () => {
+  await SupplierApi.getSupplierList().then((res) => {
+    allList.value.supplierAllList = res.map((element) => {
+      return {
+        value: element.code,
+        label: element.name
+      }
+    })
+  })
+}
+// 获取供应商列表
+const getCustomerAllList = async () => {
+  await CustomerApi.getCustomerList().then((res) => {
+    allList.value.customerAllList = res.map((element) => {
+      return {
+        value: element.code,
+        label: element.name
+      }
+    })
+  })
+}
+// 获取物料代码列表
+const getItembasicAllList = async () => {
+  await ItembasicApi.getItembasicList().then((res) => {
+    allList.value.itembasicAllList = res.map((element) => {
+      return {
+        value: element.code,
+        label: element.name
+      }
+    })
+  })
+}
+// 获取仓库列表
+const getWarehouseAllList = async () => {
+  await WarehouseApi.getWarehouseList({ available: 'TRUE' }).then((res) => {
+    allList.value.warehouseAllList = res.map((element) => {
+      return {
+        value: element.code,
+        label: element.name
+      }
+    })
+  })
+}
+// 获取库区列表
+const getAreaAllList = async () => {
+  await AreaApi.getAreaList({ available: 'TRUE' }).then((res) => {
+    allList.value.areaAllList = res.map((element) => {
+      return {
+        value: element.code,
+        label: element.name + '-'+ element.code
+      }
+    })
+  })
+}
+// 获取库位组列表
+const getLocationgroupAllList = async () => {
+  await LocationgroupApi.getLocationgroupList({ available: 'TRUE' }).then((res) => {
+    allList.value.locationgroupAllList = res.map((element) => {
+      return {
+        value: element.code,
+        label: element.name
+      }
+    })
+  })
+}
+// 获取库位列表
+const getLocationAllList = async () => {
+  await LocationpApi.getLocationList({ available: 'TRUE' }).then((res) => {
+    allList.value.locationAllList = res.map((element) => {
+      return {
+        value: element.code,
+        label: element.name
+      }
+    })
+  })
+}
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
new file mode 100644
index 000000000..65250f6f8
--- /dev/null
+++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
@@ -0,0 +1,618 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 盘点记录主表
+ */
+export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计划单号',
+    field: 'planNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '阶段',
+    field: 'stage',
+    dictType: DICT_TYPE.COUNT_STAGE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 180,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const CountRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  jobNumber: [
+    { required: true, message: '请选择任务单号', trigger: 'change' }
+  ],
+  stage: [
+    { required: true, message: '请选择阶段', trigger: 'change' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 盘点记录子表
+ */
+export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '盘点明细号',
+    field: 'countDetailNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '盘点数量',
+    field: 'countQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '盘点时间',
+    field: 'countTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '盘点人',
+    field: 'countUser',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '盘点描述',
+    field: 'countDescription',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+]))
+
+//表单校验
+export const CountRecordDetailRules = reactive({
+  countDetailNumber: [
+    { required: true, message: '请输入盘点明细号', trigger: 'blur' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  locationGroupCode: [
+    { required: true, message: '请选择库位组代码', trigger: 'change' }
+  ],
+  areaCode: [
+    { required: true, message: '请选择库区代码', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  countQty: [
+    { required: true, message: '请输入盘点数量', trigger: 'blur' }
+  ],
+  countTime: [
+    { required: true, message: '请输入盘点时间', trigger: 'change' }
+  ],
+  countUser: [
+    { required: true, message: '请输入盘点人', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/countManage/count/countRecordMain/index.vue b/src/views/wms/countManage/count/countRecordMain/index.vue
new file mode 100644
index 000000000..1ad95828b
--- /dev/null
+++ b/src/views/wms/countManage/count/countRecordMain/index.vue
@@ -0,0 +1,189 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="CountRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="CountRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="CountRecordMainRules"
+    :formAllSchemas="CountRecordMain.allSchemas"
+    :tableAllSchemas="CountRecordDetail.allSchemas"
+    :tableFormRules="CountRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CountRecordMain.allSchemas"
+    :detailAllSchemas="CountRecordDetail.allSchemas"
+    :detailAllSchemasRules="CountRecordDetailRules"
+    :apiPage="CountRecordDetailApi.getCountRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CountRecordMain,CountRecordMainRules,CountRecordDetail,CountRecordDetailRules } from './countRecordMain.data'
+import * as CountRecordMainApi from '@/api/wms/countRecordMain'
+import * as CountRecordDetailApi from '@/api/wms/countRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 盘点记录主
+defineOptions({ name: 'CountRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(CountRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CountRecordMainApi.getCountRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:count-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainCountAdjustRequesttBtn({
+      hasPermi: 'wms:count-record-main:generate'
+    }), // 生成盘点调整申请
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if(val == 'countAdjustRequest'){
+    tableObject.loading = true
+    CountRecordMainApi.generateCountRecordMain(row.id).then(()=>{
+      message.success(t('生成成功'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CountRecordMainApi.exportCountRecordMain(tableObject.params)
+    download.excel(data, '盘点记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
new file mode 100644
index 000000000..64182f0a7
--- /dev/null
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -0,0 +1,632 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
+
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as CountPlanMainApi  from '@/api/wms/countPlanMain'
+import { CountPlanMain } from '../countPlanMain/countPlanMain.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'CountRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 盘点申请主表
+ */
+export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '计划单号',
+    field: 'planNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择计划单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '盘点计划', // 查询弹窗标题
+        searchAllSchemas: CountPlanMain.allSchemas, // 查询弹窗所需类
+        searchPage: CountPlanMainApi.getCountPlanMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '阶段',
+    field: 'stage',
+    dictType: DICT_TYPE.COUNT_STAGE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'Count',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const CountRequestMainRules = reactive({
+  // requestNumber: [
+  //   { required: true, message: '请选择申请单号', trigger: 'change' }
+  // ],
+  stage: [
+    { required: true, message: '请选择阶段', trigger: 'change' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  // businessType: [
+  //   { required: true, message: '请输入业务类型', trigger: 'blur' }
+  // ],
+})
+
+
+/**
+ * @returns {Array} 盘点申请子表
+ */
+export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '盘点明细号',
+    field: 'countDetailNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:false,
+  // }
+]))
+
+//表单校验
+export const CountRequestDetailRules = reactive({
+  countDetailNumber: [
+    { required: true, message: '请输入盘点明细号', trigger: 'blur' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+})
diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue
new file mode 100644
index 000000000..58d0bd6f8
--- /dev/null
+++ b/src/views/wms/countManage/count/countRequestMain/index.vue
@@ -0,0 +1,560 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="CountRequestMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="CountRequestMain.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="CountRequestMainRules"
+    :formAllSchemas="CountRequestMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="CountRequestDetail.allSchemas"
+    :tableFormRules="CountRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="CountRequestMainApi.updateCountRequestMain"
+    :apiCreate="CountRequestMainApi.createCountRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CountRequestMain.allSchemas"
+    :detailAllSchemas="CountRequestDetail.allSchemas"
+    :detailAllSchemasRules="CountRequestDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiCreate="CountRequestDetailApi.createCountRequestDetail"
+    :apiUpdate="CountRequestDetailApi.updateCountRequestDetail"
+    :apiPage="CountRequestDetailApi.getCountRequestDetailPage"
+    :apiDelete="CountRequestDetailApi.deleteCountRequestDetail"
+    :Echo="Echo"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+  />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/count-request-main/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
+
+  <SearchTableCount
+    ref="searchTableRef"
+    @searchTableSuccess="searchTableSuccessCount" 
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import {
+  CountRequestMain,
+  CountRequestMainRules,
+  CountRequestDetail,
+  CountRequestDetailRules
+} from './countRequestMain.data'
+import * as CountRequestMainApi from '@/api/wms/countRequestMain'
+import * as CountRequestDetailApi from '@/api/wms/countRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { SearchTableCount } from '@/components/SearchTableCount'
+
+// 盘点申请
+defineOptions({ name: 'CountRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(CountRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+  //{
+  //  formField: 'productItemCode',
+  //  searchTableTitle: '物料信息',
+  //  searchTableAllSchemas: Itembasic.allSchemas,
+  //  searchTablePage: ItembasicApi.getItembasicPage
+  //}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 重盘和监盘点击去确定的时候返回
+const searchTableSuccessCount = (formField, searchField, val, type,row,count) => {
+  nextTick(() => {
+    if (formField == 'reCount') {
+      // 重盘
+      if(type == 3){
+        row.subList = val
+      }
+      row.type = type
+      CountRequestMainApi.reCount(row).then((res)=>{
+        message.success('重盘成功')
+        getList()
+      })
+    } else {
+      // 监盘
+      if(type == 2){
+        row.subList = val
+      }else if(type == 1){
+        row.count = count
+      }
+      row.type = type
+      CountRequestMainApi.superviseCount(row).then((res)=>{
+        message.success('监盘成功')
+        getList()
+      })
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo = []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CountRequestMainApi.getCountRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:count-request-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:count-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:count-request-main:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else if (val == 'mainReCount') {
+    // 重盘
+  } else if (val == 'mainSuperviseCount') {
+    // 监盘
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+// 根据状态返回该按钮是否显示
+const isShowReCountMainButton = (row, val) => {
+  if (row.jobStatus1 == 3 && (row.jobStatus2 == null || row.jobStatus2 == 3)) {
+    return false
+  } else {
+    return true
+  }
+}
+// 根据状态返回该按钮是否显示
+const isShowGenerateMainButton = (row, val) => {
+  if (val.indexOf(row.countAdjustStatus) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+
+const searchTableRef = ref()
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListCloseBtn({hide: isShowMainButton(row, ['1', '2', '3', '4', '6']),hasPermi: 'wms:count-request-main:close'}), // 关闭
+    defaultButtons.mainListReAddBtn({hide: isShowMainButton(row, ['5']),hasPermi: 'wms:count-request-main:reAdd'}), //重新添加
+    defaultButtons.mainListSubmitBtn({hide: isShowMainButton(row, ['1']),hasPermi: 'wms:count-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide: isShowMainButton(row, ['2']),hasPermi: 'wms:count-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide: isShowMainButton(row, ['2']),hasPermi: 'wms:count-request-main:agree'}), // 审批通过
+    defaultButtons.mainListHandleBtn({hide: isShowMainButton(row, ['3']),hasPermi: 'wms:count-request-main:handle'}), // 处理
+    // defaultButtons.mainListEditBtn({hide: isShowMainButton(row, ['1']),hasPermi: 'wms:count-request-main:update'}), // 编辑
+    defaultButtons.mainReCountBtn({hide: isShowReCountMainButton(row, ['1']),hasPermi: 'wms:count-request-main:reCount'}), // 重盘
+    defaultButtons.mainSuperviseCountBtn({hide: isShowReCountMainButton(row, ['1']),hasPermi: 'wms:count-request-main:supervise'}), // 监盘
+    defaultButtons.mainCountAdjustRequesttBtn({hide: isShowGenerateMainButton(row, ['2']),hasPermi: 'wms:count-request-main:generate'}), // 生成盘点调整
+    defaultButtons.mainThawRequesttBtn({hide: isShowGenerateMainButton(row, ['3']),hasPermi: 'wms:count-request-main:thaw'}) // 解冻
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  console.log(val)
+  if (val == 'mainClose') {
+    // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    CountRequestMainApi.close(row.id)
+      .then(() => {
+        message.success(t('关闭成功'))
+        tableObject.loading = false
+        getList()
+      })
+      .catch((err) => {
+        tableObject.loading = false
+        console.log(err)
+      })
+  } else if (val == 'mainReAdd') {
+    // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    CountRequestMainApi.reAdd(row.id)
+      .then(() => {
+        message.success(t('添加成功'))
+        tableObject.loading = false
+        getList()
+      })
+      .catch((err) => {
+        tableObject.loading = false
+        console.log(err)
+      })
+  } else if (val == 'mainSubmit') {
+    // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    CountRequestMainApi.submit(row.id)
+      .then(() => {
+        message.success(t('提交审批成功'))
+        tableObject.loading = false
+        getList()
+      })
+      .catch((err) => {
+        tableObject.loading = false
+        console.log(err)
+      })
+  } else if (val == 'mainTurnDown') {
+    // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    CountRequestMainApi.refused(row.id)
+      .then(() => {
+        message.success(t('驳回成功'))
+        tableObject.loading = false
+        getList()
+      })
+      .catch((err) => {
+        tableObject.loading = false
+        console.log(err)
+      })
+  } else if (val == 'mainApprove') {
+    // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    CountRequestMainApi.agree(row.id)
+      .then(() => {
+        message.success(t('审批已通过'))
+        tableObject.loading = false
+        getList()
+      })
+      .catch((err) => {
+        tableObject.loading = false
+        console.log(err)
+      })
+  } else if (val == 'mainHandle') {
+    // 处理
+    await message.confirm('确认要处理吗？')
+    tableObject.loading = true
+    CountRequestMainApi.handle(row.id)
+      .then(() => {
+        message.success(t('处理成功'))
+        tableObject.loading = false
+        getList()
+      })
+      .catch((err) => {
+        tableObject.loading = false
+        console.log(err)
+      })
+  } else if (val == 'mainReCount') {
+    // 重盘
+    const radioList = ref([{
+      label:1,
+      title:'全部'
+    },{
+      label:2,
+      title:'差异'
+    },{
+      label:3,
+      title:'选择'
+    }])
+    searchTableRef.value.open('盘点申请明细',CountRequestDetail.allSchemas,CountRequestDetailApi.getCountRequestDetailPage,'reCount','',true,'',row,{masterId:row.id},'',radioList.value)
+  } else if (val == 'mainSuperviseCount') {
+    // 监盘
+    const radioList = ref([{
+      label:1,
+      title:'数量'
+    },{
+      label:2,
+      title:'选择'
+    }])
+    searchTableRef.value.open('盘点申请明细',CountRequestDetail.allSchemas,CountRequestDetailApi.getCountRequestDetailPage,'superviseCount','',true,'',row,{masterId:row.id},'',radioList.value)
+  } else if (val == 'countAdjustRequest') {
+    // 生成盘点调整申请
+    await message.confirm('确认要生成盘点调整申请吗？')
+    CountRequestMainApi.generateCountadjustRequest(row.id)
+      .then(() => {
+        message.success(t('已生成盘点调整申请'))
+        getList()
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+  }  else if (val == 'mainThaw') {
+    // 解冻
+    await message.confirm('确认要解冻吗？')
+    tableObject.loading = true
+    CountRequestMainApi.thaw(row.id)
+      .then(() => {
+        message.success(t('解冻成功'))
+        tableObject.loading = false
+        getList()
+      })
+      .catch((err) => {
+        tableObject.loading = false
+        console.log(err)
+      })
+  } else if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await CountRequestMainApi.deleteCountRequestMain(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CountRequestMainApi.exportCountRequestMain(tableObject.params)
+    download.excel(data, '盘点申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+ * tableForm方法
+ */
+const tableFormKeys = {}
+CountRequestDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await CountRequestMainApi.createCountRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await CountRequestMainApi.updateCountRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '盘点申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await CountRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
new file mode 100644
index 000000000..ce3dc3ce0
--- /dev/null
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
@@ -0,0 +1,535 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 盘点调整记录主表
+ */
+export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '盘点记录单号',
+    field: 'countRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const CountadjustRecordMainRules =reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 盘点调整记录子表
+ */
+export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '盘点明细号',
+    field: 'countDetailNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '盘点数量',
+    field: 'countQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '库存数量',
+    field: 'inventoryQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '调整数量',
+    field: 'adjustQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const CountadjustRecordDetailRules =reactive({
+  countDetailNumber: [
+    { required: true, message: '请输入盘点明细号', trigger: 'blur' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  countQty: [
+    { required: true, message: '请输入盘点数量', trigger: 'blur' }
+  ],
+  adjustQty: [
+    { required: true, message: '请输入调整数量', trigger: 'blur' }
+  ],
+  inventoryQty: [
+    { required: true, message: '请输入库存数量', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
new file mode 100644
index 000000000..bb6fa391e
--- /dev/null
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="CountadjustRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="CountadjustRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="CountadjustRecordMainRules"
+    :formAllSchemas="CountadjustRecordMain.allSchemas"
+    :tableAllSchemas="CountadjustRecordDetail.allSchemas"
+    :tableFormRules="CountadjustRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CountadjustRecordMain.allSchemas"
+    :detailAllSchemas="CountadjustRecordDetail.allSchemas"
+    :detailAllSchemasRules="CountadjustRecordDetailRules"
+    :apiPage="CountadjustRecordDetailApi.getCountadjustRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CountadjustRecordMain,CountadjustRecordMainRules,CountadjustRecordDetail,CountadjustRecordDetailRules } from './countadjustRecordMain.data'
+import * as CountadjustRecordMainApi from '@/api/wms/countadjustRecordMain'
+import * as CountadjustRecordDetailApi from '@/api/wms/countadjustRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 盘点调整记录主
+defineOptions({ name: 'CountadjustRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(CountadjustRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CountadjustRecordMainApi.getCountadjustRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:countadjust-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CountadjustRecordMainApi.exportCountadjustRecordMain(tableObject.params)
+    download.excel(data, '盘点调整记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
new file mode 100644
index 000000000..56d36cbc3
--- /dev/null
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -0,0 +1,633 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
+
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as CountRecordMainApi  from '@/api/wms/countRecordMain'
+import { CountRecordMain } from '../../count/countRecordMain/countRecordMain.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'CountAdjustRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 盘点调整申请主表
+ */
+export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '盘点记录单号',
+    field: 'countRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择盘点记录单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '盘点记录', // 查询弹窗标题
+        searchAllSchemas: CountRecordMain.allSchemas, // 查询弹窗所需类
+        searchPage: CountRecordMainApi.getCountRecordMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const CountadjustRequestMainRules = reactive({
+  // requestNumber: [
+  //   { required: true, message: '请选择申请单号', trigger: 'change' }
+  // ],
+  warehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  // businessType: [
+  //   { required: true, message: '请输入业务类型', trigger: 'blur' }
+  // ],
+})
+
+/**
+ * @returns {Array} 盘点调整申请子表
+ */
+export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '盘点明细号',
+    field: 'countDetailNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '库存数量',
+    field: 'inventoryQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '盘点数量',
+    field: 'countQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '调整数量',
+    field: 'adjustQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    isTable:false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const CountadjustRequestDetailRules = reactive({
+  countDetailNumber: [
+    { required: true, message: '请输入盘点明细号', trigger: 'blur' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  inventoryQty: [
+    { required: true, message: '请输入库存数量', trigger: 'blur' }
+  ],
+  countQty: [
+    { required: true, message: '请输入盘点数量', trigger: 'blur' }
+  ],
+  adjustQty: [
+    { required: true, message: '请输入调整数量', trigger: 'blur' }
+  ],
+  // number: [
+  //   { required: true, message: '请输入单据号', trigger: 'blur' }
+  // ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
new file mode 100644
index 000000000..dafd918cd
--- /dev/null
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
@@ -0,0 +1,388 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="CountadjustRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="CountadjustRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="CountadjustRequestMainRules"
+    :formAllSchemas="CountadjustRequestMain.allSchemas"
+    :tableAllSchemas="CountadjustRequestDetail.allSchemas"
+    :tableFormRules="CountadjustRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="CountadjustRequestMainApi.updateCountadjustRequestMain"
+    :apiCreate="CountadjustRequestMainApi.createCountadjustRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CountadjustRequestMain.allSchemas"
+    :detailAllSchemas="CountadjustRequestDetail.allSchemas"
+    :detailAllSchemasRules="CountadjustRequestDetailRules"
+    :apiCreate="CountadjustRequestDetailApi.createCountadjustRequestDetail"
+    :apiUpdate="CountadjustRequestDetailApi.updateCountadjustRequestDetail"
+    :apiPage="CountadjustRequestDetailApi.getCountadjustRequestDetailPage"
+    :apiDelete="CountadjustRequestDetailApi.deleteCountadjustRequestDetail"
+    fromeWhere="countadjustRequest"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/countadjust-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CountadjustRequestMain,CountadjustRequestMainRules,CountadjustRequestDetail,CountadjustRequestDetailRules } from './countadjustRequestMain.data'
+import * as CountadjustRequestMainApi from '@/api/wms/countadjustRequestMain'
+import * as CountadjustRequestDetailApi from '@/api/wms/countadjustRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 盘点调整申请
+defineOptions({ name: 'CountadjustRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(CountadjustRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CountadjustRequestMainApi.getCountadjustRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:countadjust-request-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:countadjust-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:countadjust-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:countadjust-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:countadjust-request-main:reAdd'}), //重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:countadjust-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:countadjust-request-main:handle'}), // 处理
+    ]
+}
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    CountadjustRequestMainApi.close(row.id).then(() => {
+      message.success(t('关闭成功'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    CountadjustRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('添加成功'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    CountadjustRequestMainApi.submit(row.id).then(() => {
+      message.success(t('提交审批成功'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    CountadjustRequestMainApi.refused(row.id).then(() => {
+      message.success(t('驳回成功'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    CountadjustRequestMainApi.agree(row.id).then(() => {
+      message.success(t('审批已通过'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要处理吗？')
+    tableObject.loading = true
+    CountadjustRequestMainApi.handle(row.id).then(() => {
+      message.success(t('处理成功'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑 
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await CountadjustRequestMainApi.deleteCountadjustRequestMain(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CountadjustRequestMainApi.exportCountadjustRequestMain(tableObject.params)
+    download.excel(data, '盘点调整申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+CountadjustRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await CountadjustRequestMainApi.createCountadjustRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await CountadjustRequestMainApi.updateCountadjustRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '盘点调整申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
new file mode 100644
index 000000000..de3b7aadd
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
@@ -0,0 +1,746 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 客户收货记录主表
+ */
+export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '发货记录单号',
+    field: 'deliverRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '客户月台代码',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const CustomerreceiptRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' }
+  ],
+  customerDockCode: [
+    { required: true, message: '请选择客户月台代码', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 客户收货记录子表
+ */
+export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  // {
+  //   label: '销售订单号',
+  //   field: 'soNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '销售订单行',
+  //   field: 'soLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '包装号',
+  //   field: 'packingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const CustomerreceiptRecordDetailRules = reactive({
+  // soNumber: [
+  //   { required: true, message: '请选择销售订单号', trigger: 'blur' }
+  // ],
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'blur' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'blur' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'blur' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'blur' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'blur' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'blur' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'blur' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'blur' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
new file mode 100644
index 000000000..4964594aa
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="CustomerreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="CustomerreceiptRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="CustomerreceiptRecordMainRules"
+    :formAllSchemas="CustomerreceiptRecordMain.allSchemas"
+    :tableAllSchemas="CustomerreceiptRecordDetail.allSchemas"
+    :tableFormRules="CustomerreceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CustomerreceiptRecordMain.allSchemas"
+    :detailAllSchemas="CustomerreceiptRecordDetail.allSchemas"
+    :detailAllSchemasRules="CustomerreceiptRecordDetailRules"
+    :apiPage="CustomerreceiptRecordDetailApi.getCustomerreceiptRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CustomerreceiptRecordMain,CustomerreceiptRecordMainRules,CustomerreceiptRecordDetail,CustomerreceiptRecordDetailRules } from './customerreceiptRecordMain.data'
+import * as CustomerreceiptRecordMainApi from '@/api/wms/customerreceiptRecordMain'
+import * as CustomerreceiptRecordDetailApi from '@/api/wms/customerreceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 客户收货记录主
+defineOptions({ name: 'CustomerreceiptRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(CustomerreceiptRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CustomerreceiptRecordMainApi.getCustomerreceiptRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:customerreceipt-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordCustomerreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CustomerreceiptRecordMainApi.exportCustomerreceiptRecordMain(tableObject.params)
+    download.excel(data, '客户收货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
new file mode 100644
index 000000000..b76b727ed
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@@ -0,0 +1,734 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
+
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'CustomerReceiptRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 客户收货申请主表
+ */
+export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '发货记录单号',
+    field: 'deliverRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '客户月台代码',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const CustomerreceiptRequestMainRules = reactive({
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' }
+  ],
+  customerDockCode: [
+    { required: true, message: '请选择客户月台代码', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 客户收货申请子表
+ */
+export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  // {
+  //   label: '销售订单号',
+  //   field: 'soNumber',
+  //   sort: 'custom',
+  //   isForm: false,
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '销售订单行',
+  //   field: 'soLine',
+  //   sort: 'custom',
+  //   isForm: false,
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const CustomerreceiptRequestDetailRules = reactive({
+  // soNumber: [
+  //   { required: true, message: '请选择销售订单号', trigger: 'change' }
+  // ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请选择批次', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
new file mode 100644
index 000000000..541d9da6f
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
@@ -0,0 +1,381 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="CustomerreceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="CustomerreceiptRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="CustomerreceiptRequestMainRules"
+    :formAllSchemas="CustomerreceiptRequestMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="CustomerreceiptRequestDetail.allSchemas"
+    :tableFormRules="CustomerreceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="CustomerreceiptRequestMainApi.updateCustomerreceiptRequestMain"
+    :apiCreate="CustomerreceiptRequestMainApi.createCustomerreceiptRequestMain"
+    :isBusiness="true"
+    fromeWhere="customerreceipt"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CustomerreceiptRequestMain.allSchemas"
+    :detailAllSchemas="CustomerreceiptRequestDetail.allSchemas"
+    :detailAllSchemasRules="CustomerreceiptRequestDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiCreate="CustomerreceiptRequestDetailApi.createCustomerreceiptRequestDetail"
+    :apiUpdate="CustomerreceiptRequestDetailApi.updateCustomerreceiptRequestDetail"
+    :apiPage="CustomerreceiptRequestDetailApi.getCustomerreceiptRequestDetailPage"
+    :apiDelete="CustomerreceiptRequestDetailApi.deleteCustomerreceiptRequestDetail"
+    fromeWhere="customerreceipt"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+  />
+
+  </template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CustomerreceiptRequestMain,CustomerreceiptRequestMainRules,CustomerreceiptRequestDetail,CustomerreceiptRequestDetailRules } from './customerreceiptRequestMain.data'
+import * as CustomerreceiptRequestMainApi from '@/api/wms/customerreceiptRequestMain'
+import * as CustomerreceiptRequestDetailApi from '@/api/wms/customerreceiptRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 客户收货申请
+defineOptions({ name: 'CustomerreceiptRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(CustomerreceiptRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CustomerreceiptRequestMainApi.getCustomerreceiptRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:customerreceipt-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customerreceipt-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:customerreceipt-request-main:reAdd'}), //重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customerreceipt-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customerreceipt-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customerreceipt-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:customerreceipt-request-main:handle'}), // 处理
+        // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customerreceipt-request-main:update'}), // 编辑
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    CustomerreceiptRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    CustomerreceiptRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    CustomerreceiptRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    CustomerreceiptRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    CustomerreceiptRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要处理吗？')
+    tableObject.loading = true
+    CustomerreceiptRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestCustomerreceiptMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await CustomerreceiptRequestMainApi.deleteCustomerreceiptRequestMain(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CustomerreceiptRequestMainApi.exportCustomerreceiptRequestMain(tableObject.params)
+    download.excel(data, '客户收货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+CustomerreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await CustomerreceiptRequestMainApi.createCustomerreceiptRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await CustomerreceiptRequestMainApi.updateCustomerreceiptRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await CustomerreceiptRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
new file mode 100644
index 000000000..b2b761c6c
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
@@ -0,0 +1,878 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 客户退货任务主表
+ */
+export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '发货记录单号',
+    field: 'deliverRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '客户月台代码',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '收货月台',
+    field: 'receiptDock',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const CustomerreturnJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' }
+  ],
+  customerDockCode: [
+    { required: true, message: '请选择客户月台代码', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请输入从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 客户退货任务子表
+ */
+export const CustomerreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  // {
+  //   label: '销售订单号',
+  //   field: 'soNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '销售订单行',
+  //   field: 'soLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemdesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const CustomerreturnJobDetailRules = reactive({
+  // soNumber: [
+  //   { required: true, message: '请选择销售订单号', trigger: 'change' }
+  // ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
new file mode 100644
index 000000000..69ca394c1
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
@@ -0,0 +1,379 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="CustomerreturnJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="CustomerreturnJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="CustomerreturnJobMainRules"
+    :formAllSchemas="CustomerreturnJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="CustomerreturnJobDetail.allSchemas"
+    :tableFormRules="CustomerreturnJobDetailRules"
+    :apiUpdate="CustomerreturnJobMainApi.updateCustomerreturnJobMain"
+    :apiCreate="CustomerreturnJobMainApi.createCustomerreturnJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CustomerreturnJobMain.allSchemas"
+    :detailAllSchemas="CustomerreturnJobDetail.allSchemas"
+    :detailAllSchemasRules="CustomerreturnJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="CustomerreturnJobDetailApi.getCustomerreturnJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CustomerreturnJobMain,CustomerreturnJobMainRules,CustomerreturnJobDetail,CustomerreturnJobDetailRules } from './customerreturnJobMain.data'
+import * as CustomerreturnJobMainApi from '@/api/wms/customerreturnJobMain'
+import * as CustomerreturnJobDetailApi from '@/api/wms/customerreturnJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 客户退货任务主
+defineOptions({ name: 'CustomerreturnJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(CustomerreturnJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CustomerreturnJobMainApi.getCustomerreturnJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:customerreturn-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+
+    let aaa = {
+    "id": "1809200001805505479",
+    "requestNumber": "REQ1820231220-0002",
+    "deliverRecordNumber": "JOB2420231206-0005",
+    "deliverPlanNumber": "DP20231205-0002",
+    "customerCode": "CF",
+    "customerDockCode": "CFCKYT",
+    "receiptDock": null,
+    "carrierCode": "",
+    "transferMode": "",
+    "vehiclePlateNumber": "",
+    "fromWarehouseCode": null,
+    "toWarehouseCode": null,
+    "requestTime": 1703056874000,
+    "requestDueTime": 0,
+    "status": "1",
+    "expiredTime": null,
+    "updateTime": 1703056901000,
+    "updater": "超级管理员",
+    "jobStageStatus": null,
+    "priority": null,
+    "priorityIncrement": null,
+    "departmentCode": "闻荫源码",
+    "acceptUserId": null,
+    "acceptTime": null,
+    "completeUserId": null,
+    "completeTime": null,
+    "fromAreaTypes": "INSP,HOLD,SCRAP",
+    "toAreaTypes": "HOLD,INSP,SEMI,RAW",
+    "number": "JOB2520231220-0007",
+    "businessType": "CustomerRejectJob",
+    "remark": "",
+    "createTime": 1703056901000,
+    "creator": "超级管理员",
+    "fromAreaCodes": "采购在途库",
+    "toAreaCodes": "采购在途库",
+    "toDockCode": null,
+    "autoComplete": "FALSE",
+    "allowModifyLocation": "FALSE",
+    "allowModifyQty": "TRUE",
+    "allowBiggerQty": "TRUE",
+    "allowSmallerQty": "TRUE",
+    "allowModifyInventoryStatus": "TRUE",
+    "allowContinuousScanning": "TRUE",
+    "allowPartialComplete": "TRUE",
+    "allowModifyBatch": "FALSE",
+    "allowModifyPackingNumber": "FALSE",
+    "subList":  [
+      {
+        "id": "1809200000441442043",
+        "soNumber": null,
+        "soLine": null,
+        "packingNumber": "M20230421000005",
+        "batch": "20230808",
+        "inventoryStatus": "OK",
+        "ownerCode": null,
+        "containerNumber": null,
+        "fromLocationCode": "Loc_testCF",
+        "toLocationCode": "SFG",
+        "itemCode": "testCF",
+        "itemName": "陈放测试物料",
+        "itemDesc1": "测试用",
+        "itemDesc2": "测试用",
+        "projectCode": "5",
+        "qty": 22,
+        "uom": "EA",
+        "number": "REQ1820231220-0002",
+        "remark": "子表备注",
+        "createtime": null,
+        "creator": "超级管理员",
+        "handleQty": null,
+        "toPackingNumber": null,
+        "toContainerNumber": null,
+        "toBatch": null,
+        "toInventoryStatus": null
+    },
+    {
+        "id": "1809200000441442042",
+        "soNumber": null,
+        "soLine": null,
+        "packingNumber": "12",
+        "batch": "21",
+        "inventoryStatus": "OK",
+        "ownerCode": null,
+        "containerNumber": null,
+        "fromLocationCode": "Loc_testCF",
+        "toLocationCode": "H03",
+        "itemCode": "testCF",
+        "itemName": "陈放测试物料",
+        "itemDesc1": "测试用",
+        "itemDesc2": "测试用",
+        "projectCode": "5",
+        "qty": 10,
+        "uom": "EA",
+        "number": "REQ1820231220-0002",
+        "remark": "子表备注",
+        "createtime": null,
+        "creator": "超级管理员",
+        "handleQty": null,  
+        "toPackingNumber": null,
+        "toContainerNumber": null,
+        "toBatch": null,
+        "toInventoryStatus": null
+    }
+  ]
+}
+    handleHandle(aaa)
+  } else if (val == 'mainJobAba') { // 放弃
+    await message.confirm('确认要放弃吗？')
+    console.log('列表-操作按钮事件-放弃')
+    CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'mainJobClo') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    console.log('列表-操作按钮事件-关闭')
+    CustomerreturnJobMainApi.closeCustomerreturnJobMain(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'mainJobAcc') { // 承接
+    await message.confirm('确认要承接吗？')
+    console.log('列表-操作按钮事件-承接')
+    CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobCustomerreturnMain')
+}
+
+/** 执行按钮操作 */
+const handleHandle = async (data) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    await CustomerreturnJobMainApi.executeCustomerreturnJobMain(data)
+    message.success(t('common.handleSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CustomerreturnJobMainApi.exportCustomerreturnJobMain(tableObject.params)
+    download.excel(data, '客户退货任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
new file mode 100644
index 000000000..45e23fed6
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
@@ -0,0 +1,766 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 客户退货记录主表
+ */
+export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '发货记录单号',
+    field: 'deliverRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '客户月台代码',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const CustomerreturnRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' }
+  ],
+  customerDockCode: [
+    { required: true, message: '请选择客户月台代码', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 客户退货记录子表
+ */
+export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  // {
+  //   label: '销售订单号',
+  //   field: 'soNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '销售订单行',
+  //   field: 'soLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const CustomerreturnRecordDetailRules = reactive({
+  // soNumber: [
+  //   { required: true, message: '请选择销售订单号', trigger: 'change' }
+  // ],
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
new file mode 100644
index 000000000..57d4645c8
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
@@ -0,0 +1,185 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="CustomerreturnRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="CustomerreturnRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="CustomerreturnRecordMainRules"
+    :formAllSchemas="CustomerreturnRecordMain.allSchemas"
+    :tableAllSchemas="CustomerreturnRecordDetail.allSchemas"
+    :tableFormRules="CustomerreturnRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CustomerreturnRecordMain.allSchemas"
+    :detailAllSchemas="CustomerreturnRecordDetail.allSchemas"
+    :detailAllSchemasRules="CustomerreturnRecordDetailRules"
+    :apiPage="CustomerreturnRecordDetailApi.getCustomerreturnRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { CustomerreturnRecordMain,CustomerreturnRecordMainRules,CustomerreturnRecordDetail,CustomerreturnRecordDetailRules } from './customerreturnRecordMain.data'
+import * as CustomerreturnRecordMainApi from '@/api/wms/customerreturnRecordMain'
+import * as CustomerreturnRecordDetailApi from '@/api/wms/customerreturnRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 客户退货记录主
+defineOptions({ name: 'CustomerreturnRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(CustomerreturnRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CustomerreturnRecordMainApi.getCustomerreturnRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:customerreturn-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => [
+  defaultButtons.mainListDocumentPrintBtn(null), // 标签打印
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'documentPrint') { // 标签打印
+    handlePoint(row)
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordCustomerreturnMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CustomerreturnRecordMainApi.exportCustomerreturnRecordMain(tableObject.params)
+    download.excel(data, '客户退货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/929216638195793920?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&id='+row.id)
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
new file mode 100644
index 000000000..5ab8c3a1d
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -0,0 +1,1001 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
+
+import { dateFormatter, formatDate } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
+import { DeliverRecordMain } from '../../deliver/deliverRecordMain/deliverRecordMain.data'
+
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '../../../basicDataManage/customerManage/customer/customer.data'
+
+import * as CustomerdockApi from '@/api/wms/customerdock'
+import { Customerdock } from '../../../basicDataManage/customerManage/customerdock/customerdock.data'
+
+import * as CarrierApi from '@/api/wms/carrier'
+import { Carrier } from '@/views/wms/basicDataManage/orderManage/carrier/carrier.data'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+
+import * as CustomerreturnRequestApi  from '@/api/wms/customerreturnRequestMain'
+
+const { t } = useI18n() // 国际化
+const dateTime = new Date().getTime()
+console.log(dateTime);
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'CustomerRejectRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 客户退货申请主表
+ */
+export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '发货记录单号',
+    field: 'deliverRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择发货记录单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '发货记录信息', // 查询弹窗标题
+        searchAllSchemas: DeliverRecordMain.allSchemas, // 查询弹窗所需类
+        searchPage: DeliverRecordMainApi.getDeliverRecordMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'createTime', // 查询列表中字段
+          value: dateTime - 30  * 24 * 60 * 60 * 1000 + "," + dateTime, // 指查询具体值
+          action: 'betweeen', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+        }]
+      }
+    }
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户信息', // 查询弹窗标题
+        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '客户月台代码',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户月台信息', // 查询弹窗标题
+        searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerdockApi.pageCustomerCodeToCustomerDockReceiving, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'customerCode',
+          value: 'customerCode',
+          message: '请填写客户代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择承运商', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '承运商信息', // 查询弹窗标题
+        searchAllSchemas: Carrier.allSchemas, // 查询弹窗所需类
+        searchPage: CarrierApi.getCarrierPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'CustomerReject',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const CustomerreturnRequestMainRules = reactive({
+  // deliverRecordNumber: [
+  //   { required: true, message: '请选择发货记录单号', trigger: 'change' }
+  // ],
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'blur' }
+  ],
+  Customerdock: [
+    { required: true, message: '请选择客户月台代码', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  vehiclePlateNumber:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 客户退货申请子表
+ */
+export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  // {
+  //   label: '销售订单号',
+  //   field: 'soNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm:{
+  //     isInpuFocusShow: true, // 开启查询弹窗
+  //     searchListPlaceholder: '请选择销售订单号',
+  //     searchField: 'number',
+  //     searchTitle: '销售订单信息',
+  //     searchAllSchemas: SaleMain.allSchemas,
+  //     searchPage: SaleMainApi.getSaleMainPage,
+  //     searchCondition: [{
+  //       key: 'available',
+  //       value: 'TRUE',
+  //       isMainValue: false
+  //     }]
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择销售订单号',
+  //       searchField: 'number',
+  //       searchTitle: '销售订单信息',
+  //       searchAllSchemas: SaleMain.allSchemas,
+  //       searchPage: SaleMainApi.getSaleMainPage,
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '销售订单行',
+  //   field: 'soLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm:{
+  //     isInpuFocusShow: true, // 开启查询弹窗
+  //     searchListPlaceholder: '请选择销售订单行',
+  //     searchField: 'lineNumber',
+  //     searchTitle: '销售订单信息',
+  //     searchAllSchemas: SaleDetail.allSchemas,
+  //     searchPage: SaleDetailApi.getSaleDetailPage,
+  //     searchCondition: [{
+  //       key: 'available',
+  //       value: 'TRUE',
+  //       isMainValue: false
+  //     }]
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择销售订单行',
+  //       searchField: 'lineNumber',
+  //       searchTitle: '销售订单信息',
+  //       searchAllSchemas: SaleDetail.allSchemas,
+  //       searchPage: SaleDetailApi.getSaleDetailPage,
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
+      searchCondition: [{
+        key:'customerCode', // 查询列表中字段
+        value:'customerCode', // 指主表某字段 
+        message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
+        isMainValue: true // 表示查询条件是主表的字段的值
+      }
+    ]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
+        searchCondition: [{
+          key:'customerCode', // 查询列表中字段
+          value:'customerCode', // 指主表某字段 
+          message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
+          isMainValue: true // 表示查询条件是主表的字段的值
+        }
+      ]
+      }
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  // {
+  //   label: '到库位代码',
+  //   field: 'toLocationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const CustomerreturnRequestDetailRules = reactive({
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  
+})
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
new file mode 100644
index 000000000..298604960
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -0,0 +1,529 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="CustomerreturnRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="CustomerreturnRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="CustomerreturnRequestMainRules"
+    :formAllSchemas="CustomerreturnRequestMain.allSchemas"
+    :tableAllSchemas="CustomerreturnRequestDetail.allSchemas"
+    :tableFormRules="CustomerreturnRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="CustomerreturnRequestMainApi.updateCustomerreturnRequestMain"
+    :apiCreate="CustomerreturnRequestMainApi.createCustomerreturnRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    :isShowButton = isShowButton
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CustomerreturnRequestMain.allSchemas"
+    :detailAllSchemas="CustomerreturnRequestDetail.allSchemas"
+    :detailAllSchemasRules="CustomerreturnRequestDetailRules"
+    :apiCreate="CustomerreturnRequestDetailApi.createCustomerreturnRequestDetail"
+    :apiUpdate="CustomerreturnRequestDetailApi.updateCustomerreturnRequestDetail"
+    :apiPage="CustomerreturnRequestDetailApi.getCustomerreturnRequestDetailPage"
+    :apiDelete="CustomerreturnRequestDetailApi.deleteCustomerreturnRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="trueFalse"
+    :detailButtonIsShowDelete="trueFalse"
+    @detailOpenForm="detailOpenForm"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/customerreturn-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CustomerreturnRequestMain,CustomerreturnRequestMainRules,CustomerreturnRequestDetail,CustomerreturnRequestDetailRules } from './customerreturnRequestMain.data'
+import * as CustomerreturnRequestMainApi from '@/api/wms/customerreturnRequestMain'
+import * as CustomerreturnRequestDetailApi from '@/api/wms/customerreturnRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
+
+// 客户退货申请
+defineOptions({ name: 'CustomerreturnRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+const customerCode = ref()
+routeName.value = route.name
+const tableColumns = ref(CustomerreturnRequestMain.allSchemas.tableColumns)
+
+const isShowButton = ref(true)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    CustomerreturnRequestMain.allSchemas.formSchema.forEach(item => {
+      if(item.field == 'deliverRecordNumber') {
+        if(customerCode.value != null){
+          item.componentProps.searchCondition = [
+          {
+            key: 'customerCode',
+            value: customerCode.value ,
+            isMainValue: false
+          }]
+        }
+      }
+    })
+
+    console.log(128, customerCode.value)
+    if (type == 'tableForm') {
+      if(formField == 'packingNumber') {
+        row['packingNumber'] = val[0]['packingNumber']
+        row['containerNumber'] = val[0]['containerNumber']
+        row['batch'] = val[0]['batch']
+        row['inventoryStatus'] = val[0]['inventoryStatus']
+        row['fromLocationCode'] = val[0]['locationCode']
+        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['uom']
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      if(formField == 'deliverRecordNumber') {
+      setV['deliverRecordNumber'] = val[0]['number']
+      setV['deliverPlanNumber'] = val[0]['deliverPlanNumber']
+      setV['customerCode'] = val[0]['customerCode']
+      setV['customerDockCode'] = val[0]['customerDockCode']
+      if(setV['deliverRecordNumber'] != null){
+          isShowButton.value = false
+        }
+        // 获取子表数据 
+        DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['id']})
+        .then(res => {
+          res.list.forEach(obj => {
+            let value = null
+            value = obj.fromLocationCode
+            obj.fromLocationCode = obj.toLocationCode
+            obj.toLocationCode = value
+            CustomerreturnRequestDetail.allSchemas.tableFormColumns.map(item =>{
+              if(item.field == 'packingNumber') {
+              item.isInpuFocusShow = false
+              item.tableForm.isInpuFocusShow = false
+              item.tableForm.disabled = true
+            }
+            })
+          })
+          if (res) tableData.value = res.list
+        }).catch(err => {
+          console.log(err)
+          message.error('错误')
+        })
+      } else {
+        setV[formField] = val[0][searchField]
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'packingNumber') {
+      setV['packingNumber'] = val[0]['packingNumber']
+      setV['poLine'] = val[0]['packingNumber']
+      setV['containerNumber'] = val[0]['containerNumber']
+      setV['batch'] = val[0]['batch']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
+      setV['fromLocationCode'] = val[0]['locationCode']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['uom'] = val[0]['uom']
+    } else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CustomerreturnRequestMainApi.getCustomerreturnRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+const trueFalse = ref(true)
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:customerreturn-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:customerreturn-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:customerreturn-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customerreturn-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:customerreturn-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customerreturn-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customerreturn-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customerreturn-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:customerreturn-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customerreturn-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerreturn-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    CustomerreturnRequestMainApi.close(row.id).then(() => {
+      tableObject.loading = false
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })  } else if (val == 'mainReAdd') { // 重新添加
+      await message.confirm('确认要重新添加吗？')
+      tableObject.loading = true
+      CustomerreturnRequestMainApi.reAdd(row.id).then(() => {
+      tableObject.loading = false
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    CustomerreturnRequestMainApi.submit(row.id).then(() => {
+      tableObject.loading = false
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回审批吗？')
+    tableObject.loading = true
+    CustomerreturnRequestMainApi.refused(row.id).then(() => {
+      tableObject.loading = false
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    CustomerreturnRequestMainApi.agree(row.id).then(() => {
+      tableObject.loading = false
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要处理吗？')
+    tableObject.loading = true
+    CustomerreturnRequestMainApi.handle(row.id).then(() => {
+      tableObject.loading = false
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑 
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  if(type == "update"){
+    CustomerreturnRequestMain.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'deliverRecordNumber'){
+        item.componentProps.isSearchList = false,
+        item.componentProps.disabled = true
+      }
+      if(item.field == 'customerCode'){
+        item.componentProps.isSearchList = false,
+        item.componentProps.disabled = true
+      }
+      if(item.field == 'customerDockCode'){
+        item.componentProps.isSearchList = false,
+        item.componentProps.disabled = true
+      }
+    })
+  }else {
+    CustomerreturnRequestMain.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'deliverRecordNumber'){
+        item.componentProps.isSearchList = true
+      }
+      if(item.field == 'customerCode'){
+        item.componentProps.isSearchList = true
+      }
+      if(item.field == 'customerDockCode'){
+        item.componentProps.isSearchList = true
+      }
+    })
+    CustomerreturnRequestDetail.allSchemas.formSchema.forEach((itemDetail) => {
+        if(itemDetail.field == 'packingNumber'){
+          itemDetail.componentProps.isSearchList = true
+      }
+    })
+  }
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/**
+ * 详情 编辑页面打开
+ * @param type 
+ */
+const detailOpenForm = (type) => {
+  if(type == 'update'){
+  CustomerreturnRequestDetail.allSchemas.formSchema.forEach((itemDetail) => {
+    if(itemDetail.field == 'packingNumber'){
+      itemDetail.componentProps.isSearchList = false
+      itemDetail.componentProps.disabled = true
+    }
+  })}else {
+    CustomerreturnRequestDetail.allSchemas.formSchema.forEach((itemDetail) => {
+    if(itemDetail.field == 'packingNumber'){
+      itemDetail.componentProps.isSearchList = true
+    }
+  })
+  }
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  if(row.deliverPlanNumber != null){
+        trueFalse.value = false
+    }else {
+      trueFalse.value = true
+    }
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestCustomerreturnMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await CustomerreturnRequestMainApi.deleteCustomerreturnRequestMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CustomerreturnRequestMainApi.exportCustomerreturnRequestMain(tableObject.params)
+    download.excel(data, '客户退货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+CustomerreturnRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+//为true表示子表数据中存在数量为0的数据
+const flag = ref(false)
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  data.subList.forEach(obj => {
+    if(obj.qty == 0){
+      message.error(`数量不能为0!`)
+      flag.value = true
+      return;
+    }
+  })
+  if(flag.value){
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      await CustomerreturnRequestMainApi.createCustomerreturnRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await CustomerreturnRequestMainApi.updateCustomerreturnRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '客户退货申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await CustomerreturnRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
new file mode 100644
index 000000000..5e36de08f
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
@@ -0,0 +1,619 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 客户结算记录主表
+ */
+export const CustomersettleRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '发货记录单号',
+    field: 'deliverRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const CustomersettleRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 客户结算记录子表
+ */
+export const CustomersettleRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '销售订单号',
+    field: 'soNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '销售订单行',
+    field: 'soLine',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGruopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const CustomersettleRecordDetailRules = reactive({
+  soNumber: [
+    { required: true, message: '请选择销售订单号', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGruopCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
new file mode 100644
index 000000000..cbec73363
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="CustomersettleRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="CustomersettleRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="CustomersettleRecordMainRules"
+    :formAllSchemas="CustomersettleRecordMain.allSchemas"
+    :tableAllSchemas="CustomersettleRecordDetail.allSchemas"
+    :tableFormRules="CustomersettleRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CustomersettleRecordMain.allSchemas"
+    :detailAllSchemas="CustomersettleRecordDetail.allSchemas"
+    :detailAllSchemasRules="CustomersettleRecordDetailRules"
+    :apiPage="CustomersettleRecordDetailApi.getCustomersettleRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CustomersettleRecordMain,CustomersettleRecordMainRules,CustomersettleRecordDetail,CustomersettleRecordDetailRules } from './customersettleRecordMain.data'
+import * as CustomersettleRecordMainApi from '@/api/wms/customersettleRecordMain'
+import * as CustomersettleRecordDetailApi from '@/api/wms/customersettleRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 客户结算记录主
+defineOptions({ name: 'CustomersettleRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(CustomersettleRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CustomersettleRecordMainApi.getCustomersettleRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:customersettle-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordCustomersettleMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CustomersettleRecordMainApi.exportCustomersettleRecordMain(tableObject.params)
+    download.excel(data, '客户结算记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
new file mode 100644
index 000000000..291efbddc
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
@@ -0,0 +1,749 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
+
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
+import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
+import { DeliverRecordDetail, DeliverRecordMain } from '../../deliver/deliverRecordMain/deliverRecordMain.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'CustomerSettleRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 客户结算申请主表
+ */
+export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '发货记录单号',
+    field: 'deliverRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择发货记录单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '发货记录信息', // 查询弹窗标题
+        searchAllSchemas: DeliverRecordMain.allSchemas, // 查询弹窗所需类
+        searchPage: DeliverRecordMainApi.getDeliverRecordMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'CustomerSettle',
+      componentProps:{
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const CustomersettleRequestMainRules = reactive({
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' }
+  ],
+  // fromWarehouseCode: [
+  //   { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  // ],
+  // fromAreaTypes: [
+  //   { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  // ],
+  // fromAreaCodes: [
+  //   { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  // ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 客户结算申请子表
+ */
+export const CustomersettleRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  // {
+  //   label: '销售订单号',
+  //   field: 'soNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm:{
+  //     isInpuFocusShow: true, // 开启查询弹窗
+  //     searchListPlaceholder: '请选择销售订单号',
+  //     searchField: 'soNumber',
+  //     searchTitle: '发货记录信息',
+  //     searchAllSchemas: DeliverRecordDetail.allSchemas,
+  //     searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择销售订单号',
+  //       searchField: 'soNumber',
+  //       searchTitle: '发货记录信息',
+  //       searchAllSchemas: DeliverRecordDetail.allSchemas,
+  //       searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '销售订单行',
+  //   field: 'soLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const CustomersettleRequestDetailRules = reactive({
+  // soNumber: [
+  //   { required: true, message: '请选择销售订单号', trigger: 'change' }
+  // ],
+  // packingNumber: [
+  //   { required: true, message: '请选择包装号', trigger: 'change' }
+  // ],
+  // batch: [
+  //   { required: true, message: '请输入批次', trigger: 'blur' }
+  // ],
+  // inventoryStatus: [
+  //   { required: true, message: '请选择库存状态', trigger: 'change' }
+  // ],
+  // fromLocationCode: [
+  //   { required: true, message: '请选择从库位代码', trigger: 'change' }
+  // ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
new file mode 100644
index 000000000..bd88f4f6f
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
@@ -0,0 +1,408 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="CustomersettleRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="CustomersettleRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="CustomersettleRequestMainRules"
+    :formAllSchemas="CustomersettleRequestMain.allSchemas"
+    :tableAllSchemas="CustomersettleRequestDetail.allSchemas"
+    :tableFormRules="CustomersettleRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="CustomersettleRequestMainApi.updateCustomersettleRequestMain"
+    :apiCreate="CustomersettleRequestMainApi.createCustomersettleRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="CustomersettleRequestMain.allSchemas"
+    :detailAllSchemas="CustomersettleRequestDetail.allSchemas"
+    :detailAllSchemasRules="CustomersettleRequestDetailRules"
+    :apiCreate="CustomersettleRequestDetailApi.createCustomersettleRequestDetail"
+    :apiUpdate="CustomersettleRequestDetailApi.updateCustomersettleRequestDetail"
+    :apiPage="CustomersettleRequestDetailApi.getCustomersettleRequestDetailPage"
+    :apiDelete="CustomersettleRequestDetailApi.deleteCustomersettleRequestDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowDelete="false"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/customersettle-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CustomersettleRequestMain,CustomersettleRequestMainRules,CustomersettleRequestDetail,CustomersettleRequestDetailRules } from './customersettleRequestMain.data'
+import * as CustomersettleRequestMainApi from '@/api/wms/customersettleRequestMain'
+import * as CustomersettleRequestDetailApi from '@/api/wms/customersettleRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 客户结算申请
+defineOptions({ name: 'CustomersettleRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(CustomersettleRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      console.log(106, val[0])
+      row['soNumber'] = val[0]['soNumber']
+      row['soLine'] = val[0]['soLine']
+      row['packingNumber'] = val[0]['packingNumber']
+      row['batch'] = val[0]['batch']
+      row['itemCode'] = val[0]['code']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      setV['deliverRecordNumber'] = val[0]['number']
+      setV['deliverPlanNumber'] = val[0]['deliverPlanNumber']
+      setV['customerCode'] = val[0]['customerCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'deliverRecordNumber') {
+      setV['deliverRecordNumber'] = val[0]['deliverRecordNumber']
+      setV['deliverPlanNumber'] = val[0]['deliverPlanNumber']
+      setV['customerCode'] = val[0]['customerCode']
+    }else if(formField == 'itemCode') {
+      setV['packingNumber'] = val[0]['packingNumber']
+      setV['batch'] = val[0]['batch']
+      setV['itemCode'] = val[0]['itemCode']
+    }
+    else {
+    setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CustomersettleRequestMainApi.getCustomersettleRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:customersettle-request-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:customersettle-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:customersettle-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  // if (val == 'add') { // 新增
+  //   openForm('create')
+  // } else if (val == 'import') { // 导入
+  //   handleImport()
+  // } else 
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customersettle-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:customersettle-request-main:reAdd'}), //重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customersettle-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customersettle-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customersettle-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:customersettle-request-main:handle'}), // 处理
+        // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customersettle-request-main:update'}), // 编辑
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    CustomersettleRequestMainApi.close(row.id).then(() => {
+      tableObject.loading = false
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })  } else if (val == 'mainReAdd') { // 重新添加
+      await message.confirm('确认要重新添加吗？')
+      tableObject.loading = true
+      CustomersettleRequestMainApi.reAdd(row.id).then(() => {
+      tableObject.loading = false
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    CustomersettleRequestMainApi.submit(row.id).then(() => {
+      tableObject.loading = false
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    CustomersettleRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    tableObject.loading = true
+    CustomersettleRequestMainApi.agree(row.id).then(() => {
+      tableObject.loading = false
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    tableObject.loading = true
+    CustomersettleRequestMainApi.handle(row.id).then(() => {
+      tableObject.loading = false
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑 
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestCustomersettleMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await CustomersettleRequestMainApi.deleteCustomersettleRequestMain(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CustomersettleRequestMainApi.exportCustomersettleRequestMain(tableObject.params)
+    download.excel(data, '客户结算申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+CustomersettleRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await CustomersettleRequestMainApi.createCustomersettleRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await CustomersettleRequestMainApi.updateCustomersettleRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '客户结算申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await CustomersettleRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
new file mode 100644
index 000000000..3e307ff01
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
@@ -0,0 +1,882 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 发货任务主表
+ */
+export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '客户发货单号',
+    field: 'customerDeliverNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '客户月台代码',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '发货月台',
+    field: 'deliverDock',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从月台代码',
+    field: 'fromDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const DeliverJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' }
+  ],
+  customerDockCode: [
+    { required: true, message: '请选择客户月台代码', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请输入从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 发货任务子表
+ */
+export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  // {
+  //   label: '销售订单号',
+  //   field: 'soNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '销售订单行',
+  //   field: 'soLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemdesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const DeliverJobDetailRules = reactive({
+  // soNumber: [
+  //   { required: true, message: '请选择销售订单号', trigger: 'change' }
+  // ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
new file mode 100644
index 000000000..93cdffaa4
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
@@ -0,0 +1,345 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="DeliverJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="DeliverJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="DeliverJobMainRules"
+    :formAllSchemas="DeliverJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="DeliverJobDetail.allSchemas"
+    :tableFormRules="DeliverJobDetailRules"
+    :apiUpdate="DeliverJobMainApi.updateDeliverJobMain"
+    :apiCreate="DeliverJobMainApi.createDeliverJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="DeliverJobMain.allSchemas"
+    :detailAllSchemas="DeliverJobDetail.allSchemas"
+    :detailAllSchemasRules="DeliverJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="DeliverJobDetailApi.getDeliverJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { DeliverJobMain,DeliverJobMainRules,DeliverJobDetail,DeliverJobDetailRules } from './deliverJobMain.data'
+import * as DeliverJobMainApi from '@/api/wms/deliverJobMain'
+import * as DeliverJobDetailApi from '@/api/wms/deliverJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 发货任务主
+defineOptions({ name: 'DeliverJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(DeliverJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: DeliverJobMainApi.getDeliverJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+   if (val == 'mainJobExe') { // 执行
+    let aaa = {
+  "id": 3,
+  "requestNumber": "REQ1720240326-0012",
+  "deliverPlanNumber": "",
+  "customerDeliverNumber": "CUST20240326-00000012",
+  "customerCode": "KHV",
+  "customerDockCode": "YTV4",
+  "deliverDock": null,
+  "carrierCode": "",
+  "transferMode": "",
+  "vehiclePlateNumber": "",
+  "fromWarehouseCode": null,
+  "toWarehouseCode": "CKV",
+  "requestTime": 1711443936000,
+  "requestDueTime": null,
+  "status": "2",
+  "expiredTime": null,
+  "updateTime": 1711443936000,
+  "updater": "超级管理员",
+  "jobStageStatus": null,
+  "priority": null,
+  "priorityincrement": null,
+  "departmentCode": "100",
+  "acceptUserId": "1",
+  "acceptTime": 1711443941000,
+  "completeUserId": null,
+  "completeTime": null,
+  "fromAreaTypes": "FG,STOCK_UP",
+  "toAreaTypes": "CUST,THIRD_PARTY",
+  "number": "JOB2420240326-0013",
+  "businessType": "Deliver",
+  "remark": "",
+  "createTime": 1711443936000,
+  "creator": "超级管理员",
+  "ruleUserId": null,
+  "fromAreaCodes": "FG",
+  "toAreaCodes": "CUST,ZTQ",
+  "fromDockCode": null,
+  "autoComplete": "FALSE",
+  "allowModifyLocation": "FALSE",
+  "allowModifyQty": "TRUE",
+  "allowBiggerQty": "TRUE",
+  "allowSmallerQty": "TRUE",
+  "allowModifyInventoryStatus": "TRUE",
+  "allowContinuousScanning": "TRUE",
+  "allowPartialComplete": "TRUE",
+  "allowModifyBatch": "FALSE",
+  "allowModifyPackingNumber": "FALSE",
+  "inInventoryStatuses": "OK",
+  "outInventoryStatuses": "OK",
+  "concurrencyStamp": 1,
+  "useOnTheWayLocation": null,
+  "subList": [{
+  "id": 3,
+  "soNumber": null,
+  "soLine": null,
+  "packingNumber": null,
+  "batch": "2024021801",
+  "inventoryStatus": "OK",
+  "ownerCode": null,
+  "containerNumber": null,
+  "fromLocationCode": "FG",
+  "toLocationCode": "SFK",
+  "itemCode": "vvcs-zhj1",
+  "itemName": "测试物件",
+  "itemDesc1": "水冷系-散热器",
+  "itemDesc2": "水冷系-散热器",
+  "projectCode": "PJ001",
+  "qty": 11,
+  "uom": "PC",
+  "number": "JOB2420240326-0013",
+  "remark": "",
+  "createTime": 1711443936000,
+  "creator": "超级管理员",
+  "toPackingNumber": null,
+  "toContainerNumber": null,
+  "toBatch": null,
+  "handleQty": null,
+  "toInventoryStatus": null,
+  "updateTime": 1711443936000,
+  "updater": "超级管理员",
+  "onTheWayLocationCode": "FHZTK",
+      recordList: [{
+            handleQty: 11,
+            toPackingNumber: null,
+            toContainerNumber: null,
+            toBatch: '2024021801',
+            toInventoryStatus: 'OK',
+            toLocationCode: "SFK",
+            supplierCode: '31213',
+          }]
+    }
+  ]
+}
+    handleHandle(aaa)
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    DeliverJobMainApi.abandonDeliverJobMain(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    DeliverJobMainApi.closeDeliverJobMain(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    DeliverJobMainApi.acceptDeliverJobMain(row.id)
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+   const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobDeliverMain')
+}
+
+const handleHandle = async (data) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    await DeliverJobMainApi.executeDeliverJobMain(data)
+    message.success(t('common.handleSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DeliverJobMainApi.exportDeliverJobMain(tableObject.params)
+    download.excel(data, '发货任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
new file mode 100644
index 000000000..a3ca68a6e
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
@@ -0,0 +1,741 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 发货记录主表
+ */
+export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '客户发货单号',
+    field: 'customerDeliverNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '客户月台代码',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从月台代码',
+    field: 'fromDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const DeliverRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' }
+  ],
+  customerDockCode: [
+    { required: true, message: '请选择客户月台代码', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 发货记录子表
+ */
+export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  // {
+  //   label: '销售订单号',
+  //   field: 'soNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '销售订单行',
+  //   field: 'soLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+]))
+
+//表单校验
+export const DeliverRecordDetailRules = reactive({
+  // soNumber: [
+  //   { required: true, message: '请选择销售订单号', trigger: 'change' }
+  // ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
new file mode 100644
index 000000000..1677d269a
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
@@ -0,0 +1,185 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="DeliverRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="DeliverRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="DeliverRecordMainRules"
+    :formAllSchemas="DeliverRecordMain.allSchemas"
+    :tableAllSchemas="DeliverRecordDetail.allSchemas"
+    :tableFormRules="DeliverRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="DeliverRecordMain.allSchemas"
+    :detailAllSchemas="DeliverRecordDetail.allSchemas"
+    :detailAllSchemasRules="DeliverRecordDetailRules"
+    :apiPage="DeliverRecordDetailApi.getDeliverRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { DeliverRecordMain,DeliverRecordMainRules,DeliverRecordDetail,DeliverRecordDetailRules } from './deliverRecordMain.data'
+import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
+import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 发货记录主
+defineOptions({ name: 'DeliverRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(DeliverRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: DeliverRecordMainApi.getDeliverRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => [
+  defaultButtons.mainListDocumentPrintBtn(null), // 标签打印
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'documentPrint') { // 标签打印
+    handlePoint(row)
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordDeliverMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DeliverRecordMainApi.exportDeliverRecordMain(tableObject.params)
+    download.excel(data, '发货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/929209659733770240?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&id='+row.id)
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
new file mode 100644
index 000000000..fcb7b4b31
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -0,0 +1,1034 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
+
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain'
+import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data'
+
+import * as CustomerItemApi from '@/api/wms/customeritem'
+import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data'
+
+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'
+
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as WorkstationApi from '@/api/wms/workstation'
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'DeliverRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 发货申请主表
+ */
+export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '发货计划信息', // 查询弹窗标题
+        searchAllSchemas: DeliverPlanMain.allSchemas, // 查询弹窗所需类
+        searchPage: DeliverPlanMainApi.getDeliverPlanMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'status',
+          value: '6',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '客户发货单号',
+    field: 'customerDeliverNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户信息', // 查询弹窗标题
+        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '客户月台代码',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户月台信息', // 查询弹窗标题
+        searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerdockApi.pageCustomerCodeToCustomerDock, // 查询弹窗所需分页方法 
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'customerCode',
+          value: 'customerCode',
+          message: '请填写客户代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '发货类型',
+    field: 'deliverType',
+    sort: 'custom',
+    dictType: DICT_TYPE.DELIVER_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择承运商', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '承运商信息', // 查询弹窗标题
+        searchAllSchemas: Carrier.allSchemas, // 查询弹窗所需类
+        searchPage: CarrierApi.getCarrierPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '发货库区类型',
+    field: 'deliverType',
+    sort: 'custom',
+    dictType: DICT_TYPE.DELIVER_TYPE,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从月台代码',
+    field: 'fromDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'Deliver',
+      componentProps: {
+        disabled: true,
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const DeliverRequestMainRules = reactive({
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' }
+  ],
+  deliverType: [
+    { required: true, message: '发货库区类型不能为空', trigger: 'change' }
+  ],
+  customerDockCode: [
+    { required: true, message: '请选择客户月台代码', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  vehiclePlateNumber:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 发货申请子表
+ */
+export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  // {
+  //   label: '销售订单号',
+  //   field: 'soNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm:{
+  //     isInpuFocusShow: true, // 开启查询弹窗
+  //     searchListPlaceholder: '请选择销售订单号',
+  //     searchField: 'number',
+  //     searchTitle: '销售订单信息',
+  //     searchAllSchemas: SaleMain.allSchemas,
+  //     searchPage: SaleMainApi.getSaleMainPage,
+  //     searchCondition: [{
+  //       key: 'available',
+  //       value: 'TRUE',
+  //       isMainValue: false
+  //     }]
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择销售订单号',
+  //       searchField: 'number',
+  //       searchTitle: '销售订单信息',
+  //       searchAllSchemas: SaleMain.allSchemas,
+  //       searchPage: SaleMainApi.getSaleMainPage,
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '销售订单行',
+  //   field: 'soLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm:{
+  //     isInpuFocusShow: true, // 开启查询弹窗
+  //     searchListPlaceholder: '请选择销售订单行',
+  //     searchField: 'lineNumber',
+  //     searchTitle: '销售订单信息',
+  //     searchAllSchemas: SaleDetail.allSchemas,
+  //     searchPage: SaleDetailApi.getSaleDetailPage,
+  //     searchCondition: [{
+  //       key: 'available',
+  //       value: 'TRUE',
+  //       isMainValue: false
+  //     }]
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择销售订单行',
+  //       searchField: 'lineNumber',
+  //       searchTitle: '销售订单信息',
+  //       searchAllSchemas: SaleDetail.allSchemas,
+  //       searchPage: SaleDetailApi.getSaleDetailPage,
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '客户物料基础信息',
+      searchAllSchemas: Customeritem.allSchemas,
+      searchPage: CustomerItemApi.getCustomeritemPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'customerCode',
+        value: 'customerCode',
+        isMainValue: true
+      }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '客户物料基础信息',
+        searchAllSchemas: Customeritem.allSchemas,
+        searchPage: CustomerItemApi.getCustomeritemPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'customerCode',
+          value: 'customerCode',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择到库位代码',
+      searchField: 'code',
+      searchTitle: '库位基础信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: WorkstationApi.selectAreaTypeToLocation,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'areaType',
+        value: "deliverType",
+        message:"请选择发货类型",
+        isMainValue: true
+    }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择到库位代码',
+        searchField: 'code',
+        searchTitle: '库位基础信息',
+        searchAllSchemas: Location.allSchemas,
+      searchPage: WorkstationApi.selectAreaTypeToLocation,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'areaType',
+          value: "deliverType",
+          message:"请选择发货类型",
+          isMainValue: false
+      }]
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    isForm: false,
+  },
+  {
+    label: '已收货数量',
+    field: 'shippedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const DeliverRequestDetailRules = reactive({
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
new file mode 100644
index 000000000..93e8f655b
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -0,0 +1,571 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="DeliverRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="DeliverRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+        
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="DeliverRequestMainRules"
+    :formAllSchemas="DeliverRequestMain.allSchemas"
+    :tableAllSchemas="DeliverRequestDetail.allSchemas"
+    :tableFormRules="DeliverRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="DeliverRequestMainApi.updateDeliverRequestMain"
+    :apiCreate="DeliverRequestMainApi.createDeliverRequestMain"
+    :isBusiness="true"
+    fromeWhere="DeliverRequestMain"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    :isShowButton = isShowButton
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="DeliverRequestMain.allSchemas"
+    :detailAllSchemas="DeliverRequestDetail.allSchemas"
+    :detailAllSchemasRules="DeliverRequestDetailRules"
+    :apiCreate="DeliverRequestDetailApi.createDeliverRequestDetail"
+    :apiUpdate="DeliverRequestDetailApi.updateDeliverRequestDetail"
+    :apiPage="DeliverRequestDetailApi.getDeliverRequestDetailPage"
+    :apiDelete="DeliverRequestDetailApi.deleteDeliverRequestDetail"
+    fromeWhere="DeliverRequestMain"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="trueFalse"
+    :detailButtonIsShowDelete="trueFalse"
+    @detailOpenForm="detailOpenForm"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/deliver-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { DeliverRequestMain,DeliverRequestMainRules,DeliverRequestDetail,DeliverRequestDetailRules } from './deliverRequestMain.data'
+import * as DeliverRequestMainApi from '@/api/wms/deliverRequestMain'
+import * as DeliverRequestDetailApi from '@/api/wms/deliverRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
+
+// 发货申请
+defineOptions({ name: 'DeliverRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const customerCode = ref()
+const tableColumns = ref(DeliverRequestMain.allSchemas.tableColumns)
+
+const isShowButton = ref(true)
+
+//定义  展示子表数据时是否显示新增/修改/删除按钮
+const trueFalse = ref(false)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      if(formField == 'itemCode') {
+        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['customerUom']
+      }else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]      
+      if(formField == 'deliverPlanNumber') {
+        setV['deliverPlanNumber'] = val[0]['number']
+        if(setV['deliverPlanNumber'] != null){
+          isShowButton.value = false
+        }
+        setV['customerCode'] = val[0]['customerCode']
+        // 获取子表数据 getBomDisassemble
+        DeliverPlanDetailApi.selectDetailByMasterID(val[0]['id'])
+        .then(res => {
+          res.forEach(item => {
+            item.qty = item.planQty
+          })
+          if (res) tableData.value = res
+          // 修改 tableform 属性
+          DeliverRequestDetail.allSchemas.tableFormColumns.map(item => {
+            if(item.field == 'itemCode') {
+              item.isInpuFocusShow = false
+              item.tableForm.isInpuFocusShow = false
+              item.tableForm.disabled = true
+            }
+            if(item.field == 'uom') {
+              item.tableForm.disabled = true
+            }
+          })
+          // 修改 tableform 属性
+    if(formField == 'customerCode'){
+      console.log(1111,val);
+          customerCode.value = val[0]['code']
+          console.log(11112,customerCode.value);
+        }
+    DeliverRequestMain.allSchemas.tableFormColumns.map(item => {
+      if(item.field == 'customerDockCode') {
+          item.tableForm.searchCondition = [
+          {
+            key: 'customerCode',
+            value: customerCode.value ,
+            isMainValue: true
+          }]
+          item.form.componentProps.searchCondition = [
+              {
+                key: 'customerCode',
+                value: customerCode.value ,
+                isMainValue: true
+              }]}
+        else {
+          delete item.tableForm.searchCondition
+          delete item.form.componentProps.searchCondition
+        }
+      })
+        })
+        if(formField == 'itemCode'){
+          console.log( val[0]);
+          row['uom'] = val[0]['customerUom']
+        }
+      } else {
+        setV[formField] = val[0][searchField]
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'itemCode') {
+      setV['itemCode'] = val[0]['itemCode']
+      setV['uom'] = val[0]['customerUom']    
+    }else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: DeliverRequestMainApi.getDeliverRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:deliver-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:deliver-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+    resetShow()
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:deliver-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:deliver-request-main:reAdd'}), //重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:deliver-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:deliver-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    DeliverRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    DeliverRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    DeliverRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    DeliverRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    DeliverRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要 处理吗？')
+    tableObject.loading = true
+    DeliverRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑 
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  if(type == "update"){
+    DeliverRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'deliverPlanNumber') {
+              item.componentProps.isSearchList = false,
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'customerCode') {
+              item.componentProps.isSearchList = false,
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'customerDockCode') {
+              item.componentProps.isSearchList = false,
+              item.componentProps.disabled = true
+            }
+          })       
+  }else {
+    DeliverRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'deliverPlanNumber') {
+        item.componentProps.isSearchList = true
+      }
+      if (item.field == 'customerCode') {
+              item.componentProps.isSearchList = true
+            }
+            if (item.field == 'customerDockCode') {
+              item.componentProps.isSearchList = true
+            }
+    })  
+  }
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/**
+ * 详情 编辑页面打开
+ * @param row 
+ */
+ const detailOpenForm = (type) => {
+  if(type == 'update'){
+    DeliverRequestDetail.allSchemas.formSchema.forEach((itemDetail) => {
+    if(itemDetail.field == 'itemCode'){
+      itemDetail.componentProps.isSearchList = false
+      itemDetail.componentProps.disabled = true
+    }
+  })}else {
+    DeliverRequestDetail.allSchemas.formSchema.forEach((itemDetail) => {
+    if(itemDetail.field == 'itemCode'){
+      itemDetail.componentProps.isSearchList = true
+    }
+  })
+  }
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  if(row.deliverPlanNumber != null){
+        trueFalse.value = false
+    }else {
+      trueFalse.value = true
+    }
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestDeliverMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await DeliverRequestMainApi.deleteDeliverRequestMain(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DeliverRequestMainApi.exportDeliverRequestMain(tableObject.params)
+    download.excel(data, '发货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+DeliverRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+//为true表示子表数据中存在数量为0的数据
+const flag = ref(false)
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  let isExist = false
+  tableData.value.forEach(item => {
+   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))
+   if(rs.length > 1) isExist = true
+  })
+  if (isExist) {
+    formRef.value.formLoading = false
+    return message.warning('物料代码重复')
+  }
+  data.subList.forEach(obj => {
+    if(obj.qty == 0){
+      message.warning(`数量不能为0!`)
+      flag.value = true
+      return;
+    }
+  })
+  if(flag.value){
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      if(tableData.value.length <= 0){
+      message.warning(`子表明细不能为空!`)
+      flag.value = true
+      formRef.value.formLoading = false
+      return;
+  }
+      await DeliverRequestMainApi.createDeliverRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DeliverRequestMainApi.updateDeliverRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '发货申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+
+// 恢复最初属性：明细添加/删除行按钮，字段查询弹窗，可输入状态等
+// 列表头部 新增按钮 触发
+const resetShow = async () => {
+  isShowButton.value = true // tableform按钮恢复到显示
+  // 修改 tableform 属性
+  DeliverRequestDetail.allSchemas.tableFormColumns.map(item => {
+    if(item.field == 'itemCode') {
+      item.isInpuFocusShow = true
+      item.tableForm.isInpuFocusShow = true
+      item.tableForm.disabled = false
+    }
+    if(item.field == 'uom') {
+      item.tableForm.disabled = false
+    }
+    if(item.field == 'available') {
+      item.tableForm.disabled = false
+    }
+  })
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await DeliverRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
new file mode 100644
index 000000000..0ab9228ad
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -0,0 +1,748 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
+
+import * as CustomerDockApi from '@/api/wms/customerdock'
+import { Customerdock } from '@/views/wms/basicDataManage/customerManage/customerdock/customerdock.data'
+
+import * as CustomerItemApi from '@/api/wms/customeritem'
+import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data'
+
+
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as WorkstationApi from '@/api/wms/workstation'
+
+import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+
+import * as getBusinessTypeApi  from '@/api/wms/businesstype/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'DeliverPlan'
+}
+ const data = await getPlansettingApi.getPlansettingPage(queryParams)
+ const plansettingData =data?.list[0]||{}
+
+ const businessTypeQueryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'Deliver'
+}
+const data1 = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams)
+const businessTypeData =data1?.list[0]||{}
+/**
+ * @returns {Array} 发货计划主表
+ */
+export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户信息', // 查询弹窗标题
+        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '发货类型',
+    field: 'deliverType',
+    sort: 'custom',
+    dictType: DICT_TYPE.DELIVER_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const DeliverPlanMainRules = reactive({
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' }
+  ],
+  deliverType: [
+    { required: true, message: '发货库区类型不能为空', trigger: 'change' }
+  ],
+  planDate: [
+    { required: true, message: '计划日期不能为空', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 发货计划子表
+ */
+export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: '销售订单号',
+  //   field: 'soNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm:{
+  //     isInpuFocusShow: true, // 开启查询弹窗
+  //     searchListPlaceholder: '请选择销售订单号',
+  //     searchField: 'number',
+  //     searchTitle: '销售订单信息',
+  //     searchAllSchemas: SaleDetail.allSchemas,
+  //     searchPage: SaleDetailApi.getSaleDetailPage,
+  //     searchCondition: [{
+  //       key: 'available',
+  //       value: 'TRUE',
+  //       isMainValue: false
+  //     }]
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择销售订单号',
+  //       searchField: 'number',
+  //       searchTitle: '销售订单信息',
+  //       searchAllSchemas: SaleDetail.allSchemas,
+  //       searchPage: SaleDetailApi.getSaleDetailPage,
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '销售订单行',
+  //   field: 'soLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  {
+    label: '客户月台',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择客户月台代码',
+      searchField: 'code',
+      searchTitle: '客户月台基础信息',
+      searchAllSchemas: Customerdock.allSchemas,
+      searchPage: CustomerDockApi.pageCustomerCodeToCustomerDock,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+      },{
+        key: 'customerCode',
+        value: 'customerCode',
+        isMainValue: true
+    }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择客户月台代码',
+        searchField: 'code',
+        searchTitle: '客户月台基础信息',
+        searchAllSchemas: Customerdock.allSchemas,
+        searchPage: CustomerDockApi.pageCustomerCodeToCustomerDock,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'customerCode',
+          value: 'customerCode',
+          isMainValue: true
+        }]
+      }
+    },
+  },
+  {
+    label: '项目',
+    field: 'project',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '客户物料基础信息',
+      searchAllSchemas: Customeritem.allSchemas,
+      searchPage: CustomerItemApi.getCustomeritemPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'customerCode',
+        value: 'customerCode',
+        isMainValue: true
+      }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '客户物料基础信息',
+        searchAllSchemas: Customeritem.allSchemas,
+        searchPage: CustomerItemApi.getCustomeritemPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'customerCode',
+          value: 'customerCode',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择到库位代码',
+      searchField: 'code',
+      searchTitle: '库位基础信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: WorkstationApi.selectAreaTypeToLocation,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'areaType',
+        value: "deliverType",
+        message:"请选择发货类型",
+        isMainValue: true
+    }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择到库位代码',
+        searchField: 'code',
+        searchTitle: '库位基础信息',
+        searchAllSchemas: Location.allSchemas,
+      searchPage: WorkstationApi.selectAreaTypeToLocation,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'areaType',
+          value: "deliverType",
+          message:"请选择发货类型",
+          isMainValue: false
+      }]
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'  
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    isTableForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const DeliverPlanDetailRules = reactive({
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  customerDockCode: [
+    { required: true, message: '请选择客户月台代码', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  planQty: [
+    { required: true, message: '请输入计划数量', trigger: 'blur' }
+  ],
+ 
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
new file mode 100644
index 000000000..df2e09909
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
@@ -0,0 +1,459 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="DeliverPlanMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="DeliverPlanMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    :rules="DeliverPlanMainRules"
+    :formAllSchemas="DeliverPlanMain.allSchemas"
+    :tableAllSchemas="DeliverPlanDetail.allSchemas"
+    :tableFormRules="DeliverPlanDetailRules"
+    :tableData="tableData"
+    :apiUpdate="DeliverPlanMainApi.updateDeliverPlanMain"
+    :apiCreate="DeliverPlanMainApi.createDeliverPlanMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="DeliverPlanMain.allSchemas"
+    :detailAllSchemas="DeliverPlanDetail.allSchemas"
+    :detailAllSchemasRules="DeliverPlanDetailRules"
+    :apiCreate="DeliverPlanDetailApi.createDeliverPlanDetail"
+    :apiUpdate="DeliverPlanDetailApi.updateDeliverPlanDetail"
+    :apiPage="DeliverPlanDetailApi.getDeliverPlanDetailPage"
+    :apiDelete="DeliverPlanDetailApi.deleteDeliverPlanDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/deliver-plan-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { DeliverPlanMain,DeliverPlanMainRules,DeliverPlanDetail,DeliverPlanDetailRules } from './deliverPlanMain.data'
+import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain'
+import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 发货计划
+defineOptions({ name: 'DeliverPlanMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const customerCode = ref()
+const tableColumns = ref(DeliverPlanMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    // 修改 tableform 属性
+    if(formField == 'customerCode'){
+          customerCode.value = val[0]['code']
+        }
+    DeliverPlanDetail.allSchemas.tableFormColumns.map(item => {
+      if(item.field == 'customerDockCode') {
+          item.tableForm.searchCondition = [
+          {
+            key: 'customerCode',
+            value: customerCode.value ,
+            isMainValue: false
+          }]
+          item.form.componentProps.searchCondition = [
+              {
+                key: 'customerCode',
+                value: customerCode.value ,
+                isMainValue: false
+              }]}
+      })
+    if (type == 'tableForm') {
+      if(formField == 'itemCode') {
+        row['uom'] = val[0]['customerUom']        
+      }
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    // setV['soLine'] = val[0]['lineNumber']
+    // setV['lineNumber'] = val[0]['lineNumber']
+    // setV['itemCode'] = val[0]['itemCode']
+    setV['remark'] = val[0]['remark']
+    setV['uom'] = val[0]['customerUom']
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: DeliverPlanMainApi.getDeliverPlanMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:deliver-plan-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:deliver-plan-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-plan-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+   defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:deliver-plan-main:open'}), // 打开
+    defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:deliver-plan-main:close'}), // 关闭
+    defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-plan-main:submit'}), // 提交审批
+    defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-plan-main:reject'}), // 驳回
+    defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-plan-main:agree'}), // 审批通过
+    defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:deliver-plan-main:publish'}), // 发布
+    defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:deliver-plan-main:resetting'}), // 重置
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-plan-main:update'}), // 编辑
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainPlanOpe') { // 打开
+    tableObject.loading = true
+    DeliverPlanMainApi.open(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanClo') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    DeliverPlanMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanSub') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    DeliverPlanMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanTur') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    DeliverPlanMainApi.reject(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanApp') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    DeliverPlanMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanPub') { // 发布
+    await message.confirm('确认要发布吗？')
+    tableObject.loading = true
+    DeliverPlanMainApi.publish(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanRes') { // 重置
+    await message.confirm('确认要重置吗？')
+    tableObject.loading = true
+    DeliverPlanMainApi.resetting(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'planDeliverMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await DeliverPlanMainApi.deleteDeliverPlanMain(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DeliverPlanMainApi.exportDeliverPlanMain(tableObject.params)
+    download.excel(data, '发货计划主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+DeliverPlanDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+//为true表示子表数据中存在数量为0的数据
+const flag = ref(false)
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+    // 判断是否重复物料
+    let isExist = false
+  tableData.value.forEach(item => {
+   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))
+   if(rs.length > 1) isExist = true
+  })
+  if (isExist) {
+    formRef.value.formLoading = false
+    return message.warning('物料代码重复')
+  }
+  data.subList.forEach(obj => {
+    if(obj.qty == 0){
+      message.error(`数量不能为0!`)
+      flag.value = true
+      return;
+    }
+  })
+  if(flag.value){
+    formRef.value.formLoading = false
+    return
+  }
+ var isHave =DeliverPlanMain.allSchemas.formSchema.some(function (item) {
+        return item.field === 'beginTime' || item.field === 'endTime';
+      });
+      if(isHave){
+        if(data.beginTime && data.endTime && data.beginTime >=data.expireTime){
+          message.error('结束时间要大于开始时间')
+          return;
+        }
+      }
+      console.log(data.beginTime)
+      if(!data.beginTime)data.beginTime = null;
+      if(!data.planDate)data.planDate = null;
+      if(!data.endTime)data.endTime = null;
+  try {
+    if (formType === 'create') {
+      await DeliverPlanMainApi.createDeliverPlanMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DeliverPlanMainApi.updateDeliverPlanMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '发货计划主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await DeliverPlanMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
new file mode 100644
index 000000000..5e9f21dec
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
@@ -0,0 +1,329 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SaleMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SaleMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="SaleMainRules"
+    :formAllSchemas="SaleMain.allSchemas"
+    :tableAllSchemas="SaleDetail.allSchemas"
+    :tableFormRules="SaleDetailRules"
+    :tableData="tableData"
+    :apiUpdate="SaleMainApi.updateSaleMain"
+    :apiCreate="SaleMainApi.createSaleMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="SaleMain.allSchemas"
+    :detailAllSchemas="SaleDetail.allSchemas"
+    :detailAllSchemasRules="SaleDetailRules"
+    :apiCreate="SaleDetailApi.createSaleDetail"
+    :apiUpdate="SaleDetailApi.updateSaleDetail"
+    :apiPage="SaleDetailApi.getSaleDetailPage"
+    :apiDelete="SaleDetailApi.deleteSaleDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/sale-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SaleMain,SaleMainRules,SaleDetail,SaleDetailRules } from './saleMain.data'
+import * as SaleMainApi from '@/api/wms/saleMain'
+import * as SaleDetailApi from '@/api/wms/saleDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 销售订单主
+defineOptions({ name: 'SaleMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SaleMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SaleMainApi.getSaleMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:sale-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:sale-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:sale-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListOrderCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+        defaultButtons.mainListOrderPubBtn({hide:isShowMainButton(row,['1'])}), // 发布
+        defaultButtons.mainListOrderOpeBtn({hide:isShowMainButton(row,['3'])}), // 打开
+        defaultButtons.mainListOrderWitBtn({hide:isShowMainButton(row,['2'])}), // 下架
+        defaultButtons.mainListEditBtn({hasPermi:'wms:sale-main:update',hide:isShowMainButton(row,['1'])}), // 编辑
+        defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-main:delete',hide:isShowMainButton(row,['1'])}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+  } else if (val == 'mainReAdd') { // 重新添加
+    console.log('列表-操作按钮事件-重新添加')
+  } else if (val == 'mainSubmit') { // 提交审批
+    console.log('列表-操作按钮事件-提交审批')
+  } else if (val == 'mainTurnDown') { // 驳回
+    console.log('列表-操作按钮事件-驳回')
+  } else if (val == 'mainApprove') { // 审批通过
+    console.log('列表-操作按钮事件-审批通过')
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'orderSaleMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await SaleMainApi.deleteSaleMain(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SaleMainApi.exportSaleMain(tableObject.params)
+    download.excel(data, '销售订单主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+SaleDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await SaleMainApi.createSaleMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SaleMainApi.updateSaleMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '销售订单主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await SaleMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
new file mode 100644
index 000000000..3e52a8b61
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
@@ -0,0 +1,749 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 销售订单主表
+ */
+export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户信息', // 查询弹窗标题
+        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '订单类型',
+    field: 'type',
+    dictType: DICT_TYPE.SALE_ORDER_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单日期',
+    field: 'orderDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止日期',
+    field: 'dueDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '版本',
+    field: 'version',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '税率',
+    field: 'taxRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    }
+  },
+  {
+    label: '联系人姓名',
+    field: 'contactName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人电话',
+    field: 'contactPhone',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人电子邮件',
+    field: 'contactEmail',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'Deliver',
+      componentProps: {
+        disabled: true
+       }
+    },
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '当前阶段',
+    field: 'currentStage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const SaleMainRules = reactive({
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' }
+  ],
+  type: [
+    { required: true, message: '请选择订单类型', trigger: 'change' }
+  ],
+  orderDate: [
+    { required: true, message: '请输入订单日期', trigger: 'change' }
+  ],
+  taxRate: [
+    { required: true, message: '请输入税率', trigger: 'blur' }
+  ],
+  version:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactName:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactPhone:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
+  ],
+  contactEmail:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateEmail, message: '请输入正确的手机号', trigger: 'blur'}
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  currentStage:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
+
+/**
+ * @returns {Array} 销售订单子表
+ */
+export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '行号',
+    field: 'lineNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '客户计量数量',
+    field: 'customerPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '客户计量单位',
+    field: 'customerPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '已发货数量',
+    field: 'shippedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '已收货数量',
+    field: 'receivedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '已退货数量',
+    field: 'returnedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '物料基础信息', // 查询弹窗标题
+      searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+      searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isTableForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const SaleDetailRules = reactive({
+  lineNumber: [
+    { required: true, message: '请输入行号', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  planQty: [
+    { required: true, message: '请输入计划数量', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
new file mode 100644
index 000000000..6fceca776
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
@@ -0,0 +1,252 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="StockupMainJob.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="StockupMainJob.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="StockupMainJobRules"
+    :formAllSchemas="StockupMainJob.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="StockupDetailJob.allSchemas"
+    :tableFormRules="StockupDetailJobRules"
+    :apiUpdate="StockupJobMainApi.updateStockupMainJob"
+    :apiCreate="StockupJobMainApi.createStockupMainJob"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="StockupMainJob.allSchemas"
+    :detailAllSchemas="StockupDetailJob.allSchemas"
+    :detailAllSchemasRules="StockupDetailJobRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="StockupJobDetailApi.getStockupDetailJobPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { StockupMainJob,StockupMainJobRules,StockupDetailJob,StockupDetailJobRules } from './stockupMainJob.data'
+import * as StockupJobMainApi from '@/api/wms/stockupMainJob'
+import * as StockupJobDetailApi from '@/api/wms/stockupDetailJob'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+// 备货任务主
+defineOptions({ name: 'StockupJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(StockupMainJob.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: StockupJobMainApi.getStockupMainJobPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:stockup-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+   if (val == 'mainJobExe') { // 执行
+    handleHandle
+  } else if (val == 'mainJobAba') { // 放弃
+    StockupJobMainApi.abandonStockupMainJob(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    StockupJobMainApi.closeStockupMainJob(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    StockupJobMainApi.acceptStockupMainJob(row.id)
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'stockupMainJob')
+}
+
+const handleHandle = async (data) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    await StockupJobMainApi.executeStockupMainJob(data)
+    message.success(t('common.handleSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await StockupJobMainApi.exportStockupMainJob(tableObject.params)
+    download.excel(data, '备货任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
new file mode 100644
index 000000000..ae116f734
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
@@ -0,0 +1,588 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const StockupMainJobRules = reactive({
+})
+
+export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '发货记录单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    table: {
+      width: 180
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    table: {
+      width: 180
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+ 
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    table: {
+      width: 180
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+  },
+  {
+    label: '承接人用户名',
+    field: 'acceptUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    table: {
+      width: 180
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '完成人用户名',
+    field: 'completeUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    table: {
+      width: 180
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+                table: {
+                  width: 120
+                },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库库存状态范围',
+    field: 'inInventoryStatuses',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '出库库存状态范围',
+    field: 'outInventoryStatuses',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    table: {
+      width: 180
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const StockupDetailJobRules = reactive({
+})
+
+export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    },
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
new file mode 100644
index 000000000..6ba0203ae
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
@@ -0,0 +1,175 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="StockupMainRecord.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="StockupMainRecord.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="StockupMainRecordRules"
+    :formAllSchemas="StockupMainRecord.allSchemas"
+    :tableAllSchemas="StockupDetailRecord.allSchemas"
+    :tableFormRules="StockupDetailRecordRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="StockupMainRecord.allSchemas"
+    :detailAllSchemas="StockupDetailRecord.allSchemas"
+    :detailAllSchemasRules="StockupDetailRecordRules"
+    :apiPage="StockupDetailRecordApi.getStockupDetailRecordPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { StockupMainRecord,StockupMainRecordRules,StockupDetailRecord,StockupDetailRecordRules } from './stockupMainRecord.data'
+import * as StockupMainRecordApi from '@/api/wms/stockupMainRecord'
+import * as StockupDetailRecordApi from '@/api/wms/stockupDetailRecord'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+// 备货记录主
+defineOptions({ name: 'StockupMainRecord' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(StockupMainRecord.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: StockupMainRecordApi.getStockupMainRecordPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'stockupMainRecord')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await StockupMainRecordApi.exportStockupMainRecord(tableObject.params)
+    download.excel(data, '备货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
new file mode 100644
index 000000000..b44bd6867
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
@@ -0,0 +1,577 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const StockupMainRecordRules = reactive({
+})
+
+//主表
+export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '发货记录单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 100
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+//子表
+// 表单校验
+export const StockupDetailRecordRules = reactive({
+})
+
+export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    table: {
+      width: 180
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
new file mode 100644
index 000000000..21dcd5810
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
@@ -0,0 +1,518 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="StockupMainRequest.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="StockupMainRequest.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+        
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="StockupMainRequestRules"
+    :formAllSchemas="StockupMainRequest.allSchemas"
+    :tableAllSchemas="StockupDetailRequest.allSchemas"
+    :tableFormRules="StockupDetailRequestRules"
+    :tableData="tableData"
+    :apiUpdate="StockupMainRequestApi.updateStockupMainRequest"
+    :apiCreate="StockupDetailRequestApi.createStockupDetailRequest"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="StockupMainRequest.allSchemas"
+    :detailAllSchemas="StockupDetailRequest.allSchemas"
+    :detailAllSchemasRules="StockupDetailRequestRules"
+    :apiCreate="StockupDetailRequestApi.createStockupDetailRequest"
+    :apiUpdate="StockupDetailRequestApi.updateStockupDetailRequest"
+    :apiPage="StockupDetailRequestApi.getStockupDetailRequestPage"
+    :apiDelete="StockupDetailRequestApi.deleteStockupDetailRequest"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="trueFalse"
+    :detailButtonIsShowDelete="trueFalse"
+    @detailOpenForm="detailOpenForm"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/stockup-main-request/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { StockupMainRequest,StockupMainRequestRules,StockupDetailRequest,StockupDetailRequestRules } from './stockupMainRequest.data'
+import * as StockupMainRequestApi from '@/api/wms/stockupMainRequest'
+import * as StockupDetailRequestApi from '@/api/wms/stockupDetailRequest'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
+import {DeliverRequestDetail} from '../../deliver/deliverRequestMain/deliverRequestMain.data'
+
+// 备货申请
+defineOptions({ name: 'StockupMainRequest' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(StockupMainRequest.allSchemas.tableColumns)
+
+const isShowButton = ref(true)
+
+//定义  展示子表数据时是否显示新增/修改/删除按钮
+const trueFalse = ref(false)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]      
+      if (type == 'tableForm') {
+      if(formField == 'packingNumber') {
+        row['packingNumber'] = val[0]['packingNumber']
+        row['containerNumber'] = val[0]['containerNumber']
+        row['batch'] = val[0]['batch']
+        row['inventoryStatus'] = val[0]['inventoryStatus']
+        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['uom']
+      }
+      if(formField == 'toLocationCode'){
+        row['toLocationCode'] = val[0]['code']
+      }else{
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]      
+      if(formField == 'deliverPlanNumber') {
+        setV['deliverPlanNumber'] = val[0]['number']
+        if(setV['deliverPlanNumber'] != null){
+          isShowButton.value = false
+        }
+        setV['customerCode'] = val[0]['customerCode']
+        // 获取子表数据 getBomDisassemble
+        DeliverPlanDetailApi.selectDetailByMasterID(val[0]['id'])
+        .then(res => {
+          res.forEach(item => {
+            item.qty = item.planQty
+          })
+          if (res) tableData.value = res
+          // 修改 tableform 属性
+          StockupDetailRequest.allSchemas.tableFormColumns.map(item => {
+            if(item.field == 'itemCode') {
+              item.isInpuFocusShow = false
+              item.tableForm.isInpuFocusShow = false
+              item.tableForm.disabled = true
+            }
+            if(item.field == 'uom') {
+              item.tableForm.disabled = true
+            }
+          })
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+        })
+      }
+    }    
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: StockupMainRequestApi.getStockupMainRequestPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:stockup-main-request:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:stockup-main-request:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:stockup-main-request:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+    // resetShow()
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:stockup-main-request:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:stockup-main-request:reAdd'}), //重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:stockup-main-request:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:stockup-main-request:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:stockup-main-request:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:stockup-main-request:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:stockup-main-request:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:stockup-main-request:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    StockupMainRequestApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    StockupMainRequestApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    StockupMainRequestApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    StockupMainRequestApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    StockupMainRequestApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要处理吗？')
+    tableObject.loading = true
+    StockupMainRequestApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑 
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/**
+ * 详情 编辑页面打开
+ * @param row 
+ */
+ const detailOpenForm = (type) => {
+  // if(type == 'update'){
+    // StockupDetailRequest.allSchemas.formSchema.forEach(() => {
+    // if(itemDetail.field == 'itemCode'){
+    //   itemDetail.componentProps.isSearchList = false
+    //   itemDetail.componentProps.disabled = true
+    // }
+  // })}
+  // else {
+  //   StockupDetailRequest.allSchemas.formSchema.forEach(() => {
+    // if(itemDetail.field == 'itemCode'){
+    //   itemDetail.componentProps.isSearchList = true
+    // }s
+  // })
+  // }
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  if(row.deliverPlanNumber != null){
+        trueFalse.value = false
+    }else {
+      trueFalse.value = true
+    }
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'stockupMainRequest')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await StockupMainRequestApi.deleteStockupMainRequest(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await StockupMainRequestApi.exportStockupMainRequest(tableObject.params)
+    download.excel(data, '备货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+StockupDetailRequest.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+//为true表示子表数据中存在数量为0的数据
+const flag = ref(false)
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  let isExist = false
+  tableData.value.forEach(item => {
+   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))
+   if(rs.length > 1) isExist = true
+  })
+  if (isExist) {
+    formRef.value.formLoading = false
+    return message.warning('物料代码重复')
+  }
+  data.subList.forEach(obj => {
+    if(obj.qty == 0){
+      message.warning(`数量不能为0!`)
+      flag.value = true
+      return;
+    }
+  })
+  if(flag.value){
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      if(tableData.value.length <= 0){
+      message.warning(`子表明细不能为空!`)
+      flag.value = true
+      formRef.value.formLoading = false
+      return;
+  }
+      await StockupMainRequestApi.createStockupMainRequest(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await StockupMainRequestApi.updateStockupMainRequest(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '备货申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+
+// 恢复最初属性：明细添加/删除行按钮，字段查询弹窗，可输入状态等
+// 列表头部 新增按钮 触发
+const resetShow = async () => {
+  isShowButton.value = true // tableform按钮恢复到显示
+  // 修改 tableform 属性
+  StockupDetailRequest.allSchemas.tableFormColumns.map(item => {
+    // if(item.field == 'itemCode') {
+    //   item.isInpuFocusShow = true
+    //   item.tableForm.isInpuFocusShow = true
+    //   item.tableForm.disabled = false
+    // }
+    // if(item.field == 'uom') {
+    //   item.tableForm.disabled = false
+    // }
+    // if(item.field == 'available') {
+    //   item.tableForm.disabled = false
+    // }
+  })
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await StockupMainRequestApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
new file mode 100644
index 000000000..59c7b7997
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -0,0 +1,742 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
+
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain'
+import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data'
+
+import * as  locationApi from '@/api/wms/location'
+import { Location } from '../../../basicDataManage/factoryModeling/location/location.data'
+
+import * as  ItemBasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '../../../basicDataManage/itemManage/itembasic/itembasic.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'StockupRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+  // 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { ItemBasic } from '@/utils/disposition/formFields'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+
+// 表单校验
+export const StockupMainRequestRules = reactive({
+  // deliverPlanNumber: [
+  //   { required: true, message: '请选择客户代码', trigger: 'change' }
+  // ],
+})
+
+export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+  },
+  {
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '发货计划信息', // 查询弹窗标题
+        searchAllSchemas: DeliverPlanMain.allSchemas, // 查询弹窗所需类
+        searchPage: DeliverPlanMainApi.getDeliverPlanMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'status',
+          value: '6',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120
+    },
+    // form: {
+    //   // labelMessage: '信息提示说明！！！',
+    //   componentProps: {
+    //     isSearchList: true, // 开启查询弹窗
+    //     searchListPlaceholder: '请选择从仓库代码', // 输入框占位文本
+    //     searchField: 'number', // 查询弹窗赋值字段
+    //     searchTitle: '仓库信息', // 查询弹窗标题
+    //     searchAllSchemas: Itemwarehouse.allSchemas, // 查询弹窗所需类
+    //     searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+    //     searchCondition: [{
+    //       key: 'available',
+    //       value: 'TRUE',
+    //       isMainValue: false
+    //     }]
+    //   }
+    // }
+    isForm: false
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 160
+    },
+    isForm: false
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      value: 'Stockup',
+      componentProps: {
+        disabled: true,
+      }
+    },
+    table: {
+      width: 110
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '发货日期',
+    field: 'deliverDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+  },
+    {
+      label: '自动提交',
+      field: 'autoCommit',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoCommit,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '自动通过',
+      field: 'autoAgree',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoAgree,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '自动执行',
+      field: 'autoExecute',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoExecute,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '直接生成记录',
+      field: 'directCreateRecord',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.directCreateRecord,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
+      }
+    },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '入库库存状态范围',
+    field: 'inInventoryStatuses',
+    isSearch: false,
+    table: {
+      width: 170
+    },
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    tableForm: {
+      disabled: true,
+      type: 'Select',
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '出库库存状态范围',
+    field: 'outInventoryStatuses',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 170
+    },
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    tableForm: {
+      disabled: true,
+      type: 'Select',
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const StockupDetailRequestRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请选择批次', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  toLocationCode : [
+    { required: true, message: '请选择到库代码', trigger: 'change' }
+  ]
+})
+
+// //子表
+export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    isTableForm: false,
+    table: {
+      width: 180
+    },
+  },
+  // {
+  //   label: '包装号',
+  //   field: 'packingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm:{
+  //     isInpuFocusShow: true, // 开启查询弹窗
+  //     searchListPlaceholder: '请选择包装号',
+  //     searchField: 'packingNumber',
+  //     searchTitle: '库存余额信息',
+  //     searchAllSchemas: Balance.allSchemas,
+  //     searchPage: BalanceApi.getBalanceItemPage,
+  //     searchCondition: [
+  //     //   {
+  //     //   key:'customerCode', // 查询列表中字段
+  //     //   value:'customerCode', // 指主表某字段 
+  //     //   message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
+  //     //   isMainValue: true // 表示查询条件是主表的字段的值
+  //     // }
+  //   ]
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择包装号',
+  //       searchField: 'packingNumber',
+  //       searchTitle: '库存余额信息',
+  //       searchAllSchemas: Balance.allSchemas,
+  //       searchPage: BalanceApi.getBalanceItemPage,
+  //       searchCondition: [
+  //       //   {
+  //       //   key:'customerCode', // 查询列表中字段
+  //       //   value:'customerCode', // 指主表某字段 
+  //       //   message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
+  //       //   isMainValue: true // 表示查询条件是主表的字段的值
+  //       // }
+  //     ]
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '器具号',
+  //   field: 'containerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 100
+  //   },
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '批次',
+  //   field: 'batch',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   tableForm: {
+  //     disabled: true,
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '库存状态',
+  //   field: 'inventoryStatus',
+  //   dictType: DICT_TYPE.INVENTORY_STATUS,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 120
+  //   },
+  //   tableForm: {
+  //     disabled: true,
+  //     type: 'Select'
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '物料基础信息',
+      searchAllSchemas: Itembasic.allSchemas,
+      searchPage: ItemBasicApi.getItembasicPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '物料基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItemBasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    isSearch: true,
+    isTableForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    isTableForm: false,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    isSearch: true,
+    isTableForm: false,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    isSearch: true,
+    isTableForm: false,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择库位代码',
+      searchField: 'location',
+      searchTitle: '库位基础信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: locationApi.getLocationPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择库位代码',
+        searchField: 'location',
+        searchTitle: '库位基础信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: locationApi.getLocationPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    table: {
+      width: 120
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isTableForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts
new file mode 100644
index 000000000..4f6b192ac
--- /dev/null
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@@ -0,0 +1,457 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 库存余额
+ */
+export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '器具代码',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区类型',
+    field: 'areaType',
+    sort: 'custom',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: 'ERP库位代码',
+    field: 'erpLocationCode',
+    dictType: DICT_TYPE.ERP_LOCATION,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效日期',
+    field: 'expireDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '锁定数量',
+    field: 'lockedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '可用数量',
+    field: 'usableQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '入库时间',
+    field: 'putInTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+      }
+    }
+  },
+  {
+    label: '是否冻结',
+    field: 'frozen',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '冻结原因',
+    field: 'frozenReason',
+    dictType: DICT_TYPE.FROZEN_REASON,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '重量',
+    field: 'weight',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '面积',
+    field: 'area',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '体积',
+    field: 'volume',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '最后事务号',
+    field: 'lastTransNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  // TODO: 临时添加 方便操作
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 100,
+      fixed: 'right'
+    },
+  }
+]))
+
+// 表单校验
+export const BalanceRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  containerNumber: [
+    { required: true, message: '请选择器具号', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  arriveDate: [
+    { required: true, message: '请选择到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
new file mode 100644
index 000000000..22ef6d0f9
--- /dev/null
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -0,0 +1,233 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Balance.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Balance.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #itemCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
+          <span>{{ row.itemCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="BalanceRules" 
+    :formAllSchemas="Balance.allSchemas"
+    :apiUpdate="BalanceApi.updateBalance"
+    :apiCreate="BalanceApi.createBalance"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Balance.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/balance/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as BalanceApi from '@/api/wms/balance'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Balance, BalanceRules } from './balance.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+// 库存余额
+defineOptions({ name: 'Balance' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Balance.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BalanceApi.getBalancePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:balance:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:balance:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:balance:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  {
+    label: '标签信息',
+    name: 'bqxx',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    link: true,
+    float:'right',
+    hasPermi: ''
+  },
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'bqxx') {
+    let aaa = 'HPQ;V1.0;I'+row.itemCode+';P'+row.packingNumber+';B'+row.batch+';Q'+row.qty+';U'+row.uom
+    alert(aaa)
+  }
+  // if (val == 'edit') { // 编辑
+  //   // const res = await BalanceApi.getItempackaging(row.id)
+  //   openForm('update', row)
+  // } else if (val == 'delete') { // 删除
+  //   handleDelete(row.id)
+  // }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'transactionBalance')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await BalanceApi.deleteBalance(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BalanceApi.exportBalance(tableObject.params)
+    download.excel(data, '库存余额.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '库存余额导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  // importTemplateData.templateUrl = await BalanceApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/inventoryManage/container/containerMain.data.ts b/src/views/wms/inventoryManage/container/containerMain.data.ts
new file mode 100644
index 000000000..32b728b0b
--- /dev/null
+++ b/src/views/wms/inventoryManage/container/containerMain.data.ts
@@ -0,0 +1,147 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+
+/**
+ * @returns {Array} 器具主表
+ */
+export const ContainerMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '号码',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '类型',
+    field: 'type',
+    dictType: DICT_TYPE.CONTAINER_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    isForm: true,
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '总容量',
+    field: 'capacity',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+    },
+    isSearch: true,
+  },
+  {
+    label: '器具状态',
+    field: 'containerStatus',
+    dictType: DICT_TYPE.CONTAINER_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm: true,
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+  }
+]))
+
+// 表单校验
+export const ContainerMainRules = reactive({
+  number: [
+    { required: true, message: '请输入号码', trigger: 'blur' }
+  ],
+  type: [
+    { required: true, message: '请选择类型', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  ownerCode: [
+    { required: true, message: '请选择货主代码', trigger: 'change' }
+  ],
+})
+
+/**
+ * @returns {Array} 器具子表
+ */
+export const ContainerDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '内容物类型',
+    field: 'containerContentType',
+    dictType: DICT_TYPE.CONTAINER_CONTENT_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    isForm: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '内容物号',
+    field: 'contentNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    isForm: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+// 表单校验
+export const ContainerDetailRules = reactive({
+  containerContentType: [
+    { required: true, message: '请选择内容物类型', trigger: 'change' }
+  ],
+})
diff --git a/src/views/wms/inventoryManage/container/index.vue b/src/views/wms/inventoryManage/container/index.vue
new file mode 100644
index 000000000..bd7f7de6d
--- /dev/null
+++ b/src/views/wms/inventoryManage/container/index.vue
@@ -0,0 +1,171 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ContainerMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ContainerMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '号码', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ContainerMainRules"
+    :formAllSchemas="ContainerMain.allSchemas"
+    :tableAllSchemas="ContainerDetail.allSchemas"
+    :tableFormRules="ContainerDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerMain.allSchemas"
+    :detailAllSchemas="ContainerDetail.allSchemas"
+    :detailAllSchemasRules="ContainerDetailRules"
+    :apiPage="ContainerDetailApi.getContainerDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ContainerMain,ContainerMainRules,ContainerDetail,ContainerDetailRules } from './containerMain.data'
+import * as ContainerMainApi from '@/api/wms/containerMain'
+import * as ContainerDetailApi from '@/api/wms/containerDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 供应商发票记录主
+defineOptions({ name: 'ContainerMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ContainerMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerMainApi.getContainerMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:container-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'transactionContainerMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ContainerMainApi.exportContainerMain(tableObject.params)
+    download.excel(data, '器具主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts
new file mode 100644
index 000000000..2091217e8
--- /dev/null
+++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts
@@ -0,0 +1,171 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ContainerBindRecordMainRules = reactive({
+})
+
+export const ContainerBindRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+
+// 表单校验
+export const ContainerBindRecordDetailRules = reactive({
+
+})
+
+export const ContainerBindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '内容物类型',
+    field: 'containerContentType',
+    dictType: DICT_TYPE.CONTAINER_CONTENT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '内容物号',
+    field: 'contentNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    table: {
+      width: 150
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
new file mode 100644
index 000000000..0508920b2
--- /dev/null
+++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
@@ -0,0 +1,294 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ContainerBindRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ContainerBindRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="ContainerBindRecordMainRules"
+    :formAllSchemas="ContainerBindRecordMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ContainerBindRecordDetail.allSchemas"
+    :tableFormRules="ContainerBindRecordDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ContainerBindRecordMainApi.updateContainerBindRecordMain"
+    :apiCreate="ContainerBindRecordMainApi.createContainerBindRecordMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerBindRecordMain.allSchemas"
+    :detailAllSchemas="ContainerBindRecordDetail.allSchemas"
+    :detail-all-schemas-rules="ContainerBindRecordDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiCreate="ContainerBindRecordDetailApi.createContainerBindRecordDetail"
+    :apiUpdate="ContainerBindRecordDetailApi.updateContainerBindRecordDetail"
+    :apiPage="ContainerBindRecordDetailApi.getContainerBindRecordDetailPage"
+    :apiDelete="ContainerBindRecordDetailApi.deleteContainerBindRecordDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/container-bind-record-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ContainerBindRecordMain,ContainerBindRecordMainRules,ContainerBindRecordDetail,ContainerBindRecordDetailRules } from './containerBindRecordMain.data'
+import * as ContainerBindRecordMainApi from '@/api/wms/containerBindRecordMain'
+import * as ContainerBindRecordDetailApi from '@/api/wms/containerBindRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+
+defineOptions({ name: 'ContainerBindRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ContainerBindRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerBindRecordMainApi.getContainerBindRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:container-bind-record-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:container-bind-record-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:container-bind-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:container-bind-record-detail:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-bind-record-detail:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicContainerBindRecordMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ContainerBindRecordMainApi.deleteContainerBindRecordMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ContainerBindRecordMainApi.exportContainerBindRecordMain(tableObject.params)
+    download.excel(data, '器具绑定记录主.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await ContainerBindRecordMainApi.createContainerBindRecordMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ContainerBindRecordMainApi.updateContainerBindRecordMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
+  }
+}
+
+const tableData = ref([])
+
+const tableFormKeys = {}
+ContainerBindRecordDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '器具绑定记录主导入模版.xls'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ContainerBindRecordMainApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts
new file mode 100644
index 000000000..4a6b743fc
--- /dev/null
+++ b/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts
@@ -0,0 +1,145 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ContainerRepairRecordMainRules = reactive({
+})
+
+export const ContainerRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+
+// 表单校验
+export const ContainerRepairRecordDetailRules = reactive({
+
+})
+
+export const ContainerRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '从状态',
+    field: 'fromContainerStatus',
+    dictType: DICT_TYPE.CONTAINER_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    },
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '到状态',
+    field: 'toContainerStatus',
+    dictType: DICT_TYPE.CONTAINER_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    },
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
new file mode 100644
index 000000000..86c1759b2
--- /dev/null
+++ b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
@@ -0,0 +1,293 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ContainerRepairRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ContainerRepairRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="ContainerRepairRecordMainRules"
+    :formAllSchemas="ContainerRepairRecordMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ContainerRepairRecordDetail.allSchemas"
+    :tableFormRules="ContainerRepairRecordDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ContainerRepairRecordMainApi.updateContainerRepairRecordMain"
+    :apiCreate="ContainerRepairRecordMainApi.createContainerRepairRecordMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerRepairRecordMain.allSchemas"
+    :detailAllSchemas="ContainerRepairRecordDetail.allSchemas"
+    :detail-all-schemas-rules="ContainerRepairRecordDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiCreate="ContainerRepairRecordDetailApi.createContainerRepairRecordDetail"
+    :apiUpdate="ContainerRepairRecordDetailApi.updateContainerRepairRecordDetail"
+    :apiPage="ContainerRepairRecordDetailApi.getContainerRepairRecordDetailPage"
+    :apiDelete="ContainerRepairRecordDetailApi.deleteContainerRepairRecordDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/container-repair-record-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ContainerRepairRecordMain,ContainerRepairRecordMainRules,ContainerRepairRecordDetail,ContainerRepairRecordDetailRules } from './containerRepairRecordMain.data'
+import * as ContainerRepairRecordMainApi from '@/api/wms/containerRepairRecordMain'
+import * as ContainerRepairRecordDetailApi from '@/api/wms/containerRepairRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+
+defineOptions({ name: 'ContainerRepairRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ContainerRepairRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerRepairRecordMainApi.getContainerRepairRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:container-repair-record-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:container-repair-record-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:container-repair-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  //defaultButtons.mainListEditBtn({hasPermi:'wms:container-repair-record-main:update'}), // 编辑
+  //defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-repair-record-main:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicContainerRepairRecordMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ContainerRepairRecordMainApi.deleteContainerRepairRecordMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ContainerRepairRecordMainApi.exportContainerRepairRecordMain(tableObject.params)
+    download.excel(data, '器具维修记录主.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await ContainerRepairRecordMainApi.createContainerRepairRecordMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ContainerRepairRecordMainApi.updateContainerRepairRecordMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
+  }
+}
+
+const tableData = ref([])
+
+const tableFormKeys = {}
+ContainerRepairRecordDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '器具维修记录主导入模版.xls'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ContainerRepairRecordMainApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts
new file mode 100644
index 000000000..25337e1c1
--- /dev/null
+++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts
@@ -0,0 +1,170 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ContainerUnbindRecordMainRules = reactive({
+})
+
+export const ContainerUnbindRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ContainerUnbindRecordDetailRules = reactive({
+
+})
+
+export const ContainerUnbindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '内容物类型',
+    field: 'containerContentType',
+    dictType: DICT_TYPE.CONTAINER_CONTENT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '内容物号',
+    field: 'contentNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    table: {
+      width: 150
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
new file mode 100644
index 000000000..7c58106af
--- /dev/null
+++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
@@ -0,0 +1,293 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ContainerUnbindRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ContainerUnbindRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="ContainerUnbindRecordMainRules"
+    :formAllSchemas="ContainerUnbindRecordMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ContainerUnbindRecordDetail.allSchemas"
+    :tableFormRules="ContainerUnbindRecordDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ContainerUnbindRecordMainApi.updateContainerUnbindRecordMain"
+    :apiCreate="ContainerUnbindRecordMainApi.createContainerUnbindRecordMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerUnbindRecordMain.allSchemas"
+    :detailAllSchemas="ContainerUnbindRecordDetail.allSchemas"
+    :detail-all-schemas-rules="ContainerUnbindRecordDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiCreate="ContainerUnbindRecordDetailApi.createContainerUnbindRecordDetail"
+    :apiUpdate="ContainerUnbindRecordDetailApi.updateContainerUnbindRecordDetail"
+    :apiPage="ContainerUnbindRecordDetailApi.getContainerUnbindRecordDetailPage"
+    :apiDelete="ContainerUnbindRecordDetailApi.deleteContainerUnbindRecordDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/container-unbind-record-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ContainerUnbindRecordMain,ContainerUnbindRecordMainRules,ContainerUnbindRecordDetail,ContainerUnbindRecordDetailRules } from './containerUnbindRecordMain.data'
+import * as ContainerUnbindRecordMainApi from '@/api/wms/containerUnbindRecordMain'
+import * as ContainerUnbindRecordDetailApi from '@/api/wms/containerUnbindRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+
+defineOptions({ name: 'ContainerUnbindRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ContainerUnbindRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerUnbindRecordMainApi.getContainerUnbindRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:container-unbind-record-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:container-unbind-record-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:container-unbind-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  //defaultButtons.mainListEditBtn({hasPermi:'wms:container-unbind-record-main:update'}), // 编辑
+  //defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-unbind-record-main:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicContainerUnbindRecordMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ContainerUnbindRecordMainApi.deleteContainerUnbindRecordMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ContainerUnbindRecordMainApi.exportContainerUnbindRecordMain(tableObject.params)
+    download.excel(data, '器具解绑记录主.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await ContainerUnbindRecordMainApi.createContainerUnbindRecordMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ContainerUnbindRecordMainApi.updateContainerUnbindRecordMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
+  }
+}
+
+const tableData = ref([])
+
+const tableFormKeys = {}
+ContainerUnbindRecordDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '器具解绑记录主导入模版.xls'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ContainerUnbindRecordMainApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts
new file mode 100644
index 000000000..722fc9bc3
--- /dev/null
+++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts
@@ -0,0 +1,271 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import {Owner} from "@/views/wms/basicDataManage/orderManage/owner/owner.data";
+import * as OwnerApi from "@/api/wms/owner";
+import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+import {Balance} from "@/views/wms/inventoryManage/balance/balance.data";
+import * as BalanceApi from "@/api/wms/balance";
+
+// 表单校验
+export const ContainerMainRules = reactive({
+  type: [
+    { required: true, message: '请选择类型', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ]
+})
+
+export const ContainerMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '器具号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '类型',
+    field: 'type',
+    dictType: DICT_TYPE.CONTAINER_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    isForm: true,
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '总容量',
+    field: 'capacity',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+    },
+    isSearch: true,
+  },
+  {
+    label: '器具状态',
+    field: 'containerStatus',
+    dictType: DICT_TYPE.CONTAINER_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm: true,
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择货主代码',
+      searchField: 'code',
+      searchTitle: '货主信息',
+      searchAllSchemas: Owner.allSchemas,
+      searchPage: OwnerApi.getOwnerPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择货主代码',
+        searchField: 'code',
+        searchTitle: '货主信息',
+        searchAllSchemas: Owner.allSchemas,
+        searchPage: OwnerApi.getOwnerPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+
+/**
+ * @returns {Array} 器具子表
+ */
+export const ContainerDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '内容物类型',
+    field: 'containerContentType',
+    dictType: DICT_TYPE.CONTAINER_CONTENT_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    isForm: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '内容物号',
+    field: 'contentNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: true,
+      earchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePage,
+      searchCondition:[{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        isMainValue: true
+      }]
+    },
+    form:{
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalancePage,
+        searchCondition: [{
+          key: 'warehouseCode',
+          value: 'fromWarehouseCode',
+          isMainValue: true,
+        }]
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    isForm: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+// 表单校验
+export const ContainerDetailRules = reactive({
+  containerContentType: [
+    { required: true, message: '请选择内容物类型', trigger: 'change' }
+  ],
+})
diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue
new file mode 100644
index 000000000..b2e734a86
--- /dev/null
+++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue
@@ -0,0 +1,324 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ContainerMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ContainerMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ContainerMainRules"
+    :formAllSchemas="ContainerMain.allSchemas"
+    :apiUpdate="ContainerMainApi.updateContainerMain"
+    :apiCreate="ContainerMainApi.createContainerMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerMain.allSchemas"
+    :detailAllSchemas="ContainerDetail.allSchemas"
+    :detailAllSchemasRules="ContainerDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="ContainerDetailApi.getContainerDetailPage"
+    :apiCreate="ContainerDetailApi.createContainerDetail"
+    :apiUpdate="ContainerDetailApi.updateContainerDetail"
+    :apiDelete="ContainerDetailApi.deleteContainerDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ContainerMain,ContainerMainRules,ContainerDetail,ContainerDetailRules } from './containerMain.data'
+import * as ContainerMainApi from '@/api/wms/containerMain'
+import * as ContainerDetailApi from '@/api/wms/containerDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'ContainerMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ContainerMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerMainApi.getContainerMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:container-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:container-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:container-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:container-main:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-main:delete'}), // 删除
+  {
+    label: '维修',
+    name: 'repair',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  },
+  {
+    label: '报废',
+    name: 'scrap',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  }
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if(val == 'repair'){ // 维修
+    repairSubmit(row.id)
+  } else if(val == 'scrap'){ // 报废
+    scrapSubmit(row.id)
+  }
+}
+
+/** 维修按钮操作 */
+const repairSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await ContainerMainApi.repairSubmitContainerRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 报废按钮操作 */
+const scrapSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await ContainerMainApi.scrapSubmitContainerRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'contentNumber'){
+      setV['contentNumber'] = val[0]['packingNumber']
+      setV['batch'] = val[0]['batch']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
+      setV['qty'] = val[0]['qty']
+      setV['uom'] = val[0]['uom']
+      setV['itemCode'] = val[0]['itemCode']
+    }else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ContainerMainApi.deleteContainerMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ContainerMainApi.exportContainerMain(tableObject.params)
+    download.excel(data, '器具主.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '器具主导入模版.xls'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  if (formType === 'create') {
+    await ContainerMainApi.createContainerMain(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ContainerMainApi.updateContainerMain(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts
new file mode 100644
index 000000000..96c82cf8c
--- /dev/null
+++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts
@@ -0,0 +1,149 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ContainerInitRecordMainRules = reactive({
+})
+
+export const ContainerInitRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table:{
+      show:false
+    }
+  },
+]))
+
+export const ContainerInitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '类型',
+    field: 'type',
+    dictType: DICT_TYPE.CONTAINER_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '总容量',
+    field: 'capacity',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.CONTAINER_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    table: {
+      width: 150
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ContainerInitRecordDetailRules = reactive({
+
+})
diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue
new file mode 100644
index 000000000..b3b2ce535
--- /dev/null
+++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue
@@ -0,0 +1,293 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ContainerInitRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ContainerInitRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="ContainerInitRecordMainRules"
+    :formAllSchemas="ContainerInitRecordMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ContainerInitRecordDetail.allSchemas"
+    :tableFormRules="ContainerInitRecordDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ContainerInitRecordMainApi.updateContainerInitRecordMain"
+    :apiCreate="ContainerInitRecordMainApi.createContainerInitRecordMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerInitRecordMain.allSchemas"
+    :detailAllSchemas="ContainerInitRecordDetail.allSchemas"
+    :detail-all-schemas-rules="ContainerInitRecordDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiCreate="ContainerInitRecordDetailApi.createContainerInitRecordDetail"
+    :apiUpdate="ContainerInitRecordDetailApi.updateContainerInitRecordDetail"
+    :apiPage="ContainerInitRecordDetailApi.getContainerInitRecordDetailPage"
+    :apiDelete="ContainerInitRecordDetailApi.deleteContainerInitRecordDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/container-init-record-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ContainerInitRecordMain,ContainerInitRecordMainRules,ContainerInitRecordDetail,ContainerInitRecordDetailRules } from './containerInitRecordMain.data'
+import * as ContainerInitRecordMainApi from '@/api/wms/containerInitRecordMain'
+import * as ContainerInitRecordDetailApi from '@/api/wms/containerInitRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+
+defineOptions({ name: 'ContainerInitRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ContainerInitRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerInitRecordMainApi.getContainerInitRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:container-init-record-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:container-init-record-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:container-init-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:container-init-record-main:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-init-record-main:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicContainerInitRecordMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ContainerInitRecordMainApi.deleteContainerInitRecordMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ContainerInitRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+    download.excel(data, '器具初始化记录主.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await ContainerInitRecordMainApi.createContainerInitRecordMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ContainerInitRecordMainApi.updateContainerInitRecordMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
+  }
+}
+
+const tableData = ref([])
+
+const tableFormKeys = {}
+ContainerInitRecordDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '器具初始化记录主导入模版.xls'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ContainerInitRecordMainApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/inventoryManage/expectin/expectin.data.ts b/src/views/wms/inventoryManage/expectin/expectin.data.ts
new file mode 100644
index 000000000..6bdfce756
--- /dev/null
+++ b/src/views/wms/inventoryManage/expectin/expectin.data.ts
@@ -0,0 +1,134 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+
+/**
+ * @returns {Array} 预计入库存
+ */
+export const Expectin = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '任务号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+// 表单校验
+export const ExpectinRules = reactive({
+  jobNumber: [
+    { required: true, message: '请选择任务号', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请选择业务类型', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  qty: [
+    { required: true, message: '请输入数量', trigger: 'blur' }
+  ],
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  ownerCode: [
+    { required: true, message: '请选择货主代码', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryManage/expectin/index.vue b/src/views/wms/inventoryManage/expectin/index.vue
new file mode 100644
index 000000000..10a5957a9
--- /dev/null
+++ b/src/views/wms/inventoryManage/expectin/index.vue
@@ -0,0 +1,219 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Expectin.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Expectin.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #jobNumber="{row}">
+        <el-button type="primary" link @click="openDetail(row, '任务号', row.jobNumber)">
+          <span>{{ row.jobNumber }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="ExpectinRules" 
+    :formAllSchemas="Expectin.allSchemas"
+    :apiUpdate="ExpectinApi.updateExpectin"
+    :apiCreate="ExpectinApi.createExpectin"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Expectin.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/expectin/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as ExpectinApi from '@/api/wms/expectin'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Expectin, ExpectinRules } from './expectin.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Expectin' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Expectin.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ExpectinApi.getExpectinPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:expectin:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:expectin:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:expectin:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:expectin:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:expectin:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await ExpectinApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'transactionExpectin')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ExpectinApi.deleteExpectin(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ExpectinApi.exportExpectin(tableObject.params)
+    download.excel(data, '预计入库存.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '预计入库存导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  // importTemplateData.templateUrl = await ExpectinApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/inventoryManage/expectout/expectout.data.ts b/src/views/wms/inventoryManage/expectout/expectout.data.ts
new file mode 100644
index 000000000..fbd23d856
--- /dev/null
+++ b/src/views/wms/inventoryManage/expectout/expectout.data.ts
@@ -0,0 +1,145 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+
+/**
+ * @returns {Array} 预计出库存
+ */
+export const Expectout = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '任务号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+// 表单校验
+export const ExpectoutRules = reactive({
+  jobNumber: [
+    { required: true, message: '请选择任务号', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请选择业务类型', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  qty: [
+    { required: true, message: '请输入数量', trigger: 'blur' }
+  ],
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  ownerCode: [
+    { required: true, message: '请选择货主代码', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryManage/expectout/index.vue b/src/views/wms/inventoryManage/expectout/index.vue
new file mode 100644
index 000000000..378331143
--- /dev/null
+++ b/src/views/wms/inventoryManage/expectout/index.vue
@@ -0,0 +1,219 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Expectout.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Expectout.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #jobNumber="{row}">
+        <el-button type="primary" link @click="openDetail(row, '任务号', row.jobNumber)">
+          <span>{{ row.jobNumber }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="ExpectoutRules" 
+    :formAllSchemas="Expectout.allSchemas"
+    :apiUpdate="ExpectoutApi.updateExpectout"
+    :apiCreate="ExpectoutApi.createExpectout"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Expectout.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/expectout/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as ExpectoutApi from '@/api/wms/expectout'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Expectout, ExpectoutRules } from './expectout.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Expectout' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Expectout.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ExpectoutApi.getExpectoutPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:expectout:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:expectout:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:expectout:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:expectout:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:expectout:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await ExpectoutApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'transactionExpectout')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ExpectoutApi.deleteExpectout(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ExpectoutApi.exportExpectout(tableObject.params)
+    download.excel(data, '预计出库存.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '预计出库存导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  // importTemplateData.templateUrl = await ExpectoutApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/inventoryManage/locationcapacity/index.vue b/src/views/wms/inventoryManage/locationcapacity/index.vue
new file mode 100644
index 000000000..2b9b228e9
--- /dev/null
+++ b/src/views/wms/inventoryManage/locationcapacity/index.vue
@@ -0,0 +1,219 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Locationcapacity.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Locationcapacity.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #locationCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '库位代码', row.locationCode)">
+          <span>{{ row.locationCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="LocationcapacityRules" 
+    :formAllSchemas="Locationcapacity.allSchemas"
+    :apiUpdate="LocationcapacityApi.updateLocationcapacity"
+    :apiCreate="LocationcapacityApi.createLocationcapacity"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Locationcapacity.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/locationcapacity/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as LocationcapacityApi from '@/api/wms/locationcapacity'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Locationcapacity, LocationcapacityRules } from './locationcapacity.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Locationcapacity' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Locationcapacity.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: LocationcapacityApi.getLocationcapacityPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:locationcapacity:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:locationcapacity:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:locationcapacity:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:locationcapacity:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:locationcapacity:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await LocationcapacityApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'transactionLocationcapacity')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await LocationcapacityApi.deleteLocationcapacity(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await LocationcapacityApi.exportLocationcapacity(tableObject.params)
+    download.excel(data, '库位容量.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '库位容量导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  // importTemplateData.templateUrl = await LocationcapacityApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/inventoryManage/locationcapacity/locationcapacity.data.ts b/src/views/wms/inventoryManage/locationcapacity/locationcapacity.data.ts
new file mode 100644
index 000000000..8c6945dfe
--- /dev/null
+++ b/src/views/wms/inventoryManage/locationcapacity/locationcapacity.data.ts
@@ -0,0 +1,71 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+
+/**
+ * @returns {Array} 库位容量
+ */
+export const Locationcapacity = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '已用容量百分比',
+    field: 'usedCapacity',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '可用容量百分比',
+    field: 'availableCapacity',
+    sort: 'custom',
+  },
+  {
+    label: '可承受过载容量百分比',
+    field: 'bearableOverloadCapacity',
+    sort: 'custom',
+  },
+  {
+    label: '是否无限容量',
+    field: 'isInfinity',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+]))
+
+// 表单校验
+export const LocationcapacityRules = reactive({
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  usedCapacity: [
+    { required: true, message: '请输入已用容量百分比', trigger: 'blur' }
+  ],
+  availableCapacity: [
+    { required: true, message: '请输入可用容量百分比', trigger: 'blur' }
+  ],
+  bearableOverloadCapacity: [
+    { required: true, message: '请输入可承受过载容量百分比', trigger: 'blur' }
+  ],
+  isInfinity: [
+    { required: true, message: '请选择是否无限容量', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue
new file mode 100644
index 000000000..89c592de0
--- /dev/null
+++ b/src/views/wms/inventoryManage/package/index.vue
@@ -0,0 +1,266 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Package.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="PackageRules" 
+    :formAllSchemas="Package.allSchemas" 
+    :searchTableParams="searchTableParams"
+    :apiUpdate="PackageApi.updatePackage"
+    :apiCreate="PackageApi.createPackageLabel"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Package.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/package/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { Package,PackageRules } from './package.data'
+import * as PackageApi from '@/api/wms/package'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'package' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Package.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => {
+  nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      basicFormRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PackageApi.getPackagePage // 分页接口
+})
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+// const isShowMainButton = (row,val) => {
+//   if (val.indexOf(row.status) > -1) {
+//     return false
+//   } else {
+//     return true
+//   }
+// }
+
+// 列表-操作按钮
+// const butttondata = (row) => {
+//     return [
+//         defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+//         defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+//         defaultButtons.mainListPointBtn(null), // 标签打印
+//     ]
+// }
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+  defaultButtons.mainListPointBtn(null), // 标签打印
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm =async (type: string, row?: number) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await PackageApi.deletePackage(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PackageApi.exportPackage(tableObject.params)
+    download.excel(data, '包装.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+
+// 标签打印
+const handlePoint = async (row) => {
+  // 判断是采购还是制造
+  if (row.asnNumber !== null && row.asnNumber !== '') {
+    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+    window.open(src.value+'&id='+row.id)
+  } else {
+    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+    window.open(src.value+'&id='+row.id)
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '包装导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts
new file mode 100644
index 000000000..b48aba3c8
--- /dev/null
+++ b/src/views/wms/inventoryManage/package/package.data.ts
@@ -0,0 +1,420 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+// 表单校验
+export const PackageRules = reactive({
+  number: [required],
+  itemCode: [required],
+  itemName: [required],
+})
+export const Package = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '有效期(日)',
+    field: 'validityDays',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+      value: 0
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '失效日期',
+    field: 'expireDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代计量单位',
+    field: 'altUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代数量',
+    field: 'altQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    // form: {
+    //   component: 'SelectV2'
+    // },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '供应商物料代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购计划单号',
+    field: 'rpNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 182,
+    },
+  },
+  {
+    label: '生产订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '班组代码',
+    field: 'teamCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '班次代码',
+    field: 'shiftCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户月台代码',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户物料代码',
+    field: 'customerItemCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '销售订单号',
+    field: 'soNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '销售订单行',
+    field: 'soLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '质量等级',
+    field: 'eqLevel',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '重量',
+    field: 'weight',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '面积',
+    field: 'area',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '体积',
+    field: 'volume',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/inventoryManage/transaction/index.vue b/src/views/wms/inventoryManage/transaction/index.vue
new file mode 100644
index 000000000..3333d94ce
--- /dev/null
+++ b/src/views/wms/inventoryManage/transaction/index.vue
@@ -0,0 +1,220 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Transaction.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Transaction.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '事务号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="TransactionRules" 
+    :formAllSchemas="Transaction.allSchemas"
+    :apiUpdate="TransactionApi.updateTransaction"
+    :apiCreate="TransactionApi.createTransaction"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Transaction.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/transaction/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as TransactionApi from '@/api/wms/transaction'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Transaction, TransactionRules } from './transaction.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+// 库存事务
+defineOptions({ name: 'Transaction' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Transaction.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: TransactionApi.getTransactionPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:transaction:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:transaction:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:transaction:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:transaction:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:transaction:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await TransactionApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'transactionTransaction')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await TransactionApi.deleteTransaction(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TransactionApi.exportTransaction(tableObject.params)
+    download.excel(data, '事务类型.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '事务类型导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  // importTemplateData.templateUrl = await TransactionApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/inventoryManage/transaction/transaction.data.ts b/src/views/wms/inventoryManage/transaction/transaction.data.ts
new file mode 100644
index 000000000..bb93b67cd
--- /dev/null
+++ b/src/views/wms/inventoryManage/transaction/transaction.data.ts
@@ -0,0 +1,349 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 库存事务
+ */
+export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '事务号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '事务类型',
+    field: 'transactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存动作',
+    field: 'inventoryAction',
+    dictType: DICT_TYPE.INVENTORY_ACTION,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作员',
+    field: 'worker',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '记录号',
+    field: 'recordNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区类型',
+    field: 'areaType',
+    sort: 'custom',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: 'ERP库位代码',
+    field: 'erpLocationCode',
+    dictType: DICT_TYPE.ERP_LOCATION,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+      }
+    }
+  },
+  {
+    label: '失效日期',
+    field: 'expireDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+// 表单校验
+export const TransactionRules = reactive({
+  number: [
+    { required: true, message: '请输入事务号', trigger: 'blur' }
+  ],
+  transactionType: [
+    { required: true, message: '请选择事务类型', trigger: 'change' }
+  ],
+  inventoryAction: [
+    { required: true, message: '请选择库存动作', trigger: 'change' }
+  ],
+  worker: [
+    { required: true, message: '请选择操作员', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请选择业务类型', trigger: 'change' }
+  ],
+  recordNumber: [
+    { required: true, message: '请选择记录号', trigger: 'change' }
+  ],
+  activeTime: [
+    { required: true, message: '请选择生效时间', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryManage/transferlog/index.vue b/src/views/wms/inventoryManage/transferlog/index.vue
new file mode 100644
index 000000000..f9e7663fe
--- /dev/null
+++ b/src/views/wms/inventoryManage/transferlog/index.vue
@@ -0,0 +1,219 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Transferlog.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Transferlog.allSchemas"
+   />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '库存转移日志', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="TransferlogRules" 
+    :formAllSchemas="Transferlog.allSchemas"
+    :apiUpdate="ExpectinApi.updateTransferlog"
+    :apiCreate="ExpectinApi.createTransferlog"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Transferlog.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/transferlog/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as ExpectinApi from '@/api/wms/transferlog'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Transferlog, TransferlogRules } from './transferlog.data'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'Transferlog' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Transferlog.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ExpectinApi.getTransferlogPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:transferlog:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:transferlog:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:transferlog:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:transferlog:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:transferlog:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    // const res = await ExpectinApi.getItempackaging(row.id)
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'transactionTransferlog')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ExpectinApi.deleteTransferlog(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ExpectinApi.exportTransferlog(tableObject.params)
+    download.excel(data, '库存转移日志.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '库存转移日志导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  // importTemplateData.templateUrl = await ExpectinApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts
new file mode 100644
index 000000000..b45596682
--- /dev/null
+++ b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts
@@ -0,0 +1,380 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 库存转移日志
+ */
+export const Transferlog = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'recordNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '日志号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '事务类型',
+    field: 'transactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作员',
+    field: 'worker',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '失效日期',
+    field: 'expireDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从事务号',
+    field: 'fomTransactionNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从ERP库位代码',
+    field: 'fromErpLocationCode',
+    dictType: DICT_TYPE.ERP_LOCATION,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到事务号',
+    field: 'toTransactionNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到ERP库位代码',
+    field: 'toErpLocationCode',
+    dictType: DICT_TYPE.ERP_LOCATION,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+// 表单校验
+export const TransferlogRules = reactive({
+  number: [
+    { required: true, message: '请输入日志号', trigger: 'blur' }
+  ],
+  transactionType: [
+    { required: true, message: '请选择事务类型', trigger: 'change' }
+  ],
+  worker: [
+    { required: true, message: '请选择操作员', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请选择业务类型', trigger: 'change' }
+  ],
+  activeTime: [
+    { required: true, message: '请选择生效时间', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
new file mode 100644
index 000000000..d3f4a0c1f
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InventoryinitRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InventoryinitRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="InventoryinitRecordMainRules"
+    :formAllSchemas="InventoryinitRecordMain.allSchemas"
+    :tableAllSchemas="InventoryinitRecordDetail.allSchemas"
+    :tableFormRules="InventoryinitRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InventoryinitRecordMain.allSchemas"
+    :detailAllSchemas="InventoryinitRecordDetail.allSchemas"
+    :detailAllSchemasRules="InventoryinitRecordDetailRules"
+    :apiPage="InventoryinitRecordDetailApi.getInventoryinitRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { InventoryinitRecordMain,InventoryinitRecordMainRules,InventoryinitRecordDetail,InventoryinitRecordDetailRules } from './inventoryinitRecordMain.data'
+import * as InventoryinitRecordMainApi from '@/api/wms/inventoryinitRecordMain'
+import * as InventoryinitRecordDetailApi from '@/api/wms/inventoryinitRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 库存初始化记录主
+defineOptions({ name: 'InventoryinitRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InventoryinitRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InventoryinitRecordMainApi.getInventoryinitRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:inventoryinit-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordInventoryinitMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await InventoryinitRecordMainApi.exportInventoryinitRecordMain(tableObject.params)
+    download.excel(data, '库存初始化记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
new file mode 100644
index 000000000..e7efd47fb
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
@@ -0,0 +1,639 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 库存初始化记录主表
+ */
+export const InventoryinitRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const InventoryinitRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 库存初始化记录子表
+ */
+export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const InventoryinitRecordDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  arriveDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  locationGroupCode: [
+    { required: true, message: '请选择库位组代码', trigger: 'change' }
+  ],
+  areaCode: [
+    { required: true, message: '请选择库区代码', trigger: 'change' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
new file mode 100644
index 000000000..527706479
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@@ -0,0 +1,413 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InventoryinitRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InventoryinitRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="InventoryinitRequestMainRules"
+    :formAllSchemas="InventoryinitRequestMain.allSchemas"
+    :tableAllSchemas="InventoryinitRequestDetail.allSchemas"
+    :tableFormRules="InventoryinitRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="InventoryinitRequestMainApi.updateInventoryinitRequestMain"
+    :apiCreate="InventoryinitRequestMainApi.createInventoryinitRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InventoryinitRequestMain.allSchemas"
+    :detailAllSchemas="InventoryinitRequestDetail.allSchemas"
+    :detailAllSchemasRules="InventoryinitRequestDetailRules"
+    :apiCreate="InventoryinitRequestDetailApi.createInventoryinitRequestDetail"
+    :apiUpdate="InventoryinitRequestDetailApi.updateInventoryinitRequestDetail"
+    :apiPage="InventoryinitRequestDetailApi.getInventoryinitRequestDetailPage"
+    :apiDelete="InventoryinitRequestDetailApi.deleteInventoryinitRequestDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/inventoryinit-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { InventoryinitRequestMain,InventoryinitRequestMainRules,InventoryinitRequestDetail,InventoryinitRequestDetailRules } from './inventoryinitRequestMain.data'
+import * as InventoryinitRequestMainApi from '@/api/wms/inventoryinitRequestMain'
+import * as InventoryinitRequestDetailApi from '@/api/wms/inventoryinitRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 库存初始化申请
+defineOptions({ name: 'InventoryinitRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InventoryinitRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InventoryinitRequestMainApi.getInventoryinitRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:inventoryinit-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:inventoryinit-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:inventoryinit-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:inventoryinit-request-main:close'}), // 关闭
+    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:inventoryinit-request-main:reAdd'}), //重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventoryinit-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventoryinit-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventoryinit-request-main:agree'}), // 审批通过
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:inventoryinit-request-main:handle'}), // 处理
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventoryinit-request-main:update'}), // 编辑
+  
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    handleClose(row.id)
+  } else if (val == 'mainReAdd') { // 重新添加
+    handleReAdd(row.id)
+  } else if (val == 'mainSubmit') { // 提交审批
+    handleSubmit(row.id)
+  } else if (val == 'mainTurnDown') { // 驳回
+    handleRefused(row.id)
+  } else if (val == 'mainApprove') { // 审批通过
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.id)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  }
+}
+
+
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await InventoryinitRequestMainApi.closeInventoryinitRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await InventoryinitRequestMainApi.reAddInventoryinitRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await InventoryinitRequestMainApi.submitInventoryinitRequestMain(id)
+    message.success(t('common.updateSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await InventoryinitRequestMainApi.agreeInventoryinitRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await InventoryinitRequestMainApi.handleInventoryinitRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await InventoryinitRequestMainApi.refusedInventoryinitRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestInventoryinitMain')
+}
+
+/** 删除按钮操作 */
+// const handleDelete = async (id: number) => {
+//   try {
+//     // 删除的二次确认
+//     await message.delConfirm()
+//     // 发起删除
+//     await InventoryinitRequestMainApi.deleteInventoryinitRequestMain(id)
+//     message.success(t('common.delSuccess'))
+//     // 刷新列表
+//     await getList()
+//   } catch {}
+// }
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await InventoryinitRequestMainApi.exportInventoryinitRequestMain(tableObject.params)
+    download.excel(data, '库存初始化申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+InventoryinitRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await InventoryinitRequestMainApi.createInventoryinitRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await InventoryinitRequestMainApi.updateInventoryinitRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '库存初始化申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await InventoryinitRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
new file mode 100644
index 000000000..74b944bd9
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -0,0 +1,871 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as WarehouseApi  from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+import * as LocationApi  from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as ItembasicApi  from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+import * as OwnerApi  from '@/api/wms/owner'
+import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'InventoryInitialRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 库存初始化申请主表
+ */
+export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'InventoryInitial',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const InventoryinitRequestMainRules = reactive({
+  warehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 库存初始化申请子表
+ */
+export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'code',
+      searchTitle: '物料基础信息',
+      searchAllSchemas: Itembasic.allSchemas,
+      searchPage: ItembasicApi.getItembasicPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'code',
+        searchTitle: '物料基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.getLocationPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择货主代码',
+      searchField: 'code',
+      searchTitle: '货主信息',
+      searchAllSchemas: Owner.allSchemas,
+      searchPage: OwnerApi.getOwnerPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择货主代码',
+        searchField: 'code',
+        searchTitle: '货主信息',
+        searchAllSchemas: Owner.allSchemas,
+        searchPage: OwnerApi.getOwnerPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const InventoryinitRequestDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  containerNumber: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  arriveDate: [
+    { required: true, message: '请选择到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ], 
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue
new file mode 100644
index 000000000..ab6d184b6
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue
@@ -0,0 +1,163 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PackagemergeMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PackagemergeMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PackagemergeMainRules"
+    :formAllSchemas="PackagemergeMain.allSchemas"
+    :tableAllSchemas="PackagemergeDetail.allSchemas"
+    :tableFormRules="PackagemergeDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PackagemergeMain.allSchemas"
+    :detailAllSchemas="PackagemergeDetail.allSchemas"
+    :detailAllSchemasRules="PackagemergeDetailRules"
+    :apiPage="PackagemergeDetailApi.getPackagemergeDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PackagemergeMain,PackagemergeMainRules, PackagemergeDetail, PackagemergeDetailRules } from './packagemergeMain.data'
+import * as PackagemergeMainApi from '@/api/wms/packagemergeMain'
+import * as PackagemergeDetailApi from '@/api/wms/packagemergeDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 合包记录
+defineOptions({ name: 'PackagemergeMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PackagemergeMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PackagemergeMainApi.getPackagemergeMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:packagemerge-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PackagemergeMainApi.exportPackagemergeMain(tableObject.params)
+    download.excel(data, '合包记录.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
new file mode 100644
index 000000000..0b0a8acd2
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
@@ -0,0 +1,415 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+export const PackagemergeMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '用户组',
+    field: 'userGroupCode',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    sort: 'custom',
+    isTable:false
+  },
+
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  }
+]))
+
+// 表单校验
+export const PackagemergeMainRules = reactive({
+})
+
+export const PackagemergeDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从数量',
+    field: 'fromQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到数量',
+    field: 'toQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+]))
+
+// 表单校验
+export const PackagemergeDetailRules = reactive({
+})
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
new file mode 100644
index 000000000..7bb7eb81b
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PackageoverJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PackageoverJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <!-- <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template> -->
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PackageoverJobMainRules"
+    :formAllSchemas="PackageoverJobMain.allSchemas"
+    :tableAllSchemas="PackageoverJobDetail.allSchemas"
+    :tableFormRules="PackageoverJobDetailRules"
+    :apiUpdate="PackageoverJobMainApi.updatePackageoverJobMain"
+    :apiCreate="PackageoverJobMainApi.createPackageoverJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PackageoverJobMain.allSchemas"
+    :detailAllSchemas="PackageoverJobDetail.allSchemas"
+    :detailAllSchemasRules="PackageoverJobDetailRules"
+    :apiPage="PackageoverJobDetailApi.getPackageoverJobDetailPage"
+  />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PackageoverJobMain,PackageoverJobMainRules,PackageoverJobDetail,PackageoverJobDetailRules } from './packageoverJobMain.data'
+import * as PackageoverJobMainApi from '@/api/wms/packageoverJobMain'
+import * as PackageoverJobDetailApi from '@/api/wms/packageoverJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+defineOptions({ name: 'PackageoverJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PackageoverJobMain.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PackageoverJobMainApi.getPackageoverJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:packageover-job-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:packageover-job-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:packageover-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:packageover-job-main:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:packageover-job-main:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =PackageoverJobMain.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await PackageoverJobMainApi.createPackageoverJobMain(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await PackageoverJobMainApi.updatePackageoverJobMain(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicPackageoverJobMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PackageoverJobMainApi.deletePackageoverJobMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PackageoverJobMainApi.exportPackageoverJobMain(tableObject.params)
+    download.excel(data, '翻包任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
new file mode 100644
index 000000000..d9afde219
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
@@ -0,0 +1,821 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库库存状态范围',
+    field: 'inInventoryStatuses',
+    sort: 'custom',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '出库库存状态范围',
+    field: 'outInventoryStatuses',
+    sort: 'custom',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '承接人用户名',
+    field: 'acceptUserId',
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人用户名',
+    field: 'completeUserId',
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'update',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isForm: false,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   }
+  // }
+]))
+
+// 表单校验
+export const PackageoverJobMainRules = reactive({
+
+})
+
+export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '从包装号',
+  //   field: 'fromPackingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到包装号',
+  //   field: 'toPackingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从包装规格',
+    field: 'fromPackUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装规格',
+    field: 'toPackUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从标包数量',
+    field: 'fromPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到标包数量',
+    field: 'toPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'update',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isForm: false,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   }
+  // }
+]))
+
+// 表单校验
+export const PackageoverJobDetailRules = reactive({
+
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
new file mode 100644
index 000000000..9774d78d0
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
@@ -0,0 +1,196 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PackageoverMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PackageoverMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PackageoverMainRules"
+    :formAllSchemas="PackageoverMain.allSchemas"
+    :tableAllSchemas="PackageoverDetail.allSchemas"
+    :tableFormRules="PackageoverDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PackageoverMain.allSchemas"
+    :detailAllSchemas="PackageoverDetail.allSchemas"
+    :detailAllSchemasRules="PackageoverDetailRules"
+    :apiPage="PackageoverRecordDetailApi.getPackageoverDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PackageoverMain,PackageoverMainRules, PackageoverDetail, PackageoverDetailRules } from './packageoverRecordMain.data'
+import * as PackageoverRecordMainApi from '@/api/wms/packageoverRecordMain'
+import * as PackageoverRecordDetailApi from '@/api/wms/packageoverRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as PackageApi from '@/api/wms/package'
+import { getAccessToken } from '@/utils/auth'
+
+// 翻包记录
+defineOptions({ name: 'PackageoverMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PackageoverMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PackageoverRecordMainApi.getPackageoverMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:packageover-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [defaultButtons.mainListPointBtn(null)] // 标签打印
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const labelType = ref('') // 标签类别 采购还是制造等
+// 标签打印
+const handlePoint = async (row) => {
+  // 查询是否已创建过标签
+  await PackageApi.getPackagePage({
+    requestNumber: row.number
+  }).then((res) => {
+    if(res.list.length > 0) {
+      if (res.list[0].productionLineCode != null) {
+        labelType.value = 'zz'
+      } else {
+        labelType.value = 'cg'
+      }
+    }
+  }).catch(err => {
+    console.log(err)
+  })
+  // 判断是采购还是制造
+  if (labelType.value == 'cg') {
+    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+    window.open(src.value+'&request_number='+row.number)
+  } else {
+    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+    window.open(src.value+'&request_number='+row.number)
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PackageoverRecordMainApi.exportPackageoverMain(tableObject.params)
+    download.excel(data, '翻包记录.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
new file mode 100644
index 000000000..0cdb5f1f4
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
@@ -0,0 +1,496 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '任务单据号',
+    field: 'jobNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    sort: 'custom',
+    isTable:false
+  },
+
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'update',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+
+// 表单校验
+export const PackageoverMainRules = reactive({
+})
+
+// 翻包子
+export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装规格',
+    field: 'fromPackUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装规格',
+    field: 'toPackUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从标包数量',
+    field: 'fromPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到标包数量',
+    field: 'toPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '从器具号',
+  //   field: 'fromContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到器具号',
+  //   field: 'toContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '从货主代码',
+  //   field: 'fromOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到货主代码',
+  //   field: 'toOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '创建时间',
+  //   field: 'createTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false
+  // },
+]))
+
+// 表单校验
+export const PackageoverDetailRules = reactive({
+})
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
new file mode 100644
index 000000000..d43b42968
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
@@ -0,0 +1,439 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PackageoverRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PackageoverRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PackageoverRequestMainRules"
+    :formAllSchemas="PackageoverRequestMain.allSchemas"
+    :tableAllSchemas="PackageoverRequestDetail.allSchemas"
+    :tableFormRules="PackageoverRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="PackageoverRequestMainApi.updatePackageoverRequestMain"
+    :apiCreate="PackageoverRequestMainApi.createPackageoverRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PackageoverRequestMain.allSchemas"
+    :detailAllSchemas="PackageoverRequestDetail.allSchemas"
+    :detailAllSchemasRules="PackageoverRequestDetailRules"
+    :apiCreate="PackageoverRequestDetailApi.createPackageoverRequestDetail"
+    :apiUpdate="PackageoverRequestDetailApi.updatePackageoverRequestDetail"
+    :apiPage="PackageoverRequestDetailApi.getPackageoverRequestDetailPage"
+    :apiDelete="PackageoverRequestDetailApi.deletePackageoverRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/packageover-request-main/import" :importTemplateData="importTemplateData" @success="importSuccess" 
+  :updateIsDisable="true" :coverIsDisable="true" :mode="2"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { PackageoverRequestMain,PackageoverRequestMainRules, PackageoverRequestDetail, PackageoverRequestDetailRules } from './packageoverRequestMain.data'
+import * as PackageoverRequestMainApi from '@/api/wms/packageoverRequestMain'
+import * as PackageoverRequestDetailApi from '@/api/wms/packageoverRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'PackageoverRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PackageoverRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if (formField == 'itemCode') {
+        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['uom']
+        row['qty'] = val[0]['qty']
+        row['batch'] = val[0]['batch']
+        row['fromLocationCode'] = val[0]['locationCode']
+        row['toLocationCode'] = val[0]['locationCode']
+        row['fromLocationGroupCode'] = val[0]['locationGroupCode']
+        row['toLocationGroupCode'] = val[0]['locationGroupCode']
+        row['fromAreaCode'] = val[0]['areaCode']
+        row['toAreaCode'] = val[0]['areaCode']
+        row['inventoryStatus'] = val[0]['inventoryStatus']
+        row['fromPackUnit'] = val[0]['packUnit']
+        row['fromPackQty'] = val[0]['packQty']
+      } else if (formField == 'toPackUnit') {
+        row['toPackUnit'] = val[0]['packUnit']
+        row['toPackQty'] = val[0]['packQty']
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      if (formField == 'fromWarehouseCode') {
+        setV['fromWarehouseCode'] = val[0]['code']
+        setV['toWarehouseCode'] = val[0]['code']
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if (formField == 'itemCode') {
+      setV['itemCode'] = val[0]['itemCode']
+      setV['uom'] = val[0]['uom']
+      setV['qty'] = val[0]['qty']
+      setV['batch'] = val[0]['batch']
+      setV['fromLocationCode'] = val[0]['locationCode']
+      setV['toLocationCode'] = val[0]['locationCode']
+      setV['fromLocationGroupCode'] = val[0]['locationGroupCode']
+      setV['toLocationGroupCode'] = val[0]['locationGroupCode']
+      setV['fromAreaCode'] = val[0]['areaCode']
+      setV['toAreaCode'] = val[0]['areaCode']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
+      setV['fromPackUnit'] = val[0]['packUnit']
+      setV['fromPackQty'] = val[0]['packQty']
+    } else if (formField == 'toPackUnit') {
+      setV['toPackUnit'] = val[0]['packUnit']
+      setV['toPackQty'] = val[0]['packQty']
+    } else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PackageoverRequestMainApi.getPackageoverRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:packageover-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:packageover-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:packageover-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:packageover-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:packageover-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:packageover-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:packageover-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:packageover-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:packageover-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:packageover-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:issue-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    PackageoverRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    PackageoverRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    PackageoverRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    PackageoverRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    PackageoverRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要处理吗？')
+    tableObject.loading = true
+    PackageoverRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑 
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await PackageoverRequestMainApi.deletePackageoverRequestMain(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PackageoverRequestMainApi.exportPackageoverRequestMain(tableObject.params)
+    download.excel(data, '翻包申请.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+PackageoverRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  let tableForm = JSON.parse(JSON.stringify(tableFormKeys))
+  tableData.value.push(tableForm)
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  if(tableData.value.find(item => (item.toPackUnit == item.fromPackUnit))) {
+    message.warning('从包装规格与到包装规格不能相同')
+    formRef.value.formLoading = false
+    return
+  }
+  if(tableData.value.find(item => (item.qty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      await PackageoverRequestMainApi.createPackageoverRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PackageoverRequestMainApi.updatePackageoverRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '翻包申请导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await PackageoverRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
new file mode 100644
index 000000000..3bf617148
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
@@ -0,0 +1,890 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+import * as ItempackagingApi from '@/api/wms/itempackage'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+// 获取自动提交自动通过自动执行，跳过任务直接生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'PackageOverRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+
+export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style:{width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '入库库存状态范围',
+    field: 'inInventoryStatuses',
+    sort: 'custom',
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '出库库存状态范围',
+    field: 'outInventoryStatuses',
+    sort: 'custom',
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'OverPackage',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 180,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const PackageoverRequestMainRules = reactive({
+  fromWarehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+})
+
+export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '库存余额信息', // 查询弹窗标题
+        searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+        searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
+        searchCondition:[
+        //   {
+        //   key: 'locationCode',
+        //   value: 'fromLocationCode',
+        //   message: '请填写从库位代码！',
+        //   isMainValue: true
+        // },
+        {
+          key: 'inventoryStatus',
+          value: 'OK',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '库存余额信息', // 查询弹窗标题
+      searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+      searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
+      searchCondition:[
+      //   {
+      //   key: 'locationCode',
+      //   value: 'fromLocationCode',
+      //   message: '请填写从库位代码！',
+      //   isMainValue: true
+      // },
+      {
+        key: 'inventoryStatus',
+        value: 'OK',
+        isMainValue: false
+      }]
+    },
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 100
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    tableForm:{
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从包装规格',
+    field: 'fromPackUnit',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      isSearchList: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+      searchField: 'packUnit', // 查询弹窗赋值字段
+      searchTitle: '物料包装信息', // 查询弹窗标题
+      searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+      searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'itemCode',
+        value: 'itemCode',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'packUnit', // 查询弹窗赋值字段
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '到包装规格',
+    field: 'toPackUnit',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      isSearchList: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+      searchField: 'packUnit', // 查询弹窗赋值字段
+      searchTitle: '物料包装信息', // 查询弹窗标题
+      searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+      searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'packUnit', // 查询弹窗赋值字段
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '从标包数量',
+    field: 'fromPackQty',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到标包数量',
+    field: 'toPackQty',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 110
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+  }
+]))
+
+// 表单校验
+export const PackageoverRequestDetailRules = reactive({
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  fromPackUnit: [
+    { required: true, message: '请选择从包装规格', trigger: 'change' }
+  ],
+  toPackUnit: [
+    { required: true, message: '请选择到包装规格', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
new file mode 100644
index 000000000..674d15de0
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
@@ -0,0 +1,129 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PackageoverRetrospect.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PackageoverRetrospect.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="PackageoverRetrospect.allSchemas" />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PackageoverRetrospect } from './packageoverRetrospect.data'
+import * as PackageoverRetrospectApi from '@/api/wms/packageoverRetrospect'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'PackageoverRetrospect' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PackageoverRetrospect.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PackageoverRetrospectApi.getPackageoverRetrospectPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:packageoverRetrospect:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:packageoverRetrospect:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:packageoverRetrospect:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicPackageoverRetrospect')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PackageoverRetrospectApi.exportPackageoverRetrospect(tableObject.params)
+    download.excel(data, '翻包记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
new file mode 100644
index 000000000..725b82081
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
@@ -0,0 +1,409 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+// 表单校验
+export const PackageoverRetrospectRules = reactive({
+})
+
+export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '任务单据号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 200
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 200
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装规格',
+    field: 'fromPackUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装规格',
+    field: 'toPackUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从标包数量',
+    field: 'fromPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到标包数量',
+    field: 'toPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    sort: 'custom',
+    isTable:false
+  },
+
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'update',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  }
+]))
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue
new file mode 100644
index 000000000..23f2c3fbb
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue
@@ -0,0 +1,163 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PackagesplitMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PackagesplitMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PackagesplitMainRules"
+    :formAllSchemas="PackagesplitMain.allSchemas"
+    :tableAllSchemas="PackagesplitDetail.allSchemas"
+    :tableFormRules="PackagesplitDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PackagesplitMain.allSchemas"
+    :detailAllSchemas="PackagesplitDetail.allSchemas"
+    :detailAllSchemasRules="PackagesplitDetailRules"
+    :apiPage="PackagesplitDetailApi.getPackagesplitDetailPage"
+  />
+</template>
+
+<script setup lang="ts" >
+import download from '@/utils/download'
+import { PackagesplitMain,PackagesplitMainRules, PackagesplitDetail, PackagesplitDetailRules } from './packagesplitMain.data'
+import * as PackagesplitMainApi from '@/api/wms/packagesplitMain'
+import * as PackagesplitDetailApi from '@/api/wms/packagesplitDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 拆包记录
+defineOptions({ name: 'PackagesplitMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PackagesplitMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PackagesplitMainApi.getPackagesplitMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:packagesplit-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PackagesplitMainApi.exportPackagesplitMainApi(tableObject.params)
+    download.excel(data, '拆包记录.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
new file mode 100644
index 000000000..fef7aa3e7
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
@@ -0,0 +1,417 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+
+export const PackagesplitMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '用户组',
+    field: 'userGroupCode',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    sort: 'custom',
+    isTable:false
+  },
+
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  }
+]))
+
+
+// 表单校验
+export const PackagesplitMainRules = reactive({
+})
+
+export const PackagesplitDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从数量',
+    field: 'fromQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到数量',
+    field: 'toQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+]))
+// 表单校验
+export const PackagesplitDetailRules = reactive({
+})
+
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
new file mode 100644
index 000000000..428ccc3a4
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
@@ -0,0 +1,241 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ScrapJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ScrapJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ScrapJobMainRules"
+    :formAllSchemas="ScrapJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ScrapJobDetail.allSchemas"
+    :tableFormRules="ScrapJobDetailRules"
+    :apiUpdate="ScrapJobMainApi.updateScrapJobMain"
+    :apiCreate="ScrapJobMainApi.createScrapJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ScrapJobMain.allSchemas"
+    :detailAllSchemas="ScrapJobDetail.allSchemas"
+    :detailAllSchemasRules="ScrapJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="ScrapJobDetailApi.getScrapJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ScrapJobMain,ScrapJobMainRules,ScrapJobDetail,ScrapJobDetailRules } from './scrapJobMain.data'
+import * as ScrapJobMainApi from '@/api/wms/scrapJobMain'
+import * as ScrapJobDetailApi from '@/api/wms/scrapJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 报废出库任务主
+defineOptions({ name: 'ScrapJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ScrapJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ScrapJobMainApi.getScrapJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:scrap-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+  } else if (val == 'mainJobClo') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobScrapMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ScrapJobMainApi.exportScrapJobMain(tableObject.params)
+    download.excel(data, '报废出库任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
new file mode 100644
index 000000000..99effbbd7
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -0,0 +1,768 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+
+/**
+ * @returns {Array} 报废出库任务主表
+ */
+export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ScrapJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 报废出库任务子表
+ */
+export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.SCRAP_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const ScrapJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue
new file mode 100644
index 000000000..a0754c892
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ScrapRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ScrapRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ScrapRecordMainRules"
+    :formAllSchemas="ScrapRecordMain.allSchemas"
+    :tableAllSchemas="ScrapRecordDetail.allSchemas"
+    :tableFormRules="ScrapRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ScrapRecordMain.allSchemas"
+    :detailAllSchemas="ScrapRecordDetail.allSchemas"
+    :detailAllSchemasRules="ScrapRecordDetailRules"
+    :apiPage="ScrapRecordDetailApi.getScrapRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ScrapRecordMain,ScrapRecordMainRules,ScrapRecordDetail,ScrapRecordDetailRules } from './scrapRecordMain.data'
+import * as ScrapRecordMainApi from '@/api/wms/scrapRecordMain'
+import * as ScrapRecordDetailApi from '@/api/wms/scrapRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 报废出库记录主
+defineOptions({ name: 'ScrapRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ScrapRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ScrapRecordMainApi.getScrapRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:scrap-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordScrapMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ScrapRecordMainApi.exportScrapRecordMain(tableObject.params)
+    download.excel(data, '报废出库记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
new file mode 100644
index 000000000..f75a7d2ba
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -0,0 +1,580 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+
+/**
+ * @returns {Array} 报废出库记录主表
+ */
+export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+]))
+
+//表单校验
+export const ScrapRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 报废出库记录子表
+ */
+export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.SCRAP_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+]))
+
+//表单校验
+export const ScrapRecordDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
new file mode 100644
index 000000000..76183c8cf
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -0,0 +1,493 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ScrapRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ScrapRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ScrapRequestMainRules"
+    :formAllSchemas="ScrapRequestMain.allSchemas"
+    :tableAllSchemas="ScrapRequestDetail.allSchemas"
+    :tableFormRules="ScrapRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ScrapRequestMainApi.updateScrapRequestMain"
+    :apiCreate="ScrapRequestMainApi.createScrapRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @inputNumberChange="inputNumberChange"
+    @submitForm="submitForm"
+    @tableFormSelectOnBlur="tableFormSelectOnBlur"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ScrapRequestMain.allSchemas"
+    :detailAllSchemas="ScrapRequestDetail.allSchemas"
+    :detailAllSchemasRules="ScrapRequestDetailRules"
+    :apiCreate="ScrapRequestDetailApi.createScrapRequestDetail"
+    :apiUpdate="ScrapRequestDetailApi.updateScrapRequestDetail"
+    :apiPage="ScrapRequestDetailApi.getScrapRequestDetailPage"
+    :apiDelete="ScrapRequestDetailApi.deleteScrapRequestDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @detailBasicFormOnChange="qtyOnChange"
+    :detailValidate="detailValidate"
+    @onBlur="onBlur"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/scrap-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ScrapRequestMain,ScrapRequestMainRules,ScrapRequestDetail,ScrapRequestDetailRules } from './scrapRequestMain.data'
+import * as ScrapRequestMainApi from '@/api/wms/scrapRequestMain'
+import * as ScrapRequestDetailApi from '@/api/wms/scrapRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as StdcostpriceApi from '@/api/wms/stdcostprice'
+
+// 报废出库申请
+defineOptions({ name: 'ScrapRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ScrapRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      row['packingNumber'] = val[0]['packingNumber']
+      row['batch'] = val[0]['batch']
+      row['fromLocationCode'] = val[0]['locationCode']
+      row['itemCode'] = val[0]['itemCode']
+      row['uom'] = val[0]['uom']
+      // 查询标准价格
+      let param = {'itemCode':val[0]['itemCode'] as string}
+      StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
+        row['singlePrice'] = res.price
+      })
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    setV['packingNumber'] = val[0]['packingNumber']
+    setV['batch'] = val[0]['batch']
+    setV['fromLocationCode'] = val[0]['locationCode']
+    setV['itemCode'] = val[0]['itemCode']
+    setV['uom'] = val[0]['uom']
+    // 查询标准价格
+    let param = {'itemCode':val[0]['itemCode'] as string}
+    StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
+        setV['singlePrice'] = res.price
+      })
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ScrapRequestMainApi.getScrapRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:scrap-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:scrap-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:scrap-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:scrap-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:scrap-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:scrap-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:scrap-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:scrap-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:scrap-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:scrap-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:scrap-request-main:delete'}), // 删除
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
+  } else if (val == 'mainReAdd') { // 重新添加
+    console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
+  } else if (val == 'mainSubmit') { // 提交审批
+    console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
+  } else if (val == 'mainTurnDown') { // 驳回
+    console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
+  } else if (val == 'mainApprove') { // 审批通过
+    console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  }  else if (val == 'mainHandle') { // 处理
+    handleHandle(row.id)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await ScrapRequestMainApi.closeScrapRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await ScrapRequestMainApi.reAddScrapRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await ScrapRequestMainApi.submitScrapRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await ScrapRequestMainApi.refusedScrapRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await ScrapRequestMainApi.agreeScrapRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await ScrapRequestMainApi.handleScrapRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestScrapMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ScrapRequestMainApi.deleteScrapRequestMain(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ScrapRequestMainApi.exportScrapRequestMain(tableObject.params)
+    download.excel(data, '报废出库申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ScrapRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      console.log("【报废出库子列表】",data.subList)
+      if(data.subList.length == 0){
+        message.warning("请添加子列表数据")
+        return;
+      }
+      let flag = false;
+      data.subList.forEach((item) => {
+          if(item.qty == 0){
+            message.warning("数量不能为0")
+            flag = true;
+            return;
+          }
+      })
+      if(flag){
+        formRef.value.formLoading = false
+        return
+      }
+      await ScrapRequestMainApi.createScrapRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ScrapRequestMainApi.updateScrapRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '报废出库申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+const onBlur = (field, e) => {
+  if (field == 'reason') {
+    detailRef.value.formRef.formRef.formModel[field] = e.target.value
+  }
+}
+
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  if (field == 'reason') {
+    tableData.value[index][field] = val.target.value
+  }
+}
+
+const inputNumberChange = (field, index, row, val) => {
+  if(field == 'qty' || field == 'singlePrice'){
+    row.amount = row.qty * row.singlePrice
+  }
+}
+
+const qtyOnChange = (field,val) =>{
+  if(field == 'qty' || field == 'singlePrice'){
+    detailRef.value.formRef.formRef.formModel.amount = detailRef.value.formRef.formRef.formModel.qty * detailRef.value.formRef.formRef.formModel.singlePrice
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ScrapRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
new file mode 100644
index 000000000..6ae1a9a94
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -0,0 +1,787 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ScrapRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 报废出库申请主表
+ */
+export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'Scrap',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disable: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disable: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disable: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm:false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disable: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ScrapRequestMainRules = reactive({
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 报废出库申请子表
+ */
+export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePage,
+      searchCondition: [{
+        key: 'warehouseCode',
+        value: 'fromWarehouseCode',
+        message: '请填写从仓库代码！',
+        isMainValue: true
+      },{
+        key: 'inventoryStatus',
+        value: 'SCRAP',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalancePage,
+        searchCondition: [{
+          key: 'warehouseCode',
+          value: 'fromWarehouseCode',
+          message: '请填写从仓库代码！',
+          isMainValue: true
+        },{
+          key: 'inventoryStatus',
+          value: 'SCRAP',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      disabled:true,
+      min: 0,
+      precision: 6,
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps:{
+        disabled:true,
+      }
+    },
+    tableForm: {
+      disabled:true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.SCRAP_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '项目订单号',
+    field: 'projectOrderNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ScrapRequestDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
new file mode 100644
index 000000000..cab328190
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
@@ -0,0 +1,283 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="TransferissueJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="TransferissueJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="TransferissueJobMainRules"
+    :formAllSchemas="TransferissueJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="TransferissueJobDetail.allSchemas"
+    :tableFormRules="TransferissueJobDetailRules"
+    :apiUpdate="TransferissueJobMainApi.updateTransferissueJobMain"
+    :apiCreate="TransferissueJobMainApi.createTransferissueJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="TransferissueJobMain.allSchemas"
+    :detailAllSchemas="TransferissueJobDetail.allSchemas"
+    :detailAllSchemasRules="TransferissueJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="TransferissueJobDetailApi.getTransferissueJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { TransferissueJobMain,TransferissueJobMainRules,TransferissueJobDetail,TransferissueJobDetailRules } from './transferissueJobMain.data'
+import * as TransferissueJobMainApi from '@/api/wms/transferissueJobMain'
+import * as TransferissueJobDetailApi from '@/api/wms/transferissueJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as PurchasereceiptJobMainApi from "@/api/wms/purchasereceiptJobMain";
+import {acceptTransferissueJobMain} from "@/api/wms/transferissueJobMain";
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+// 调拨出库任务主
+defineOptions({ name: 'TransferissueJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(TransferissueJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: TransferissueJobMainApi.getTransferissueJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:transferissue-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-job-main:close'}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+    handleAbandon(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+    handleAccept(row.id)
+  }
+}
+
+/** 放弃按钮操作 */
+const handleAbandon = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await TransferissueJobMainApi.abandonTransferissueJobMain(id)
+    message.success(t('common.closeSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await TransferissueJobMainApi.closeTransferissueJobMain(id)
+    message.success(t('common.closeSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 承接按钮操作 */
+const handleAccept = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await TransferissueJobMainApi.acceptTransferissueJobMain(id)
+    message.success(t('common.closeSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobTransferissueMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TransferissueJobMainApi.exportTransferissueJobMain(tableObject.params)
+    download.excel(data, '调拨出库任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
new file mode 100644
index 000000000..38d3fd546
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
@@ -0,0 +1,854 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+
+/**
+ * @returns {Array} 调拨出库任务主表
+ */
+export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '发货月台',
+    field: 'deliverDock',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从月台代码',
+    field: 'fromDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const TransferissueJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 调拨出库任务子表
+ */
+export const TransferissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    form: {
+      component: 'InputNumber',
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const TransferissueJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue
new file mode 100644
index 000000000..f988040a9
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="TransferissueRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="TransferissueRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="TransferissueRecordMainRules"
+    :formAllSchemas="TransferissueRecordMain.allSchemas"
+    :tableAllSchemas="TransferissueRecordDetail.allSchemas"
+    :tableFormRules="TransferissueRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="TransferissueRecordMain.allSchemas"
+    :detailAllSchemas="TransferissueRecordDetail.allSchemas"
+    :detailAllSchemasRules="TransferissueRecordDetailRules"
+    :apiPage="TransferissueRecordDetailApi.getTransferissueRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { TransferissueRecordMain,TransferissueRecordMainRules,TransferissueRecordDetail,TransferissueRecordDetailRules } from './transferissueRecordMain.data'
+import * as TransferissueRecordMainApi from '@/api/wms/transferissueRecordMain'
+import * as TransferissueRecordDetailApi from '@/api/wms/transferissueRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 调拨出库记录主
+defineOptions({ name: 'TransferissueRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(TransferissueRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: TransferissueRecordMainApi.getTransferissueRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:transferissue-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordTransferissueMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TransferissueRecordMainApi.exportTransferissueRecordMain(tableObject.params)
+    download.excel(data, '调拨出库记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
new file mode 100644
index 000000000..32a7ed2ee
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
@@ -0,0 +1,702 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+
+/**
+ * @returns {Array} 调拨出库记录主表
+ */
+export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从月台代码',
+    field: 'fromDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const TransferissueRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 调拨出库记录子表
+ */
+export const TransferissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const TransferissueRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
new file mode 100644
index 000000000..d9d57d8c4
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
@@ -0,0 +1,477 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="TransferissueRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="TransferissueRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="TransferissueRequestMainRules"
+    :formAllSchemas="TransferissueRequestMain.allSchemas"
+    :tableAllSchemas="TransferissueRequestDetail.allSchemas"
+    :tableFormRules="TransferissueRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="TransferissueRequestMainApi.updateTransferissueRequestMain"
+    :apiCreate="TransferissueRequestMainApi.createTransferissueRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @tableFormSelectOnBlur="tableFormSelectOnBlur"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="TransferissueRequestMain.allSchemas"
+    :detailAllSchemas="TransferissueRequestDetail.allSchemas"
+    :detailAllSchemasRules="TransferissueRequestDetailRules"
+    :apiCreate="TransferissueRequestDetailApi.createTransferissueRequestDetail"
+    :apiUpdate="TransferissueRequestDetailApi.updateTransferissueRequestDetail"
+    :apiPage="TransferissueRequestDetailApi.getTransferissueRequestDetailPage"
+    :apiDelete="TransferissueRequestDetailApi.deleteTransferissueRequestDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailValidate="detailValidate"
+    @onBlur="onBlur"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/transferissue-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { TransferissueRequestMain,TransferissueRequestMainRules,TransferissueRequestDetail,TransferissueRequestDetailRules } from './transferissueRequestMain.data'
+import * as TransferissueRequestMainApi from '@/api/wms/transferissueRequestMain'
+import * as TransferissueRequestDetailApi from '@/api/wms/transferissueRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 调拨出库申请
+defineOptions({ name: 'TransferissueRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(TransferissueRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if (formField == 'packingNumber') {
+        row['packingNumber'] = val[0]['packingNumber']
+        row['containerNumber'] = val[0]['containerNumber']
+        row['batch'] = val[0]['batch']
+        row['inventoryStatus'] = val[0]['inventoryStatus']
+        row['fromLocationCode'] = val[0]['locationCode']
+        row['itemCode'] = val[0]['itemCode']
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'packingNumber'){
+      setV['packingNumber'] = val[0]['packingNumber']
+      setV['containerNumber'] = val[0]['containerNumber']
+      setV['batch'] = val[0]['batch']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
+      setV['fromLocationCode'] = val[0]['locationCode']
+      setV['itemCode'] = val[0]['itemCode']
+    }else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: TransferissueRequestMainApi.getTransferissueRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:transferissue-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:transferissue-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:transferissue-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:transferissue-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:transferissue-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferissue-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferissue-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:transferissue-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-request-main:update'}), // 编辑
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
+  } else if (val == 'mainReAdd') { // 重新添加
+    console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
+  } else if (val == 'mainSubmit') { // 提交审批
+    console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
+  } else if (val == 'mainTurnDown') { // 驳回
+    console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
+  } else if (val == 'mainApprove') { // 审批通过
+    console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.id)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await TransferissueRequestMainApi.closeTransferissueRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await TransferissueRequestMainApi.reAddTransferissueRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await TransferissueRequestMainApi.submitTransferissueRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await TransferissueRequestMainApi.refusedTransferissueRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await TransferissueRequestMainApi.agreeTransferissueRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await TransferissueRequestMainApi.handleTransferissueRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+const onBlur = (field, e) => {
+  if (field == 'reason') {
+    detailRef.value.formRef.formRef.formModel[field] = e.target.value
+  }
+}
+
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  if (field == 'reason') {
+    tableData.value[index][field] = val.target.value
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestTransferissueMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await TransferissueRequestMainApi.deleteTransferissueRequestMain(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TransferissueRequestMainApi.exportTransferissueRequestMain(tableObject.params)
+    download.excel(data, '调拨出库申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+TransferissueRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    console.log("【调拨出库子列表】",data.subList)
+    if (formType === 'create') {
+      if(data.subList.length == 0){
+        message.warning("请添加子列表数据")
+        return;
+      }
+      let flag = false;
+      data.subList.forEach((item) => {
+          if(item.qty == 0){
+            message.warning("数量不能为0")
+            flag = true;
+            return;
+          }
+      })
+      if(flag){
+        formRef.value.formLoading = false
+        return
+      }
+      await TransferissueRequestMainApi.createTransferissueRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await TransferissueRequestMainApi.updateTransferissueRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '调拨出库申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await TransferissueRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
new file mode 100644
index 000000000..8ecbc07aa
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -0,0 +1,910 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as CarrierApi  from '@/api/wms/carrier'
+import { Carrier } from '@/views/wms/basicDataManage/orderManage/carrier/carrier.data'
+
+import * as DockApi  from '@/api/wms/dock'
+import { Dock } from '@/views/wms/basicDataManage/factoryModeling/dock/dock.data'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'TransferDeliverRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+
+
+/**
+ * @returns {Array} 调拨出库申请主表
+ */
+export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择承运商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '承运商信息', // 查询弹窗标题
+        searchAllSchemas: Carrier.allSchemas, // 查询弹窗所需类
+        searchPage: CarrierApi.getCarrierPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从月台代码',
+    field: 'fromDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择从月台代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '月台信息', // 查询弹窗标题
+        searchAllSchemas: Dock.allSchemas, // 查询弹窗所需类
+        searchPage: DockApi.getDockPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'TransferDeliver',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const TransferissueRequestMainRules = reactive({
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  vehiclePlateNumber:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 调拨出库申请子表
+ */
+export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePage,
+      searchCondition: [{
+        key: 'warehouseCode',
+        value: 'fromWarehouseCode',
+        message: '请填写从仓库代码！',
+        isMainValue: true,
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalancePage,
+        searchCondition: [{
+          key: 'warehouseCode',
+          value: 'fromWarehouseCode',
+          message: '请填写从仓库代码！',
+          isMainValue: true,
+        }]
+      }
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '来源库位',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'warehouseCode',
+        value: 'toWarehouseCode',
+        message: '请填写到仓库代码！',
+        isMainValue: true,
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'warehouseCode',
+          value: 'toWarehouseCode',
+          message: '请填写到仓库代码！',
+          isMainValue: true,
+        }]
+      }
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const TransferissueRequestDetailRules = reactive({
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
new file mode 100644
index 000000000..69c3480a6
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
@@ -0,0 +1,241 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="TransferreceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="TransferreceiptJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="TransferreceiptJobMainRules"
+    :formAllSchemas="TransferreceiptJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="TransferreceiptJobDetail.allSchemas"
+    :tableFormRules="TransferreceiptJobDetailRules"
+    :apiUpdate="TransferreceiptJobMainApi.updateTransferreceiptJobMain"
+    :apiCreate="TransferreceiptJobMainApi.createTransferreceiptJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="TransferreceiptJobMain.allSchemas"
+    :detailAllSchemas="TransferreceiptJobDetail.allSchemas"
+    :detailAllSchemasRules="TransferreceiptJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="TransferreceiptJobDetailApi.getTransferreceiptJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { TransferreceiptJobMain,TransferreceiptJobMainRules,TransferreceiptJobDetail,TransferreceiptJobDetailRules } from './transferreceiptJobMain.data'
+import * as TransferreceiptJobMainApi from '@/api/wms/transferreceiptJobMain'
+import * as TransferreceiptJobDetailApi from '@/api/wms/transferreceiptJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 调拨入库任务主
+defineOptions({ name: 'TransferreceiptJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(TransferreceiptJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: TransferreceiptJobMainApi.getTransferreceiptJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:transferreceipt-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+  } else if (val == 'mainJobClo') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobTransferreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TransferreceiptJobMainApi.exportTransferreceiptJobMain(tableObject.params)
+    download.excel(data, '调拨入库任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
new file mode 100644
index 000000000..e11a049d3
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
@@ -0,0 +1,846 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+
+/**
+ * @returns {Array} 调拨入库任务主表
+ */
+export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const TransferreceiptJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 调拨入库任务子表
+ */
+export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const TransferreceiptJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue
new file mode 100644
index 000000000..b2b72f479
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="TransferreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="TransferreceiptRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="TransferreceiptRecordMainRules"
+    :formAllSchemas="TransferreceiptRecordMain.allSchemas"
+    :tableAllSchemas="TransferreceiptRecordDetail.allSchemas"
+    :tableFormRules="TransferreceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="TransferreceiptRecordMain.allSchemas"
+    :detailAllSchemas="TransferreceiptRecordDetail.allSchemas"
+    :detailAllSchemasRules="TransferreceiptRecordDetailRules"
+    :apiPage="TransferreceiptRecordDetailApi.getTransferreceiptRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { TransferreceiptRecordMain,TransferreceiptRecordMainRules,TransferreceiptRecordDetail,TransferreceiptRecordDetailRules } from './transferreceiptRecordMain.data'
+import * as TransferreceiptRecordMainApi from '@/api/wms/transferreceiptRecordMain'
+import * as TransferreceiptRecordDetailApi from '@/api/wms/transferreceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 调拨入库记录主
+defineOptions({ name: 'TransferreceiptRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(TransferreceiptRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: TransferreceiptRecordMainApi.getTransferreceiptRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:transferreceipt-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordTransferreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TransferreceiptRecordMainApi.exportTransferreceiptRecordMain(tableObject.params)
+    download.excel(data, '调拨入库记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
new file mode 100644
index 000000000..e9acb88d2
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
@@ -0,0 +1,710 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+
+/**
+ * @returns {Array} 调拨入库记录主表
+ */
+export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '收货月台',
+    field: 'receiptDock',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const TransferreceiptRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 调拨入库记录子表
+ */
+export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+]))
+
+//表单校验
+export const TransferreceiptRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
new file mode 100644
index 000000000..24a179d68
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
@@ -0,0 +1,428 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="TransferreceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="TransferreceiptRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="TransferreceiptRequestMainRules"
+    :formAllSchemas="TransferreceiptRequestMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="TransferreceiptRequestDetail.allSchemas"
+    :tableFormRules="TransferreceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="TransferreceiptRequestMainApi.updateTransferreceiptRequestMain"
+    :apiCreate="TransferreceiptRequestMainApi.createTransferreceiptRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="TransferreceiptRequestMain.allSchemas"
+    :detailAllSchemas="TransferreceiptRequestDetail.allSchemas"
+    :detailAllSchemasRules="TransferreceiptRequestDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiCreate="TransferreceiptRequestDetailApi.createTransferreceiptRequestDetail"
+    :apiUpdate="TransferreceiptRequestDetailApi.updateTransferreceiptRequestDetail"
+    :apiPage="TransferreceiptRequestDetailApi.getTransferreceiptRequestDetailPage"
+    :apiDelete="TransferreceiptRequestDetailApi.deleteTransferreceiptRequestDetail"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/transferreceipt-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { TransferreceiptRequestMain,TransferreceiptRequestMainRules,TransferreceiptRequestDetail,TransferreceiptRequestDetailRules } from './transferreceiptRequestMain.data'
+import * as TransferreceiptRequestMainApi from '@/api/wms/transferreceiptRequestMain'
+import * as TransferreceiptRequestDetailApi from '@/api/wms/transferreceiptRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+
+// 调拨入库申请
+defineOptions({ name: 'TransferreceiptRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(TransferreceiptRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: TransferreceiptRequestMainApi.getTransferreceiptRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:transferreceipt-request-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:transferreceipt-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:transferreceipt-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:transferreceipt-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:transferreceipt-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferreceipt-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferreceipt-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferreceipt-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:transferreceipt-request-main:handle'}), // 处理
+        // defaultButtons.mainListEditBtn({hasPermi:'wms:transferreceipt-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:transferreceipt-request-main:delete'}), // 删除
+    ]
+}
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
+  } else if (val == 'mainReAdd') { // 重新添加
+    console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
+  } else if (val == 'mainSubmit') { // 提交审批
+    console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
+  } else if (val == 'mainTurnDown') { // 驳回
+    console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
+  } else if (val == 'mainApprove') { // 审批通过
+    console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.id)
+  }else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await TransferreceiptRequestMainApi.handleTransferreceiptRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await TransferreceiptRequestMainApi.agreeTransferreceiptRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await TransferreceiptRequestMainApi.refusedTransferreceiptRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await TransferreceiptRequestMainApi.submitTransferreceiptRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await TransferreceiptRequestMainApi.reAddTransferreceiptRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await TransferreceiptRequestMainApi.closeTransferreceiptRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    tableObject.loading = false
+    await getList()
+  } catch {}
+}
+
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestTransferreceiptMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await TransferreceiptRequestMainApi.deleteTransferreceiptRequestMain(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TransferreceiptRequestMainApi.exportTransferreceiptRequestMain(tableObject.params)
+    download.excel(data, '调拨入库申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+TransferreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await TransferreceiptRequestMainApi.createTransferreceiptRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await TransferreceiptRequestMainApi.updateTransferreceiptRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '调拨入库申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await TransferreceiptRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
new file mode 100644
index 000000000..e8f6ee261
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
@@ -0,0 +1,689 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'TransferReceiptRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 调拨入库申请主表
+ */
+export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'TransferReceipt',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const TransferreceiptRequestMainRules = reactive({
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 调拨入库申请子表
+ */
+export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const TransferreceiptRequestDetailRules = reactive({
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+})
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
new file mode 100644
index 000000000..5ee4577e8
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
@@ -0,0 +1,241 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="UnplannedissueJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="UnplannedissueJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="UnplannedissueJobMainRules"
+    :formAllSchemas="UnplannedissueJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="UnplannedissueJobDetail.allSchemas"
+    :tableFormRules="UnplannedissueJobDetailRules"
+    :apiUpdate="UnplannedissueJobMainApi.updateUnplannedissueJobMain"
+    :apiCreate="UnplannedissueJobMainApi.createUnplannedissueJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="UnplannedissueJobMain.allSchemas"
+    :detailAllSchemas="UnplannedissueJobDetail.allSchemas"
+    :detailAllSchemasRules="UnplannedissueJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="UnplannedissueJobDetailApi.getUnplannedissueJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { UnplannedissueJobMain,UnplannedissueJobMainRules,UnplannedissueJobDetail,UnplannedissueJobDetailRules } from './unplannedissueJobMain.data'
+import * as UnplannedissueJobMainApi from '@/api/wms/unplannedissueJobMain'
+import * as UnplannedissueJobDetailApi from '@/api/wms/unplannedissueJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 计划外出库任务主
+defineOptions({ name: 'UnplannedissueJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(UnplannedissueJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: UnplannedissueJobMainApi.getUnplannedissueJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedissue-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+  } else if (val == 'mainJobClo') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobUnplannedissueMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await UnplannedissueJobMainApi.exportUnplannedissueJobMain(tableObject.params)
+    download.excel(data, '计划外出库任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
new file mode 100644
index 000000000..8609deee4
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
@@ -0,0 +1,769 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+
+/**
+ * @returns {Array} 计划外出库任务主表
+ */
+export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const UnplannedissueJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 计划外出库任务子表
+ */
+export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const UnplannedissueJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
new file mode 100644
index 000000000..d12357f4e
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="UnplannedissueRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="UnplannedissueRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="UnplannedissueRecordMainRules"
+    :formAllSchemas="UnplannedissueRecordMain.allSchemas"
+    :tableAllSchemas="UnplannedissueRecordDetail.allSchemas"
+    :tableFormRules="UnplannedissueRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="UnplannedissueRecordMain.allSchemas"
+    :detailAllSchemas="UnplannedissueRecordDetail.allSchemas"
+    :detailAllSchemasRules="UnplannedissueRecordDetailRules"
+    :apiPage="UnplannedissueRecordDetailApi.getUnplannedissueRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { UnplannedissueRecordMain,UnplannedissueRecordMainRules,UnplannedissueRecordDetail,UnplannedissueRecordDetailRules } from './unplannedissueRecordMain.data'
+import * as UnplannedissueRecordMainApi from '@/api/wms/unplannedissueRecordMain'
+import * as UnplannedissueRecordDetailApi from '@/api/wms/unplannedissueRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 计划外出库记录主
+defineOptions({ name: 'UnplannedissueRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(UnplannedissueRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: UnplannedissueRecordMainApi.getUnplannedissueRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedissue-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordUnplannedissueMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await UnplannedissueRecordMainApi.exportUnplannedissueRecordMain(tableObject.params)
+    download.excel(data, '计划外出库记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
new file mode 100644
index 000000000..75c83ba26
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
@@ -0,0 +1,592 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+
+/**
+ * @returns {Array} 计划外出库记录主表
+ */
+export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从月台代码',
+    field: 'fromDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const UnplannedissueRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 计划外出库记录子表
+ */
+export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+]))
+
+//表单校验
+export const UnplannedissueRecordDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
new file mode 100644
index 000000000..fcefc2809
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
@@ -0,0 +1,461 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="UnplannedissueRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="UnplannedissueRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="UnplannedissueRequestMainRules"
+    :formAllSchemas="UnplannedissueRequestMain.allSchemas"
+    :tableAllSchemas="UnplannedissueRequestDetail.allSchemas"
+    :tableFormRules="UnplannedissueRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="UnplannedissueRequestMainApi.updateUnplannedissueRequestMain"
+    :apiCreate="UnplannedissueRequestMainApi.createUnplannedissueRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @tableFormSelectOnBlur="tableFormSelectOnBlur"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="UnplannedissueRequestMain.allSchemas"
+    :detailAllSchemas="UnplannedissueRequestDetail.allSchemas"
+    :detailAllSchemasRules="UnplannedissueRequestDetailRules"
+    :apiCreate="UnplannedissueRequestDetailApi.createUnplannedissueRequestDetail"
+    :apiUpdate="UnplannedissueRequestDetailApi.updateUnplannedissueRequestDetail"
+    :apiPage="UnplannedissueRequestDetailApi.getUnplannedissueRequestDetailPage"
+    :apiDelete="UnplannedissueRequestDetailApi.deleteUnplannedissueRequestDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailValidate="detailValidate"
+    @onBlur="onBlur"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/unplannedissue-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { UnplannedissueRequestMain,UnplannedissueRequestMainRules,UnplannedissueRequestDetail,UnplannedissueRequestDetailRules } from './unplannedissueRequestMain.data'
+import * as UnplannedissueRequestMainApi from '@/api/wms/unplannedissueRequestMain'
+import * as UnplannedissueRequestDetailApi from '@/api/wms/unplannedissueRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as TransferissueRequestMainApi from "@/api/wms/transferissueRequestMain";
+
+// 计划外出库申请
+defineOptions({ name: 'UnplannedissueRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(UnplannedissueRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      row['packingNumber'] = val[0]['packingNumber']
+      row['containerNumber'] = val[0]['containerNumber']
+      row['batch'] = val[0]['batch']
+      row['inventoryStatus'] = val[0]['inventoryStatus']
+      row['fromLocationCode'] = val[0]['locationCode']
+      row['itemCode'] = val[0]['itemCode']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    setV['packingNumber'] = val[0]['packingNumber']
+    setV['containerNumber'] = val[0]['containerNumber']
+    setV['batch'] = val[0]['batch']
+    setV['inventoryStatus'] = val[0]['inventoryStatus']
+    setV['fromLocationCode'] = val[0]['locationCode']
+    setV['itemCode'] = val[0]['itemCode']
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: UnplannedissueRequestMainApi.getUnplannedissueRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:unplannedissue-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:unplannedissue-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedissue-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:unplannedissue-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedissue-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedissue-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedissue-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedissue-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:unplannedissue-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedissue-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedissue-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
+  } else if (val == 'mainReAdd') { // 重新添加
+    console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
+  } else if (val == 'mainSubmit') { // 提交审批
+    console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
+  } else if (val == 'mainTurnDown') { // 驳回
+    console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
+  } else if (val == 'mainApprove') { // 审批通过
+    console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.id)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  await message.confirm(t('common.confirmHandle'))
+  tableObject.loading = true
+  await UnplannedissueRequestMainApi.handleUnplannedissueRequestMain(id)
+  message.success(t('common.handleSuccess'))
+  tableObject.loading = false
+  await getList()
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  await message.confirm(t('common.confirmAgree'))
+  tableObject.loading = true
+  await UnplannedissueRequestMainApi.agreeUnplannedissueRequestMain(id)
+  message.success(t('common.agreeSuccess'))
+  tableObject.loading = false
+  await getList()
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  await message.confirm(t('common.confirmRefused'))
+  tableObject.loading = true
+  await UnplannedissueRequestMainApi.refusedUnplannedissueRequestMain(id)
+  message.success(t('common.refusedSuccess'))
+  tableObject.loading = false
+  await getList()
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  await message.confirm(t('common.confirmSubmit'))
+  tableObject.loading = true
+  await UnplannedissueRequestMainApi.submitUnplannedissueRequestMain(id)
+  message.success(t('common.submitSuccess'))
+  tableObject.loading = false
+  await getList()
+}
+
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  await message.confirm(t('common.confirmColse'))
+  tableObject.loading = true
+  await UnplannedissueRequestMainApi.closeUnplannedissueRequestMain(id)
+  message.success(t('common.closeSuccess'))
+  tableObject.loading = false
+  await getList()
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  await message.confirm(t('common.confirmReAdd'))
+  tableObject.loading = true
+  await UnplannedissueRequestMainApi.reAddUnplannedissueRequestMain(id)
+  message.success(t('common.reAddSuccess'))
+  tableObject.loading = false
+  await getList()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestUnplannedissueMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await UnplannedissueRequestMainApi.deleteUnplannedissueRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await UnplannedissueRequestMainApi.exportUnplannedissueRequestMain(tableObject.params)
+    download.excel(data, '计划外出库申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+UnplannedissueRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      console.log("【计划外出库子列表】",data.subList)
+      if(data.subList.length == 0){
+        message.warning("请添加子列表数据")
+        return;
+      }
+      let flag = false;
+      data.subList.forEach((item) => {
+          if(item.qty == 0){
+            message.warning("数量不能为0")
+            flag = true;
+            return;
+          }
+      })
+      if(flag){
+        formRef.value.formLoading = false
+        return
+      }
+      await UnplannedissueRequestMainApi.createUnplannedissueRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await UnplannedissueRequestMainApi.updateUnplannedissueRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+const onBlur = (field, e) => {
+  if (field == 'reason') {
+    detailRef.value.formRef.formRef.formModel[field] = e.target.value
+  }
+}
+
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  if (field == 'reason') {
+    tableData.value[index][field] = val.target.value
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '计划外出库申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await UnplannedissueRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
new file mode 100644
index 000000000..2c0d3080f
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -0,0 +1,669 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'UnplannedDeliverRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 计划外出库申请主表
+ */
+export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'UnplannedDeliver',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const UnplannedissueRequestMainRules = reactive({
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 计划外出库申请子表
+ */
+export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalancePage
+      }
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const UnplannedissueRequestDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  containerNumber:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
new file mode 100644
index 000000000..421138d93
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
@@ -0,0 +1,241 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="UnplannedreceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="UnplannedreceiptJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="UnplannedreceiptJobMainRules"
+    :formAllSchemas="UnplannedreceiptJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="UnplannedreceiptJobDetail.allSchemas"
+    :tableFormRules="UnplannedreceiptJobDetailRules"
+    :apiUpdate="UnplannedreceiptJobMainApi.updateUnplannedreceiptJobMain"
+    :apiCreate="UnplannedreceiptJobMainApi.createUnplannedreceiptJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="UnplannedreceiptJobMain.allSchemas"
+    :detailAllSchemas="UnplannedreceiptJobDetail.allSchemas"
+    :detailAllSchemasRules="UnplannedreceiptJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="UnplannedreceiptJobDetailApi.getUnplannedreceiptJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { UnplannedreceiptJobMain,UnplannedreceiptJobMainRules,UnplannedreceiptJobDetail,UnplannedreceiptJobDetailRules } from './unplannedreceiptJobMain.data'
+import * as UnplannedreceiptJobMainApi from '@/api/wms/unplannedreceiptJobMain'
+import * as UnplannedreceiptJobDetailApi from '@/api/wms/unplannedreceiptJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 计划外入库任务主
+defineOptions({ name: 'UnplannedreceiptJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(UnplannedreceiptJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: UnplannedreceiptJobMainApi.getUnplannedreceiptJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedreceipt-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+  } else if (val == 'mainJobClo') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobUnplannedreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await UnplannedreceiptJobMainApi.exportUnplannedreceiptJobMain(tableObject.params)
+    download.excel(data, '计划外入库任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
new file mode 100644
index 000000000..1525201c3
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
@@ -0,0 +1,871 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+
+/**
+ * @returns {Array} 计划外入库任务主表
+ */
+export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const UnplannedreceiptJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 计划外入库任务子表
+ */
+export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.UNPLANNED_RECEIPT_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const UnplannedreceiptJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  arriveDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入从过期日期', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
new file mode 100644
index 000000000..f368e8a5f
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="UnplannedreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="UnplannedreceiptRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="UnplannedreceiptRecordMainRules"
+    :formAllSchemas="UnplannedreceiptRecordMain.allSchemas"
+    :tableAllSchemas="UnplannedreceiptRecordDetail.allSchemas"
+    :tableFormRules="UnplannedreceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="UnplannedreceiptRecordMain.allSchemas"
+    :detailAllSchemas="UnplannedreceiptRecordDetail.allSchemas"
+    :detailAllSchemasRules="UnplannedreceiptRecordDetailRules"
+    :apiPage="UnplannedreceiptRecordDetailApi.getUnplannedreceiptRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { UnplannedreceiptRecordMain,UnplannedreceiptRecordMainRules,UnplannedreceiptRecordDetail,UnplannedreceiptRecordDetailRules } from '@/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data'
+import * as UnplannedreceiptRecordMainApi from '@/api/wms/unplannedreceiptRecordMain'
+import * as UnplannedreceiptRecordDetailApi from '@/api/wms/unplannedreceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 调拨入库记录主
+defineOptions({ name: 'UnplannedreceiptRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(UnplannedreceiptRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: UnplannedreceiptRecordMainApi.getUnplannedreceiptRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedreceipt-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordUnplannedreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await UnplannedreceiptRecordMainApi.exportUnplannedreceiptRecordMain(tableObject.params)
+    download.excel(data, '计划外入库记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
new file mode 100644
index 000000000..c875677b4
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -0,0 +1,644 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+
+/**
+ * @returns {Array} 计划外入库记录主表
+ */
+export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const UnplannedreceiptRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 计划外入库记录子表
+ */
+export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.UNPLANNED_RECEIPT_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+]))
+
+//表单校验
+export const UnplannedreceiptRecordDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  arriveDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择过期日期', trigger: 'change' }
+  ]
+})
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
new file mode 100644
index 000000000..78cbb6234
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -0,0 +1,651 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="UnplannedreceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="UnplannedreceiptRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="UnplannedreceiptRequestMainRules"
+    :formAllSchemas="UnplannedreceiptRequestMain.allSchemas"
+    :tableAllSchemas="UnplannedreceiptRequestDetail.allSchemas"
+    :tableFormRules="UnplannedreceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="UnplannedreceiptRequestMainApi.updateUnplannedreceiptRequestMain"
+    :apiCreate="UnplannedreceiptRequestMainApi.createUnplannedreceiptRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @inputNumberChange="inputNumberChange"
+    @tableFormSelectOnBlur="tableFormSelectOnBlur"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="UnplannedreceiptRequestMain.allSchemas"
+    :detailAllSchemas="UnplannedreceiptRequestDetail.allSchemas"
+    :detailAllSchemasRules="UnplannedreceiptRequestDetailRules"
+    :apiCreate="UnplannedreceiptRequestDetailApi.createUnplannedreceiptRequestDetail"
+    :apiUpdate="UnplannedreceiptRequestDetailApi.updateUnplannedreceiptRequestDetail"
+    :apiPage="UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPage"
+    :apiDelete="UnplannedreceiptRequestDetailApi.deleteUnplannedreceiptRequestDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailValidate="detailValidate"
+    @detailBasicFormOnChange="qtyOnChange"
+    @onBlur="onBlur"
+  />
+
+  <!-- 创建标签 -->
+  <BasicForm
+    ref="formLabelRef"
+    @success="getList"
+    :tableAllSchemas="detailListTableColumns"
+    :tableFormRules="UnplannedreceiptRequestDetailLabelRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitFormLabel"
+    
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/unplannedreceipt-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import {
+  UnplannedreceiptRequestMain,
+  UnplannedreceiptRequestMainRules,
+  UnplannedreceiptRequestDetail,
+  UnplannedreceiptRequestDetailRules,
+  UnplannedreceiptRequestDetailLabelRules, UnplannedreceiptRequestDetailLabel
+} from './unplannedreceiptRequestMain.data'
+import * as UnplannedreceiptRequestMainApi from '@/api/wms/unplannedreceiptRequestMain'
+import * as UnplannedreceiptRequestDetailApi from '@/api/wms/unplannedreceiptRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItembasicApi from "@/api/wms/itembasic";
+import * as PackageApi from "@/api/wms/package";
+import { formatTime } from '@/utils/index'
+
+// 计划外入库申请
+defineOptions({ name: 'UnplannedreceiptRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(UnplannedreceiptRequestMain.allSchemas.tableColumns)
+
+//创建标签
+const detailListTableColumns = UnplannedreceiptRequestDetailLabel.allSchemas
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const labelType = ref('') // 标签类别 采购还是制造等 
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 判断 物料类型是否与其他物料类型一致
+const isItemType = async (itemCode, labelTypeParams) => {
+  let isType = false
+  const labelTypeOld = JSON.parse(JSON.stringify(labelType.value))
+  await ItembasicApi.getItembasicPage({
+    pageSize: 10,
+    pageNo: 1,
+    code: itemCode,
+    sort: '',
+    by: 'ASC',
+  }).then(res => {
+    if (res.list.length > 0) {
+      // 判断物料 可采购 可制造
+      if (res.list[0].enableMake == "FALSE") {
+        labelType.value = 'cg'
+        if (labelTypeParams == 'cg') {
+          isType = true
+        }
+      } else {
+        labelType.value = 'zz'
+        if (labelTypeParams == 'zz') {
+          isType = true
+        }
+      }
+      if(labelTypeParams == '') isType = true
+    }
+  })
+  // 当第二次选择为不同类型时 类型要重置到第一次选择的结果
+  if (!isType) labelType.value = labelTypeOld
+  return isType
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async () => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if(formField == 'toLocationCode'){
+        row['toLocationCode'] = val[0]['code']
+      } else if(formField == 'itemCode'){
+        const isType = await isItemType(val[0]['code'], labelType.value)
+        if(!isType){
+          message.warning('当前物料可制造与其他数据不一致，请重新选择！')
+        } else {
+          row['itemCode'] = val[0]['code']
+          row['uom'] = val[0]['uom']
+        }
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if(formField == 'toLocationCode'){
+      setV['toLocationCode'] = val[0]['code']
+    }
+    if(formField == 'itemCode'){
+      setV['itemCode'] = val[0]['code']
+      setV['uom'] = val[0]['uom']
+    }
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: UnplannedreceiptRequestMainApi.getUnplannedreceiptRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:unplannedreceipt-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:unplannedreceipt-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedreceipt-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:unplannedreceipt-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedreceipt-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedreceipt-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedreceipt-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedreceipt-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:unplannedreceipt-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedreceipt-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedreceipt-request-main:delete'}), // 删除
+      {
+        label: '创建标签',
+        name: 'cjbq',
+        hide: isShowMainButton(row,['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  console.log("val",val)
+  if (val == 'mainClose') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
+  } else if (val == 'mainReAdd') { // 重新添加
+    console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
+  } else if (val == 'mainSubmit') { // 提交审批
+    console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
+  } else if (val == 'mainTurnDown') { // 驳回
+    console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
+  } else if (val == 'mainApprove') { // 审批通过
+    console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    console.log('列表-操作按钮事件-处理')
+    handleHandle(row.id)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if( val == 'cjbq'){// 创建标签
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (isCreateLabel) {
+      message.warning('已创建过标签！！！')
+      return
+    }
+    console.log("列表-操作按钮事件-创建标签")
+    detatableData.params = {
+      masterId:row.id
+    }
+    await getDetailList()
+    // 判断 是否已创建标签
+    if (detatableData.tableList[0].packingNumber) {
+      message.warning('已创建过标签！！！')
+      return
+    }
+    // 打开创建标签页面
+    // dialogVisible.value = true
+    formLabelRef.value.open('create', row)
+    detatableData.tableList.map((item) => {
+      // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
+      ItembasicApi.getItembasicPage({
+        pageSize: 10,
+        pageNo: 1,
+        code: item.itemCode,
+        sort: '',
+        by: 'ASC',
+      }).then(res => {
+        if (res.list.length > 0) {
+          // 判断物料 可采购 可制造
+          if (res.list[0].enableMake == "FALSE") {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(item => {
+              if(item.field == 'productionLineCodePackage') {
+                item.tableForm.isInpuFocusShow = false
+                item.tableForm.disabled = true
+                UnplannedreceiptRequestDetailLabelRules.productionLineCodePackage[0].required = false
+              }
+              if(item.field == 'supplierItemCode') {
+                item.tableForm.isInpuFocusShow = true
+                item.tableForm.disabled = false
+                UnplannedreceiptRequestDetailLabelRules.supplierItemCode[0].required = true
+              }
+            })
+          } else {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(item => {
+              if(item.field == 'supplierItemCode') {
+                item.tableForm.isInpuFocusShow = false
+                item.tableForm.disabled = true
+                UnplannedreceiptRequestDetailLabelRules.supplierItemCode[0].required = false
+              }
+              if(item.field == 'productionLineCodePackage') {
+                item.tableForm.isInpuFocusShow = true
+                item.tableForm.disabled = false
+                UnplannedreceiptRequestDetailLabelRules.productionLineCodePackage[0].required = true
+              }
+            })
+          }
+        } else {
+          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          return
+        }
+      })
+    })
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  await message.confirm(t('common.confirmColse'))
+  tableObject.loading = true
+  await UnplannedreceiptRequestMainApi.closeUnplannedreceiptRequestMain(id)
+  message.success(t('common.closeSuccess'))
+  tableObject.loading = false
+  await getList()
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  await message.confirm(t('common.confirmReAdd'))
+  tableObject.loading = true
+  await UnplannedreceiptRequestMainApi.reAddUnplannedreceiptRequestMain(id)
+  message.success(t('common.reAddSuccess'))
+  tableObject.loading = false
+  await getList()
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  await message.confirm(t('common.confirmSubmit'))
+  tableObject.loading = true
+  await UnplannedreceiptRequestMainApi.submitUnplannedreceiptRequestMain(id)
+  message.success(t('common.submitSuccess'))
+  tableObject.loading = false
+  await getList()
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  await message.confirm(t('common.confirmRefused'))
+  tableObject.loading = true
+  await UnplannedreceiptRequestMainApi.refusedUnplannedreceiptRequestMain(id)
+  message.success(t('common.refusedSuccess'))
+  tableObject.loading = false
+  await getList()
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  await message.confirm(t('common.confirmAgree'))
+  tableObject.loading = true
+  await UnplannedreceiptRequestMainApi.agreeUnplannedreceiptRequestMain(id)
+  message.success(t('common.agreeSuccess'))
+  tableObject.loading = false
+  await getList()
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  await message.confirm(t('common.confirmHandle'))
+  tableObject.loading = true
+  await UnplannedreceiptRequestMainApi.handleUnplannedreceiptRequestMain(id)
+  message.success(t('common.handleSuccess'))
+  tableObject.loading = false
+  await getList()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestUnplannedreceiptMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await UnplannedreceiptRequestMainApi.deleteUnplannedreceiptRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await UnplannedreceiptRequestMainApi.exportUnplannedreceiptRequestMain(tableObject.params)
+    download.excel(data, '计划外入库申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+UnplannedreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  let tfk = JSON.parse(JSON.stringify(tableFormKeys))
+  tfk.batch = formatTime(new Date(), 'yyyyMMdd')
+  tableData.value.push(tfk)
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      console.log("【计划外入库子列表】",data.subList)
+      if(data.subList.length == 0){
+        message.warning("请添加子列表数据")
+        return;
+      }
+      let flag = false;
+      data.subList.forEach((item) => {
+          if(item.qty == 0){
+            message.warning("数量不能为0")
+            flag = true;
+            return;
+          }
+      })
+      if(flag){
+        formRef.value.formLoading = false
+        return
+      }
+      await UnplannedreceiptRequestMainApi.createUnplannedreceiptRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await UnplannedreceiptRequestMainApi.updateUnplannedreceiptRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '计划外入库申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 创建标签
+const submitFormLabel = async (formType, data) => {
+  try {
+    detatableData.tableList.forEach(async (item) => {
+      await PackageApi.createPackageLabel(item).then(res => {
+        isCreateLabel.value = true
+        message.success('创建标签成功')
+      }).catch(err => {
+        isCreateLabel.value = false
+        console.log(err)
+        message.error('创建标签失败')
+      })
+    })
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+const inputNumberChange = (field, index, row, val) => {
+  if(field == 'qty' || field == 'singlePrice'){
+    row.amount = row.qty * row.singlePrice
+  }
+}
+const qtyOnChange = (field,val) =>{
+  if(field == 'qty' || field == 'singlePrice'){
+    detailRef.value.formRef.formRef.formModel.amount = detailRef.value.formRef.formRef.formModel.qty * detailRef.value.formRef.formRef.formModel.singlePrice
+  }
+}
+
+const onBlur = (field, e) => {
+  if (field == 'reason') {
+    detailRef.value.formRef.formRef.formModel[field] = e.target.value
+  }
+}
+
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  if (field == 'reason') {
+    tableData.value[index][field] = val.target.value
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await UnplannedreceiptRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
new file mode 100644
index 000000000..e102db256
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -0,0 +1,1166 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
+import * as LocationApi from "@/api/wms/location";
+import {
+  Productionlineitem
+} from "@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data";
+import * as ProductionlineitemApi from "@/api/wms/productionlineitem";
+import {
+  Supplieritem
+} from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data";
+import * as SupplieritemApi from "@/api/wms/supplieritem";
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'UnplannedReceiptRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 计划外入库申请主表
+ */
+export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'UnplannedReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const UnplannedreceiptRequestMainRules = reactive({
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 计划外入库申请子表
+ */
+export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',// 输入框占位文本
+      searchField: 'code',// 查询弹窗赋值字段
+      searchTitle: '物料基础信息',
+      searchAllSchemas: Itembasic.allSchemas,
+      searchPage: ItembasicApi.getItembasicPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        action: '==',
+        isSearch: true,
+        isMainValue: false
+      }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    },
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      disabled:true,
+      min: 0,
+      precision: 6,
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'warehouseCode',
+        value: 'toWarehouseCode',
+        message: '请填写到仓库代码！',
+        isMainValue: true,
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'warehouseCode',
+          value: 'toWarehouseCode',
+          message: '请填写到仓库代码！',
+          isMainValue: true,
+        }]
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.UNPLANNED_RECEIPT_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const UnplannedreceiptRequestDetailRules = reactive({
+  arriveDate: [
+    { required: true, message: '请选择到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择过期日期', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+
+/**
+ * @returns {Array} 生产退料申请子表创建标签
+ */
+export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCodePackage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'productionLineCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  }
+]))
+
+//表单校验
+export const UnplannedreceiptRequestDetailLabelRules = reactive({
+  supplierItemCode: [
+    { required: true, message: '请选择供应商', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ]
+})
diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue
new file mode 100644
index 000000000..3133dcd36
--- /dev/null
+++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue
@@ -0,0 +1,314 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="IssueJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="IssueJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <!-- <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template> -->
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="IssueJobMainRules"
+    :formAllSchemas="IssueJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="IssueJobDetail.allSchemas"
+    :tableFormRules="IssueJobDetailRules"
+    :apiUpdate="IssueJobMainApi.updateIssueJobMain"
+    :apiCreate="IssueJobMainApi.createIssueJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="IssueJobMain.allSchemas"
+    :detailAllSchemas="IssueJobDetail.allSchemas"
+    :detailAllSchemasRules="IssueJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="IssueJobDetailApi.getIssueJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { IssueJobMain,IssueJobMainRules,IssueJobDetail,IssueJobDetailRules } from './issueJobMain.data'
+import * as IssueJobMainApi from '@/api/wms/issueJobMain'
+import * as IssueJobDetailApi from '@/api/wms/issueJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { getDictLabel, DICT_TYPE } from '@/utils/dict'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 发料任务主
+defineOptions({ name: 'IssueJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(IssueJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: IssueJobMainApi.getIssueJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:issue-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    let aaa = {
+        id: '1809190000221670786',
+        requestNumber: "REC4620231120-0001",
+        workShopCode: "222",
+        fromWarehouseCode: null,
+        toWarehouseCode: null,
+        requestTime: 1700449299000,
+        requestDueTime: 1700448320000,
+        status: "4",
+        expiredTime: null,
+        // updateTime: 1700551119000,
+        // updater: "1",
+        priority: null,
+        priorityIncrement: null,
+        departmentCode: "研发部门",
+        acceptUserId: "1",
+        acceptTime: 1700562156000,
+        completeUserName: null,
+        completeTime: null,
+        fromAreaTypes: "RAW,SEMI",
+        toAreaTypes: "WIP",
+        number: "JOB0620231121-0001",
+        businessType: "Issue",
+        remark: null,
+        createTime: 1700551119000,
+        creator: "1",
+        fromAreaCodes: "",
+        toAreaCodes: "",
+        useOnTheWayLocation: "TRUE",
+        autoComplete: "FALSE",
+        allowModifyLocation: "TRUE",
+        allowModifyQty: "TRUE",
+        allowBiggerQty: "TRUE",
+        allowSmallerQty: "TRUE",
+        allowModifyInventoryStatus: "TRUE",
+        allowContinuousScanning: "TRUE",
+        allowPartialComplete: "TRUE",
+        allowModifyPackingNumber: "FALSE",
+        allowModifyBatch: "FALSE",
+        subList: [{
+          id: '1809190000965784282',
+          productionLineCode: "111",
+          workStationCode: "555",
+          inventoryStatus: "OK",
+          onTheWayLocationCode: null,
+          packingNumber: "12",
+          containerNumber: "001",
+          batch: "21",
+          fromLocationCode: "H03",
+          toLocationCode: "1",
+          itemCode: "item01",
+          itemName: "物料01",
+          itemDesc1: "",
+          itemDesc2: "",
+          packQty: null,
+          packUnit: null,
+          supplierQty: null,
+          supplierUom: null,
+          projectCode: "xm01",
+          qty: 50,
+          uom: "EA",
+          number: "JOB0620231121-0001",
+          remark: null,
+          createTime: 1700550582000,
+          creator: "1",
+          fromOwnerCode: null,
+          toOwnerCode: null,
+          // updateTime: 1700551119000,
+          // updater: "1",
+          recordLst: [{
+            handleQty: 10,
+            toPackingNumber: '12',
+            toContainerNumber: '001',
+            toBatch: '21',
+            toInventoryStatus: 'OK',
+            toLocationCode: 'H03',
+            supplierCode: '31213',
+          },{
+            handleQty: 22,
+            toPackingNumber: 'M20230421000005',
+            toContainerNumber: '001',
+            toBatch: '20230808',
+            toInventoryStatus: 'OK',
+            toLocationCode: 'SFG',
+            supplierCode: '31213',
+          }]
+      }]
+    }
+    IssueJobMainApi.executeIssueMain(aaa)
+  } else if (val == 'mainJobAba') { // 放弃
+    IssueJobMainApi.abandonIssueMain(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    IssueJobMainApi.closeIssueMain(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    IssueJobMainApi.acceptIssueMain(row.id)
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await IssueJobMainApi.exportIssueJobMain(tableObject.params)
+    download.excel(data, '发料任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
new file mode 100644
index 000000000..6f4a919d9
--- /dev/null
+++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
@@ -0,0 +1,869 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 发料任务主表
+ */
+export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '车间代码',
+    field: 'workShopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'update',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人用户名',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人用户名',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '使用在途库',
+    field: 'useOnTheWayLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
+]))
+
+//表单校验
+export const IssueJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 发料任务子表
+ */
+export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const IssueJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/index.vue b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
new file mode 100644
index 000000000..011761bd5
--- /dev/null
+++ b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="IssueRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="IssueRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="IssueRecordMainRules"
+    :formAllSchemas="IssueRecordMain.allSchemas"
+    :tableAllSchemas="IssueRecordDetail.allSchemas"
+    :tableFormRules="IssueRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="IssueRecordMain.allSchemas"
+    :detailAllSchemas="IssueRecordDetail.allSchemas"
+    :detailAllSchemasRules="IssueRecordDetailRules"
+    :apiPage="IssueRecordDetailApi.getIssueRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { IssueRecordMain,IssueRecordMainRules,IssueRecordDetail,IssueRecordDetailRules } from './issueRecordMain.data'
+import * as IssueRecordMainApi from '@/api/wms/issueRecordMain'
+import * as IssueRecordDetailApi from '@/api/wms/issueRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 发料记录主
+defineOptions({ name: 'IssueRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(IssueRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: IssueRecordMainApi.getIssueRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:issue-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await IssueRecordMainApi.exportIssueRecordMain(tableObject.params)
+    download.excel(data, '发料记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
new file mode 100644
index 000000000..96b413cba
--- /dev/null
+++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
@@ -0,0 +1,697 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 发料记录主表
+ */
+export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '使用在途库',
+    field: 'useOnTheWayLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const IssueRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择库位类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 发料记录子表
+ */
+export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+]))
+
+//表单校验
+export const IssueRecordDetailRules = reactive({
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
new file mode 100644
index 000000000..5829f45d1
--- /dev/null
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -0,0 +1,455 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="IssueRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="IssueRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="IssueRequestMainRules"
+    :formAllSchemas="IssueRequestMain.allSchemas"
+    :tableAllSchemas="IssueRequestDetail.allSchemas"
+    :tableFormRules="IssueRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="IssueRequestMainApi.updateIssueRequestMain"
+    :apiCreate="IssueRequestMainApi.createIssueRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="IssueRequestMain.allSchemas"
+    :detailAllSchemas="IssueRequestDetail.allSchemas"
+    :detailAllSchemasRules="IssueRequestDetailRules"
+    :apiCreate="IssueRequestDetailApi.createIssueRequestDetail"
+    :apiUpdate="IssueRequestDetailApi.updateIssueRequestDetail"
+    :apiPage="IssueRequestDetailApi.getIssueRequestDetailPage"
+    :apiDelete="IssueRequestDetailApi.deleteIssueRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailValidate="detailValidate"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/issue-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { IssueRequestMain,IssueRequestMainRules,IssueRequestDetail,IssueRequestDetailRules } from './issueRequestMain.data'
+import * as IssueRequestMainApi from '@/api/wms/issueRequestMain'
+import * as IssueRequestDetailApi from '@/api/wms/issueRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 发料申请
+defineOptions({ name: 'IssueRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(IssueRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if (formField == 'itemCode') {
+        row['itemCode'] = val[0]['code']
+        row['uom'] = val[0]['uom']
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      if (formField == 'fromWarehouseCode') {
+        setV['fromWarehouseCode'] = val[0]['code']
+        setV['toWarehouseCode'] = val[0]['code']
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if (formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+      setV['uom'] = val[0]['uom']
+    } else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: IssueRequestMainApi.getIssueRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:issue-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:issue-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:issue-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:issue-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:issue-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:issue-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:issue-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:issue-request-main:handle'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:issue-request-main:update'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:issue-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:issue-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    IssueRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    IssueRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    IssueRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    IssueRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    IssueRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要处理吗？')
+    tableObject.loading = true
+    IssueRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑 
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 编辑时 车间代码不可修改
+  if (type == 'update') {
+    // 修改 tableform 属性
+    IssueRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
+    })
+  } else {
+    // 修改 tableform 属性
+    IssueRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await IssueRequestMainApi.deleteIssueRequestMain(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await IssueRequestMainApi.exportIssueRequestMain(tableObject.params)
+    download.excel(data, '发料申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+IssueRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  // 添加明细 已有数据 添加的明细 生产线 工位按照之前数据进行添加
+  let tableForm = JSON.parse(JSON.stringify(tableFormKeys))
+  if (tableData.value.length > 0) {
+    tableForm.productionLineCode = tableData.value[0].productionLineCode
+    tableForm.workStationCode = tableData.value[0].workStationCode
+  }
+  tableData.value.push(tableForm)
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  if(tableData.value.find(item => (item.qty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  // 判断子表中，是否有不同的生产线和工位
+  // if (tableData.value.length > 0) {
+  //   let productionLineCode = tableData.value[0].productionLineCode
+  //   let workStationCode = tableData.value[0].workStationCode
+  //   for(var i=0;i<tableData.value.length;i++) {
+  //     if(productionLineCode !== tableData.value[i].productionLineCode){
+  //       message.warning('子表数据：生产线存在不同数据，请修改成统一数据！')
+  //       formRef.value.formLoading = false
+  //       return;
+  //     }
+  //     if(workStationCode !== tableData.value[i].workStationCode){
+  //       message.warning('子表数据：工位存在不同数据，请修改成统一数据！')
+  //       formRef.value.formLoading = false
+  //       return;
+  //     }
+  //   }
+  // }
+  try {
+    if (formType === 'create') {
+      await IssueRequestMainApi.createIssueRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await IssueRequestMainApi.updateIssueRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = async (data) => {
+    // let rs = false
+    // TODO: 单一新编/编辑，校验是否与其他子数据存在生产线工位有不同数据情况
+    return true
+  }
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '发料申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await IssueRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
new file mode 100644
index 000000000..f650a5238
--- /dev/null
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -0,0 +1,879 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as WorkstationApi from '@/api/wms/workstation'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'IssueRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 发料申请主表
+ */
+export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style:{width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'Issue',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '使用在途库',
+    field: 'useOnTheWayLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 200,
+      fixed: 'right'
+    },
+  }
+]))
+
+export const IssueRequestMainRules = reactive({
+  workshopCode: [
+    { required: true, message: '请选择车间代码', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 发料申请子表
+ */
+export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '生产线信息', // 查询弹窗标题
+      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'workshopCode',
+        value:'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'workshopCode',
+          value:'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '工位信息', // 查询弹窗标题
+      searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+      searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productionLineCode',
+        value:'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      isSearchList: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '物料信息', // 查询弹窗标题
+      searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+      searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const IssueRequestDetailRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  workStationCode: [
+    { required: true, message: '请选择工位代码', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请输入包装号', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请输入到库位代码', trigger: 'blur' }
+  ],
+  qty: [
+    { required: true, message: '请输入数量', trigger: 'blur' }
+  ],
+  uom: [
+    { required: true, message: '请选择单位', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
new file mode 100644
index 000000000..4dc6976d5
--- /dev/null
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="OnlinesettlementRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="OnlinesettlementRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="OnlinesettlementRecordMainRules"
+    :formAllSchemas="OnlinesettlementRecordMain.allSchemas"
+    :tableAllSchemas="OnlinesettlementRecordDetail.allSchemas"
+    :tableFormRules="OnlinesettlementRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="OnlinesettlementRecordMain.allSchemas"
+    :detailAllSchemas="OnlinesettlementRecordDetail.allSchemas"
+    :detailAllSchemasRules="OnlinesettlementRecordDetailRules"
+    :apiPage="OnlinesettlementRecordDetailApi.getOnlinesettlementRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { OnlinesettlementRecordMain,OnlinesettlementRecordMainRules,OnlinesettlementRecordDetail,OnlinesettlementRecordDetailRules } from './onlinesettlementRecordMain.data'
+import * as OnlinesettlementRecordMainApi from '@/api/wms/onlinesettlementRecordMain'
+import * as OnlinesettlementRecordDetailApi from '@/api/wms/onlinesettlementRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 上线结算记录主
+defineOptions({ name: 'OnlinesettlementRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(OnlinesettlementRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: OnlinesettlementRecordMainApi.getOnlinesettlementRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:onlinesettlement-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await OnlinesettlementRecordMainApi.exportOnlinesettlementRecordMain(tableObject.params)
+    download.excel(data, '上线结算记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts
new file mode 100644
index 000000000..53202d515
--- /dev/null
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts
@@ -0,0 +1,463 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ *  @returns {Array} 上线结算记录主表
+ */
+export const OnlinesettlementRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '发料记录单号',
+    field: 'issueRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const OnlinesettlementRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  issueRecordNumber: [
+    { required: true, message: '请选择发料记录单号', trigger: 'change' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 上线结算记录子表
+ */
+export const OnlinesettlementRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+]))
+
+//表单校验
+export const OnlinesettlementRecordDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  locationGroupCode: [
+    { required: true, message: '请选择库位组代码', trigger: 'change' }
+  ],
+  areaCode: [
+    { required: true, message: '请选择库区代码', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
new file mode 100644
index 000000000..3ae34cff2
--- /dev/null
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
@@ -0,0 +1,343 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="OnlinesettlementRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="OnlinesettlementRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="OnlinesettlementRequestMainRules"
+    :formAllSchemas="OnlinesettlementRequestMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="OnlinesettlementRequestDetail.allSchemas"
+    :tableFormRules="OnlinesettlementRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="OnlinesettlementRequestMainApi.updateOnlinesettlementRequestMain"
+    :apiCreate="OnlinesettlementRequestMainApi.createOnlinesettlementRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="OnlinesettlementRequestMain.allSchemas"
+    :detailAllSchemas="OnlinesettlementRequestDetail.allSchemas"
+    :detailAllSchemasRules="OnlinesettlementRequestDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiCreate="OnlinesettlementRequestDetailApi.createOnlinesettlementRequestDetail"
+    :apiUpdate="OnlinesettlementRequestDetailApi.updateOnlinesettlementRequestDetail"
+    :apiPage="OnlinesettlementRequestDetailApi.getOnlinesettlementRequestDetailPage"
+    :apiDelete="OnlinesettlementRequestDetailApi.deleteOnlinesettlementRequestDetail"
+    :Echo="Echo"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/onlinesettlement-request-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { OnlinesettlementRequestMain,OnlinesettlementRequestMainRules,OnlinesettlementRequestDetail,OnlinesettlementRequestDetailRules } from './onlinesettlementRequestMain.data'
+import * as OnlinesettlementRequestMainApi from '@/api/wms/onlinesettlementRequestMain'
+import * as OnlinesettlementRequestDetailApi from '@/api/wms/onlinesettlementRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+
+// 上线结算申请
+defineOptions({ name: 'OnlinesettlementRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(OnlinesettlementRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      // SupplieritemApi.getSupplieritemPage({
+      //   supplierCode: val[0]['supplierCode'],
+      //   itemCode: val[0]['itemCode']
+      // }).then(res => {
+      //   if(res?.list[0]?.settlementType == 'ONLINE'){
+      //     setV['issueRecordNumber'] = val[0]['number']
+      //     formRef.setValues(setV)
+      //   } else{
+      //     message.error('找不到对应的结算方式')
+      //   }
+      // })
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: OnlinesettlementRequestMainApi.getOnlinesettlementRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:onlinesettlement-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:onlinesettlement-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:onlinesettlement-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListEditBtn({hasPermi:'wms:onlinesettlement-request-main:update'}), // 编辑
+        defaultButtons.mainListDeleteBtn({hasPermi:'wms:onlinesettlement-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await OnlinesettlementRequestMainApi.deleteOnlinesettlementRequestMain(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await OnlinesettlementRequestMainApi.exportOnlinesettlementRequestMain(tableObject.params)
+    download.excel(data, '上线结算申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+OnlinesettlementRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await OnlinesettlementRequestMainApi.createOnlinesettlementRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await OnlinesettlementRequestMainApi.updateOnlinesettlementRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '上线结算申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await OnlinesettlementRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
new file mode 100644
index 000000000..fc8df1334
--- /dev/null
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
@@ -0,0 +1,609 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as IssueRecordDetailApi from '@/api/wms/issueRecordDetail'
+import { IssueRecordDetail } from '../../issue/issueRecordMain/issueRecordMain.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'OnlineSettlementRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 上线结算申请主表
+ */
+export const OnlinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '发料记录单号',
+    field: 'issueRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    form: {
+      labelMessage: '该记录中物料代码、供应商代码会影响单号的选择,请在供应商物料信息中维护',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择发料记录单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '发料记录', // 查询弹窗标题
+        searchAllSchemas: IssueRecordDetail.allSchemas, // 查询弹窗所需类
+        searchPage: IssueRecordDetailApi.getIssueRecordDetailPage, // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const OnlinesettlementRequestMainRules = reactive({
+  issueRecordNumber: [
+    { required: true, message: '请输入发料记录单号', trigger: 'blur' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请输入仓库代码', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
+
+/**
+ *  @returns {Array} 上线结算申请子表
+ */
+export const OnlinesettlementRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+      isSearchList: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装号', // 输入框占位文本
+      searchField: 'toPackingNumber', // 查询弹窗赋值字段
+      searchTitle: '发料记录', // 查询弹窗标题
+      searchAllSchemas: IssueRecordDetail.allSchemas, // 查询弹窗所需类
+      searchPage: IssueRecordDetailApi.getIssueRecordDetailPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'number',
+        value:'issueRecordNumber',
+        message: '请填写发料记录单号！',
+        isMainValue: true
+      }] 
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装号', // 输入框占位文本
+      searchField: 'toPackingNumber', // 查询弹窗赋值字段
+      searchTitle: '发料记录', // 查询弹窗标题
+      searchAllSchemas: IssueRecordDetail.allSchemas, // 查询弹窗所需类
+      searchPage: IssueRecordDetailApi.getIssueRecordDetailPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'number',
+        value:'issueRecordNumber',
+        message: '请填写发料记录单号！',
+        isMainValue: true
+      }]
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const OnlinesettlementRequestDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/issueManage/pick/pickJobMain/index.vue b/src/views/wms/issueManage/pick/pickJobMain/index.vue
new file mode 100644
index 000000000..fca7919b6
--- /dev/null
+++ b/src/views/wms/issueManage/pick/pickJobMain/index.vue
@@ -0,0 +1,238 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PickJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PickJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PickJobMainRules"
+    :formAllSchemas="PickJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="PickJobDetail.allSchemas"
+    :tableFormRules="PickJobDetailRules"
+    :apiUpdate="PickJobMainApi.updatePickJobMain"
+    :apiCreate="PickJobMainApi.createPickJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PickJobMain.allSchemas"
+    :detailAllSchemas="PickJobDetail.allSchemas"
+    :detailAllSchemasRules="PickJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="PickJobDetailApi.getPickJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PickJobMain,PickJobMainRules,PickJobDetail,PickJobDetailRules } from './pickJobMain.data'
+import * as PickJobMainApi from '@/api/wms/pickJobMain'
+import * as PickJobDetailApi from '@/api/wms/pickJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 备货任务主
+defineOptions({ name: 'PickJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PickJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PickJobMainApi.getPickJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:pick-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+  } else if (val == 'mainJobClo') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PickJobMainApi.exportPickJobMain(tableObject.params)
+    download.excel(data, '备货任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
new file mode 100644
index 000000000..0a50534e2
--- /dev/null
+++ b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
@@ -0,0 +1,785 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 备货任务主表
+ */
+export const PickJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'update',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人用户名',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人用户名',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PickJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 备货任务子表
+ */
+export const PickJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemdesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const PickJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/issueManage/pick/pickRecordMain/index.vue b/src/views/wms/issueManage/pick/pickRecordMain/index.vue
new file mode 100644
index 000000000..87352f916
--- /dev/null
+++ b/src/views/wms/issueManage/pick/pickRecordMain/index.vue
@@ -0,0 +1,171 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PickRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PickRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PickRecordMainRules"
+    :formAllSchemas="PickRecordMain.allSchemas"
+    :tableAllSchemas="PickRecordDetail.allSchemas"
+    :tableFormRules="PickRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PickRecordMain.allSchemas"
+    :detailAllSchemas="PickRecordDetail.allSchemas"
+    :detailAllSchemasRules="PickRecordDetailRules"
+    :apiPage="PickRecordDetailApi.getPickRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PickRecordMain,PickRecordMainRules,PickRecordDetail,PickRecordDetailRules } from './pickRecordMain.data'
+import * as PickRecordMainApi from '@/api/wms/pickRecordMain'
+import * as PickRecordDetailApi from '@/api/wms/pickRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 备货记录主
+defineOptions({ name: 'PickRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PickRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PickRecordMainApi.getPickRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:pick-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PickRecordMainApi.exportPickRecordMain(tableObject.params)
+    download.excel(data, '备货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts
new file mode 100644
index 000000000..c0fff1c77
--- /dev/null
+++ b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts
@@ -0,0 +1,641 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 备货记录主表
+ */
+export const PickRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const PickRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 备货记录子表
+ */
+export const PickRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const PickRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/issueManage/pick/pickRequestMain/index.vue b/src/views/wms/issueManage/pick/pickRequestMain/index.vue
new file mode 100644
index 000000000..5e1d78556
--- /dev/null
+++ b/src/views/wms/issueManage/pick/pickRequestMain/index.vue
@@ -0,0 +1,348 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PickRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PickRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PickRequestMainRules"
+    :formAllSchemas="PickRequestMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="PickRequestDetail.allSchemas"
+    :tableFormRules="PickRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="PickRequestMainApi.updatePickRequestMain"
+    :apiCreate="PickRequestMainApi.createPickRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PickRequestMain.allSchemas"
+    :detailAllSchemas="PickRequestDetail.allSchemas"
+    :detailAllSchemasRules="PickRequestDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiCreate="PickRequestDetailApi.createPickRequestDetail"
+    :apiUpdate="PickRequestDetailApi.updatePickRequestDetail"
+    :apiPage="PickRequestDetailApi.getPickRequestDetailPage"
+    :apiDelete="PickRequestDetailApi.deletePickRequestDetail"
+    :Echo="Echo"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/pick-request-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { PickRequestMain,PickRequestMainRules,PickRequestDetail,PickRequestDetailRules } from './pickRequestMain.data'
+import * as PickRequestMainApi from '@/api/wms/pickRequestMain'
+import * as PickRequestDetailApi from '@/api/wms/pickRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 备货申请
+defineOptions({ name: 'PickRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PickRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PickRequestMainApi.getPickRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:pick-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:pick-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:pick-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
+        defaultButtons.mainListEditBtn({hasPermi:'wms:pick-request-main:update'}), // 编辑
+        defaultButtons.mainListDeleteBtn({hasPermi:'wms:pick-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+  } else if (val == 'mainReAdd') { // 重新添加
+    console.log('列表-操作按钮事件-重新添加')
+  } else if (val == 'mainSubmit') { // 提交审批
+    console.log('列表-操作按钮事件-提交审批')
+  } else if (val == 'mainTurnDown') { // 驳回
+    console.log('列表-操作按钮事件-驳回')
+  } else if (val == 'mainApprove') { // 审批通过
+    console.log('列表-操作按钮事件-审批通过')
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await PickRequestMainApi.deletePickRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PickRequestMainApi.exportPickRequestMain(tableObject.params)
+    download.excel(data, '备货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+PickRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await PickRequestMainApi.createPickRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PickRequestMainApi.updatePickRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '备货申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await PickRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
new file mode 100644
index 000000000..6d58aa495
--- /dev/null
+++ b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
@@ -0,0 +1,598 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'PickRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+
+/**
+ * @returns {Array} 备货申请主表
+ */
+export const PickRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'Pick',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PickRequestMainRules = reactive({
+  fromWarehouseCode: [
+    { required: true, message: '请输入从仓库代码', trigger: 'blur' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请输入到仓库代码', trigger: 'blur' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 备货申请子表
+ */
+export const PickRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const PickRequestDetailRules = reactive({
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请输入到库位代码', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
new file mode 100644
index 000000000..e48179a41
--- /dev/null
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -0,0 +1,506 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PreparetoissueMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PreparetoissueMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PreparetoissueMainRules"
+    :formAllSchemas="PreparetoissueMain.allSchemas"
+    :tableAllSchemas="PreparetoissueDetail.allSchemas"
+    :tableFormRules="PreparetoissueDetailRules"
+    :tableData="tableData"
+    :apiUpdate="PreparetoissueMainApi.updatePreparetoissueMain"
+    :apiCreate="PreparetoissueMainApi.createPreparetoissueMain"
+    :isBusiness="true"
+    :isShowButton="isShowButton"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PreparetoissueMain.allSchemas"
+    :detailAllSchemas="PreparetoissueDetail.allSchemas"
+    :detailAllSchemasRules="PreparetoissueDetailRules"
+    :apiCreate="PreparetoissueDetailApi.createPreparetoissueDetail"
+    :apiUpdate="PreparetoissueDetailApi.updatePreparetoissueDetail"
+    :apiPage="PreparetoissueDetailApi.getPreparetoissueDetailPage"
+    :apiDelete="PreparetoissueDetailApi.deletePreparetoissueDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/preparetoissue-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PreparetoissueMain,PreparetoissueMainRules,PreparetoissueDetail,PreparetoissueDetailRules } from './preparetoissueMain.data'
+import * as PreparetoissueMainApi from '@/api/wms/preparetoissueMain'
+import * as PreparetoissueDetailApi from '@/api/wms/preparetoissueDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+
+// 备料计划
+defineOptions({ name: 'PreparetoissueMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PreparetoissueMain.allSchemas.tableColumns)
+
+const isShowButton = ref(true)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if (formField == 'itemCode') {
+        row['itemCode'] = val[0]['componentItemCode']
+      } else {
+        row[formField] = val[0][searchField]
+        row['toLocationCode'] = val[0]['rawLocationCode']
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      if (formField == 'productionPlanNumber') {
+        setV['workshop'] = val[0]['workshop']
+        setV['prodLine'] = val[0]['productionLine']
+        setV['shift'] = val[0]['shift']
+        setV['team'] = val[0]['team']
+        isShowButton.value = false
+        // 获取子表数据 getBomDisassemble
+        PreparetoissueMainApi.getBomDisassemble(val[0]['id'])
+        .then(res => {
+          if (res) tableData.value = res
+          // 根据子表物料代码 和主表生产线 查询生产线物料关系 获取 原料库位赋值目标库位
+          tableData.value.map(item => {
+            ProductionlineitemApi.getProductionlineitemPage({
+              productionLineCode: val[0]['productionLine'],
+              itemCode: item.itemCode,
+              pageSize: 100,
+              pageNo: 1,
+              sort: '',
+              by: 'ASC'
+            }).then(res => {
+              item.toLocationCode = res.list[0].rawLocationCode
+            })
+          })
+          // 修改 tableform 属性
+          PreparetoissueDetail.allSchemas.tableFormColumns.map(item => {
+            if(item.field == 'itemCode') {
+              item.isInpuFocusShow = false
+              item.tableForm.isInpuFocusShow = false
+              item.tableForm.disabled = true
+            }
+            if(item.field == 'planQty') {
+              item.tableForm.disabled = true
+            }
+            if(item.field == 'uom') {
+              item.tableForm.disabled = true
+            }
+            if(item.field == 'available') {
+              item.tableForm.disabled = true
+            }
+          })
+        }).catch(err => {
+          console.log(err)
+          message.error('错误')
+        })
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if (formField == 'itemCode') {
+      setV['itemCode'] = val[0]['componentItemCode']
+    } else {
+      setV['toLocationCode'] = val[0]['rawLocationCode']
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PreparetoissueMainApi.getPreparetoissueMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:preparetoissue-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:preparetoissue-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:preparetoissue-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+    resetShow()
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+  defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:preparetoissue-main:open'}), // 打开
+    defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:preparetoissue-main:close'}), // 关闭
+    defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:preparetoissue-main:submit'}), // 提交审批
+    defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:preparetoissue-main:reject'}), // 驳回
+    defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:preparetoissue-main:agree'}), // 审批通过
+    defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:preparetoissue-main:publish'}), // 发布
+    defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:preparetoissue-main:resetting'}), // 重置
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:preparetoissue-main:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:preparetoissue-main:delete'}), // 删除
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainPlanOpe') { // 打开
+    tableObject.loading = true
+    PreparetoissueMainApi.open(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanClo') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    PreparetoissueMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanSub') { // 提交审批
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    PreparetoissueMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanTur') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    PreparetoissueMainApi.reject(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanApp') { // 审批通过
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    PreparetoissueMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanPub') { // 发布
+    await message.confirm('确认要发布吗？')
+    tableObject.loading = true
+    PreparetoissueMainApi.publish(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanRes') { // 重置
+    await message.confirm('确认要重置吗？')
+    tableObject.loading = true
+    PreparetoissueMainApi.resetting(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  if (type == 'update') {
+    // 修改 tableform 属性
+    PreparetoissueMain.allSchemas.formSchema.map(item => {
+      if(item.field == 'productionPlanNumber' || 
+          item.field == 'workshop' ||
+          item.field == 'prodLine' ||
+          item.field == 'shift' ||
+          item.field == 'team'
+      ){
+        item.componentProps.isSearchList = false
+        item.componentProps.disabled = true
+      }
+    })
+  } else {
+    // 修改 tableform 属性
+    PreparetoissueMain.allSchemas.formSchema.map(item => {
+      if(item.field == 'productionPlanNumber' || 
+          item.field == 'workshop' ||
+          item.field == 'prodLine' ||
+          item.field == 'shift' ||
+          item.field == 'team'
+      ){
+        item.componentProps.isSearchList = true
+        item.componentProps.disabled = false
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await PreparetoissueMainApi.deletePreparetoissueMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PreparetoissueMainApi.exportPreparetoissueMain(tableObject.params)
+    download.excel(data, '备料计划主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+PreparetoissueDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  if(formRef.value.formRef.formModel.prodLine === ''){
+    message.warning("请选择生产线代码");
+    return;
+  }
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await PreparetoissueMainApi.createPreparetoissueMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PreparetoissueMainApi.updatePreparetoissueMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '备料计划主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 恢复最初属性：明细添加/删除行按钮，字段查询弹窗，可输入状态等
+// 列表头部 新增按钮 触发
+const resetShow = async () => {
+  isShowButton.value = true // tableform按钮恢复到显示
+  // 修改 tableform 属性
+  PreparetoissueDetail.allSchemas.tableFormColumns.map(item => {
+    if(item.field == 'itemCode') {
+      item.isInpuFocusShow = true
+      item.tableForm.isInpuFocusShow = true
+      item.tableForm.disabled = false
+    }
+    if(item.field == 'planQty') {
+      item.tableForm.disabled = false
+    }
+    if(item.field == 'uom') {
+      item.tableForm.disabled = false
+    }
+    if(item.field == 'available') {
+      item.tableForm.disabled = false
+    }
+  })
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  // importTemplateData.templateUrl = await PreparetoissueMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
new file mode 100644
index 000000000..2337788fe
--- /dev/null
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -0,0 +1,774 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+import * as ProductionMainApi from '@/api/wms/productionMain'
+import { ProductionMain } from '@/views/wms/productionManage/productionplan/productionMain/productionMain.data'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+// import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+// import * as BomApi from '@/api/wms/bom'
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+import * as WorkStationApi from '@/api/wms/workstation'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+
+import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'PreparetoissuePlan'
+}
+ const data = await getPlansettingApi.getPlansettingPage(queryParams)
+ const plansettingData =data?.list[0]||{}
+
+/**
+ * @returns {Array} 备料计划主表
+ */
+export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      labelMessage: '同时影响车间 生产线 班组 班次',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产计划', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '生产计划信息', // 查询弹窗标题
+        searchAllSchemas: ProductionMain.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionMainApi.getProductionMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'status',
+          value:'6',
+          isMainValue: false
+        },{
+          key:'available',
+          value:'TRUE',
+          isMainValue: false
+        }] 
+      }
+    }
+  },
+  {
+    label: '车间',
+    field: 'workshop',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '生产线',
+    field: 'prodLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      labelMessage: '该生产线会影响明细中的物料代码,工位',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选班次', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '班次信息', // 查询弹窗标题
+        searchAllSchemas: Shift.allSchemas, // 查询弹窗所需类
+        searchPage: ShiftApi.getShiftPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选班组', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '班组信息', // 查询弹窗标题
+        searchAllSchemas: Team.allSchemas, // 查询弹窗所需类
+        searchPage: TeamApi.getTeamPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'Issue',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 220,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PreparetoissueMainRules = reactive({
+  workshop: [
+    { required: true, message: '请选择车间', trigger: 'change' }
+  ],
+  prodLine: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ],
+  shift: [
+    { required: true, message: '请选择班次', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组', trigger: 'change' }
+  ],
+  planDate: [
+    { required: true, message: '请输入计划日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 备料计划子表
+ */
+export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineitemApi.getProductionlineitemPageByItemtype, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'prodLine',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPageByItemtype, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productionLineCode',
+        value:'prodLine',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }] 
+    },
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    tableForm:{
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select'
+    },
+  },
+  {
+    label: '目标库位',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    },
+  },
+  {
+    label: '工位',
+    field: 'workStation',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择工位', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'prodLine',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key:'workshopCode',
+          value:'workshop',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key:'available',
+          value:'TRUE',
+          isMainValue: false
+        }] 
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'prodLine',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key:'workshopCode',
+          value:'workshop',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key:'available',
+          value:'TRUE',
+          isMainValue: false
+        }] 
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      type: 'FormDateTime',
+      dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isTableForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select',
+      default: 'TRUE'
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const PreparetoissueDetailRules = reactive({
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'blur' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  planQty: [
+    { required: true, message: '请输入计划数量', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  workStation: [
+    { required: true, message: '请选择工位', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  dueTime:  [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ]
+})
\ No newline at end of file
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
new file mode 100644
index 000000000..660119199
--- /dev/null
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
@@ -0,0 +1,315 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionreceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionreceiptJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductionreceiptJobMainRules"
+    :formAllSchemas="ProductionreceiptJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ProductionreceiptJobDetail.allSchemas"
+    :tableFormRules="ProductionreceiptJobDetailRules"
+    :apiUpdate="ProductionreceiptJobMainApi.updateProductionreceiptJobMain"
+    :apiCreate="ProductionreceiptJobMainApi.createProductionreceiptJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionreceiptJobMain.allSchemas"
+    :detailAllSchemas="ProductionreceiptJobDetail.allSchemas"
+    :detailAllSchemasRules="ProductionreceiptJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="ProductionreceiptJobDetailApi.getProductionreceiptJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionreceiptJobMain,ProductionreceiptJobMainRules,ProductionreceiptJobDetail,ProductionreceiptJobDetailRules } from './productionreceiptJobMain.data'
+import * as ProductionreceiptJobMainApi from '@/api/wms/productionreceiptJobMain'
+import * as ProductionreceiptJobDetailApi from '@/api/wms/productionreceiptJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 生产收料任务主
+defineOptions({ name: 'ProductionreceiptJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionreceiptJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionreceiptJobMainApi.getProductionreceiptJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productionreceipt-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    let aaa = {
+    "id": "1809180000625614571",
+    "issueJobNumber": "JOB0620231121-0001",
+    "workshopCode": "222",
+    "fromWarehouseCode": "11",
+    "toWarehouseCode": "22",
+    "requestTime": 1700550442000,
+    "requestDueTime": null,
+    "status": "2",
+    "expiredTime": null,
+    "updateTime": 1700550582000,
+    "updater": "1",
+    "jobStageStatus": null,
+    "priority": null,
+    "priorityIncrement": null,
+    "departmentCode": "研发部门",
+    "acceptUserId": "1",
+    "acceptTime": 1700737729000,
+    "completeUserId": null,
+    "completeTime": null,
+    "fromAreaTypes": "RAW,SEMI",
+    "toAreaTypes": "WIP",
+    "number": "JOB2920231123-0001",
+    "businessType": "ProductionReceipt",
+    "remark": null,
+    "createTime": 1700550581000,
+    "creator": "1",
+    "fromAreaCodes": "33",
+    "toAreaCodes": "44",
+    "useOnTheWayLocation": "FALSE",
+    "autoComplete": "FALSE",
+    "allowModifyLocation": "TRUE",
+    "allowModifyQty": "TRUE",
+    "allowBiggerQty": "TRUE",
+    "allowSmallerQty": "TRUE",
+    "allowModifyInventoryStatus": "TRUE",
+    "allowContinuousScanning": "TRUE",
+    "allowPartialComplete": "TRUE",
+    "allowModifyBatch": "FALSE",
+    "allowModifyPackingNumber": "FALSE",
+        subList: [
+    {
+        "id": "1809180001922347895",
+        "productionLineCode": "111",
+        "workStationCode": "555",
+        "onTheWayLocationCode": "",
+        "packingNumber": "001",
+        "containerNumber": "002",
+        "batch": "003",
+        "inventoryStatus": "OK",
+        "fromLocationCode": "H03",
+        "itemCode": "item01",
+        "itemName": "物料01",
+        "itemDesc1": "",
+        "itemDesc2": "",
+        "projectCode": "xm01",
+        "qty": 22,
+        "uom": "EA",
+        "number": "JOB2920231123-0001",
+        "remark": null,
+        "createTime": 1700550582000,
+        "creator": "1",
+        "fromOwnerCode": null,
+        "toOwnerCode": null,
+        handleQty: 10,
+        toPackingNumber: '12',
+        toContainerNumber: '001',
+        toBatch: '21',
+        toInventoryStatus: 'OK',
+        toLocationCode: 'H03',
+        supplierCode: 'MRL',
+    },
+    {
+        "id": "1809180001922347894",
+        "productionLineCode": "111",
+        "workStationCode": "555",
+        "onTheWayLocationCode": "",
+        "packingNumber": "2222",
+        "containerNumber": "333",
+        "batch": "444",
+        "inventoryStatus": "OK",
+        "fromLocationCode": "H03",
+        "itemCode": "item01",
+        "itemName": "物料01",
+        "itemDesc1": "",
+        "itemDesc2": "",
+        "projectCode": "xm01",
+        "qty": 10,
+        "uom": "EA",
+        "number": "JOB2920231123-0001",
+        "remark": null,
+        "createTime": 1700550582000,
+        "creator": "1",
+        "fromOwnerCode": null,
+        "toOwnerCode": null,
+        handleQty: 10,
+        toPackingNumber: '12',
+        toContainerNumber: '001',
+        toBatch: '21',
+        toInventoryStatus: 'OK',
+        toLocationCode: 'H03',
+        supplierCode: 'MRL',
+    }
+]
+    }
+    ProductionreceiptJobMainApi.executeIssueMain(aaa)
+  } else if (val == 'mainJobAba') { // 放弃
+    ProductionreceiptJobMainApi.abandonIssueMain(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    ProductionreceiptJobMainApi.closeIssueMain(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    ProductionreceiptJobMainApi.acceptIssueMain(row.id)
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionreceiptJobMainApi.exportProductionreceiptJobMain(tableObject.params)
+    download.excel(data, '生产收料任务.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
new file mode 100644
index 000000000..961dcab60
--- /dev/null
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
@@ -0,0 +1,796 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 生产收料任务主表
+ */
+export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '发料任务单号',
+    field: 'issueJobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'update',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '使用在途库',
+    field: 'useOnTheWayLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
+]))
+
+//表单校验
+export const ProductionreceiptJobMainRules = reactive({
+  issueJobNumber: [
+    { required: true, message: '请选择发料任务单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+})
+
+/**
+ * @returns {Array} 生产收料任务子表
+ */
+export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formater: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const ProductionreceiptJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
new file mode 100644
index 000000000..fc1c8413c
--- /dev/null
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionreceiptRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductionreceiptRecordMainRules"
+    :formAllSchemas="ProductionreceiptRecordMain.allSchemas"
+    :tableAllSchemas="ProductionreceiptRecordDetail.allSchemas"
+    :tableFormRules="ProductionreceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionreceiptRecordMain.allSchemas"
+    :detailAllSchemas="ProductionreceiptRecordDetail.allSchemas"
+    :detailAllSchemasRules="ProductionreceiptRecordDetailRules"
+    :apiPage="ProductionreceiptRecordDetailApi.getProductionreceiptRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionreceiptRecordMain,ProductionreceiptRecordMainRules,ProductionreceiptRecordDetail,ProductionreceiptRecordDetailRules } from './productionreceiptRecordMain.data'
+import * as ProductionreceiptRecordMainApi from '@/api/wms/productionreceiptRecordMain'
+import * as ProductionreceiptRecordDetailApi from '@/api/wms/productionreceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 生产收料记录主
+defineOptions({ name: 'ProductionreceiptRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionreceiptRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionreceiptRecordMainApi.getProductionreceiptRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productionreceipt-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionreceiptRecordMainApi.exportProductionreceiptRecordMain(tableObject.params)
+    download.excel(data, '生产收料记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
new file mode 100644
index 000000000..b1799c14d
--- /dev/null
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
@@ -0,0 +1,678 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 生产收料记录主表
+ */
+export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '发料记录单号',
+    field: 'issueRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detai: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detai: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detai: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detai: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detai: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '使用在途库',
+    field: 'useOnTheWayLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  }
+]))
+
+//表单校验
+export const ProductionreceiptRecordMainRules = reactive({
+  issueJobNumber: [
+    { required: true, message: '请选择发料任务单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 生产收料记录子表
+ */
+export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const ProductionreceiptRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请输入到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
new file mode 100644
index 000000000..1692e3476
--- /dev/null
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
@@ -0,0 +1,287 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionreturnJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionreturnJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductionreturnJobMainRules"
+    :formAllSchemas="ProductionreturnJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ProductionreturnJobDetail.allSchemas"
+    :tableFormRules="ProductionreturnJobDetailRules"
+    :apiUpdate="ProductionreturnJobMainApi.updateProductionreturnJobMain"
+    :apiCreate="ProductionreturnJobMainApi.createProductionreturnJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionreturnJobMain.allSchemas"
+    :detailAllSchemas="ProductionreturnJobDetail.allSchemas"
+    :detailAllSchemasRules="ProductionreturnJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="ProductionreturnJobDetailApi.getProductionreturnJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionreturnJobMain,ProductionreturnJobMainRules,ProductionreturnJobDetail,ProductionreturnJobDetailRules } from './productionreturnJobMain.data'
+import * as ProductionreturnJobMainApi from '@/api/wms/productionreturnJobMain'
+import * as ProductionreturnJobDetailApi from '@/api/wms/productionreturnJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 生产退料任务主
+defineOptions({ name: 'ProductionreturnJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionreturnJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionreturnJobMainApi.getProductionreturnJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productionreturn-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    let aaa = {
+    "id": "1704091910747713549",
+    "requestNumber": "REQ3920231206-0011",
+    "workshopCode": "work2",
+    "fromWarehouseCode": null,
+    "toWarehouseCode": null,
+    "requestTime": null,
+    "requestDueTime": 0,
+    "status": "2",
+    "expiredTime": null,
+    "updateTime": 1701848561000,
+    "updater": "1",
+    "jobStageStatus": null,
+    "priority": null,
+    "priorityIncrement": null,
+    "departmentCode": "103",
+    "acceptUserId": "1",
+    "acceptTime": 1701856251000,
+    "completeUserId": null,
+    "completeTime": null,
+    "fromAreaTypes": "WIP",
+    "toAreaTypes": "HOLD",
+    "number": "JOB2820231206-0013",
+    "businessType": "ReturnToHold",
+    "remark": "",
+    "createTime": 1701848561000,
+    "creator": "1",
+    "fromAreaCodes": "",
+    "toAreaCodes": "",
+    "autoComplete": "FALSE",
+    "allowModifyLocation": "FALSE",
+    "allowModifyQty": "TRUE",
+    "allowBiggerQty": "TRUE",
+    "allowSmallerQty": "TRUE",
+    "allowModifyInventoryStatus": "TRUE",
+    "allowContinuousScanning": "TRUE",
+    "allowPartialComplete": "TRUE",
+    "allowModifyBatch": "FALSE",
+    "allowModifyPackingNumber": "FALSE",
+    subList: [{
+        "id": "1704691692096618499",
+        "productionLineCode": "line4",
+        "workStationCode": "station4",
+        "packingNumber": "PN-00063",
+        "containerNumber": null,
+        "batch": "000000",
+        "inventoryStatus": "OK",
+        "fromLocationCode": "L-W-001-01",
+        "itemCode": "THILDD0A701AG",
+        "itemName": "HL后雾灯",
+        "itemDesc1": "HL后雾",
+        "itemDesc2": "",
+        "projectCode": "P0001",
+        "qty": 6,
+        "uom": "EA",
+        "number": "JOB2820231206-0013",
+        "remark": "",
+        "createTime": 1701848561000,
+        "creator": "1",
+        "fromOwnerCode": null,
+        "toOwnerCode": null,
+        handleQty: 10,
+        toPackingNumber: '12',
+        toContainerNumber: '001',
+        toBatch: '21',
+        toInventoryStatus: 'OK',
+        toLocationCode: 'H03',
+      }]
+    }
+    ProductionreturnJobMainApi.executeProductionreturnMain(aaa)
+  } else if (val == 'mainJobAba') { // 放弃
+    ProductionreturnJobMainApi.abandonProductionreturnMain(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    ProductionreturnJobMainApi.closeProductionreturnMain(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    ProductionreturnJobMainApi.acceptProductionreturnMain(row.id)
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionreturnJobMainApi.exportProductionreturnJobMain(tableObject.params)
+    download.excel(data, '生产退料任务.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
new file mode 100644
index 000000000..fb3413b72
--- /dev/null
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
@@ -0,0 +1,808 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 生产退料任务主表
+ */
+export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
+]))
+
+//表单校验
+export const ProductionreturnJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 生产退料任务子表
+ */
+export const ProductionreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const ProductionreturnJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
new file mode 100644
index 000000000..1e9458787
--- /dev/null
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionreturnRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionreturnRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductionreturnRecordMainRules"
+    :formAllSchemas="ProductionreturnRecordMain.allSchemas"
+    :tableAllSchemas="ProductionreturnRecordDetail.allSchemas"
+    :tableFormRules="ProductionreturnRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionreturnRecordMain.allSchemas"
+    :detailAllSchemas="ProductionreturnRecordDetail.allSchemas"
+    :detailAllSchemasRules="ProductionreturnRecordDetailRules"
+    :apiPage="ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionreturnRecordMain,ProductionreturnRecordMainRules,ProductionreturnRecordDetail,ProductionreturnRecordDetailRules } from './productionreturnRecordMain.data'
+import * as ProductionreturnRecordMainApi from '@/api/wms/productionreturnRecordMain'
+import * as ProductionreturnRecordDetailApi from '@/api/wms/productionreturnRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 生产退料记录主
+defineOptions({ name: 'ProductionreturnRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionreturnRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionreturnRecordMainApi.getProductionreturnRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productionreturn-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMain(tableObject.params)
+    download.excel(data, '生产退料记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
new file mode 100644
index 000000000..10db40ece
--- /dev/null
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
@@ -0,0 +1,650 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 生产退料记录主表
+ */
+export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductionreturnRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 生产退料记录子表
+ */
+export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+]))
+
+//表单校验
+export const ProductionreturnRecordDetailRules = reactive({
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  frompackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  frombatch: [
+    { required: true, message: '请输入从批次', trigger: 'change' }
+  ],
+  fromlocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromlocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromareaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  topackingNumber: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  tobatch: [
+    { required: true, message: '请输入到批次', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
new file mode 100644
index 000000000..582f72410
--- /dev/null
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -0,0 +1,697 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionreturnRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionreturnRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductionreturnRequestMainRules"
+    :formAllSchemas="ProductionreturnRequestMain.allSchemas"
+    :tableAllSchemas="ProductionreturnRequestDetail.allSchemas"
+    :tableFormRules="ProductionreturnRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductionreturnRequestMainApi.updateProductionreturnRequestMain"
+    :apiCreate="ProductionreturnRequestMainApi.createProductionreturnRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionreturnRequestMain.allSchemas"
+    :detailAllSchemas="ProductionreturnRequestDetail.allSchemas"
+    :detailAllSchemasRules="ProductionreturnRequestDetailRules"
+    :apiCreate="ProductionreturnRequestDetailApi.createProductionreturnRequestDetail"
+    :apiUpdate="ProductionreturnRequestDetailApi.updateProductionreturnRequestDetail"
+    :apiPage="ProductionreturnRequestDetailApi.getProductionreturnRequestDetailPage"
+    :apiDelete="ProductionreturnRequestDetailApi.deleteProductionreturnRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @detailOpenForm="detailOpenForm"
+  />
+
+  <!-- 创建标签 -->
+    <BasicForm
+      ref="formLabelRef"
+      @success="getList"
+      :tableAllSchemas="detailListTableColumns"
+      :tableFormRules="ProductionreturnRequestDetailLabelRules"
+      :tableData="detatableData.tableList"
+      :isBusiness="true"
+      :isShowButton="false"
+      @handleAddTable="handleAddTable"
+      @handleDeleteTable="handleDeleteTable"
+      @searchTableSuccess="searchTableSuccess"
+      @submitForm="submitFormLabel"
+    />
+      
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productionreturn-request-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ProductionreturnRequestMain,ProductionreturnRequestMainRules,ProductionreturnRequestDetail,ProductionreturnRequestDetailRules,ProductionreturnRequestDetailLabel,ProductionreturnRequestDetailLabelRules } from './productionreturnRequestMain.data'
+import * as ProductionreturnRequestMainApi from '@/api/wms/productionreturnRequestMain'
+import * as ProductionreturnRequestDetailApi from '@/api/wms/productionreturnRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import * as PackageApi from '@/api/wms/package'
+import { getAccessToken } from '@/utils/auth'
+
+// 生产退料申请
+defineOptions({ name: 'ProductionreturnRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionreturnRequestMain.allSchemas.tableColumns)
+
+//创建标签
+const detailListTableColumns = ProductionreturnRequestDetailLabel.allSchemas
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const labelType = ref('') // 标签类别 采购还是制造等 
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: ProductionreturnRequestDetailApi.getProductionreturnRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 判断 物料类型是否与其他物料类型一致
+const isItemType = async (itemCode, labelTypeParams) => {
+  let isType = false
+  const labelTypeOld = JSON.parse(JSON.stringify(labelType.value))
+  await ItembasicApi.getItembasicPage({
+    pageSize: 10,
+    pageNo: 1,
+    code: itemCode,
+    sort: '',
+    by: 'ASC',
+  }).then(res => {
+    if (res.list.length > 0) {
+      // 判断物料 可采购 可制造
+      if (res.list[0].enableMake == "FALSE") {
+        labelType.value = 'cg'
+        if (labelTypeParams == 'cg') {
+          isType = true
+        }
+      } else {
+        labelType.value = 'zz'
+        if (labelTypeParams == 'zz') {
+          isType = true
+        }
+      }
+      if(labelTypeParams == '') isType = true
+    }
+  })
+  // 当第二次选择为不同类型时 类型要重置到第一次选择的结果
+  if (!isType) labelType.value = labelTypeOld
+  return isType
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async () => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if(formField == 'itemCode') {
+        const isType = await isItemType(val[0]['itemCode'], labelType.value)
+        if(!isType){
+          message.warning('当前物料可制造与其他数据不一致，请重新选择！')
+        } else {
+          row['itemCode'] = val[0]['itemCode']
+          row['uom'] = val[0]['uom']
+          row['inventoryStatus'] = val[0]['inventoryStatus']
+          row['qty'] = val[0]['qty']
+          // 如果有批次 赋值库存余额批次 无批次 赋值 000000
+          if (val[0]['batch'] !== '') {
+            row['batch'] = val[0]['batch']
+          } else {
+            row['batch'] = '000000'
+          }
+          // 修改 tableform 属性 数量最大值设置为库存余额中数量 
+          // TODO: tableFormColumns 修改属性目前只限于整个列 并不满足行要求 例如： 第一条数据最大10 第二条数据最大20 那么第一条数据会变成最大20限制
+          ProductionreturnRequestDetail.allSchemas.tableFormColumns.map(item => {
+            if(item.field == 'qty' && val[0]['qty'] > 0) {
+              item.tableForm.max = val[0]['qty']
+            }
+          })
+        }
+      } else if(formField == 'workStationCode') {
+        row['workStationCode'] = val[0]['code']
+        row['fromLocationCode'] = val[0]['rawLocationCode']
+      } else if(formField == 'packUnit') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      tableData.value = [] // 重置明细数据
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(async () => {
+    const setV = {}
+    if(formField == 'itemCode') {
+      const isType = await isItemType(val[0]['itemCode'], labelType.value)
+      if(!isType){
+        message.warning('当前物料可制造与其他数据不一致，请重新选择！')
+      } else {
+        setV['itemCode'] = val[0]['itemCode']
+        setV['uom'] = val[0]['uom']
+        setV['inventoryStatus'] = val[0]['inventoryStatus']
+        setV['qty'] = val[0]['qty']
+        // 如果有批次 赋值库存余额批次 无批次 赋值 000000
+        if (val[0]['batch'] !== '') {
+            setV['batch'] = val[0]['batch']
+          } else {
+            setV['batch'] = '000000'
+          }
+        // 修改 tableform 属性 数量最大值设置为库存余额中数量
+        ProductionreturnRequestDetail.allSchemas.tableFormColumns.map(item => {
+          if(item.field == 'qty' && val[0]['qty'] > 0) {
+            item.tableForm.max = val[0]['qty']
+          }
+        })
+      }
+    } else if(formField == 'workStationCode') {
+      setV['workStationCode'] = val[0]['code']
+      setV['fromLocationCode'] = val[0]['rawLocationCode']
+    } else if(formField == 'packUnit') {
+      setV['packUnit'] = val[0]['packUnit']
+      setV['packQty'] = val[0]['packQty']
+    } else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionreturnRequestMainApi.getProductionreturnRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productionreturn-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productionreturn-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productionreturn-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+      defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productionreturn-request-main:close'}), // 关闭
+      defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productionreturn-request-main:reAdd'}), // 重新添加
+      defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:submit'}), // 提交审批
+      defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionreturn-request-main:refused'}), // 驳回
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionreturn-request-main:agree'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productionreturn-request-main:handle'}), // 处理
+      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:update'}), // 编辑
+      // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturn-request-main:delete'}), // 删除
+      // 创建标签
+      {
+        label: '创建标签',
+        name: 'cjbq',
+        hide: isShowMainButton(row,['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+      defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    ProductionreturnRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    ProductionreturnRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    ProductionreturnRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    ProductionreturnRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    ProductionreturnRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'cjbq') { // 创建标签
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (isCreateLabel) {
+      message.warning('已创建过标签！！！')
+      return
+    }
+    detatableData.params = {
+      masterId:row.id
+    }
+    await getDetailList()
+    // 打开创建标签页面
+    // dialogVisible.value = true
+    formLabelRef.value.open('create', row)
+    detatableData.tableList.map((item) => {
+      // item.batch = '000000'
+      // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
+      ItembasicApi.getItembasicPage({
+        pageSize: 10,
+        pageNo: 1,
+        code: item.itemCode,
+        sort: '',
+        by: 'ASC',
+      }).then(res => {
+        if (res.list.length > 0) {
+          // 判断物料 可采购 可制造
+          if (res.list[0].enableMake == "FALSE") {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'productionLineCodePackage') {
+              // itemColumns.tableForm.isInpuFocusShow = false
+              // itemColumns.tableForm.disabled = true
+              ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = false
+            }
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = true
+              itemColumns.tableForm.disabled = false
+              ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = true
+            }
+          })
+          } else {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = false
+              itemColumns.tableForm.disabled = true
+              ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = false
+            }
+            if(itemColumns.field == 'productionLineCodePackage') {
+              item.productionLineCodePackage = item.productionLineCode
+              // itemColumns.tableForm.isInpuFocusShow = true
+              // itemColumns.tableForm.disabled = false
+              ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = true
+            }
+          })
+          }
+        } else {
+          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          return
+        }
+      })
+    })
+
+  } else if (val == 'mainHandle') { // 处理
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (!isCreateLabel) {
+      message.warning('请先创建标签')
+      return
+    }
+    tableObject.loading = true
+    ProductionreturnRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑 
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 编辑时 车间代码不可修改
+  if (type == 'update') {
+    // 修改 tableform 属性
+    ProductionreturnRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
+    })
+  } else {
+    // 修改 tableform 属性
+    ProductionreturnRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+/** 详情操作——子表表单 */
+const detailOpenForm = (type, row) => {
+  nextTick(()=>{
+    // detailRef.value.formRef.formRef.formModel.batch = '000000'
+  })
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductionreturnRequestMainApi.deleteProductionreturnRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionreturnRequestMainApi.exportProductionreturnRequestMain(tableObject.params)
+    download.excel(data, '生产退料合格申请.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductionreturnRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  let tfk = JSON.parse(JSON.stringify(tableFormKeys))
+  // tfk.batch = '000000'
+  tableData.value.push(tfk)
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  let isZC = true // 数量和标包数量 是否整除
+  data.subList.forEach(item => {
+    if (item.qty % item.packQty !== 0) {
+      isZC = false
+    }
+  })
+  if(!isZC) {
+    formRef.value.formLoading = false
+    await message.confirm('含有不整箱情况,是否继续?')
+    formRef.value.formLoading = true
+  }
+  // 合格退料 添加参数 isOK
+  data.isOK = true
+  try {
+    if (formType === 'create') {
+      // 子表不能为空
+      if (tableData.value.length == 0) {
+        formRef.value.formLoading = false
+        return message.warning('请添加明细数据！')
+      }
+      await ProductionreturnRequestMainApi.createProductionreturnRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductionreturnRequestMainApi.updateProductionreturnRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 创建标签
+const submitFormLabel = async (formType, data) => {
+  try {
+    detatableData.tableList.forEach(async (item) => {
+      item.toLocationCode = item.fromLocationCode
+      await PackageApi.createPackageLabel(item).then(() => {
+        isCreateLabel.value = true
+        message.success('创建标签成功')
+      }).catch(err => {
+        isCreateLabel.value = false
+        console.log(err)
+        message.error('创建标签失败')
+      })
+    })
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+// 标签打印
+const handlePoint = async (row) => {
+  // 查询是否已创建过标签
+  await PackageApi.getPackagePage({
+    requestNumber: row.number
+  }).then((res) => {
+    if(res.list.length > 0) {
+      isCreateLabel.value = true
+      if (res.list[0].productionLineCode != null) {
+        labelType.value = 'zz'
+      } else {
+        labelType.value = 'cg'
+      }
+    } else {
+      isCreateLabel.value = false
+    }
+  }).catch(err => {
+    isCreateLabel.value = false
+    console.log(err)
+  })
+  // 判断是采购还是制造
+  if (isCreateLabel.value) {
+    if (labelType.value == 'cg') {
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      window.open(src.value+'&request_number='+row.number)
+    } else {
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      window.open(src.value+'&request_number='+row.number)
+    }
+  } else {
+    message.warning('请先创建标签')
+  }
+}
+
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '生产退料导入模版.xlsx'
+  })
+
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductionreturnRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
new file mode 100644
index 000000000..ae283b571
--- /dev/null
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -0,0 +1,1250 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as WorkshopApi  from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as ProductionlineApi  from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as WorkstationApi  from '@/api/wms/workstation'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import * as ProductionlineitemApi  from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+
+import * as ItempackagingApi from '@/api/wms/itempackage'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+
+import * as SupplieritemApi  from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'MaterialReturnRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ console.log(34, requestsettingData)
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 生产退料申请主表
+ */
+export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductionreturnRequestMainRules = reactive({
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  workshopCode: [
+    { required: true, message: '请选择车间', trigger: 'change' }
+  ], 
+})
+
+/**
+ * @returns {Array} 生产退料申请子表
+ */
+export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '生产线信息', // 查询弹窗标题
+      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
+        isMainValue: true
+      }]
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请选择车间信息！',
+          isMainValue: true
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请选择生产线信息！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '工位信息', // 查询弹窗标题
+      searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+      searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请选择车间信息！',
+        isMainValue: true
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请选择生产线信息！',
+        isMainValue: true
+      }]
+    },
+  },
+  
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '库存余额信息', // 查询弹窗标题
+        searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+        searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'locationCode',
+          value: 'fromLocationCode',
+          message: '请填写从库位代码！',
+          isMainValue: true
+        },{
+          key: 'inventoryStatus',
+          value: 'OK',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '库存余额信息', // 查询弹窗标题
+      searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+      searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'locationCode',
+        value: 'fromLocationCode',
+        message: '请填写从库位代码！',
+        isMainValue: true
+      },{
+        key: 'inventoryStatus',
+        value: 'OK',
+        isMainValue: false
+      }]
+    },
+  },
+  // {
+  //   label: '包装号',
+  //   field: 'packingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '器具号',
+  //   field: 'containerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      isSearchList: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+      searchField: 'packUnit', // 查询弹窗赋值字段
+      searchTitle: '物料包装信息', // 查询弹窗标题
+      searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+      searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请先选择物料代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'packUnit', // 查询弹窗赋值字段
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '标包数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductionreturnRequestDetailRules = reactive({
+  workStationCode: [
+    { required: true, message: '请选择工位代码', trigger: 'change' }
+  ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  // packingNumber: [
+  //   { required: true, message: '请选择包装号', trigger: 'change' }
+  // ],
+  // batch: [
+  //   { required: true, message: '请输入批次', trigger: 'blur' }
+  // ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  // fromLocationCode: [
+  //   { required: true, message: '请输入从库位代码', trigger: 'blur' }
+  // ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'blur' }
+  ]
+})
+
+/**
+ * @returns {Array} 生产退料申请子表创建标签
+ */
+export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCodePackage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+      // isInpuFocusShow: true,
+      // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      // searchField: 'productionLineCode', // 查询弹窗赋值字段
+      // searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      // searchCondition:[{
+      //   key: 'itemCode',
+      //   value: 'itemCode',
+      //   isMainValue: true
+      // }]
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductionreturnRequestDetailLabelRules = reactive({
+  supplierItemCode: [
+    { required: true, message: '请选择供应商', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ]
+})
+
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
new file mode 100644
index 000000000..ce344ef0d
--- /dev/null
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -0,0 +1,666 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionreturnRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionreturnRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductionreturnRequestMainRules"
+    :formAllSchemas="ProductionreturnRequestMain.allSchemas"
+    :tableAllSchemas="ProductionreturnRequestDetail.allSchemas"
+    :tableFormRules="ProductionreturnRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductionreturnRequestMainNoApi.updateProductionreturnRequestMain"
+    :apiCreate="ProductionreturnRequestMainNoApi.createProductionreturnRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionreturnRequestMain.allSchemas"
+    :detailAllSchemas="ProductionreturnRequestDetail.allSchemas"
+    :detailAllSchemasRules="ProductionreturnRequestDetailRules"
+    :apiCreate="ProductionreturnRequestDetailNoApi.createProductionreturnRequestDetail"
+    :apiUpdate="ProductionreturnRequestDetailNoApi.updateProductionreturnRequestDetail"
+    :apiPage="ProductionreturnRequestDetailNoApi.getProductionreturnRequestDetailPage"
+    :apiDelete="ProductionreturnRequestDetailNoApi.deleteProductionreturnRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 创建标签 -->
+    <BasicForm
+      ref="formLabelRef"
+      @success="getList"
+      :tableAllSchemas="detailListTableColumns"
+      :tableFormRules="ProductionreturnRequestDetailNoLabelRules"
+      :tableData="detatableData.tableList"
+      :isBusiness="true"
+      :isShowButton="false"
+      @handleAddTable="handleAddTable"
+      @handleDeleteTable="handleDeleteTable"
+      @searchTableSuccess="searchTableSuccess"
+      @submitForm="submitFormLabel"
+    />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productionreturn-request-main/hold-import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionreturnRequestMain,ProductionreturnRequestMainRules } from '../productionreturnRequestMain/productionreturnRequestMain.data'
+import { ProductionreturnRequestDetail,ProductionreturnRequestDetailRules, ProductionreturnRequestDetailNoLabel, ProductionreturnRequestDetailNoLabelRules } from './productionreturnRequestMainNo.data'
+
+import * as ProductionreturnRequestMainNoApi from '@/api/wms/productionreturnRequestMainNo'
+import * as ProductionreturnRequestDetailNoApi from '@/api/wms/productionreturnRequestDetailNo'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import * as PackageApi from '@/api/wms/package'
+import { formatTime } from '@/utils/index'
+import { getAccessToken } from '@/utils/auth'
+
+// 隔离退料申请
+defineOptions({ name: 'ProductionreturnRequestMainNo' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionreturnRequestMain.allSchemas.tableColumns)
+
+//创建标签
+const detailListTableColumns = ProductionreturnRequestDetailNoLabel.allSchemas
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const labelType = ref('') // 标签类别 采购还是制造等 
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: ProductionreturnRequestDetailNoApi.getProductionreturnRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 判断 物料类型是否与其他物料类型一致
+const isItemType = async (itemCode, labelTypeParams) => {
+  let isType = false
+  const labelTypeOld = JSON.parse(JSON.stringify(labelType.value))
+  await ItembasicApi.getItembasicPage({
+    pageSize: 10,
+    pageNo: 1,
+    code: itemCode,
+    sort: '',
+    by: 'ASC',
+  }).then(res => {
+    if (res.list.length > 0) {
+      // 判断物料 可采购 可制造
+      if (res.list[0].enableMake == "FALSE") {
+        labelType.value = 'cg'
+        if (labelTypeParams == 'cg') {
+          isType = true
+        }
+      } else {
+        labelType.value = 'zz'
+        if (labelTypeParams == 'zz') {
+          isType = true
+        }
+      }
+      if(labelTypeParams == '') isType = true
+    }
+  })
+  // 当第二次选择为不同类型时 类型要重置到第一次选择的结果
+  if (!isType) labelType.value = labelTypeOld
+  return isType
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async () => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if(formField == 'itemCode') {
+        const isType = await isItemType(val[0]['itemCode'], labelType.value)
+        if(!isType){
+          message.warning('当前物料可制造与其他数据不一致，请重新选择！')
+        } else {
+          row['batch'] = val[0]['batch']==''?formatTime(new Date(), 'yyyyMMdd'):val[0]['batch']
+          row['itemCode'] = val[0]['itemCode']
+          row['uom'] = val[0]['uom']
+          row['inventoryStatus'] = val[0]['inventoryStatus']
+          row['qty'] = val[0]['qty']
+          // 修改 tableform 属性 数量最大值设置为库存余额中数量
+          ProductionreturnRequestDetail.allSchemas.tableFormColumns.map(item => {
+            if(item.field == 'qty') {
+              item.tableForm.max = val[0]['qty']
+            }
+            if(item.field == 'batch') {
+              item.tableForm.disabled = false
+            }
+          })
+        }
+      } else if(formField == 'workStationCode') {
+        row['workStationCode'] = val[0]['code']
+        row['fromLocationCode'] = val[0]['rawLocationCode']
+      } else if(formField == 'packUnit') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      tableData.value = [] // 重置明细数据
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(async () => {
+    const setV = {}
+    if(formField == 'itemCode') {
+      const isType = await isItemType(val[0]['itemCode'], labelType.value)
+      if(!isType){
+        message.warning('当前物料可制造与其他数据不一致，请重新选择！')
+      } else {
+        setV['batch'] = val[0]['batch']
+        setV['itemCode'] = val[0]['itemCode']
+        setV['uom'] = val[0]['uom']
+        setV['inventoryStatus'] = val[0]['inventoryStatus']
+        setV['qty'] = val[0]['qty']
+        // 修改 tableform 属性 数量最大值设置为库存余额中数量
+        ProductionreturnRequestDetail.allSchemas.tableFormColumns.map(item => {
+          if(item.field == 'qty') {
+            item.tableForm.max = val[0]['qty']
+          }
+        })
+      }
+    } else if(formField == 'workStationCode') {
+      setV['workStationCode'] = val[0]['code']
+      setV['fromLocationCode'] = val[0]['rawLocationCode']
+    } else if(formField == 'packUnit') {
+      setV['packUnit'] = val[0]['packUnit']
+      setV['packQty'] = val[0]['packQty']
+    } else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionreturnRequestMainNoApi.getProductionreturnRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productionreturn-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productionreturn-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productionreturn-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+      defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productionreturn-request-main:close'}), // 关闭
+      defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productionreturn-request-main:reAdd'}), // 重新添加
+      defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:submit'}), // 提交审批
+      defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionreturn-request-main:refused'}), // 驳回
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionreturn-request-main:agree'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productionreturn-request-main:handle'}), // 处理
+      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:update'}), // 编辑
+      // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturn-request-main:delete'}), // 删除
+      // 创建标签
+      {
+        label: '创建标签',
+        name: 'cjbq',
+        hide: isShowMainButton(row,['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+      defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    ProductionreturnRequestMainNoApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    ProductionreturnRequestMainNoApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    ProductionreturnRequestMainNoApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    ProductionreturnRequestMainNoApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    ProductionreturnRequestMainNoApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'cjbq') { // 创建标签
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (isCreateLabel) {
+      message.warning('已创建过标签！！！')
+      return
+    }
+    detatableData.params = {
+      masterId:row.id
+    }
+    await getDetailList()
+    // 打开创建标签页面
+    // dialogVisible.value = true
+    formLabelRef.value.open('create', row)
+    detatableData.tableList.map((item) => {
+      // item.batch = '000000' 不合格批次 用原有数据的
+      // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
+      ItembasicApi.getItembasicPage({
+        pageSize: 10,
+        pageNo: 1,
+        code: item.itemCode,
+        sort: '',
+        by: 'ASC',
+      }).then(res => {
+        if (res.list.length > 0) {
+          // 判断物料 可采购 可制造
+          if (res.list[0].enableMake == "FALSE") {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'productionLineCodePackage') {
+              // itemColumns.tableForm.isInpuFocusShow = false
+              // itemColumns.tableForm.disabled = true
+              ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = false
+            }
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = true
+              itemColumns.tableForm.disabled = false
+              ProductionreturnRequestDetailNoLabelRules.supplierItemCode[0].required = true
+            }
+          })
+          } else {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = false
+              itemColumns.tableForm.disabled = true
+              ProductionreturnRequestDetailNoLabelRules.supplierItemCode[0].required = false
+            }
+            if(itemColumns.field == 'productionLineCodePackage') {
+              item.productionLineCodePackage = item.productionLineCode
+              // itemColumns.tableForm.isInpuFocusShow = true
+              // itemColumns.tableForm.disabled = false
+              ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = true
+            }
+          })
+          }
+        } else {
+          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          return
+        }
+      })
+    })
+
+  } else if (val == 'mainHandle') { // 处理
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (!isCreateLabel) {
+      message.warning('请先创建标签')
+      return
+    }
+    tableObject.loading = true
+    ProductionreturnRequestMainNoApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑 
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 编辑时 车间代码不可修改
+  if (type == 'update') {
+    // 修改 tableform 属性
+    ProductionreturnRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
+    })
+  } else {
+    // 修改 tableform 属性
+    ProductionreturnRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductionreturnRequestMainNoApi.deleteProductionreturnRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionreturnRequestMainNoApi.exportProductionreturnRequestMain(tableObject.params)
+    download.excel(data, '生产退料不合格申请.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductionreturnRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  // 合格退料 添加参数 isOK
+  data.isOK = false // 不合格 false
+  try {
+    if (formType === 'create') {
+      // 子表不能为空
+      if (tableData.value.length == 0) {
+        formRef.value.formLoading = false
+        return message.warning('请添加明细数据！')
+      }
+      await ProductionreturnRequestMainNoApi.createProductionreturnRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductionreturnRequestMainNoApi.updateProductionreturnRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 创建标签
+const submitFormLabel = async (formType, data) => {
+  try {
+    detatableData.tableList.forEach(async (item) => {
+      await PackageApi.createPackageLabel(item).then(res => {
+        isCreateLabel.value = true
+        message.success('创建标签成功')
+      }).catch(err => {
+        isCreateLabel.value = false
+        console.log(err)
+        message.error('创建标签失败')
+      })
+    })
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+// 标签打印
+const handlePoint = async (row) => {
+  // 查询是否已创建过标签
+  await PackageApi.getPackagePage({
+    requestNumber: row.number
+  }).then((res) => {
+    if(res.list.length > 0) {
+      isCreateLabel.value = true
+      if (res.list[0].productionLineCode != null) {
+        labelType.value = 'zz'
+      } else {
+        labelType.value = 'cg'
+      }
+    } else {
+      isCreateLabel.value = false
+    }
+  }).catch(err => {
+    isCreateLabel.value = false
+    console.log(err)
+  })
+  // 判断是采购还是制造
+  if (isCreateLabel.value) {
+    if (labelType.value == 'cg') {
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      window.open(src.value+'&request_number='+row.number)
+    } else {
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      window.open(src.value+'&request_number='+row.number)
+    }
+  } else {
+    message.warning('请先创建标签')
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '隔离退料导入模版.xlsx'
+  })
+
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductionreturnRequestMainNoApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
new file mode 100644
index 000000000..c43b49670
--- /dev/null
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -0,0 +1,827 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as SupplieritemApi  from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+
+import * as ProductionlineApi  from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as WorkstationApi  from '@/api/wms/workstation'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import * as ItempackagingApi from '@/api/wms/itempackage'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 生产退料申请子表
+ */
+export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '生产线信息', // 查询弹窗标题
+      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
+        isMainValue: true
+      }]
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请选择车间信息！',
+          isMainValue: true
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请选择生产线信息！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '工位信息', // 查询弹窗标题
+      searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+      searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请选择车间信息！',
+        isMainValue: true
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请选择生产线信息！',
+        isMainValue: true
+      }]
+    },
+  },
+  
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '库存余额信息', // 查询弹窗标题
+        searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+        searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'locationCode',
+          value: 'fromLocationCode',
+          message: '请填写从库位代码！',
+          isMainValue: true
+        },{
+          key: 'inventoryStatus',
+          value: 'OK',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '库存余额信息', // 查询弹窗标题
+      searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+      searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'locationCode',
+        value: 'fromLocationCode',
+        message: '请填写从库位代码！',
+        isMainValue: true
+      },{
+        key: 'inventoryStatus',
+        value: 'OK',
+        isMainValue: false
+      }]
+    },
+  },
+  // {
+  //   label: '包装号',
+  //   field: 'packingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '器具号',
+  //   field: 'containerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      isSearchList: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+      searchField: 'packUnit', // 查询弹窗赋值字段
+      searchTitle: '物料包装信息', // 查询弹窗标题
+      searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+      searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请先选择物料代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'packUnit', // 查询弹窗赋值字段
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '标包数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: false
+    },
+    form: {
+      componentProps: {
+        disabled: false
+      }
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductionreturnRequestDetailRules = reactive({
+  workStationCode: [
+    { required: true, message: '请选择工位代码', trigger: 'change' }
+  ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  // packingNumber: [
+  //   { required: true, message: '请选择包装号', trigger: 'change' }
+  // ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  // fromLocationCode: [
+  //   { required: true, message: '请输入从库位代码', trigger: 'blur' }
+  // ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 隔离退料申请子表创建标签
+ */
+export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCodePackage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: false,
+    },
+    form: {
+      componentProps: {
+        disabled: false
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductionreturnRequestDetailNoLabelRules = reactive({
+  supplierItemCode: [
+    { required: true, message: '请选择供应商', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ], 
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ]
+})
\ No newline at end of file
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
new file mode 100644
index 000000000..1c7fefc2f
--- /dev/null
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
@@ -0,0 +1,342 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="RepleinshJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="RepleinshJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="RepleinshJobMainRules"
+    :formAllSchemas="RepleinshJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="RepleinshJobDetail.allSchemas"
+    :tableFormRules="RepleinshJobDetailRules"
+    :apiUpdate="RepleinshJobMainApi.updateRepleinshJobMain"
+    :apiCreate="RepleinshJobMainApi.createRepleinshJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="RepleinshJobMain.allSchemas"
+    :detailAllSchemas="RepleinshJobDetail.allSchemas"
+    :detailAllSchemasRules="RepleinshJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="RepleinshJobDetailApi.getRepleinshJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { RepleinshJobMain,RepleinshJobMainRules,RepleinshJobDetail,RepleinshJobDetailRules } from './repleinshJobMain.data'
+import * as RepleinshJobMainApi from '@/api/wms/repleinshJobMain'
+import * as RepleinshJobDetailApi from '@/api/wms/repleinshJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 补料任务主
+defineOptions({ name: 'RepleinshJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(RepleinshJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: RepleinshJobMainApi.getRepleinshJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:repleinsh-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    let aaa = {
+    "id": "1809180001854123375",
+    "requestNumber": "REQ2020231128-0002",
+    "requestTime": null,
+    "requestDueTime": 1701014400000,
+    "status": "1",
+    "expiredTime": null,
+    "updateTime": 1701151187000,
+    "updater": "1",
+    "jobStageStatus": null,
+    "priority": null,
+    "priorityIncrement": null,
+    "departmentCode": null,
+    "acceptUserId": "1",
+    "acceptTime": 1701159181000,
+    "completeUserId": null,
+    "completeTime": null,
+    "fromAreaTypes": "RAW,SEMI",
+    "toAreaTypes": "WIP",
+    "number": "JOB0720231128-0001",
+    "businessType": "Repleinment",
+    "remark": null,
+    "createTime": 1701151187000,
+    "creator": "1",
+    "fromWarehouseCode": null,
+    "toWarehouseCode": null,
+    "fromAreaCodes": "",
+    "toAreaCodes": "",
+    "autoComplete": "FALSE",
+    "allowModifyLocation": "TRUE",
+    "allowModifyQty": "TRUE",
+    "allowBiggerQty": "TRUE",
+    "allowSmallerQty": "TRUE",
+    "allowModifyInventoryStatus": "TRUE",
+    "allowContinuousScanning": "TRUE",
+    "allowPartialComplete": "TRUE",
+    "allowModifyBatch": "FALSE",
+    "allowModifyPackingNumber": "FALSE",
+    subList: [
+    {
+        "id": "1809180000559485683",
+        "packingNumber": "12",
+        "containerNumber": "001",
+        "batch": "21",
+        "inventoryStatus": "OK",
+        "fromLocationCode": "H03",
+        "toLocationCode": "WIP",
+        "itemCode": "item01",
+        "itemName": "物料01",
+        "itemDesc1": "",
+        "itemDesc2": "",
+        "projectCode": "xm01",
+        "qty": 110,
+        "uom": "EA",
+        "number": "JOB0720231128-0001",
+        "remark": null,
+        "createTime": 1701151187000,
+        "creator": "1",
+        "fromOwnerCode": null,
+        "toOwnerCode": null,
+          recordLst: [{
+            handleQty: 10,
+            toPackingNumber: '12',
+            toContainerNumber: '001',
+            toBatch: '21',
+            toInventoryStatus: 'OK',
+            toLocationCode: 'H03',
+            supplierCode: '31213',
+          },{
+            handleQty: 20,
+            toPackingNumber: 'M20230421000005',
+            toContainerNumber: '001',
+            toBatch: '20230808',
+            toInventoryStatus: 'OK',
+            toLocationCode: 'SFG',
+            supplierCode: '31213',
+          }]
+    },
+    {
+        "id": "1809180000559485682",
+        "packingNumber": "P20230427000027",
+        "containerNumber": "001",
+        "batch": "20230427",
+        "inventoryStatus": "OK",
+        "fromLocationCode": "INSPECT",
+        "toLocationCode": "WIP",
+        "itemCode": "item01",
+        "itemName": "物料01",
+        "itemDesc1": "",
+        "itemDesc2": "",
+        "projectCode": "xm01",
+        "qty": 110,
+        "uom": "EA",
+        "number": "JOB0720231128-0001",
+        "remark": null,
+        "createTime": 1701151187000,
+        "creator": "1",
+        "fromOwnerCode": null,
+        "toOwnerCode": null,
+          recordLst: [{
+            handleQty: 30,
+            toPackingNumber: '12',
+            toContainerNumber: '001',
+            toBatch: '21',
+            toInventoryStatus: 'OK',
+            toLocationCode: 'H03',
+            supplierCode: '31213',
+          },{
+            handleQty: 40,
+            toPackingNumber: 'M20230421000005',
+            toContainerNumber: '001',
+            toBatch: '20230808',
+            toInventoryStatus: 'OK',
+            toLocationCode: 'SFG',
+            supplierCode: '31213',
+          }]
+    }
+]
+}
+    RepleinshJobMainApi.executeRepleinshMain(aaa)
+  } else if (val == 'mainJobAba') { // 放弃
+    RepleinshJobMainApi.abandonRepleinshMain(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    RepleinshJobMainApi.closeRepleinshMain(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    RepleinshJobMainApi.acceptRepleinshMain(row.id)
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await RepleinshJobMainApi.exportRepleinshJobMain(tableObject.params)
+    download.excel(data, '补料任务.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
new file mode 100644
index 000000000..eddd68caa
--- /dev/null
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -0,0 +1,791 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 补料任务主表
+ */
+export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    isTable:false
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    isTable:false
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人用户名',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人用户名',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'update',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
+]))
+
+//表单校验
+export const RepleinshJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 补料任务子表
+ */
+export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemdesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const RepleinshJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
new file mode 100644
index 000000000..20e489328
--- /dev/null
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
@@ -0,0 +1,171 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="RepleinshRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="RepleinshRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="RepleinshRecordMainRules"
+    :formAllSchemas="RepleinshRecordMain.allSchemas"
+    :tableAllSchemas="RepleinshRecordDetail.allSchemas"
+    :tableFormRules="RepleinshRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="RepleinshRecordMain.allSchemas"
+    :detailAllSchemas="RepleinshRecordDetail.allSchemas"
+    :detailAllSchemasRules="RepleinshRecordDetailRules"
+    :apiPage="RepleinshRecordDetailApi.getRepleinshRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { RepleinshRecordMain,RepleinshRecordMainRules,RepleinshRecordDetail,RepleinshRecordDetailRules } from './repleinshRecordMain.data'
+import * as RepleinshRecordMainApi from '@/api/wms/repleinshRecordMain'
+import * as RepleinshRecordDetailApi from '@/api/wms/repleinshRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 补料记录主
+defineOptions({ name: 'RepleinshRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(RepleinshRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: RepleinshRecordMainApi.getRepleinshRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:repleinsh-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await RepleinshRecordMainApi.exportRepleinshRecordMain(tableObject.params)
+    download.excel(data, '补料记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
new file mode 100644
index 000000000..3de9f2a92
--- /dev/null
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
@@ -0,0 +1,629 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 补料记录主表
+ */
+export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const RepleinshRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 补料记录子表
+ */
+export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const RepleinshRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
new file mode 100644
index 000000000..9a2ff9392
--- /dev/null
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -0,0 +1,406 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="RepleinshRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="RepleinshRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="RepleinshRequestMainRules"
+    :formAllSchemas="RepleinshRequestMain.allSchemas"
+    :tableAllSchemas="RepleinshRequestDetail.allSchemas"
+    :tableFormRules="RepleinshRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="RepleinshRequestMainApi.updateRepleinshRequestMain"
+    :apiCreate="RepleinshRequestMainApi.createRepleinshRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="RepleinshRequestMain.allSchemas"
+    :detailAllSchemas="RepleinshRequestDetail.allSchemas"
+    :detailAllSchemasRules="RepleinshRequestDetailRules"
+    :apiCreate="RepleinshRequestDetailApi.createRepleinshRequestDetail"
+    :apiUpdate="RepleinshRequestDetailApi.updateRepleinshRequestDetail"
+    :apiPage="RepleinshRequestDetailApi.getRepleinshRequestDetailPage"
+    :apiDelete="RepleinshRequestDetailApi.deleteRepleinshRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/repleinsh-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { RepleinshRequestMain,RepleinshRequestMainRules,RepleinshRequestDetail,RepleinshRequestDetailRules } from './repleinshRequestMain.data'
+import * as RepleinshRequestMainApi from '@/api/wms/repleinshRequestMain'
+import * as RepleinshRequestDetailApi from '@/api/wms/repleinshRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 补料申请
+defineOptions({ name: 'RepleinshRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(RepleinshRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if (formField == 'itemCode') {
+        row['itemCode'] = val[0]['code']
+        row['uom'] = val[0]['uom']
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      if (formField == 'fromWarehouseCode') {
+        setV['fromWarehouseCode'] = val[0]['code']
+        setV['toWarehouseCode'] = val[0]['code']
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if (formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+      setV['uom'] = val[0]['uom']
+    } else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: RepleinshRequestMainApi.getRepleinshRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:repleinsh-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:repleinsh-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:repleinsh-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:repleinsh-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:repleinsh-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:repleinsh-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:repleinsh-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:repleinsh-request-main:handle'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:repleinsh-request-main:update'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:repleinsh-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:repleinsh-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    RepleinshRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    RepleinshRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    RepleinshRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    RepleinshRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    RepleinshRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要处理吗？')
+    tableObject.loading = true
+    RepleinshRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await RepleinshRequestMainApi.deleteRepleinshRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await RepleinshRequestMainApi.exportRepleinshRequestMain(tableObject.params)
+    download.excel(data, '补料申请.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+RepleinshRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  if(tableData.value.find(item => (item.qty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      await RepleinshRequestMainApi.createRepleinshRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RepleinshRequestMainApi.updateRepleinshRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '补料申请导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await RepleinshRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
new file mode 100644
index 000000000..ec3e1b9f5
--- /dev/null
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -0,0 +1,742 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as ItembasicApi  from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+import * as LocationApi  from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'RepleinmentRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 补料申请主表
+ */
+export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'Repleinment',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const RepleinshRequestMainRules = reactive({
+  fromWarehouseCode: [
+    { required: true, message: '请输入从仓库代码', trigger: 'blur' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请输入到仓库代码', trigger: 'blur' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 补料申请子表
+ */
+export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '物料基础信息', // 查询弹窗标题
+      searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+      searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    form: {
+      value: 'OK',
+      componentProps: {
+        disabled: true
+      }
+    },
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      default: 'OK',
+      disabled: true
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const RepleinshRequestDetailRules = reactive({
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请输入到库位代码', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
new file mode 100644
index 000000000..310727855
--- /dev/null
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
@@ -0,0 +1,220 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InventorychangeRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InventorychangeRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="InventorychangeRecordMainRules"
+    :formAllSchemas="InventorychangeRecordMain.allSchemas"
+    :tableAllSchemas="InventorychangeRecordDetail.allSchemas"
+    :tableFormRules="InventorychangeRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InventorychangeRecordMain.allSchemas"
+    :detailAllSchemas="InventorychangeRecordDetail.allSchemas"
+    :detailAllSchemasRules="InventorychangeRecordDetailRules"
+    :apiPage="InventorychangeRecordDetailApi.getInventorychangeRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { InventorychangeRecordMain,InventorychangeRecordMainRules,InventorychangeRecordDetail,InventorychangeRecordDetailRules } from './inventorychangeRecordMain.data'
+import * as InventorychangeRecordMainApi from '@/api/wms/inventorychangeRecordMain'
+import * as InventorychangeRecordDetailApi from '@/api/wms/inventorychangeRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 库存修改记录主
+defineOptions({ name: 'InventorychangeRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InventorychangeRecordMain.allSchemas.tableColumns)
+
+console.log(99 ,  routeName.value)
+const fromInventoryStatus = ref()
+const toInventoryStatus = ref()
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InventorychangeRecordMainApi.getInventorychangeRecordMainPage // 分页接口
+})
+
+
+// 判断 路由名称 进行条件过滤
+/**
+ * OktoholdRecordMain 合格转隔离
+ */
+ if ( routeName.value == 'OktoholdReqordMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'OK',
+    toInventoryStatus:'HOLD'
+  }
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "HOLD"
+} else if ( routeName.value == 'HoldtookRecordMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'HOLD',
+    toInventoryStatus:'OK'
+  }
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "OK"
+} else if ( routeName.value == 'HoldtoscrapRecordMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'HOLD',
+    toInventoryStatus:'SCRAP'
+  }
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "SCRAP"
+} else if ( routeName.value == 'OktoscrapRecordMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'OK',
+    toInventoryStatus:'SCRAP'
+  }
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "SCRAP"
+} else if ( routeName.value == 'ScraptoholdRecordMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'SCRAP',
+    toInventoryStatus:'HOLD'
+  }
+  fromInventoryStatus.value = 'SCRAP'
+  toInventoryStatus.value = "HOLD"
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:inventorychange-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await InventorychangeRecordMainApi.exportInventorychangeRecordMain(tableObject.params)
+    download.excel(data, '库存修改记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
new file mode 100644
index 000000000..a17f9797c
--- /dev/null
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
@@ -0,0 +1,704 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 库存修改记录主表
+ */
+export const InventorychangeRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const InventorychangeRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 库存修改记录子表
+ */
+export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '从数量',
+    field: 'fromQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '到数量',
+    field: 'toQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从替代批次',
+    field: 'fromAltBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到替代批次',
+    field: 'toAltBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从到货日期',
+    field: 'fromArriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '到到货日期',
+    field: 'toArriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从生产日期',
+    field: 'fromProduceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '到生产日期',
+    field: 'toProduceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从过期日期',
+    field: 'fromExpireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '到过期日期',
+    field: 'toExpireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const InventorychangeRecordDetailRules = reactive({
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  locationGroupCode: [
+    { required: true, message: '请选择库位组代码', trigger: 'change' }
+  ],
+  areaCode: [
+    { required: true, message: '请选择库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
new file mode 100644
index 000000000..1f2af5f01
--- /dev/null
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -0,0 +1,468 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InventorychangeRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InventorychangeRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="InventorychangeRequestMainRules"
+    :formAllSchemas="InventorychangeRequestMain.allSchemas"
+    :tableAllSchemas="InventorychangeRequestDetail.allSchemas"
+    :tableFormRules="InventorychangeRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="InventorychangeRequestMainApi.updateInventorychangeRequestMain"
+    :apiCreate="InventorychangeRequestMainApi.createInventorychangeRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InventorychangeRequestMain.allSchemas"
+    :detailAllSchemas="InventorychangeRequestDetail.allSchemas"
+    :detailAllSchemasRules="InventorychangeRequestDetailRules"
+    :apiCreate="InventorychangeRequestDetailApi.createInventorychangeRequestDetail"
+    :apiUpdate="InventorychangeRequestDetailApi.updateInventorychangeRequestDetail"
+    :apiPage="InventorychangeRequestDetailApi.getInventorychangeRequestDetailPage"
+    :apiDelete="InventorychangeRequestDetailApi.deleteInventorychangeRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/inventorychange-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { InventorychangeRequestMain,InventorychangeRequestMainRules,InventorychangeRequestDetail,InventorychangeRequestDetailRules } from './inventorychangeRequestMain.data'
+import * as InventorychangeRequestMainApi from '@/api/wms/inventorychangeRequestMain'
+import * as InventorychangeRequestDetailApi from '@/api/wms/inventorychangeRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InventorychangeRequestMain.allSchemas.tableColumns)
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InventorychangeRequestMainApi.getInventorychangeRequestMainPage // 分页接口
+})
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      row['fromPackingNumber'] = val[0]['packingNumber']
+      row['toPackingNumber'] = val[0]['packingNumber']
+      row['fromBatch'] = val[0]['batch']
+      row['toBatch'] = val[0]['batch']
+      row['fromInventoryStatus'] = val[0]['inventoryStatus']
+      row['toInventoryStatus'] = val[0]['inventoryStatus']
+      row['fromContainerNumber'] = val[0]['containerNumber']
+      row['toContainerNumber'] = val[0]['containerNumber']
+      row['fromQty'] = val[0]['qty']
+      row['toQty'] = val[0]['qty']
+      row['fromOwnerCode'] = val[0]['ownerCode']
+      row['toOwnerCode'] = val[0]['ownerCode']
+      row['fromAltBatch'] = val[0]['altBatch']
+      row['toAltBatch'] = val[0]['altBatch']
+      row['fromArriveDate'] = val[0]['arriveDate']
+      row['toArriveDate'] = val[0]['arriveDate']
+      row['fromProduceDate'] = val[0]['produceDate']
+      row['toProduceDate'] = val[0]['produceDate']
+      row['fromExpireDate'] = val[0]['expireDate']
+      row['toExpireDate'] = val[0]['expireDate']
+      row['itemCode'] = val[0]['itemCode']
+      row['locationCode'] = val[0]['locationCode']
+      row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      setV['fromPackingNumber'] = val[0]['fromPackingNumber']
+      setV['toPackingNumber'] = val[0]['packingNumber']
+      setV['fromBatch'] = val[0]['batch']
+      setV['toBatch'] = val[0]['batch']
+      setV['fromInventoryStatus'] = val[0]['inventoryStatus']
+      setV['toInventoryStatus'] = val[0]['inventoryStatus']
+      setV['fromContainerNumber'] = val[0]['containerNumber']
+      setV['toContainerNumber'] = val[0]['containerNumber']
+      setV['fromQty'] = val[0]['qty']
+      setV['toQty'] = val[0]['qty']
+      setV['fromOwnerCode'] = val[0]['ownerCode']
+      setV['toOwnerCode'] = val[0]['ownerCode']
+      setV['fromAltBatch'] = val[0]['altBatch']
+      setV['toAltBatch'] = val[0]['altBatch']
+      setV['fromArriveDate'] = val[0]['arriveDate']
+      setV['toArriveDate'] = val[0]['arriveDate']
+      setV['fromProduceDate'] = val[0]['produceDate']
+      setV['toProduceDate'] = val[0]['produceDate']
+      setV['fromExpireDate'] = val[0]['expireDate']
+      setV['toExpireDate'] = val[0]['expireDate']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['locationCode'] = val[0]['locationCode']
+      setV['uom'] = val[0]['uom']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+      if(formField == 'fromPackingNumber') {
+      setV['fromPackingNumber'] = val[0]['packingNumber']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['fromBatch'] = val[0]['batch']
+      setV['toBatch'] = val[0]['batch']
+      setV['locationCode'] = val[0]['locationCode']
+      setV['fromQty'] = val[0]['qty']
+      setV['fromInventoryStatus'] = val[0]['inventoryStatus']
+      setV['uom'] = val[0]['uom']
+      } else {
+      setV[formField] = val[0][searchField]
+      }
+    formRef.setValues(setV)
+  })
+}
+
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:inventorychange-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:inventorychange-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:inventorychange-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:inventorychange-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorychange-request-main:reAdd'}), //重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorychange-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorychange-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorychange-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:inventorychange-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorychange-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventorychange-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    InventorychangeRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    InventorychangeRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    InventorychangeRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    InventorychangeRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    InventorychangeRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要处理吗？')
+    tableObject.loading = true
+    InventorychangeRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await InventorychangeRequestMainApi.deleteInventorychangeRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await InventorychangeRequestMainApi.exportInventorychangeRequestMain(tableObject.params)
+    download.excel(data, '库存修改申请.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+InventorychangeRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+//为true表示子表数据中存在数量为0的数据
+const flag = ref()
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  let isExist = false
+  tableData.value.forEach(item => {
+   let rs =  tableData.value.filter(filterItem => (filterItem.packingNumber == item.packingNumber))
+   if(rs.length > 1) isExist = true
+  })
+  if (isExist) {
+    formRef.value.formLoading = false
+    return message.warning('包装号重复')
+  }
+  data.subList.forEach(obj => {
+    if(obj.toQty == 0){
+      message.error(`到数量不能为0!`)
+      flag.value = true
+      return;
+    }
+  })
+  if(flag.value){
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      console.log(data)
+      await InventorychangeRequestMainApi.createInventorychangeRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await InventorychangeRequestMainApi.updateInventorychangeRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '库存修改申请导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await InventorychangeRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
new file mode 100644
index 000000000..3b9d03647
--- /dev/null
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -0,0 +1,945 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import * as OwnerApi from '@/api/wms/owner'
+import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'InventoryChangeRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+
+/**
+ * @returns {Array} 库存修改申请主表
+ */
+export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const InventorychangeRequestMainRules = reactive({
+  // warehouseCode: [
+  //   { required: true, message: '请选择仓库代码', trigger: 'change' }
+  // ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 库存修改申请子表
+ */
+export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择从包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择从包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalancePage
+      }
+    }
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从数量',
+    field: 'fromQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 6,
+        disabled: true
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 6,
+      disabled: true
+    },
+  },
+  {
+    label: '到数量',
+    field: 'toQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min:0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min:0,
+      precision: 6
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+      }
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择货主代码',
+      searchField: 'code',
+      searchTitle: '货主信息',
+      searchAllSchemas: Owner.allSchemas,
+      searchPage: OwnerApi.getOwnerPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择货主代码',
+        searchField: 'code',
+        searchTitle: '货主信息',
+        searchAllSchemas: Owner.allSchemas,
+        searchPage: OwnerApi.getOwnerPage
+      }
+    }
+  },
+  {
+    label: '从替代批次',
+    field: 'fromAltbatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从到货日期',
+    field: 'fromArriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从生产日期',
+    field: 'fromProduceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从过期日期',
+    field: 'fromExpireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        disabled: true
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'x',
+      disabled: true
+    },
+  },
+  {
+    label: '到过期日期',
+    field: 'toExpireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '到替代批次',
+    field: 'toAltBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '到到货日期',
+    field: 'toArrivdAte',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '到生产日期',
+    field: 'toProduceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const InventorychangeRequestDetailRules = reactive({
+  toInventoryStatus: [
+    { required: true, message: '请选择到库存状态', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请点击从包装号选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
new file mode 100644
index 000000000..13ebfa2b4
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
@@ -0,0 +1,311 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InventorymoveJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InventorymoveJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="InventorymoveJobMainRules"
+    :formAllSchemas="InventorymoveJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="InventorymoveJobDetail.allSchemas"
+    :tableFormRules="InventorymoveJobDetailRules"
+    :apiUpdate="InventorymoveJobMainApi.updateInventorymoveJobMain"
+    :apiCreate="InventorymoveJobMainApi.createInventorymoveJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InventorymoveJobMain.allSchemas"
+    :detailAllSchemas="InventorymoveJobDetail.allSchemas"
+    :detailAllSchemasRules="InventorymoveJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="InventorymoveJobDetailApi.getInventorymoveJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { InventorymoveJobMain,InventorymoveJobMainRules,InventorymoveJobDetail,InventorymoveJobDetailRules } from './inventorymoveJobMain.data'
+import * as InventorymoveJobMainApi from '@/api/wms/inventorymoveJobMain'
+import * as InventorymoveJobDetailApi from '@/api/wms/inventorymoveJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 库存转移任务主
+defineOptions({ name: 'InventorymoveJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InventorymoveJobMain.allSchemas.tableColumns)
+
+const fromInventoryStatus = ref()
+const toInventoryStatus = ref()
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InventorymoveJobMainApi.getInventorymoveJobMainPage // 分页接口
+})
+const importFileName = ref()
+// 判断 路由名称 进行条件过滤
+/**
+ * OktoholdJobMain 合格转隔离
+ */
+ if ( routeName.value == 'OktoholdJobMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'OK',
+    toInventoryStatus:'HOLD'
+  }
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "HOLD"
+  importFileName.value = '合格转隔离任务'
+} else if ( routeName.value == 'HoldtookJobMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'HOLD',
+    toInventoryStatus:'OK'
+  }
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "OK"
+  importFileName.value = '隔离转合格任务'
+} else if ( routeName.value == 'HoldtoscrapJobMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'HOLD',
+    toInventoryStatus:'SCRAP'
+  }
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "SCRAP"
+  importFileName.value = '隔离转报废任务'
+} else if ( routeName.value == 'OktoscrapJobMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'OK',
+    toInventoryStatus:'SCRAP'
+  }
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "SCRAP"
+  importFileName.value = '合格转报废任务'
+} else if ( routeName.value == 'ScraptoholdJobMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'SCRAP',
+    toInventoryStatus:'HOLD'
+  }
+  fromInventoryStatus.value = 'SCRAP'
+  toInventoryStatus.value = "HOLD"
+  importFileName.value = '报废转隔离任务'
+} else {
+  console.log(146 , fromInventoryStatus.value)
+  fromInventoryStatus.value = null
+  importFileName.value = '库存移动任务'
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    InventorymoveJobMainApi.executeInventorymoveMain(row.id)
+  } else if (val == 'mainJobAba') { // 放弃
+    InventorymoveJobMainApi.abandonInventorymoveMain(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    InventorymoveJobMainApi.closeInventorymoveMain(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    InventorymoveJobMainApi.acceptInventorymoveMain(row.id)
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    if(routeName.value == 'OktoholdJobMain'){
+      const data = await InventorymoveJobMainApi.exportOkToHoldJobMain(tableObject.params)
+      download.excel(data, '合格转隔离任务主.xlsx')
+        }else if ( routeName.value == 'HoldtookJobMain') {
+          const data = await InventorymoveJobMainApi.exportHoldToOkJobMain(tableObject.params)
+          download.excel(data, '隔离转合格任务主.xlsx')
+        }else if ( routeName.value == 'HoldtoscrapJobMain') {
+          const data = await InventorymoveJobMainApi.exportHoldToScrapJobMain(tableObject.params)
+          download.excel(data, '隔离转报废任务主.xlsx')
+        }else if ( routeName.value == 'OktoscrapJobtMain') {
+          const data = await InventorymoveJobMainApi.exportOkToScrapJobMain(tableObject.params)
+          download.excel(data, '合格转报废任务主.xlsx')
+        }else if ( routeName.value == 'ScraptoholdJobMain') {
+          const data = await InventorymoveJobMainApi.exportScrapToHoldJobMain(tableObject.params)
+          download.excel(data, '报废转隔离任务主.xlsx')
+        }else{
+          const data = await InventorymoveJobMainApi.exportInventorymoveJobMain(tableObject.params)
+          download.excel(data, '库存转移任务主.xlsx')
+        }
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
new file mode 100644
index 000000000..c29587068
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@@ -0,0 +1,831 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 库存转移任务主表
+ */
+export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '使用在途库',
+    field: 'useOnTheWayLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const InventorymoveJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 库存转移任务子表
+ */
+export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '到库存状态',
+  //   field: 'toInventoryStatus',
+  //   dictType: DICT_TYPE.INVENTORY_STATUS,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const InventorymoveJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
new file mode 100644
index 000000000..bff1e39f2
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
@@ -0,0 +1,246 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InventorymoveRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InventorymoveRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="InventorymoveRecordMainRules"
+    :formAllSchemas="InventorymoveRecordMain.allSchemas"
+    :tableAllSchemas="InventorymoveRecordDetail.allSchemas"
+    :tableFormRules="InventorymoveRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InventorymoveRecordMain.allSchemas"
+    :detailAllSchemas="InventorymoveRecordDetail.allSchemas"
+    :detailAllSchemasRules="InventorymoveRecordDetailRules"
+    :apiPage="InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { InventorymoveRecordMain,InventorymoveRecordMainRules,InventorymoveRecordDetail,InventorymoveRecordDetailRules } from './inventorymoveRecordMain.data'
+import * as InventorymoveRecordMainApi from '@/api/wms/inventorymoveRecordMain'
+import * as InventorymoveRecordDetailApi from '@/api/wms/inventorymoveRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 库存转移记录主
+defineOptions({ name: 'InventorymoveRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const importFileName = ref()
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InventorymoveRecordMain.allSchemas.tableColumns)
+
+console.log(99 ,  routeName.value)
+const fromInventoryStatus = ref()
+const toInventoryStatus = ref()
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InventorymoveRecordMainApi.getInventorymoveRecordMainPage // 分页接口
+})
+
+// 判断 路由名称 进行条件过滤
+/**
+ * OktoholdRequestMain 合格转隔离
+ */
+ if ( routeName.value == 'OktoholdRecordMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'OK',
+    toInventoryStatus:'HOLD'
+  }
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "HOLD"
+  importFileName.value = '合格转隔离记录'
+} else if ( routeName.value == 'HoldtookRecordMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'HOLD',
+    toInventoryStatus:'OK'
+  }
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "OK"
+  importFileName.value = '隔离转合格记录'
+} else if ( routeName.value == 'HoldtoscrapRecordMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'HOLD',
+    toInventoryStatus:'SCRAP'
+  }
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "SCRAP"
+  importFileName.value = '隔离转报废记录'
+} else if ( routeName.value == 'OktoscrapRecordMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'OK',
+    toInventoryStatus:'SCRAP'
+  }
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "SCRAP"
+  importFileName.value = '合格转报废记录'
+} else if ( routeName.value == 'ScraptoholdRecordMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'SCRAP',
+    toInventoryStatus:'HOLD'
+  }
+  fromInventoryStatus.value = 'SCRAP'
+  toInventoryStatus.value = "HOLD"
+  importFileName.value = '报废转隔离记录'
+} else {
+  console.log(146 , fromInventoryStatus.value)
+  fromInventoryStatus.value = null
+  importFileName.value = '库存移动记录'
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    if(routeName.value == 'OktoholdRecordMain'){
+      const data = await InventorymoveRecordMainApi.exportOkToHoldRecordMain(tableObject.params)
+      download.excel(data, '合格转隔离记录主.xlsx')
+        }else if ( routeName.value == 'HoldtookRecordMain') {
+          const data = await InventorymoveRecordMainApi.exportHoldToOkRecordMain(tableObject.params)
+          download.excel(data, '隔离转合格记录主.xlsx')
+        }else if ( routeName.value == 'HoldtoscrapRecordMain') {
+          const data = await InventorymoveRecordMainApi.exportHoldToScrapRecordMain(tableObject.params)
+          download.excel(data, '隔离转报废记录主.xlsx')
+        }else if ( routeName.value == 'OktoscrapRecordtMain') {
+          const data = await InventorymoveRecordMainApi.exportOkToScrapRecordMain(tableObject.params)
+          download.excel(data, '合格转报废记录主.xlsx')
+        }else if ( routeName.value == 'ScraptoholdRecordMain') {
+          const data = await InventorymoveRecordMainApi.exportScrapToHoldRecordMain(tableObject.params)
+          download.excel(data, '报废转隔离记录主.xlsx')
+        }else{
+          const data = await InventorymoveRecordMainApi.exportInventorymoveRecordMain(tableObject.params)
+          download.excel(data, '库存转移记录主.xlsx')
+        }
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
new file mode 100644
index 000000000..28365764f
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
@@ -0,0 +1,685 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 库存转移记录主表
+ */
+export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '使用在途库',
+    field: 'useOnTheWayLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const InventorymoveRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 库存转移记录子表
+ */
+export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+]))
+
+//表单校验
+export const InventorymoveRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  fromInventoryStatus: [
+    { required: true, message: '请选择从库存状态', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  toInventoryStatus: [
+    { required: true, message: '请选择到库存状态', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
new file mode 100644
index 000000000..39058e266
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -0,0 +1,678 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InventorymoveRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InventorymoveRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="InventorymoveRequestMainRules"
+    :formAllSchemas="InventorymoveRequestMain.allSchemas"
+    :tableAllSchemas="InventorymoveRequestDetail.allSchemas"
+    :tableFormRules="InventorymoveRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="InventorymoveRequestMainApi.updateInventorymoveRequestMain"
+    :apiCreate="InventorymoveRequestMainApi.createInventorymoveRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InventorymoveRequestMain.allSchemas"
+    :detailAllSchemas="InventorymoveRequestDetail.allSchemas"
+    :detailAllSchemasRules="InventorymoveRequestDetailRules"
+    :apiCreate="InventorymoveRequestDetailApi.createInventorymoveRequestDetail"
+    :apiUpdate="InventorymoveRequestDetailApi.updateInventorymoveRequestDetail"
+    :apiPage="InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage"
+    :apiDelete="InventorymoveRequestDetailApi.deleteInventorymoveRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @detailOpenForm="detailOpenForm"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/inventorymove-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :fromInventoryStatus= "fromInventoryStatus" :toInventoryStatus="toInventoryStatus" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveRequestDetail,InventorymoveRequestDetailRules } from './inventorymoveRequestMain.data'
+import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain'
+import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { log } from 'console'
+
+// 库存转移申请
+defineOptions({ name: 'InventorymoveRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InventorymoveRequestMain.allSchemas.tableColumns)
+const businessType = ref()
+
+console.log(99 ,  routeName.value)
+const fromInventoryStatus = ref()
+const toInventoryStatus = ref()
+const importFileName = ref()
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InventorymoveRequestMainApi.getInventorymoveRequestMainPage // 分页接口
+})
+
+// 判断 路由名称 进行条件过滤
+/**
+ * OktoholdRequestMain 合格转隔离
+ */
+ if ( routeName.value == 'OktoholdRequestMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'OK',
+    toInventoryStatus:'HOLD'
+  }
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "HOLD"
+  businessType.value = 'OkToHoldRequest'
+  importFileName.value = '合格转隔离申请'
+} else if ( routeName.value == 'HoldtookRequestMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'HOLD',
+    toInventoryStatus:'OK'
+  }
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "OK"
+  businessType.value = 'HoldToOkRequest'
+  importFileName.value = '隔离转合格申请'
+} else if ( routeName.value == 'HoldtoscrapRequestMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'HOLD',
+    toInventoryStatus:'SCRAP'
+  }
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "SCRAP"
+  businessType.value = 'HoldToScrapRequest'
+  importFileName.value = '隔离转报废申请'
+} else if ( routeName.value == 'OktoscrapRequestMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'OK',
+    toInventoryStatus:'SCRAP'
+  }
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "SCRAP"
+  businessType.value = 'OkToScrapRequest'
+  importFileName.value = '合格转报废申请'
+} else if ( routeName.value == 'ScraptoholdRequestMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'SCRAP',
+    toInventoryStatus:'HOLD'
+  }
+  fromInventoryStatus.value = 'SCRAP'
+  toInventoryStatus.value = "HOLD"
+  businessType.value = 'ScrapToHoldRequest'
+  importFileName.value = '报废转隔离申请'
+} else if( routeName.value == 'InventorymoveRequestMain'){
+  fromInventoryStatus.value = null
+  businessType.value = 'InventorymoveRequest'
+  importFileName.value = '库存移动申请'
+}else {
+  tableObject.params = {
+    fromInventoryStatus: 'OK',
+    toInventoryStatus:'SCRAP'
+  }
+}
+
+// 修改 tableform 属性
+InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
+  if(item.field == 'fromPackingNumber') {
+    if (fromInventoryStatus.value) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value ,
+        isMainValue: false
+      },
+      {
+          key: 'fromWarehouseCode',
+          value: 'fromWarehouseCode',
+          message: '请选择从仓库代码！',
+          isMainValue: true
+        }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },
+      {
+          key: 'fromWarehouseCode',
+          value: 'fromWarehouseCode',
+          message: '请选择从仓库代码！',
+          isMainValue: true
+        }]
+    } else if (fromInventoryStatus.value == null) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value ,
+        isMainValue: false
+      },
+      {
+          key: 'fromWarehouseCode',
+          value: 'fromWarehouseCode',
+          message: '请选择从仓库代码！',
+          isMainValue: true
+        }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },
+      {
+          key: 'fromWarehouseCode',
+          value: 'fromWarehouseCode',
+          message: '请选择从仓库代码！',
+          isMainValue: true
+        }]
+    } else {
+      delete item.tableForm.searchCondition
+    }
+  }
+  if(item.field == "toLocationCode"){
+    if (toInventoryStatus.value) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      }]
+    }else if (toInventoryStatus.value == null) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value ,
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      }]
+    }
+  }
+})
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      if(formField == 'fromPackingNumber'){
+        row['fromPackingNumber'] = val[0]['packingNumber']
+        row['fromContainerNumber'] = val[0]['containerNumber']
+        row['itemCode'] = val[0]['itemCode']
+        row['fromBatch'] = val[0]['batch']
+        row['fromInventoryStatus'] = val[0]['inventoryStatus']
+        row['fromLocationCode'] = val[0]['locationCode']
+        row['uom'] = val[0]['uom']
+        if(routeName.value == 'OktoholdRequestMain'){
+          row['toInventoryStatus'] = "HOLD"
+        }else if ( routeName.value == 'HoldtookRequestMain') {
+          row['toInventoryStatus'] = "OK"
+        }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+          row['toInventoryStatus'] = "SCRAP"
+        }else if ( routeName.value == 'OktoscrapRequestMain') {
+          row['toInventoryStatus'] = "SCRAP"
+        }else if ( routeName.value == 'ScraptoholdRequestMain') {
+          row['toInventoryStatus'] = "HOLD"
+        }else{
+          row['toInventoryStatus'] = val[0]['inventoryStatus']
+        }
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      if (formField == 'fromWarehouseCode') {
+        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.push({
+          key: 'warehouseCode',
+          value: val[0]["code"],
+          isMainValue: false
+        })
+      } else {
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => {
+          if (item.key == 'warehouseCode') {
+            item.value = val[0]["code"]
+          }
+        })
+      }
+      }
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'fromPackingNumber') {
+      setV['fromPackingNumber'] = val[0]['packingNumber']
+      setV['fromContainerNumber'] = val[0]['containerNumber']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['fromBatch'] = val[0]['batch']
+      setV['fromInventoryStatus'] = val[0]['inventoryStatus']
+      setV['fromLocationCode'] = val[0]['locationCode']
+      setV['uom'] = val[0]['uom']
+      if(routeName.value == 'OktoholdRequestMain'){
+        setV['toInventoryStatus'] = "HOLD"
+      }else if ( routeName.value == 'HoldtookRequestMain') {
+        setV['toInventoryStatus'] = "OK"
+      }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+        setV['toInventoryStatus'] = "SCRAP"
+        }else if ( routeName.value == 'OktoscrapRequestMain') {
+        setV['toInventoryStatus'] = "SCRAP"
+      }else if ( routeName.value == 'ScraptoholdRequestMain') {
+        setV['toInventoryStatus'] = "HOLD"
+      }else{
+        setV['toInventoryStatus'] = val[0]['inventoryStatus']
+      }
+    } else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:inventorymove-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:inventorymove-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorymove-request-main:reAdd'}), //重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorymove-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorymove-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorymove-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:inventorymove-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorymove-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventorymove-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要处理吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/**
+ * 详情 新增/编辑事件
+ */
+const detailOpenForm = (type, row) => {
+    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.push({
+          key: 'warehouseCode',
+          value: fromWarehouseCodeMain.value,
+          isMainValue: false
+        })
+      } else {
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => {
+          if (item.key == 'warehouseCode') {
+            item.value = fromWarehouseCodeMain.value
+          }
+        })
+      }
+}
+
+const fromWarehouseCodeMain = ref()
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  fromWarehouseCodeMain.value = row.fromWarehouseCode
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await InventorymoveRequestMainApi.deleteInventorymoveRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    if(routeName.value == 'OktoholdRequestMain'){
+      const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params)
+      download.excel(data, '合格转隔离申请主.xlsx')
+        }else if ( routeName.value == 'HoldtookRequestMain') {
+          const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params)
+          download.excel(data, '隔离转合格申请主.xlsx')
+        }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+          const data = await InventorymoveRequestMainApi.exportHoldToScrapRequestMain(tableObject.params)
+          download.excel(data, '隔离转报废申请主.xlsx')
+        }else if ( routeName.value == 'OktoscrapRequestMain') {
+          const data = await InventorymoveRequestMainApi.exportOkToScrapRequestMain(tableObject.params)
+          download.excel(data, '合格转报废申请主.xlsx')
+        }else if ( routeName.value == 'ScraptoholdRequestMain') {
+          const data = await InventorymoveRequestMainApi.exportScrapToHoldRequestMain(tableObject.params)
+          download.excel(data, '报废转隔离申请主.xlsx')
+        }else{
+          const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params)
+          download.excel(data, '库存转移申请主.xlsx')
+        }
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+//为true表示子表数据中存在数量为0的数据
+const flag = ref()
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数  
+  let isExist = false
+  tableData.value.forEach(item => {
+    console.log(item,777777777777);
+    
+   let rs =  tableData.value.filter(filterItem => (filterItem.fromPackingNumber == item.fromPackingNumber)   )
+   console.log(rs,5666);
+   if(rs.length > 1) isExist = true
+  })
+  if (isExist) {
+    formRef.value.formLoading = false
+    isExist = false
+    return message.warning('包装号重复')
+  }
+  data.subList.forEach(item => {
+    console.log(556565,item);
+    if(fromInventoryStatus.value){
+      item.fromInventoryStatus = fromInventoryStatus.value
+      item.toInventoryStatus = toInventoryStatus.value
+    }   
+    if(item.qty == 0){
+      message.error(`到数量不能为0!`)
+      flag.value = true
+      return;
+    } 
+          })      
+  if(flag.value){
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      await InventorymoveRequestMainApi.createInventorymoveRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await InventorymoveRequestMainApi.updateInventorymoveRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: importFileName.value + '.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  if(routeName.value == "InventorymoveRequestMain"){
+    importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplate()
+  }else {
+    importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplateExceptMove()
+  }
+})
+</script>
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
new file mode 100644
index 000000000..78fc398a4
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -0,0 +1,870 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import * as LocationApi  from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'MoveRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 库存转移申请主表
+ */
+export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择从仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库基础信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择从仓库代码',
+        searchField: 'code',
+        searchTitle: '仓库基础信息',
+        searchAllSchemas: Warehouse.allSchemas,
+        searchPage: WarehouseApi.getWarehousePage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    // dictType: DICT_TYPE.AREA_TYPE,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    // dictType: DICT_TYPE.AREA_TYPE,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'Move',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '使用在途库',
+    field: 'useOnTheWayLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const InventorymoveRequestMainRules = reactive({
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'blur' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 库存转移申请子表
+ */
+export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择从包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.selectLocationTypeToBalance,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择从包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.selectLocationTypeToBalance,
+      }
+    }
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择到库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.selectBusinessTypeToLocation,
+      searchCondition: [
+      {
+        key: 'type',
+        value: 'businessType',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择到库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.selectBusinessTypeToLocation,
+        searchCondition: [
+          {
+            key: 'type',
+            value: 'businessType',
+            isMainValue: true
+          }]
+      }
+    }
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const InventorymoveRequestDetailRules = reactive({
+  itemCode: [
+    { required: true, message: '请点击从包装号选择物料代码', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromInventoryStatus: [
+    { required: true, message: '请选择从库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/moveManage/itemChange/index.vue b/src/views/wms/moveManage/itemChange/index.vue
new file mode 100644
index 000000000..0e1632f26
--- /dev/null
+++ b/src/views/wms/moveManage/itemChange/index.vue
@@ -0,0 +1,232 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ItemChange.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :route-name="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="ItemChange.allSchemas" />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+      total: tableObject.total
+    }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort">
+      <template #itemCode="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
+          <span>{{ row.itemCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm ref="basicFormRef" @success="submitForm" :rules="ItemChangeRules" :formAllSchemas="ItemChange.allSchemas"
+    :apiUpdate="BalanceApi.updateBalance" :apiCreate="BalanceApi.createBalance" :isBusiness="false"
+    @searchTableSuccess="searchTableSuccess" />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ItemChange.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/balance/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as BalanceApi from '@/api/wms/balance'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { ItemChange, ItemChangeRules } from './itemChange.data.ts'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+// 物料调整
+defineOptions({ name: 'ItemChange' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ItemChange.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BalanceApi.getBalancePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:balance:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:balance:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:balance:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:balance:update' }), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  }
+  // else if (val == 'delete') { // 删除
+  //   handleDelete(row.id)
+  // }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await BalanceApi.deleteBalance(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BalanceApi.exportBalance(tableObject.params)
+    download.excel(data, '库存余额.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  try {
+      if (formType === 'create') {
+        await BalanceApi.createBalance(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await BalanceApi.updateBalance(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '库存余额导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  // importTemplateData.templateUrl = await BalanceApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/moveManage/itemChange/itemChange.data.ts b/src/views/wms/moveManage/itemChange/itemChange.data.ts
new file mode 100644
index 000000000..4f7331bd9
--- /dev/null
+++ b/src/views/wms/moveManage/itemChange/itemChange.data.ts
@@ -0,0 +1,490 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+import * as OwnerApi from '@/api/wms/owner'
+import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
+
+/**
+ * @returns {Array} 物料调整
+ */
+export const ItemChange = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: true,
+  },
+  // 可修改
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '器具代码',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  // 可修改
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  // 可修改
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: 'ERP库位代码',
+    field: 'erpLocationCode',
+    dictType: DICT_TYPE.ERP_LOCATION,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  // 可修改
+  {
+    label: '失效日期',
+    field: 'expireDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    }
+  },
+  // 可修改
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择货主代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '货主信息', // 查询弹窗标题
+        searchAllSchemas: Owner.allSchemas, // 查询弹窗所需类
+        searchPage: OwnerApi.getOwnerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '锁定数量',
+    field: 'lockedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    isForm: false
+  },
+  {
+    label: '可用数量',
+    field: 'usableQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    isForm: false
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    isForm: false
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    isForm: false
+  },
+  {
+    label: '入库时间',
+    field: 'putInTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '是否冻结',
+    field: 'frozen',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '冻结原因',
+    field: 'frozenReason',
+    dictType: DICT_TYPE.FROZEN_REASON,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '重量',
+    field: 'weight',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    isForm: false
+  },
+  {
+    label: '面积',
+    field: 'area',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    isForm: false
+  },
+  {
+    label: '体积',
+    field: 'volume',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    isForm: false
+  },
+  {
+    label: '最后事务号',
+    field: 'lastTransNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 100,
+      fixed: 'right'
+    },
+  }
+]))
+
+// 表单校验
+export const ItemChangeRules = reactive({
+  // packingNumber: [
+  //   { required: true, message: '请选择包装号', trigger: 'change' }
+  // ],
+  // containerNumber: [
+  //   { required: true, message: '请选择器具号', trigger: 'change' }
+  // ],
+  // itemCode: [
+  //   { required: true, message: '请选择物料代码', trigger: 'change' }
+  // ],
+  // batch: [
+  //   { required: true, message: '请输入批次', trigger: 'blur' }
+  // ],
+  // arriveDate: [
+  //   { required: true, message: '请选择到货日期', trigger: 'change' }
+  // ],
+  // produceDate: [
+  //   { required: true, message: '请选择生产日期', trigger: 'change' }
+  // ],
+})
\ No newline at end of file
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
new file mode 100644
index 000000000..0b705e2a4
--- /dev/null
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="OfflinesettlementRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="OfflinesettlementRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="OfflinesettlementRecordMainRules"
+    :formAllSchemas="OfflinesettlementRecordMain.allSchemas"
+    :tableAllSchemas="OfflinesettlementRecordDetail.allSchemas"
+    :tableFormRules="OfflinesettlementRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="OfflinesettlementRecordMain.allSchemas"
+    :detailAllSchemas="OfflinesettlementRecordDetail.allSchemas"
+    :detailAllSchemasRules="OfflinesettlementRecordDetailRules"
+    :apiPage="OfflinesettlementRecordDetailApi.getOfflinesettlementRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { OfflinesettlementRecordMain,OfflinesettlementRecordMainRules,OfflinesettlementRecordDetail,OfflinesettlementRecordDetailRules } from './offlinesettlementRecordMain.data'
+import * as OfflinesettlementRecordMainApi from '@/api/wms/offlinesettlementRecordMain'
+import * as OfflinesettlementRecordDetailApi from '@/api/wms/offlinesettlementRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 下线结算记录主
+defineOptions({ name: 'OfflinesettlementRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(OfflinesettlementRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: OfflinesettlementRecordMainApi.getOfflinesettlementRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:offlinesettlement-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordOfflinesettlementMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await OfflinesettlementRecordMainApi.exportOfflinesettlementRecordMain(tableObject.params)
+    download.excel(data, '下线结算记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts
new file mode 100644
index 000000000..c0abc9591
--- /dev/null
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts
@@ -0,0 +1,497 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 下线结算记录主表
+ */
+export const OfflinesettlementRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: '申请单号',
+  //   field: 'requestNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch: true
+  // },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '制品收货记录单号',
+    field: 'productReceiptRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+ 
+]))
+
+//表单校验
+export const OfflinesettlementRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  productReceiptRecordNumber: [
+    { required: true, message: '请选择制品收货记录单号', trigger: 'change' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 下线结算记录子表
+ */
+export const OfflinesettlementRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+]))
+
+//表单校验
+export const OfflinesettlementRecordDetailRules= reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  locationGroupCode: [
+    { required: true, message: '请选择库位组代码', trigger: 'change' }
+  ],
+  areaCode: [
+    { required: true, message: '请选择库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
new file mode 100644
index 000000000..624cd7e56
--- /dev/null
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
@@ -0,0 +1,351 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="OfflinesettlementRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="OfflinesettlementRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="OfflinesettlementRequestMainRules"
+    :formAllSchemas="OfflinesettlementRequestMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="OfflinesettlementRequestDetail.allSchemas"
+    :tableFormRules="OfflinesettlementRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="OfflinesettlementRequestMainApi.updateOfflinesettlementRequestMain"
+    :apiCreate="OfflinesettlementRequestMainApi.createOfflinesettlementRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="OfflinesettlementRequestMain.allSchemas"
+    :detailAllSchemas="OfflinesettlementRequestDetail.allSchemas"
+    :detailAllSchemasRules="OfflinesettlementRequestDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiCreate="OfflinesettlementRequestDetailApi.createOfflinesettlementRequestDetail"
+    :apiUpdate="OfflinesettlementRequestDetailApi.updateOfflinesettlementRequestDetail"
+    :apiPage="OfflinesettlementRequestDetailApi.getOfflinesettlementRequestDetailPage"
+    :apiDelete="OfflinesettlementRequestDetailApi.deleteOfflinesettlementRequestDetail"
+    :Echo="Echo"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/offlinesettlement-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { OfflinesettlementRequestMain,OfflinesettlementRequestMainRules,OfflinesettlementRequestDetail,OfflinesettlementRequestDetailRules } from './offlinesettlementRequestMain.data'
+import * as OfflinesettlementRequestMainApi from '@/api/wms/offlinesettlementRequestMain'
+import * as OfflinesettlementRequestDetailApi from '@/api/wms/offlinesettlementRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 下线结算申请
+defineOptions({ name: 'OfflinesettlementRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(OfflinesettlementRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: OfflinesettlementRequestMainApi.getOfflinesettlementRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:offlinesettlement-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:offlinesettlement-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:offlinesettlement-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
+        defaultButtons.mainListEditBtn({hasPermi:'wms:offlinesettlement-request-main:update'}), // 编辑
+        defaultButtons.mainListDeleteBtn({hasPermi:'wms:offlinesettlement-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+  } else if (val == 'mainReAdd') { // 重新添加
+    console.log('列表-操作按钮事件-重新添加')
+  } else if (val == 'mainSubmit') { // 提交审批
+    console.log('列表-操作按钮事件-提交审批')
+  } else if (val == 'mainTurnDown') { // 驳回
+    console.log('列表-操作按钮事件-驳回')
+  } else if (val == 'mainApprove') { // 审批通过
+    console.log('列表-操作按钮事件-审批通过')
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestOfflinesettlementMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await OfflinesettlementRequestMainApi.deleteOfflinesettlementRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await OfflinesettlementRequestMainApi.exportOfflinesettlementRequestMain(tableObject.params)
+    download.excel(data, '下线结算申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+OfflinesettlementRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await OfflinesettlementRequestMainApi.createOfflinesettlementRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await OfflinesettlementRequestMainApi.updateOfflinesettlementRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '下线结算申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await OfflinesettlementRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
new file mode 100644
index 000000000..df080e227
--- /dev/null
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
@@ -0,0 +1,579 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'OfflineSettlementRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 下线结算申请主表
+ */
+export const OfflinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '制品收货记录单号',
+    field: 'productReceiptRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const OfflinesettlementRequestMainRules = reactive({
+  productReceiptRecordNumber: [
+    { required: true, message: '请选择制品收货记录单号', trigger: 'change' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 下线结算申请子表
+ */
+export const OfflinesettlementRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const OfflinesettlementRequestDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
new file mode 100644
index 000000000..2a3b4d72b
--- /dev/null
+++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
@@ -0,0 +1,241 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductdismantleJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductdismantleJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductdismantleJobMainRules"
+    :formAllSchemas="ProductdismantleJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ProductdismantleJobDetail.allSchemas"
+    :tableFormRules="ProductdismantleJobDetailRules"
+    :apiUpdate="ProductdismantleJobMainApi.updateProductdismantleJobMain"
+    :apiCreate="ProductdismantleJobMainApi.createProductdismantleJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductdismantleJobMain.allSchemas"
+    :detailAllSchemas="ProductdismantleJobDetail.allSchemas"
+    :detailAllSchemasRules="ProductdismantleJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="ProductdismantleJobDetailApi.getProductdismantleJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductdismantleJobMain,ProductdismantleJobMainRules,ProductdismantleJobDetail,ProductdismantleJobDetailRules } from './productdismantleJobMain.data'
+import * as ProductdismantleJobMainApi from '@/api/wms/productdismantleJobMain'
+import * as ProductdismantleJobDetailApi from '@/api/wms/productdismantleJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 制品拆解任务主
+defineOptions({ name: 'ProductdismantleJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductdismantleJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductdismantleJobMainApi.getProductdismantleJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productdismantle-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+  } else if (val == 'mainJobClo') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobProductdismantleMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductdismantleJobMainApi.exportProductdismantleJobMain(tableObject.params)
+    download.excel(data, '制品拆解任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
new file mode 100644
index 000000000..bdc4a04c4
--- /dev/null
+++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
@@ -0,0 +1,881 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品拆解任务主表
+ */
+export const ProductdismantleJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductdismantleJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品拆解任务子表
+ */
+export const ProductdismantleJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const ProductdismantleJobDetailRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
new file mode 100644
index 000000000..54daffa22
--- /dev/null
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductdismantleRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductdismantleRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductdismantleRecordMainRules"
+    :formAllSchemas="ProductdismantleRecordMain.allSchemas"
+    :tableAllSchemas="ProductdismantleRecordDetaila.allSchemas"
+    :tableFormRules="ProductdismantleRecordDetailaRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductdismantleRecordMain.allSchemas"
+    :detailAllSchemas="ProductdismantleRecordDetaila.allSchemas"
+    :detailAllSchemasRules="ProductdismantleRecordDetailaRules"
+    :apiPage="ProductdismantleRecordDetailApi.getProductdismantleRecordDetailaPage"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- bom列表 -->
+  <Dialog
+    :title="DialogTitle"
+    v-model="bomModelVisible"
+    width="80%"
+    :scroll="true"
+    max-height="450px"
+  >
+      <TableForm
+        ref="tableFormRef"
+        class="w-[100%]"
+        :tableFields="DismantleRecordDetailb.allSchemas.tableColumns"
+        :tableData="detatableDataBom.tableList"
+        :isShowButton="false"
+        :isShowReduceButton="false"
+      />
+    <template #footer>
+      <ButtonBase :Butttondata="ButttondataBom" @button-base-click="buttonBaseClickBom" />
+    </template>
+  </Dialog>
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductdismantleRecordMain,ProductdismantleRecordMainRules,ProductdismantleRecordDetaila,ProductdismantleRecordDetailaRules, DismantleRecordDetailb } from './productdismantleRecordMain.data'
+import * as ProductdismantleRecordMainApi from '@/api/wms/productdismantleRecordMain'
+import * as ProductdismantleRecordDetailApi from '@/api/wms/productdismantleRecordDetaila'
+import * as DismantleRecordDetailbApi from '@/api/wms/dismantleRecordDetailb'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 制品拆解记录主
+defineOptions({ name: 'ProductdismantleRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductdismantleRecordMain.allSchemas.tableColumns)
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+  label: 'Bom',
+  name: 'bom',
+  hide: false,
+  type: 'primary',
+  icon: '',
+  color: '',
+  hasPermi: '',
+  link: true, // 文本展现按钮
+}])
+
+// Bom 窗口
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const rowId = ref()
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: DismantleRecordDetailbApi.getDismantleRecordDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+/** bom 列表 表单 按钮 */
+const ButttondataBom = [
+  defaultButtons.formCloseBtn(null) // 关闭
+]
+// bom 列表 表单 按钮
+const buttonBaseClickBom = async (val) => {
+  if (val == 'close') {
+    bomModelVisible.value = false
+  }
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+       masterId: row.id
+    }
+    rowId.value =  row.id
+    await getDetailListBom()
+  }
+}
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductdismantleRecordMainApi.getProductdismantleRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productdismantle-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordProductdismantleMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductdismantleRecordMainApi.exportProductdismantleRecordMain(tableObject.params)
+    download.excel(data, '制品拆解记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
new file mode 100644
index 000000000..de6e44621
--- /dev/null
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
@@ -0,0 +1,1008 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品拆解记录主表
+ */
+export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductdismantleRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品拆解记录子表
+ */
+export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+    tableForm: {
+      type: 'action',
+      buttonText: 'Bom',
+      buttonName: 'Bom'
+    }
+  }
+]))
+
+//表单校验
+export const ProductdismantleRecordDetailaRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品拆解记录子表
+ */
+export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style:{width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'FormDateTime',
+      dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+]))
+
+//表单校验
+export const DismantleRecordDetailbRules = reactive({
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
new file mode 100644
index 000000000..43e4cc648
--- /dev/null
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@@ -0,0 +1,611 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductdismantleRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductdismantleRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductdismantleRequestMainRules"
+    :formAllSchemas="ProductdismantleRequestMain.allSchemas"
+    :tableAllSchemas="ProductdismantleRequestDetaila.allSchemas"
+    :tableFormRules="ProductdismantleRequestDetailaRules"
+    :tableData="tableData"
+    :apiUpdate="ProductdismantleRequestMainApi.updateProductdismantleRequestMain"
+    :apiCreate="ProductdismantleRequestMainApi.createProductdismantleRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @buttonOperationClick="buttonOperationClick"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductdismantleRequestMain.allSchemas"
+    :detailAllSchemas="ProductdismantleRequestDetaila.allSchemas"
+    :detailAllSchemasRules="ProductdismantleRequestDetailaRules"
+    :apiCreate="ProductdismantleRequestDetailApi.createProductdismantleRequestDetaila"
+    :apiUpdate="ProductdismantleRequestDetailApi.updateProductdismantleRequestDetaila"
+    :apiPage="ProductdismantleRequestDetailApi.getProductdismantleRequestDetailaPage"
+    :apiDelete="ProductdismantleRequestDetailApi.deleteProductdismantleRequestDetaila"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+    :detailValidate="detailValidate"
+  />
+
+  <!-- bom列表 -->
+  <Dialog
+    :title="DialogTitle"
+    v-model="bomModelVisible"
+    width="80%"
+    :scroll="true"
+    max-height="450px"
+  >
+      <TableForm
+        ref="tableFormRef"
+        class="w-[100%]"
+        :tableFields="BomDismantle.allSchemas.tableColumns"
+        :tableData="detatableDataBom.tableList"
+        :isShowButton="false"
+        :isShowReduceButton="false"
+      />
+    <template #footer>
+      <ButtonBase :Butttondata="ButttondataBom" @button-base-click="buttonBaseClickBom" />
+    </template>
+  </Dialog>
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ProductdismantleRequestMain,ProductdismantleRequestMainRules,ProductdismantleRequestDetaila,ProductdismantleRequestDetailaRules,BomDismantle } from './productdismantleRequestMain.data'
+import * as ProductdismantleRequestMainApi from '@/api/wms/productdismantleRequestMain'
+import * as ProductdismantleRequestDetailApi from '@/api/wms/productdismantleRequestDetaila'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as BomDismantleApi from '@/api/wms/bomDismantle'
+import * as dismantleRequestDetailbApi from '@/api/wms/dismantleRequestDetailb'
+
+
+// 制品拆解申请
+defineOptions({ name: 'ProductdismantleRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductdismantleRequestMain.allSchemas.tableColumns)
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+  label: 'Bom',
+  name: 'bom',
+  hide: false,
+  type: 'primary',
+  icon: '',
+  color: '',
+  hasPermi: '',
+  link: true, // 文本展现按钮
+}])
+
+// Bom 窗口
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const tableListBom = ref()
+const detailQty = ref()
+const lsBomSave = ref()
+const rowId = ref()
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BomDismantleApi.getDetailbBomDismantlePage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+/** bom 列表 表单 按钮 */
+const mainStatus = ref()
+const ButttondataBom = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// bom 列表 表单 按钮
+const buttonBaseClickBom = async (val) => {
+  // 保存
+  if (val == 'save') {
+    // 新增bom保存 临时的
+    let flag = false;
+    let bomQty = 0;
+    detatableDataBom.tableList.forEach((item) => {
+      if(item.qty!=0 && (item.bomQty * detailQty.value < item.qty)){
+        flag = true;
+        bomQty = item.bomQty * detailQty.value;
+        return;
+      }
+    })
+    if(flag){
+      message.warning('数量需要小于'+bomQty+'(子表数量乘以Bom数量的值)！')
+      return
+    }
+    tableListBom.value = detatableDataBom.tableList.filter(item => (item.qty!=0 && item.bomQty * detailQty.value >= item.qty))
+    if (lsBomSave.value) {
+      // 根据 填写的数量 为基准 不填写数量的忽略
+      tableData.value.forEach((item, index) => {
+        if(tableListBom.value[0].rowId == index) {
+          item.childList = tableListBom.value
+        }
+      })
+    } else {
+      if(tableListBom.value.length > 0){
+        // 详情下的 bom编辑功能 调用接口 保存数据
+        await dismantleRequestDetailbApi.updateDismantleRequestDetailb(rowId.value, tableListBom.value)
+        message.success(t('common.updateSuccess'))
+      }else{
+        message.warning('数量不能为0！')
+        return
+      }
+    }
+    bomModelVisible.value = false
+  }
+  // 关闭
+  else if (val == 'close') {
+    bomModelVisible.value = false
+  }
+}
+// 新增 tableform bom 按钮事件
+const buttonOperationClick = async (row, label, index)=> {
+  if (row.itemCode == '') {
+    message.warning('请选择物料代码！')
+    return
+  }
+  detatableDataBom.params.itemCode = row.itemCode
+  detatableDataBom.params.bomVersion = row.bomVersion
+  detatableDataBom.params.masterId = ''
+  DialogTitle.value = '物料代码:【' + row.itemCode + '】 Bom 信息'
+  detailQty.value = row.qty
+  bomModelVisible.value = true
+  await getDetailListBom()
+  // console.log(183, detatableDataBom.tableList)
+  detatableDataBom.tableList.map(item => {
+    // TODO: 需要限制 最大输入数 由于不同条数，统一应用一个配置，需要详细分析之后再做修改
+    // 修改 tableform 属性
+    // BomDismantle.allSchemas.tableFormColumns.map(itemColumns => {
+    //   if(itemColumns.field == 'qty') {
+    //     itemColumns.tableForm.max = item.qty
+    //   }
+    // })
+    item.rowId = index
+    if(tableData.value[index].childList.length > 0) {
+      tableData.value[index].childList.forEach(itemChild => {
+        if (itemChild.itemCode == item.itemCode) {
+          item.qty = itemChild.qty
+        }
+      })
+    }else {
+      item.qty = item.bomQty * row.qty
+    }
+  })
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+       itemCode: row.itemCode,
+       bomVersion: row.bomVersion,
+       masterId: row.id
+    }
+    rowId.value =  row.id
+    detailQty.value = row.qty
+    await getDetailListBom()
+  }
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if(formField == 'packingNumber'){
+        row['containerNumber'] = val[0]['containerNumber']
+        row['itemCode'] = val[0]['itemCode']
+        row['packingNumber'] = val[0]['packingNumber']
+        row['batch'] = val[0]['batch']
+        row['uom'] = val[0]['uom']
+        row['qty'] = val[0]['qty']
+        row['inventoryStatus'] = val[0]['inventoryStatus']
+        row['fromLocationCode'] = val[0]['locationCode']
+        row['produceDate'] = val[0]['produceDate']
+        row['expireDate'] = val[0]['expireDate']
+        row['bomVersion'] = ''
+        row['childList'] = []
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if(formField == 'packingNumber'){
+      setV['containerNumber'] = val[0]['containerNumber']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['packingNumber'] = val[0]['packingNumber']
+      setV['batch'] = val[0]['batch']
+      setV['uom'] = val[0]['uom']
+      setV['qty'] = val[0]['qty']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
+      setV['fromLocationCode'] = val[0]['locationCode']
+      setV['produceDate'] = val[0]['produceDate']
+      setV['expireDate'] = val[0]['expireDate']
+      setV['bomVersion'] = ''
+      setV['childList'] = []
+    }else if(formField == 'bomVersion') {
+      setV['bomVersion'] = val[0]['version']
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductdismantleRequestMainApi.getProductdismantleRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productdismantle-request-main:create'}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productdismantle-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productdismantle-request-main:close'}), // 关闭
+    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productdismantle-request-main:reAdd'}), // 重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productdismantle-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productdismantle-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productdismantle-request-main:handle'}), // 审批通过
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productdismantle-request-main:update'}), // 处理
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productdismantle-request-main:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productdismantle-request-main:delete'}), // 删除
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    ProductdismantleRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    ProductdismantleRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    ProductdismantleRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    ProductdismantleRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    ProductdismantleRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要处理吗？')
+    tableObject.loading = true
+    ProductdismantleRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 临时存储 新增/编辑 还是 详情操作 区别第二子表Detailb 的窗体保存 是直接调用接口，还是临时存储
+  lsBomSave.value = true
+  mainStatus.value = '1'
+  ButttondataBom.value = [
+    defaultButtons.formSaveBtn({ hide : mainStatus.value != 1 }), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+  if(type == 'create'){
+    ProductdismantleRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'workshopCode') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = true
+      }
+    })
+  }
+  if(type == 'update'){
+    ProductdismantleRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'workshopCode') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = false
+      }
+    })
+  }
+
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  lsBomSave.value = false
+  mainStatus.value = row.status;
+  console.log("mainStatus.value：",mainStatus.value)
+  ButttondataBom.value = [
+    defaultButtons.formSaveBtn({ hide : mainStatus.value != 1 }), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestProductdismantleMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductdismantleRequestMainApi.deleteProductdismantleRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductdismantleRequestMainApi.exportProductdismantleRequestMain(tableObject.params)
+    download.excel(data, '制品拆解申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductdismantleRequestDetaila.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  // 判断 bom 是否添加
+  let childListRs = true
+  // 根据 填写的数量 为基准 不填写数量的忽略
+  tableData.value.forEach((item) => {
+    if (!item.childList) {
+      childListRs = false
+    }
+  })
+  if (!childListRs) {
+    message.warning('请填写Bom信息！')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+      if (formType === 'create') {
+        if(data.subList.length == 0){
+          message.warning("请添加子列表数据")
+          return;
+        }
+        let flag = false;
+        data.subList.forEach((item) => {
+            if(item.qty == 0){
+              message.warning("数量不能为0")
+              flag = true;
+              return;
+            }
+        })
+        if(flag){
+          formRef.value.formLoading = false
+          return
+        }
+        await ProductdismantleRequestMainApi.createProductdismantleRequestMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ProductdismantleRequestMainApi.updateProductdismantleRequestMain(data)
+        message.success(t('common.updateSuccess'))
+      }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
new file mode 100644
index 000000000..42f93e103
--- /dev/null
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -0,0 +1,1369 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as ProcessApi from '@/api/wms/process'
+import { Process } from '@/views/wms/basicDataManage/factoryModeling/process/process.data'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as WorkstationApi from '@/api/wms/workstation'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import {Bom} from "@/views/wms/basicDataManage/itemManage/bom/bom.data";
+import * as BomApi from "@/api/wms/bom";
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductDisassembleRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 制品拆解申请主表
+ */
+export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductDisassemble',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style:{width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style:{width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style:{width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style:{width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductdismantleRequestMainRules = reactive({
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
+  workshopCode: [
+    { required: true, message: '请选择车间', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组', trigger: 'change' }
+  ],
+  shift: [
+    { required: true, message: '请选择班次', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品拆解申请子表
+ */
+export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '拆解生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '生产线信息', // 查询弹窗标题
+      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '拆解工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '工位信息', // 查询弹窗标题
+      searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+      searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工序代码',
+      searchField: 'code',
+      searchTitle: '工序信息',
+      searchAllSchemas: Process.allSchemas,
+      searchPage: ProcessApi.getProcessPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择工序代码',
+        searchField: 'code',
+        searchTitle: '工序信息',
+        searchAllSchemas: Process.allSchemas,
+        searchPage: ProcessApi.getProcessPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalanceItemPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalanceItemPage
+      }
+    }
+  },
+
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '成品库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'FormDate',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'FormDate',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+      // type: 'Select'
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style:{width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style:{width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+    tableForm: {
+      type: 'action',
+      buttonText: 'Bom',
+      buttonName: 'Bom'
+    }
+  }
+]))
+
+//表单校验
+export const ProductdismantleRequestDetailaRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  workStationCode: [
+    { required: true, message: '请选择工位代码', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  bomVersion: [
+    { required: true, message: '请选择Bom版本', trigger: 'change' }
+  ], 
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品拆解申请子表
+ */
+export const DismantleRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  }
+]))
+
+//表单校验
+export const DismantleRequestDetailbRules = reactive({
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} bom 拆解
+ */
+export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '行标记',
+    field: 'rowId',
+    isTableForm: false,
+    isForm: false,
+    tableForm:{
+      disabled: true
+    },
+    table: {
+      show: false
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: 'Bom数量',
+    field: 'bomQty',
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: 'Bom版本',
+    field: 'version',
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    tableForm:{
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+]))
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
new file mode 100644
index 000000000..a622c2c4e
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -0,0 +1,493 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductionMainRules"
+    :formAllSchemas="ProductionMain.allSchemas"
+    :tableAllSchemas="ProductionDetail.allSchemas"
+    :tableFormRules="ProductionDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductionMainApi.updateProductionMain"
+    :apiCreate="ProductionMainApi.createProductionMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionMain.allSchemas"
+    :detailAllSchemas="ProductionDetail.allSchemas"
+    :detailAllSchemasRules="ProductionDetailRules"
+    :apiCreate="ProductionDetailApi.createProductionDetail"
+    :apiUpdate="ProductionDetailApi.updateProductionDetail"
+    :apiPage="ProductionDetailApi.getProductionDetailPage"
+    :apiDelete="ProductionDetailApi.deleteProductionDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'predict'" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionMain,ProductionMainRules,ProductionDetail,ProductionDetailRules } from './productionMain.data'
+import * as ProductionMainApi from '@/api/wms/productionMain'
+import * as ProductionDetailApi from '@/api/wms/productionDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItemBasicApi from '@/api/wms/itembasic'
+
+// 生产计划主
+// 预生产计划
+defineOptions({ name: 'ProductionMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      await ItemBasicApi.getItembasicPage({
+        code: row['itemCode']
+      }).then(res => {
+        row['uom'] = res?.list[0].uom
+      }).catch(err =>{
+        console.log(err);
+      })
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      if(formField == 'workshop'){
+        setV['workshop'] = val[0]['code']
+        setV['productionLine'] = ''
+        if(tableData.value){
+          tableData.value.forEach(item => {
+            item.itemCode =''
+            item.bomVersion = ''
+            item.uom = ''
+          })
+        }
+      }else{
+        setV[formField] = val[0][searchField]
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(async() => {
+    const setV = {}
+    await ItemBasicApi.getItembasicPage({
+        code: setV['itemCode']
+      }).then(res => {
+        setV['uom'] = res.list[0].uom
+      }).catch(err =>{
+        console.log(err);
+      })
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionMainApi.getProductionMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:production-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:production-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:production-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:production-main:open'}), // 打开
+    defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:production-main:close'}), // 关闭
+    defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:submit'}), // 提交审批
+    defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:production-main:reject'}), // 驳回
+    defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:production-main:agree'}), // 审批通过
+    defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:production-main:publish'}), // 发布
+    defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
+    {
+      label: '生成备料计划/收货申请',
+      name: 'scbljh',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainPlanOpe') { // 打开
+    tableObject.loading = true
+    await ProductionMainApi.open(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanClo') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    await ProductionMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanSub') { // 提交审批
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    await ProductionMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanTur') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    await ProductionMainApi.reject(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanApp') { // 审批通过
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    await ProductionMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanPub') { // 发布
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要发布吗？')
+    // 物料含有不可用时 是否继续执行
+    let isAvailable = true
+    await ProductionMainApi.getProductionDetail(row.id).then(async res =>{
+      if (res.length > 0) {
+        let rs = ''
+        res.forEach(item => {
+          rs += item.itemCode + ','
+        })
+        await message.confirm('物料：【'+rs +'】目前为不可用状态，是否继续发布？').catch(() => {
+          isAvailable = false
+        })
+      }
+    })
+    if (!isAvailable) {
+      return
+    }
+    tableObject.loading = true
+    await ProductionMainApi.publish(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanRes') { // 重置
+    await message.confirm('确认要重置吗？')
+    tableObject.loading = true
+    await ProductionMainApi.resetting(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scbljh') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成备料计划/收货申请吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generateRequest(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+  
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 新增与修改 修改车间和生产线的编辑属性
+  if(type == 'create'){
+    ProductionMain.allSchemas.formSchema.forEach((itemColumn) =>{
+      if(itemColumn.field == 'workshop'){
+        itemColumn.componentProps.isSearchList=true
+        itemColumn.componentProps.disabled=true
+      }
+      if(itemColumn.field == 'productionLine'){
+        itemColumn.componentProps.isSearchList=true
+        itemColumn.componentProps.disabled=true
+      }
+    })
+  }
+  if(type == 'update'){
+    ProductionMain.allSchemas.formSchema.forEach((itemColumn) =>{
+      if(itemColumn.field == 'workshop'){
+        itemColumn.componentProps.isSearchList=false
+        itemColumn.componentProps.disabled=true
+      }
+      if(itemColumn.field == 'productionLine'){
+        itemColumn.componentProps.isSearchList=false
+        itemColumn.componentProps.disabled=true
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'planProductionMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductionMainApi.deleteProductionMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionMainApi.exportProductionMain(tableObject.params)
+    download.excel(data, '预生产计划.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductionDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  if(tableData.value.find(item => (item.planQty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      data.subList = tableData.value // 拼接子表数据参数
+      await ProductionMainApi.createProductionMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductionMainApi.updateProductionMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '生产计划导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductionMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
new file mode 100644
index 000000000..0f0444c03
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -0,0 +1,912 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as WorkMainApi from '@/api/wms/workMain'
+import * as WorkDetailApi from '@/api/wms/workDetail'
+import { WorkDetail, WorkMain } from '../workMain/workMain.data'
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+import * as BomApi from '@/api/wms/bom'
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductionPlan'
+}
+ const data = await getPlansettingApi.getPlansettingPage(queryParams)
+ const plansettingData =data?.list[0]||{}
+
+/**
+ * @returns {Array} 生产计划主表
+ */
+export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    // form: {
+    //   value: '1',
+    //   componentProps: {
+    //     disabled: true
+    //   }
+    // },
+    isForm:false,
+    isSearch: true,
+  },
+  {
+    label: '顺序',
+    field: 'displayOrder',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        maxlength: 50
+      }
+    }
+  },
+  {
+    label: '机台',
+    field: 'workshop',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '生产线',
+    field: 'productionLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshop',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'detailItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划数量',
+    field: 'detailPlanQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '计划类型',
+    field: 'planType',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Select',
+      value: 'predict',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+
+  // {
+  //   label: '开始时间',
+  //   field: 'beginTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '结束时间',
+  //   field: 'endTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单号',
+  //   field: 'woNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择订单号',
+  //       searchField: 'number',
+  //       searchTitle: '生产订单信息',
+  //       searchAllSchemas: WorkMain.allSchemas,
+  //       searchPage: WorkMainApi.getWorkMainPage
+  //     }
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'woLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择订单行',
+  //       searchField: 'lineNumber',
+  //       searchTitle: '生产订单信息',
+  //       searchAllSchemas: WorkDetail.allSchemas,
+  //       searchPage: WorkDetailApi.getWorkDetailPage
+  //     }
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 220,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductionMainRules = reactive({
+  displayOrder: [
+    { required: true, message: '请输入顺序', trigger: 'blur' },
+    // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  workshop: [
+    { required: true, message: '请选择车间', trigger: 'change' }
+  ],
+  productionLine: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ],
+  shift: [
+    { required: true, message: '请选择班次', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组', trigger: 'change' }
+  ],
+  planDate: [
+    { required: true, message: '请输入计划日期', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  beginTime: [
+    { required: true, message: '请输入开始时间', trigger: 'blur' }
+  ],
+  endTime: [
+    { required: true, message: '请输入结束时间', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 生产计划子表
+ */
+export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '生产线物料关系信息', // 查询弹窗标题
+        searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'productionLine',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productionLineCode',
+        value:'productionLine',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }], 
+    },
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+  },
+  {
+    label: '合格数量',
+    field: 'goodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '不合格数量',
+    field: 'notGoodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select'
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      default: 'TRUE'
+    },
+    // isTableForm: false,
+    // isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductionDetailRules = reactive({
+  bomVersion: [
+    { required: true, message: '请输入Bom版本', trigger: 'blur' }
+  ],
+  // goodQty: [
+  //   { required: true, message: '请输入合格数量', trigger: 'blur' }
+  // ],
+  // notGoodQty: [
+  //   { required: true, message: '请输入不合格数量', trigger: 'blur' }
+  // ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  planQty: [
+    { required: true, message: '请输入计划数量', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
new file mode 100644
index 000000000..fb0a7b699
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -0,0 +1,492 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductionMainRules"
+    :formAllSchemas="ProductionMain.allSchemas"
+    :tableAllSchemas="ProductionDetail.allSchemas"
+    :tableFormRules="ProductionDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductionMainApi.updateProductionMain"
+    :apiCreate="ProductionMainApi.createProductionMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionMain.allSchemas"
+    :detailAllSchemas="ProductionDetail.allSchemas"
+    :detailAllSchemasRules="ProductionDetailRules"
+    :apiCreate="ProductionDetailApi.createProductionDetail"
+    :apiUpdate="ProductionDetailApi.updateProductionDetail"
+    :apiPage="ProductionDetailApi.getProductionDetailPage"
+    :apiDelete="ProductionDetailApi.deleteProductionDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'assemble'"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionMain,ProductionMainRules,ProductionDetail,ProductionDetailRules } from './productionMainAssemble.data'
+import * as ProductionMainApi from '@/api/wms/productionMain'
+import * as ProductionDetailApi from '@/api/wms/productionDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItemBasicApi from '@/api/wms/itembasic'
+
+// 装配计划
+defineOptions({ name: 'ProductionMainAssemble' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      await ItemBasicApi.getItembasicPage({
+        code: row['itemCode']
+      }).then(res => {
+        row['uom'] = res?.list[0].uom
+      }).catch(err =>{
+        console.log(err);
+      })
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      if(formField == 'workshop'){
+        setV['workshop'] = val[0]['code']
+        setV['productionLine'] = ''
+        if(tableData.value){
+          tableData.value.forEach(item => {
+            item.itemCode =''
+            item.bomVersion = ''
+            item.uom = ''
+          })
+        }
+      }else{
+        setV[formField] = val[0][searchField]
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(async() => {
+    const setV = {}
+    await ItemBasicApi.getItembasicPage({
+        code: setV['itemCode']
+      }).then(res => {
+        setV['uom'] = res.list[0].uom
+      }).catch(err =>{
+        console.log(err);
+      })
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionMainApi.getProductionMainAssemblePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:production-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:production-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:production-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:production-main:open'}), // 打开
+    defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:production-main:close'}), // 关闭
+    defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:submit'}), // 提交审批
+    defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:production-main:reject'}), // 驳回
+    defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:production-main:agree'}), // 审批通过
+    defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:production-main:publish'}), // 发布
+    defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
+    {
+      label: '生成备料计划/收货申请',
+      name: 'scbljh',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainPlanOpe') { // 打开
+    tableObject.loading = true
+    await ProductionMainApi.open(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanClo') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    await ProductionMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanSub') { // 提交审批
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    await ProductionMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanTur') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    await ProductionMainApi.reject(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanApp') { // 审批通过
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    await ProductionMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanPub') { // 发布
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要发布吗？')
+    // 物料含有不可用时 是否继续执行
+    let isAvailable = true
+    await ProductionMainApi.getProductionDetail(row.id).then(async res =>{
+      if (res.length > 0) {
+        let rs = ''
+        res.forEach(item => {
+          rs += item.itemCode + ','
+        })
+        await message.confirm('物料：【'+rs +'】目前为不可用状态，是否继续发布？').catch(() => {
+          isAvailable = false
+        })
+      }
+    })
+    if (!isAvailable) {
+      return
+    }
+    tableObject.loading = true
+    await ProductionMainApi.publish(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanRes') { // 重置
+    await message.confirm('确认要重置吗？')
+    tableObject.loading = true
+    await ProductionMainApi.resetting(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scbljh') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成备料计划/收货申请吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generateRequest(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+  
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 新增与修改 修改车间和生产线的编辑属性
+  if(type == 'create'){
+    ProductionMain.allSchemas.formSchema.forEach((itemColumn) =>{
+      if(itemColumn.field == 'workshop'){
+        itemColumn.componentProps.isSearchList=true
+        itemColumn.componentProps.disabled=true
+      }
+      if(itemColumn.field == 'productionLine'){
+        itemColumn.componentProps.isSearchList=true
+        itemColumn.componentProps.disabled=true
+      }
+    })
+  }
+  if(type == 'update'){
+    ProductionMain.allSchemas.formSchema.forEach((itemColumn) =>{
+      if(itemColumn.field == 'workshop'){
+        itemColumn.componentProps.isSearchList=false
+        itemColumn.componentProps.disabled=true
+      }
+      if(itemColumn.field == 'productionLine'){
+        itemColumn.componentProps.isSearchList=false
+        itemColumn.componentProps.disabled=true
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'planProductionMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductionMainApi.deleteProductionMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionMainApi.exportProductionMainAssemble(tableObject.params)
+    download.excel(data, '装配计划.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductionDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  if(tableData.value.find(item => (item.planQty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      data.subList = tableData.value // 拼接子表数据参数
+      await ProductionMainApi.createProductionMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductionMainApi.updateProductionMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '装配计划导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductionMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
new file mode 100644
index 000000000..d7d82f5b9
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -0,0 +1,912 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as WorkMainApi from '@/api/wms/workMain'
+import * as WorkDetailApi from '@/api/wms/workDetail'
+import { WorkDetail, WorkMain } from '../workMain/workMain.data'
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+import * as BomApi from '@/api/wms/bom'
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductionPlan'
+}
+ const data = await getPlansettingApi.getPlansettingPage(queryParams)
+ const plansettingData =data?.list[0]||{}
+
+/**
+ * @returns {Array} 生产计划主表
+ */
+export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    // form: {
+    //   value: '1',
+    //   componentProps: {
+    //     disabled: true
+    //   }
+    // },
+    isForm:false,
+    isSearch: true,
+  },
+  {
+    label: '顺序',
+    field: 'displayOrder',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        maxlength: 50
+      }
+    }
+  },
+  {
+    label: '车间',
+    field: 'workshop',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '生产线',
+    field: 'productionLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshop',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'detailItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划数量',
+    field: 'detailPlanQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '计划类型',
+    field: 'planType',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Select',
+      value: 'assemble',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+
+  // {
+  //   label: '开始时间',
+  //   field: 'beginTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '结束时间',
+  //   field: 'endTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单号',
+  //   field: 'woNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择订单号',
+  //       searchField: 'number',
+  //       searchTitle: '生产订单信息',
+  //       searchAllSchemas: WorkMain.allSchemas,
+  //       searchPage: WorkMainApi.getWorkMainPage
+  //     }
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'woLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择订单行',
+  //       searchField: 'lineNumber',
+  //       searchTitle: '生产订单信息',
+  //       searchAllSchemas: WorkDetail.allSchemas,
+  //       searchPage: WorkDetailApi.getWorkDetailPage
+  //     }
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 220,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductionMainRules = reactive({
+  displayOrder: [
+    { required: true, message: '请输入顺序', trigger: 'blur' },
+    // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  workshop: [
+    { required: true, message: '请选择车间', trigger: 'change' }
+  ],
+  productionLine: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ],
+  shift: [
+    { required: true, message: '请选择班次', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组', trigger: 'change' }
+  ],
+  planDate: [
+    { required: true, message: '请输入计划日期', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  beginTime: [
+    { required: true, message: '请输入开始时间', trigger: 'blur' }
+  ],
+  endTime: [
+    { required: true, message: '请输入结束时间', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 生产计划子表
+ */
+export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '生产线物料关系信息', // 查询弹窗标题
+        searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'productionLine',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productionLineCode',
+        value:'productionLine',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }], 
+    },
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+  },
+  {
+    label: '合格数量',
+    field: 'goodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '不合格数量',
+    field: 'notGoodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select'
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      default: 'TRUE'
+    },
+    // isTableForm: false,
+    // isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductionDetailRules = reactive({
+  bomVersion: [
+    { required: true, message: '请输入Bom版本', trigger: 'blur' }
+  ],
+  // goodQty: [
+  //   { required: true, message: '请输入合格数量', trigger: 'blur' }
+  // ],
+  // notGoodQty: [
+  //   { required: true, message: '请输入不合格数量', trigger: 'blur' }
+  // ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  planQty: [
+    { required: true, message: '请输入计划数量', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
new file mode 100644
index 000000000..3f5092e1a
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -0,0 +1,492 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductionMainRules"
+    :formAllSchemas="ProductionMain.allSchemas"
+    :tableAllSchemas="ProductionDetail.allSchemas"
+    :tableFormRules="ProductionDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductionMainApi.updateProductionMain"
+    :apiCreate="ProductionMainApi.createProductionMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionMain.allSchemas"
+    :detailAllSchemas="ProductionDetail.allSchemas"
+    :detailAllSchemasRules="ProductionDetailRules"
+    :apiCreate="ProductionDetailApi.createProductionDetail"
+    :apiUpdate="ProductionDetailApi.updateProductionDetail"
+    :apiPage="ProductionDetailApi.getProductionDetailPage"
+    :apiDelete="ProductionDetailApi.deleteProductionDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'assembleSparePart'"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionMain,ProductionMainRules,ProductionDetail,ProductionDetailRules } from './productionMainAssembleSparePart.data'
+import * as ProductionMainApi from '@/api/wms/productionMain'
+import * as ProductionDetailApi from '@/api/wms/productionDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItemBasicApi from '@/api/wms/itembasic'
+
+// 装配备件计划
+defineOptions({ name: 'ProductionMainASparePart' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      await ItemBasicApi.getItembasicPage({
+        code: row['itemCode']
+      }).then(res => {
+        row['uom'] = res?.list[0].uom
+      }).catch(err =>{
+        console.log(err);
+      })
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      if(formField == 'workshop'){
+        setV['workshop'] = val[0]['code']
+        setV['productionLine'] = ''
+        if(tableData.value){
+          tableData.value.forEach(item => {
+            item.itemCode =''
+            item.bomVersion = ''
+            item.uom = ''
+          })
+        }
+      }else{
+        setV[formField] = val[0][searchField]
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(async() => {
+    const setV = {}
+    await ItemBasicApi.getItembasicPage({
+        code: setV['itemCode']
+      }).then(res => {
+        setV['uom'] = res.list[0].uom
+      }).catch(err =>{
+        console.log(err);
+      })
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionMainApi.getProductionMainASparePartPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:production-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:production-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:production-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:production-main:open'}), // 打开
+    defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:production-main:close'}), // 关闭
+    defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:submit'}), // 提交审批
+    defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:production-main:reject'}), // 驳回
+    defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:production-main:agree'}), // 审批通过
+    defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:production-main:publish'}), // 发布
+    defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
+    {
+      label: '生成备料计划/收货申请',
+      name: 'scbljh',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainPlanOpe') { // 打开
+    tableObject.loading = true
+    await ProductionMainApi.open(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanClo') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    await ProductionMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanSub') { // 提交审批
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    await ProductionMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanTur') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    await ProductionMainApi.reject(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanApp') { // 审批通过
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    await ProductionMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanPub') { // 发布
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要发布吗？')
+    // 物料含有不可用时 是否继续执行
+    let isAvailable = true
+    await ProductionMainApi.getProductionDetail(row.id).then(async res =>{
+      if (res.length > 0) {
+        let rs = ''
+        res.forEach(item => {
+          rs += item.itemCode + ','
+        })
+        await message.confirm('物料：【'+rs +'】目前为不可用状态，是否继续发布？').catch(() => {
+          isAvailable = false
+        })
+      }
+    })
+    if (!isAvailable) {
+      return
+    }
+    tableObject.loading = true
+    await ProductionMainApi.publish(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanRes') { // 重置
+    await message.confirm('确认要重置吗？')
+    tableObject.loading = true
+    await ProductionMainApi.resetting(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scbljh') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成备料计划/收货申请吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generateRequest(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+  
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 新增与修改 修改车间和生产线的编辑属性
+  if(type == 'create'){
+    ProductionMain.allSchemas.formSchema.forEach((itemColumn) =>{
+      if(itemColumn.field == 'workshop'){
+        itemColumn.componentProps.isSearchList=true
+        itemColumn.componentProps.disabled=true
+      }
+      if(itemColumn.field == 'productionLine'){
+        itemColumn.componentProps.isSearchList=true
+        itemColumn.componentProps.disabled=true
+      }
+    })
+  }
+  if(type == 'update'){
+    ProductionMain.allSchemas.formSchema.forEach((itemColumn) =>{
+      if(itemColumn.field == 'workshop'){
+        itemColumn.componentProps.isSearchList=false
+        itemColumn.componentProps.disabled=true
+      }
+      if(itemColumn.field == 'productionLine'){
+        itemColumn.componentProps.isSearchList=false
+        itemColumn.componentProps.disabled=true
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'planProductionMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductionMainApi.deleteProductionMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionMainApi.exportProductionMainAssembleSparePart(tableObject.params)
+    download.excel(data, '装配备件计划.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductionDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  if(tableData.value.find(item => (item.planQty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      data.subList = tableData.value // 拼接子表数据参数
+      await ProductionMainApi.createProductionMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductionMainApi.updateProductionMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '装配备件计划导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductionMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
new file mode 100644
index 000000000..d7bb6a6b6
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -0,0 +1,912 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as WorkMainApi from '@/api/wms/workMain'
+import * as WorkDetailApi from '@/api/wms/workDetail'
+import { WorkDetail, WorkMain } from '../workMain/workMain.data'
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+import * as BomApi from '@/api/wms/bom'
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductionPlan'
+}
+ const data = await getPlansettingApi.getPlansettingPage(queryParams)
+ const plansettingData =data?.list[0]||{}
+
+/**
+ * @returns {Array} 生产计划主表
+ */
+export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    // form: {
+    //   value: '1',
+    //   componentProps: {
+    //     disabled: true
+    //   }
+    // },
+    isForm:false,
+    isSearch: true,
+  },
+  {
+    label: '顺序',
+    field: 'displayOrder',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        maxlength: 50
+      }
+    }
+  },
+  {
+    label: '车间',
+    field: 'workshop',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '生产线',
+    field: 'productionLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshop',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'detailItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划数量',
+    field: 'detailPlanQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '计划类型',
+    field: 'planType',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Select',
+      value: 'assembleSparePart',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+
+  // {
+  //   label: '开始时间',
+  //   field: 'beginTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '结束时间',
+  //   field: 'endTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单号',
+  //   field: 'woNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择订单号',
+  //       searchField: 'number',
+  //       searchTitle: '生产订单信息',
+  //       searchAllSchemas: WorkMain.allSchemas,
+  //       searchPage: WorkMainApi.getWorkMainPage
+  //     }
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'woLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择订单行',
+  //       searchField: 'lineNumber',
+  //       searchTitle: '生产订单信息',
+  //       searchAllSchemas: WorkDetail.allSchemas,
+  //       searchPage: WorkDetailApi.getWorkDetailPage
+  //     }
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 220,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductionMainRules = reactive({
+  displayOrder: [
+    { required: true, message: '请输入顺序', trigger: 'blur' },
+    // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  workshop: [
+    { required: true, message: '请选择车间', trigger: 'change' }
+  ],
+  productionLine: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ],
+  shift: [
+    { required: true, message: '请选择班次', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组', trigger: 'change' }
+  ],
+  planDate: [
+    { required: true, message: '请输入计划日期', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  beginTime: [
+    { required: true, message: '请输入开始时间', trigger: 'blur' }
+  ],
+  endTime: [
+    { required: true, message: '请输入结束时间', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 生产计划子表
+ */
+export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '生产线物料关系信息', // 查询弹窗标题
+        searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'productionLine',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productionLineCode',
+        value:'productionLine',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }], 
+    },
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+  },
+  {
+    label: '合格数量',
+    field: 'goodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '不合格数量',
+    field: 'notGoodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select'
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      default: 'TRUE'
+    },
+    // isTableForm: false,
+    // isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductionDetailRules = reactive({
+  bomVersion: [
+    { required: true, message: '请输入Bom版本', trigger: 'blur' }
+  ],
+  // goodQty: [
+  //   { required: true, message: '请输入合格数量', trigger: 'blur' }
+  // ],
+  // notGoodQty: [
+  //   { required: true, message: '请输入不合格数量', trigger: 'blur' }
+  // ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  planQty: [
+    { required: true, message: '请输入计划数量', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
new file mode 100644
index 000000000..c49c0cd21
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -0,0 +1,492 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductionMainRules"
+    :formAllSchemas="ProductionMain.allSchemas"
+    :tableAllSchemas="ProductionDetail.allSchemas"
+    :tableFormRules="ProductionDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductionMainApi.updateProductionMain"
+    :apiCreate="ProductionMainApi.createProductionMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionMain.allSchemas"
+    :detailAllSchemas="ProductionDetail.allSchemas"
+    :detailAllSchemasRules="ProductionDetailRules"
+    :apiCreate="ProductionDetailApi.createProductionDetail"
+    :apiUpdate="ProductionDetailApi.updateProductionDetail"
+    :apiPage="ProductionDetailApi.getProductionDetailPage"
+    :apiDelete="ProductionDetailApi.deleteProductionDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2"  :extend="'assembleSparePart'"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionMain,ProductionMainRules,ProductionDetail,ProductionDetailRules } from './productionMainPredictSparePart.data'
+import * as ProductionMainApi from '@/api/wms/productionMain'
+import * as ProductionDetailApi from '@/api/wms/productionDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItemBasicApi from '@/api/wms/itembasic'
+
+// 预生产备件计划
+defineOptions({ name: 'ProductionMainPredictSparePart' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      await ItemBasicApi.getItembasicPage({
+        code: row['itemCode']
+      }).then(res => {
+        row['uom'] = res?.list[0].uom
+      }).catch(err =>{
+        console.log(err);
+      })
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      if(formField == 'workshop'){
+        setV['workshop'] = val[0]['code']
+        setV['productionLine'] = ''
+        if(tableData.value){
+          tableData.value.forEach(item => {
+            item.itemCode =''
+            item.bomVersion = ''
+            item.uom = ''
+          })
+        }
+      }else{
+        setV[formField] = val[0][searchField]
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(async() => {
+    const setV = {}
+    await ItemBasicApi.getItembasicPage({
+        code: setV['itemCode']
+      }).then(res => {
+        setV['uom'] = res.list[0].uom
+      }).catch(err =>{
+        console.log(err);
+      })
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionMainApi.getProductionMainPredictSparePartPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:production-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:production-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:production-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:production-main:open'}), // 打开
+    defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:production-main:close'}), // 关闭
+    defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:submit'}), // 提交审批
+    defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:production-main:reject'}), // 驳回
+    defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:production-main:agree'}), // 审批通过
+    defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:production-main:publish'}), // 发布
+    defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
+    {
+      label: '生成备料计划/收货申请',
+      name: 'scbljh',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainPlanOpe') { // 打开
+    tableObject.loading = true
+    await ProductionMainApi.open(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanClo') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    await ProductionMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanSub') { // 提交审批
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    await ProductionMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanTur') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    await ProductionMainApi.reject(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanApp') { // 审批通过
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    await ProductionMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanPub') { // 发布
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要发布吗？')
+    // 物料含有不可用时 是否继续执行
+    let isAvailable = true
+    await ProductionMainApi.getProductionDetail(row.id).then(async res =>{
+      if (res.length > 0) {
+        let rs = ''
+        res.forEach(item => {
+          rs += item.itemCode + ','
+        })
+        await message.confirm('物料：【'+rs +'】目前为不可用状态，是否继续发布？').catch(() => {
+          isAvailable = false
+        })
+      }
+    })
+    if (!isAvailable) {
+      return
+    }
+    tableObject.loading = true
+    await ProductionMainApi.publish(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanRes') { // 重置
+    await message.confirm('确认要重置吗？')
+    tableObject.loading = true
+    await ProductionMainApi.resetting(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scbljh') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成备料计划/收货申请吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generateRequest(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+  
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 新增与修改 修改车间和生产线的编辑属性
+  if(type == 'create'){
+    ProductionMain.allSchemas.formSchema.forEach((itemColumn) =>{
+      if(itemColumn.field == 'workshop'){
+        itemColumn.componentProps.isSearchList=true
+        itemColumn.componentProps.disabled=true
+      }
+      if(itemColumn.field == 'productionLine'){
+        itemColumn.componentProps.isSearchList=true
+        itemColumn.componentProps.disabled=true
+      }
+    })
+  }
+  if(type == 'update'){
+    ProductionMain.allSchemas.formSchema.forEach((itemColumn) =>{
+      if(itemColumn.field == 'workshop'){
+        itemColumn.componentProps.isSearchList=false
+        itemColumn.componentProps.disabled=true
+      }
+      if(itemColumn.field == 'productionLine'){
+        itemColumn.componentProps.isSearchList=false
+        itemColumn.componentProps.disabled=true
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'planProductionMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductionMainApi.deleteProductionMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionMainApi.exportProductionMainPredictSparePart(tableObject.params)
+    download.excel(data, '预生产备件计划.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductionDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  if(tableData.value.find(item => (item.planQty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      data.subList = tableData.value // 拼接子表数据参数
+      await ProductionMainApi.createProductionMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductionMainApi.updateProductionMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '预生产备件计划导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductionMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
new file mode 100644
index 000000000..7ab3206c9
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -0,0 +1,912 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as WorkMainApi from '@/api/wms/workMain'
+import * as WorkDetailApi from '@/api/wms/workDetail'
+import { WorkDetail, WorkMain } from '../workMain/workMain.data'
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+import * as BomApi from '@/api/wms/bom'
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductionPlan'
+}
+ const data = await getPlansettingApi.getPlansettingPage(queryParams)
+ const plansettingData =data?.list[0]||{}
+
+/**
+ * @returns {Array} 生产计划主表
+ */
+export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    // form: {
+    //   value: '1',
+    //   componentProps: {
+    //     disabled: true
+    //   }
+    // },
+    isForm:false,
+    isSearch: true,
+  },
+  {
+    label: '顺序',
+    field: 'displayOrder',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        maxlength: 50
+      }
+    }
+  },
+  {
+    label: '机台',
+    field: 'workshop',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '生产线',
+    field: 'productionLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshop',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'detailItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划数量',
+    field: 'detailPlanQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '计划类型',
+    field: 'planType',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Select',
+      value: 'predictSparePart',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+
+  // {
+  //   label: '开始时间',
+  //   field: 'beginTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '结束时间',
+  //   field: 'endTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单号',
+  //   field: 'woNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择订单号',
+  //       searchField: 'number',
+  //       searchTitle: '生产订单信息',
+  //       searchAllSchemas: WorkMain.allSchemas,
+  //       searchPage: WorkMainApi.getWorkMainPage
+  //     }
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'woLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择订单行',
+  //       searchField: 'lineNumber',
+  //       searchTitle: '生产订单信息',
+  //       searchAllSchemas: WorkDetail.allSchemas,
+  //       searchPage: WorkDetailApi.getWorkDetailPage
+  //     }
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 220,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductionMainRules = reactive({
+  displayOrder: [
+    { required: true, message: '请输入顺序', trigger: 'blur' },
+    // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  workshop: [
+    { required: true, message: '请选择车间', trigger: 'change' }
+  ],
+  productionLine: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ],
+  shift: [
+    { required: true, message: '请选择班次', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组', trigger: 'change' }
+  ],
+  planDate: [
+    { required: true, message: '请输入计划日期', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  beginTime: [
+    { required: true, message: '请输入开始时间', trigger: 'blur' }
+  ],
+  endTime: [
+    { required: true, message: '请输入结束时间', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 生产计划子表
+ */
+export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '生产线物料关系信息', // 查询弹窗标题
+        searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'productionLine',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productionLineCode',
+        value:'productionLine',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }], 
+    },
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+  },
+  {
+    label: '合格数量',
+    field: 'goodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '不合格数量',
+    field: 'notGoodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select'
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      default: 'TRUE'
+    },
+    // isTableForm: false,
+    // isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductionDetailRules = reactive({
+  bomVersion: [
+    { required: true, message: '请输入Bom版本', trigger: 'blur' }
+  ],
+  // goodQty: [
+  //   { required: true, message: '请输入合格数量', trigger: 'blur' }
+  // ],
+  // notGoodQty: [
+  //   { required: true, message: '请输入不合格数量', trigger: 'blur' }
+  // ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  planQty: [
+    { required: true, message: '请输入计划数量', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productionplan/workMain/index.vue b/src/views/wms/productionManage/productionplan/workMain/index.vue
new file mode 100644
index 000000000..23e63b9f6
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/workMain/index.vue
@@ -0,0 +1,316 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="WorkMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="WorkMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="WorkMainRules"
+    :formAllSchemas="WorkMain.allSchemas"
+    :tableAllSchemas="WorkDetail.allSchemas"
+    :tableFormRules="WorkDetailRules"
+    :tableData="tableData"
+    :apiUpdate="WorkMainApi.updateWorkMain"
+    :apiCreate="WorkMainApi.createWorkMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="WorkMain.allSchemas"
+    :detailAllSchemas="WorkDetail.allSchemas"
+    :detailAllSchemasRules="WorkDetailRules"
+    :apiCreate="WorkDetailApi.createWorkDetail"
+    :apiUpdate="WorkDetailApi.updateWorkDetail"
+    :apiPage="WorkDetailApi.getWorkDetailPage"
+    :apiDelete="WorkDetailApi.deleteWorkDetail"
+    :Echo="Echo"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/work-main/import" :importTemplateData="importTemplateData" @success="importSuccess" :is-show-out="true"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { WorkMain,WorkMainRules,WorkDetail,WorkDetailRules } from './workMain.data'
+import * as WorkMainApi from '@/api/wms/workMain'
+import * as WorkDetailApi from '@/api/wms/workDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 生产订单
+defineOptions({ name: 'WorkMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(WorkMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: WorkMainApi.getWorkMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:work-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:work-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:work-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi:'wms:work-main:update'}), // 编辑
+  ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+  } else if (val == 'mainReAdd') { // 重新添加
+    console.log('列表-操作按钮事件-重新添加')
+  } else if (val == 'mainSubmit') { // 提交审批
+    console.log('列表-操作按钮事件-提交审批')
+  } else if (val == 'mainTurnDown') { // 驳回
+    console.log('列表-操作按钮事件-驳回')
+  } else if (val == 'mainApprove') { // 审批通过
+    console.log('列表-操作按钮事件-审批通过')
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'orderWorkMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await WorkMainApi.deleteWorkMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await WorkMainApi.exportWorkMain(tableObject.params)
+    download.excel(data, '生产订单主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+WorkDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await WorkMainApi.createWorkMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await WorkMainApi.updateWorkMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '生产订单主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await WorkMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts b/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts
new file mode 100644
index 000000000..0f1be4649
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts
@@ -0,0 +1,510 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 生产订单主表
+ */
+export const WorkMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择客户代码',
+      searchField: 'code',
+      searchTitle: '客户信息',
+      searchAllSchemas: Customer.allSchemas,
+      searchPage: CustomerApi.getCustomerPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择客户代码',
+        searchField: 'code',
+        searchTitle: '客户信息',
+        searchAllSchemas: Customer.allSchemas,
+        searchPage: CustomerApi.getCustomerPage
+      }
+    }
+  },
+  {
+    label: '订单类型',
+    field: 'type',
+    dictType: DICT_TYPE.WORK_ORDER_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '订单日期',
+    field: 'orderDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止日期',
+    field: 'dueDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '版本',
+    field: 'version',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '当前阶段',
+    field: 'currentStage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      value: 'ProductReceipt',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const WorkMainRules = reactive({
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' }
+  ],
+  // type: [
+  //   { required: true, message: '请选择订单类型', trigger: 'change' }
+  // ],
+  orderDate: [
+    { required: true, message: '请选择订单日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  // createTime: [
+  //   { required: true, message: '请输入创建时间', trigger: 'blur' }
+  // ],
+  // creator: [
+  //   { required: true, message: '请输入创建者', trigger: 'blur' }
+  // ],
+  // number: [
+  //   { required: true, message: '请输入单据号', trigger: 'blur' }
+  // ],
+  // businessType: [
+  //   { required: true, message: '请输入业务类型', trigger: 'blur' }
+  // ],
+})
+
+/**
+ * @returns {Array} 生产订单子表
+ */
+export const WorkDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '行号',
+    field: 'lineNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '完工数量',
+    field: 'finishedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type:'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'code',
+      searchTitle: '物料基础信息',
+      searchAllSchemas: Itembasic.allSchemas,
+      searchPage: ItembasicApi.getItembasicPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'code',
+        searchTitle: '物料基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type:'InputNumber',
+      min: 1,
+      precision: 6
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const WorkDetailRules = reactive({
+  // lineNumber: [
+  //   { required: true, message: '请输入行号', trigger: 'change' }
+  // ],
+  // available: [
+  //   { required: true, message: '请选择是否可用', trigger: 'change' }
+  // ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  planQty: [
+    { required: true, message: '请输入计划数量', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
new file mode 100644
index 000000000..083052113
--- /dev/null
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -0,0 +1,280 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductputawayJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductputawayJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductputawayJobMainRules"
+    :formAllSchemas="ProductputawayJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ProductputawayJobDetail.allSchemas"
+    :tableFormRules="ProductputawayJobDetailRules"
+    :apiUpdate="ProductputawayJobMainApi.updateProductputawayJobMain"
+    :apiCreate="ProductputawayJobMainApi.createProductputawayJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductputawayJobMain.allSchemas"
+    :detailAllSchemas="ProductputawayJobDetail.allSchemas"
+    :detailAllSchemasRules="ProductputawayJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="ProductputawayJobDetailApi.getProductputawayJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductputawayJobMain,ProductputawayJobMainRules,ProductputawayJobDetail,ProductputawayJobDetailRules } from './productputawayJobMain.data'
+import * as ProductputawayJobMainApi from '@/api/wms/productputawayJobMain'
+import * as ProductputawayJobDetailApi from '@/api/wms/productputawayJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 制品上架任务主
+defineOptions({ name: 'ProductputawayJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductputawayJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductputawayJobMainApi.getProductputawayJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    let aaa = {
+    "id": "1809190000111838147",
+    "requestNumber": "REC4620231214-0004",
+    "supplierCode": null,
+    "fromWarehouseCode": "W1",
+    "toWarehouseCode": null,
+    "fromAreaCodes": "",
+    "toAreaCodes": "",
+    "fromAreaTypes": "WIP,RAW",
+    "toAreaTypes": "SEMI,FG",
+    "completetime": 1702545291000,
+    "requestTime": 1702524283000,
+    "requestDueTime": 1689562428000,
+    "status": "2",
+    "expiredTime": null,
+    "updateTime": 1702545291000,
+    "updater": "1",
+    "jobStageStatus": null,
+    "priority": null,
+    "priorityIncrement": null,
+    "departmentCode": "103",
+    "acceptUserId": "1",
+    "acceptTime": 1702552206000,
+    "completeUserId": null,
+    "number": "JOB2220231214-0007",
+    "businessType": "ProductPutaway",
+    "remark": "111100",
+    "createTime": 1702545291000,
+    "creator": "1",
+    "autoComplete": "FALSE",
+    "allowModifyLocation": "FALSE",
+    "allowModifyQty": "TRUE",
+    "allowBiggerQty": "TRUE",
+    "allowSmallerQty": "TRUE",
+    "allowModifyInventoryStatus": "TRUE",
+    "allowContinuousScanning": "TRUE",
+    "allowPartialComplete": "TRUE",
+    "allowModifyBatch": "FALSE",
+    "allowModifyPackingNumber": "FALSE",
+    "inInventoryStatuses": "OK",
+    "outInventoryStatuses": "OK",
+      subList: [
+      {
+    "id": "1809190001814017359",
+    "packingNumber": "12",
+    "containerNumber": "001",
+    "batch": "21",
+    "inventoryStatus": "OK",
+    "poNumber": null,
+    "poLine": "item01",
+    "fromLocationCode": "H03",
+    "toLocationCode": "L-R-001-002-1-02",
+    "itemCode": "item01",
+    "itemName": "物料01",
+    "itemDesc1": "",
+    "itemDesc2": "",
+    "projectCode": "xm01",
+    "qty": 3,
+    "uom": "EA",
+    "number": "JOB2220231214-0007",
+    "remark": "00",
+    "createTime": 1702545291000,
+    "creator": "1",
+    "fromOwnerCode": null,
+    "toOwnerCode": null
+}
+      ]
+    }
+    ProductputawayJobMainApi.executeProductputawayMain(aaa)
+  } else if (val == 'mainJobAba') { // 放弃
+    ProductputawayJobMainApi.abandonProductputawayMain(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    ProductputawayJobMainApi.closeProductputawayMain(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    ProductputawayJobMainApi.acceptProductputawayMain(row.id)
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobProductputawayMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductputawayJobMainApi.exportProductputawayJobMain(tableObject.params)
+    download.excel(data, '制品上架任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
new file mode 100644
index 000000000..3cd26c74d
--- /dev/null
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
@@ -0,0 +1,809 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品上架任务主表
+ */
+export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  // {
+  //   label: '供应商代码',
+  //   field: 'supplierCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'update',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    form: {
+      component: 'InputNumber',
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    form: {
+      component: 'InputNumber',
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人用户名',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人用户名',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
+]))
+
+//表单校验
+export const ProductputawayJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品上架任务子表
+ */
+export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemdesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const ProductputawayJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
new file mode 100644
index 000000000..6b3c98003
--- /dev/null
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductputawayRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductputawayRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductputawayRecordMainRules"
+    :formAllSchemas="ProductputawayRecordMain.allSchemas"
+    :tableAllSchemas="ProductputawayRecordDetail.allSchemas"
+    :tableFormRules="ProductputawayRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductputawayRecordMain.allSchemas"
+    :detailAllSchemas="ProductputawayRecordDetail.allSchemas"
+    :detailAllSchemasRules="ProductputawayRecordDetailRules"
+    :apiPage="ProductputawayRecordDetailApi.getProductputawayRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductputawayRecordMain,ProductputawayRecordMainRules,ProductputawayRecordDetail,ProductputawayRecordDetailRules } from './productputawayRecordMain.data'
+import * as ProductputawayRecordMainApi from '@/api/wms/productputawayRecordMain'
+import * as ProductputawayRecordDetailApi from '@/api/wms/productputawayRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 制品上架记录主
+defineOptions({ name: 'ProductputawayRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductputawayRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductputawayRecordMainApi.getProductputawayRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordProductputawayMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(tableObject.params)
+    download.excel(data, '制品上架记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
new file mode 100644
index 000000000..adecda095
--- /dev/null
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
@@ -0,0 +1,665 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品上架记录主表
+ */
+export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  // {
+  //   label: '供应商代码',
+  //   field: 'supplierCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductputawayRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品上架记录子表
+ */
+export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const ProductputawayRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
new file mode 100644
index 000000000..14f928dfc
--- /dev/null
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@@ -0,0 +1,409 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductputawayRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductputawayRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductputawayRequestMainRules"
+    :formAllSchemas="ProductputawayRequestMain.allSchemas"
+    :tableAllSchemas="ProductputawayRequestDetail.allSchemas"
+    :tableFormRules="ProductputawayRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductputawayRequestMainApi.updateProductputawayRequestMain"
+    :apiCreate="ProductputawayRequestMainApi.createProductputawayRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductputawayRequestMain.allSchemas"
+    :detailAllSchemas="ProductputawayRequestDetail.allSchemas"
+    :detailAllSchemasRules="ProductputawayRequestDetailRules"
+    :apiCreate="ProductputawayRequestDetailApi.createProductputawayRequestDetail"
+    :apiUpdate="ProductputawayRequestDetailApi.updateProductputawayRequestDetail"
+    :apiPage="ProductputawayRequestDetailApi.getProductputawayRequestDetailPage"
+    :apiDelete="ProductputawayRequestDetailApi.deleteProductputawayRequestDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productputaway-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ProductputawayRequestMain,ProductputawayRequestMainRules,ProductputawayRequestDetail,ProductputawayRequestDetailRules } from './productputawayRequestMain.data'
+import * as ProductputawayRequestMainApi from '@/api/wms/productputawayRequestMain'
+import * as ProductputawayRequestDetailApi from '@/api/wms/productputawayRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 制品上架申请
+defineOptions({ name: 'ProductputawayRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductputawayRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      row['poLine'] = val[0]['itemCode']
+      row['packingNumber'] = val[0]['packingNumber']
+      row['containerNumber'] = val[0]['containerNumber']
+      row['batch'] = val[0]['batch']
+      row['uom'] = val[0]['uom']
+      row['inventoryStatus'] = val[0]['inventoryStatus']
+      row['fromLocationCode'] = val[0]['locationCode']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    setV['poLine'] = val[0]['itemCode']
+    setV['packingNumber'] = val[0]['packingNumber']
+    setV['containerNumber'] = val[0]['containerNumber']
+    setV['batch'] = val[0]['batch']
+    setV['uom'] = val[0]['uom']
+    setV['inventoryStatus'] = val[0]['inventoryStatus']
+    setV['fromLocationCode'] = val[0]['locationCode']
+    formRef.setValues(setV)
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductputawayRequestMainApi.getProductputawayRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productputaway-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productputaway-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productputaway-request-main:close'}), // 关闭
+    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productputaway-request-main:reAdd'}), // 重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productputaway-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productputaway-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productputaway-request-main:agree'}), // 审批通过
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productputaway-request-main:handle'}), // 处理
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productputaway-request-main:update'}), // 编辑
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    ProductputawayRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    ProductputawayRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    ProductputawayRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    ProductputawayRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    ProductputawayRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要处理吗？')
+    tableObject.loading = true
+    ProductputawayRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestProductputawayMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductputawayRequestMainApi.deleteProductputawayRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductputawayRequestMainApi.exportProductputawayRequestMain(tableObject.params)
+    download.excel(data, '制品上架申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductputawayRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  if(data.subList.find(item => (item.qty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      await ProductputawayRequestMainApi.createProductputawayRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductputawayRequestMainApi.updateProductputawayRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '制品上架申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductputawayRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
new file mode 100644
index 000000000..f1bd40f28
--- /dev/null
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -0,0 +1,752 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import { TableColumn } from '@/types/table'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductPutawayRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 制品上架申请主表
+ */
+export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  // {
+  //   label: '供应商代码',
+  //   field: 'supplierCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch: true,
+  //   isForm: false,
+  // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductPutaway',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductputawayRequestMainRules = reactive({
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品上架申请子表
+ */
+export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      isSearchList: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '库存余额信息', // 查询弹窗标题
+      searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+      searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '库存余额信息', // 查询弹窗标题
+        searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+        searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm:{
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductputawayRequestDetailRules = reactive({
+  // packingNumber: [
+  //   { required: true, message: '请输入包装号', trigger: 'blur' }
+  // ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  // inventoryStatus: [
+  //   { required: true, message: '请选择库存状态', trigger: 'change' }
+  // ],
+  // fromLocationCode: [
+  //   { required: true, message: '请输入从库位代码', trigger: 'blur' }
+  // ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
new file mode 100644
index 000000000..e536108bd
--- /dev/null
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@@ -0,0 +1,303 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptJobMainRules"
+    :formAllSchemas="ProductreceiptJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ProductreceiptJobDetail.allSchemas"
+    :tableFormRules="ProductreceiptJobDetailRules"
+    :apiUpdate="ProductreceiptJobMainApi.updateProductreceiptJobMain"
+    :apiCreate="ProductreceiptJobMainApi.createProductreceiptJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptJobMain.allSchemas"
+    :detailAllSchemas="ProductreceiptJobDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="ProductreceiptJobDetailApi.getProductreceiptJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductreceiptJobMain,ProductreceiptJobMainRules,ProductreceiptJobDetail,ProductreceiptJobDetailRules } from './productreceiptJobMain.data'
+import * as ProductreceiptJobMainApi from '@/api/wms/productreceiptJobMain'
+import * as ProductreceiptJobDetailApi from '@/api/wms/productreceiptJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+// 制品收货任务主
+// 预生产收货任务主
+defineOptions({ name: 'ProductreceiptJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptJobMainApi.getProductreceiptJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    let aaa = {
+    "id": "1809190001478278226",
+    "requestNumber": "REC4620231212-0011",
+    "productionPlanNumber": "WP20231212-0002",
+    "workShopCode": "work2",
+    "team": "7",
+    "shift": "8",
+    "details": null,
+    "requestTime": 1702376849000,
+    "requestDueTime": null,
+    "status": "2",
+    "expiredTime": null,
+    "updateTime": 1702376904000,
+    "updater": "超级管理员",
+    "jobStageStatus": null,
+    "priority": null,
+    "priorityIncrement": null,
+    "departmentCode": "103",
+    "acceptUserId": "1",
+    "acceptTime": 1702376913000,
+    "completeUserId": "1",
+    "completeTime": 1702377036000,
+    "toWarehouseCode": null,
+    "toAreaCodes": "",
+    "fromAreaTypes": "WIP",
+    "toAreaTypes": "WIP",
+    "number": "JOB2120231212-0001",
+    "businessType": "ProductReceipt",
+    "remark": null,
+    "createTime": 1702376904000,
+    "creator": "超级管理员",
+    "autoComplete": "FALSE",
+    "allowModifyLocation": "FALSE",
+    "allowModifyQty": "TRUE",
+    "allowBiggerQty": "TRUE",
+    "allowSmallerQty": "TRUE",
+    "allowModifyInventoryStatus": "TRUE",
+    "allowContinuousScanning": "TRUE",
+    "allowPartialComplete": "TRUE",
+    "allowModifyBatch": "FALSE",
+    "allowModifyPackingNumber": "FALSE",
+    "inInventoryStatuses": "OK",
+    "outInventoryStatuses": "OK",
+    "concurrencyStamp": null,
+      subList: [
+      {
+    "id": "1809190000003953999",
+    "productionLineCode": "line4",
+    "workStationCode": "station4",
+    "processCode": null,
+    "packingNumber": "PN-00113",
+    "containerNumber": null,
+    "batch": "20231212",
+    "produceDate": null,
+    "expireDate": null,
+    "inventoryStatus": "OK",
+    "woNumber": null,
+    "woLine": null,
+    "packQty": 8,
+    "packUnit": "BOX",
+    "itemCode": "item01",
+    "itemName": "物料01",
+    "itemDesc1": "",
+    "itemDesc2": "",
+    "projectCode": "xm01",
+    "qty": 2,
+    "uom": "EA",
+    "number": "JOB2120231212-0001",
+    "remark": null,
+    "createTime": 1702376904000,
+    "creator": "1",
+    "toOwnerCode": null,
+          handleQty: 10,
+          toPackingNumber: '12',
+          toContainerNumber: '001',
+          toBatch: '21',
+          toInventoryStatus: 'OK',
+          toLocationCode: 'H03',
+        }
+      ]
+    }
+    ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
+  } else if (val == 'mainJobAba') { // 放弃
+    ProductreceiptJobMainApi.abandonProductreceiptMain(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    ProductreceiptJobMainApi.closeProductreceiptMain(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    ProductreceiptJobMainApi.acceptProductreceiptMain(row.id)
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobProductreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(tableObject.params)
+    download.excel(data, '制品收货任务.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
new file mode 100644
index 000000000..fabd59e4a
--- /dev/null
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -0,0 +1,914 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品收货任务主表
+ */
+export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '生产线代码',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '收货类型',
+    field: 'type',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
+]))
+
+//表单校验
+export const ProductreceiptJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货任务子表
+ */
+export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const ProductreceiptJobDetailRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  woNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  woLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
new file mode 100644
index 000000000..1c70fb43f
--- /dev/null
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -0,0 +1,231 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptRecordMainRules"
+    :formAllSchemas="ProductreceiptRecordMain.allSchemas"
+    :tableAllSchemas="ProductreceiptRecordDetail.allSchemas"
+    :tableFormRules="ProductreceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptRecordMain.allSchemas"
+    :detailAllSchemas="ProductreceiptRecordDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptRecordDetailRules"
+    :apiPage="ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPage"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- bom列表 -->
+  <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushRecordDetailb.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, BackflushRecordDetailb } from './productreceiptRecordMain.data'
+import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain'
+import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+// 制品收货记录主
+// 预生产收货记录主
+defineOptions({ name: 'ProductreceiptRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptRecordMain.allSchemas.tableColumns)
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: 'Bom',
+    name: 'bom',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// Bom查看
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BackflushRecordDetailbApi.getBackflushRecordDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptRecordMainApi.getProductreceiptRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordProductreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(tableObject.params)
+    download.excel(data, '制品收货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
new file mode 100644
index 000000000..b779fb084
--- /dev/null
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@@ -0,0 +1,956 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品收货记录主表
+ */
+export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '收货类型',
+    field: 'type',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductreceiptRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货记录子表
+ */
+export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionlineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductreceiptRecordDetailRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  woNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  woLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货记录子表
+ */
+export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const BackflushRecordDetailbRules = reactive({
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
new file mode 100644
index 000000000..c94351527
--- /dev/null
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -0,0 +1,671 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptRequestMainRules"
+    :formAllSchemas="ProductreceiptRequestMain.allSchemas"
+    :tableAllSchemas="ProductreceiptRequestDetail.allSchemas"
+    :tableFormRules="ProductreceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductreceiptRequestMainApi.updateProductreceiptRequestMain"
+    :apiCreate="ProductreceiptRequestMainApi.createProductreceiptRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptRequestMain.allSchemas"
+    :detailAllSchemas="ProductreceiptRequestDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptRequestDetailRules"
+    :apiCreate="ProductreceiptRequestDetailApi.createProductreceiptRequestDetail"
+    :apiUpdate="ProductreceiptRequestDetailApi.updateProductreceiptRequestDetail"
+    :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage"
+    :apiDelete="ProductreceiptRequestDetailApi.deleteProductreceiptRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+    :detailValidate="detailValidate"
+  />
+
+    <!-- 创建标签 -->
+    <BasicForm
+      ref="formLabelRef"
+      @success="getList"
+      :tableAllSchemas="detailListTableColumns"
+      :tableFormRules="ProductreceiptRequestLabelRules"
+      :tableData="detatableData.tableList"
+      :isBusiness="true"
+      :isShowButton="false"
+      @handleAddTable="handleAddTable"
+      @handleDeleteTable="handleDeleteTable"
+      @searchTableSuccess="searchTableSuccess"
+      @submitForm="submitFormLabel"
+    />
+
+    <!-- bom列表 -->
+    <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushDetailRequest.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'predict'"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,
+  ProductreceiptRequestDetailRules, BackflushDetailRequest,
+  ProductreceiptRequestLabel,ProductreceiptRequestLabelRules } from './productreceiptRequestMain.data'
+import * as ProductreceiptRequestMainApi from '@/api/wms/productreceiptRequestMain'
+import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequestDetail'
+import * as BackflushRequestDetailbApi from '@/api/wms/backflushRequestDetailb'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import * as PackageApi from '@/api/wms/package'
+import { formatTime } from '@/utils/index'
+import { getAccessToken } from '@/utils/auth'
+
+// 制品收货申请
+// 预生产收货申请
+defineOptions({ name: 'ProductreceiptRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptRequestMain.allSchemas.tableColumns)
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: 'Bom',
+    name: 'bom',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+//创建标签
+const detailListTableColumns = ProductreceiptRequestLabel.allSchemas
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const labelType = ref('') // 标签类别 采购还是制造等 
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// Bom查看
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BackflushRequestDetailbApi.getBackflushRequestDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      if (formField == 'secondPackUnit') {
+        row['secondPackUnit'] = val[0]['packUnit']
+        row['secondPackQty'] = val[0]['packQty']
+      }
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptRequestMainApi.getProductreceiptRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productreceipt-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productreceipt-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭
+      defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceipt-request-main:reAdd'}), // 重新添加
+      defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:submit'}), // 提交审批
+      defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:refused'}), // 驳回
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:agree'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productreceipt-request-main:handle'}), // 处理
+      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:update'}), // 编辑
+      {
+        label: '创建标签',
+        name: 'cjbq',
+        hide: isShowMainButton(row,['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+      defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productreceipt-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'cjbq') { // 创建标签
+
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (isCreateLabel) {
+      message.warning('已创建过标签！！！')
+      return
+    }
+    detatableData.params = {
+      masterId:row.id
+    }
+    await getDetailList()
+    // 打开创建标签页面
+    // dialogVisible.value = true
+    formLabelRef.value.open('create', row)
+    detatableData.tableList.map((item) => {
+      // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
+      ItembasicApi.getItembasicPage({
+        pageSize: 10,
+        pageNo: 1,
+        code: item.itemCode,
+        sort: '',
+        by: 'ASC',
+      }).then(res => {
+        if (res.list.length > 0) {
+          // 判断物料 可采购 可制造
+          if (res.list[0].enableMake == "FALSE") {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'productionLineCodePackage') {
+              // itemColumns.tableForm.isInpuFocusShow = false
+              // itemColumns.tableForm.disabled = true
+              ProductreceiptRequestLabelRules.productionLineCodePackage[0].required = false
+            }
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = true
+              itemColumns.tableForm.disabled = false
+              ProductreceiptRequestLabelRules.supplierItemCode[0].required = true
+            }
+          })
+          } else {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = false
+              itemColumns.tableForm.disabled = true
+              ProductreceiptRequestLabelRules.supplierItemCode[0].required = false
+            }
+            if(itemColumns.field == 'productionLineCodePackage') {
+              item.productionLineCodePackage = item.productionLineCode
+              // itemColumns.tableForm.isInpuFocusShow = true
+              // itemColumns.tableForm.disabled = false
+              ProductreceiptRequestLabelRules.productionLineCodePackage[0].required = true
+            }
+          })
+          }
+        } else {
+          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          return
+        }
+      })
+    })
+
+  } else if (val == 'mainHandle') { // 处理
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (!isCreateLabel) {
+      message.warning('请先创建标签')
+      return
+    }
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 编辑时 车间代码不可修改
+  if (type == 'update') {
+    // 修改 tableform 属性
+    ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
+    })
+  } else {
+    // 修改 tableform 属性
+    ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestProductreceiptMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductreceiptRequestMainApi.deleteProductreceiptRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain(tableObject.params)
+    download.excel(data, '制品收货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  let tfk = JSON.parse(JSON.stringify(tableFormKeys))
+  tfk.batch = formatTime(new Date(), 'yyyyMMdd')
+  tableData.value.push(tfk)
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  if(data.subList.find(item => (item.qty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      await ProductreceiptRequestMainApi.createProductreceiptRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductreceiptRequestMainApi.updateProductreceiptRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '制品收货申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 创建标签
+const submitFormLabel = async (formType, data) => {
+  try {
+    detatableData.tableList.forEach(async (item) => {
+      // 创建标签 要物料库区配置表中 入库包装规格
+      item.packUnit = null
+      item.inOfOut = 'in'
+      await PackageApi.createPackageLabel(item).then(res => {
+        isCreateLabel.value = true
+        message.success('创建标签成功')
+      }).catch(err => {
+        isCreateLabel.value = false
+        console.log(err)
+        message.error('创建标签失败')
+      })
+    })
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+// 标签打印
+const handlePoint = async (row) => {
+  // 查询是否已创建过标签
+  await PackageApi.getPackagePage({
+    requestNumber: row.number
+  }).then((res) => {
+    if(res.list.length > 0) {
+      isCreateLabel.value = true
+      if (res.list[0].productionLineCode != null) {
+        labelType.value = 'zz'
+      } else {
+        labelType.value = 'cg'
+      }
+    } else {
+      isCreateLabel.value = false
+    }
+  }).catch(err => {
+    isCreateLabel.value = false
+    console.log(err)
+  })
+  // 判断是采购还是制造
+  if (isCreateLabel.value) {
+    if (labelType.value == 'cg') {
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      window.open(src.value+'&request_number='+row.number)
+    } else {
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      window.open(src.value+'&request_number='+row.number)
+    }
+  } else {
+    message.warning('请先创建标签')
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductreceiptRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
new file mode 100644
index 000000000..e5926c672
--- /dev/null
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -0,0 +1,1774 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+
+import * as WorkstationApi from '@/api/wms/workstation'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+
+import * as ProcessApi from '@/api/wms/process'
+import { Process } from '@/views/wms/basicDataManage/factoryModeling/process/process.data'
+
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as BomApi from '@/api/wms/bom'
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+import * as SupplieritemApi  from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductReceiptRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 制品收货申请主表
+ */
+export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '收货类型',
+    field: 'type',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductreceiptRequestMainRules = reactive({
+  workshopCode: [
+    { required: true, message: '请选择车间代码', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组代码', trigger: 'change' }
+  ],
+  shift: [
+    { required: true, message: '请选择班次代码', trigger: 'change' }
+  ],
+  // departmentCode: [
+  //   { required: true, message: '请输入部门', trigger: 'blur' }
+  // ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货申请子表
+ */
+export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码',
+      searchField: 'code',
+      searchTitle: '生产线信息',
+      searchAllSchemas: Productionline.allSchemas,
+      searchPage: ProductionlineApi.getProductionlinePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线代码',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位代码',
+      searchField: 'code',
+      searchTitle: '工位信息',
+      searchAllSchemas: Workstation.allSchemas,
+      searchPage: WorkstationApi.getWorkstationPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择工位代码',
+        searchField: 'code',
+        searchTitle: '工位信息',
+        searchAllSchemas: Workstation.allSchemas,
+        searchPage: WorkstationApi.getWorkstationPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工序代码',
+      searchField: 'code',
+      searchTitle: '工序信息',
+      searchAllSchemas: Process.allSchemas,
+      searchPage: ProcessApi.getProcessPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择工序代码',
+        searchField: 'code',
+        searchTitle: '工序信息',
+        searchAllSchemas: Process.allSchemas,
+        searchPage: ProcessApi.getProcessPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '生产线物料关系信息',
+      searchAllSchemas: Productionlineitem.allSchemas,
+      searchPage: ProductionlineitemApi.getProductionlineitemPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '生产线物料关系信息',
+        searchAllSchemas: Productionlineitem.allSchemas,
+        searchPage: ProductionlineitemApi.getProductionlineitemPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+    
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      type: 'FormDate',
+      valueFormat: 'x',
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      type: 'FormDate',
+      valueFormat: 'x',
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductreceiptRequestDetailRules = reactive({
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择过期日期', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  bomVersion: [
+    { required: true, message: '请选择Bom版本', trigger: 'change' }
+  ],
+  workStationCode: [
+    { required: true, message: '请选择工位代码', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货申请子表
+ */
+export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  }
+]))
+
+//表单校验
+export const BackflushRequestDetailbRules = reactive({
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+  
+})
+
+
+
+
+
+/**
+ * @returns {Array} 制品收货申请子表二子表
+ */
+export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+]))
+
+
+/**
+ * @returns {Array} 制品收货申请创建标签
+ */
+export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCodePackage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+      // isInpuFocusShow: true,
+      // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      // searchField: 'productionLineCode', // 查询弹窗赋值字段
+      // searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      // searchCondition:[{
+      //   key: 'itemCode',
+      //   value: 'itemCode',
+      //   isMainValue: true
+      // }]
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装规格1',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      disabled: true
+    },
+  },
+  {
+    label: '包装数量1',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '包装规格2',
+    field: 'secondPackUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装数量2',
+    field: 'secondPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+]))
+
+//表单校验
+export const ProductreceiptRequestLabelRules = reactive({
+  supplierItemCode: [
+    { required: true, message: '请选择供应商', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ]
+})
+
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
new file mode 100644
index 000000000..60a4a75ba
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
@@ -0,0 +1,302 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptJobMainRules"
+    :formAllSchemas="ProductreceiptJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ProductreceiptJobDetail.allSchemas"
+    :tableFormRules="ProductreceiptJobDetailRules"
+    :apiUpdate="ProductreceiptJobMainApi.updateProductreceiptJobMain"
+    :apiCreate="ProductreceiptJobMainApi.createProductreceiptJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptJobMain.allSchemas"
+    :detailAllSchemas="ProductreceiptJobDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="ProductreceiptJobDetailApi.getProductreceiptJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductreceiptJobMain,ProductreceiptJobMainRules,ProductreceiptJobDetail,ProductreceiptJobDetailRules } from './productreceiptAssembleJobMain.data'
+import * as ProductreceiptJobMainApi from '@/api/wms/productreceiptJobMain'
+import * as ProductreceiptJobDetailApi from '@/api/wms/productreceiptJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+// 装配收货任务主
+defineOptions({ name: 'ProductreceiptJobMainA' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptJobMainApi.getProductreceiptJobMainAssemblePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    let aaa = {
+    "id": "1809190001478278226",
+    "requestNumber": "REC4620231212-0011",
+    "productionPlanNumber": "WP20231212-0002",
+    "workShopCode": "work2",
+    "team": "7",
+    "shift": "8",
+    "details": null,
+    "requestTime": 1702376849000,
+    "requestDueTime": null,
+    "status": "2",
+    "expiredTime": null,
+    "updateTime": 1702376904000,
+    "updater": "超级管理员",
+    "jobStageStatus": null,
+    "priority": null,
+    "priorityIncrement": null,
+    "departmentCode": "103",
+    "acceptUserId": "1",
+    "acceptTime": 1702376913000,
+    "completeUserId": "1",
+    "completeTime": 1702377036000,
+    "toWarehouseCode": null,
+    "toAreaCodes": "",
+    "fromAreaTypes": "WIP",
+    "toAreaTypes": "WIP",
+    "number": "JOB2120231212-0001",
+    "businessType": "ProductReceipt",
+    "remark": null,
+    "createTime": 1702376904000,
+    "creator": "超级管理员",
+    "autoComplete": "FALSE",
+    "allowModifyLocation": "FALSE",
+    "allowModifyQty": "TRUE",
+    "allowBiggerQty": "TRUE",
+    "allowSmallerQty": "TRUE",
+    "allowModifyInventoryStatus": "TRUE",
+    "allowContinuousScanning": "TRUE",
+    "allowPartialComplete": "TRUE",
+    "allowModifyBatch": "FALSE",
+    "allowModifyPackingNumber": "FALSE",
+    "inInventoryStatuses": "OK",
+    "outInventoryStatuses": "OK",
+    "concurrencyStamp": null,
+      subList: [
+      {
+    "id": "1809190000003953999",
+    "productionLineCode": "line4",
+    "workStationCode": "station4",
+    "processCode": null,
+    "packingNumber": "PN-00113",
+    "containerNumber": null,
+    "batch": "20231212",
+    "produceDate": null,
+    "expireDate": null,
+    "inventoryStatus": "OK",
+    "woNumber": null,
+    "woLine": null,
+    "packQty": 8,
+    "packUnit": "BOX",
+    "itemCode": "item01",
+    "itemName": "物料01",
+    "itemDesc1": "",
+    "itemDesc2": "",
+    "projectCode": "xm01",
+    "qty": 2,
+    "uom": "EA",
+    "number": "JOB2120231212-0001",
+    "remark": null,
+    "createTime": 1702376904000,
+    "creator": "1",
+    "toOwnerCode": null,
+          handleQty: 10,
+          toPackingNumber: '12',
+          toContainerNumber: '001',
+          toBatch: '21',
+          toInventoryStatus: 'OK',
+          toLocationCode: 'H03',
+        }
+      ]
+    }
+    ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
+  } else if (val == 'mainJobAba') { // 放弃
+    ProductreceiptJobMainApi.abandonProductreceiptMain(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    ProductreceiptJobMainApi.closeProductreceiptMain(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    ProductreceiptJobMainApi.acceptProductreceiptMain(row.id)
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobProductreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptJobMainApi.exportProductreceiptJobMainAssemble(tableObject.params)
+    download.excel(data, '装配收货任务.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
new file mode 100644
index 000000000..e71496ba3
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
@@ -0,0 +1,917 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品收货任务主表
+ */
+export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '生产线代码',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '收货类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    isForm: false
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
+]))
+
+//表单校验
+export const ProductreceiptJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货任务子表
+ */
+export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const ProductreceiptJobDetailRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  woNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  woLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
new file mode 100644
index 000000000..f0b49ad0f
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
@@ -0,0 +1,230 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptRecordMainRules"
+    :formAllSchemas="ProductreceiptRecordMain.allSchemas"
+    :tableAllSchemas="ProductreceiptRecordDetail.allSchemas"
+    :tableFormRules="ProductreceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptRecordMain.allSchemas"
+    :detailAllSchemas="ProductreceiptRecordDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptRecordDetailRules"
+    :apiPage="ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPage"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- bom列表 -->
+  <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushRecordDetailb.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, BackflushRecordDetailb } from './productreceiptAssembleRecordMain.data'
+import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain'
+import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+// 装配收货记录主
+defineOptions({ name: 'ProductreceiptRecordMainA' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptRecordMain.allSchemas.tableColumns)
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: 'Bom',
+    name: 'bom',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// Bom查看
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BackflushRecordDetailbApi.getBackflushRecordDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptRecordMainApi.getProductreceiptRecordMainAssemblePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordProductreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordAssembleMain(tableObject.params)
+    download.excel(data, '装配收货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
new file mode 100644
index 000000000..17a217872
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
@@ -0,0 +1,959 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品收货记录主表
+ */
+export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '收货类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    isForm: false
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductreceiptRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货记录子表
+ */
+export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionlineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductreceiptRecordDetailRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  woNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  woLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货记录子表
+ */
+export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const BackflushRecordDetailbRules = reactive({
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
new file mode 100644
index 000000000..394e6041c
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -0,0 +1,670 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptRequestMainRules"
+    :formAllSchemas="ProductreceiptRequestMain.allSchemas"
+    :tableAllSchemas="ProductreceiptRequestDetail.allSchemas"
+    :tableFormRules="ProductreceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductreceiptRequestMainApi.updateProductreceiptRequestMain"
+    :apiCreate="ProductreceiptRequestMainApi.createProductreceiptRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptRequestMain.allSchemas"
+    :detailAllSchemas="ProductreceiptRequestDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptRequestDetailRules"
+    :apiCreate="ProductreceiptRequestDetailApi.createProductreceiptRequestDetail"
+    :apiUpdate="ProductreceiptRequestDetailApi.updateProductreceiptRequestDetail"
+    :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage"
+    :apiDelete="ProductreceiptRequestDetailApi.deleteProductreceiptRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+    :detailValidate="detailValidate"
+  />
+
+    <!-- 创建标签 -->
+    <BasicForm
+      ref="formLabelRef"
+      @success="getList"
+      :tableAllSchemas="detailListTableColumns"
+      :tableFormRules="ProductreceiptRequestLabelRules"
+      :tableData="detatableData.tableList"
+      :isBusiness="true"
+      :isShowButton="false"
+      @handleAddTable="handleAddTable"
+      @handleDeleteTable="handleDeleteTable"
+      @searchTableSuccess="searchTableSuccess"
+      @submitForm="submitFormLabel"
+    />
+
+    <!-- bom列表 -->
+    <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushDetailRequest.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'assemble'"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,
+  ProductreceiptRequestDetailRules, BackflushDetailRequest,
+  ProductreceiptRequestLabel,ProductreceiptRequestLabelRules } from './productreceiptAssembleRequestMain.data'
+import * as ProductreceiptRequestMainApi from '@/api/wms/productreceiptRequestMain'
+import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequestDetail'
+import * as BackflushRequestDetailbApi from '@/api/wms/backflushRequestDetailb'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import * as PackageApi from '@/api/wms/package'
+import { formatTime } from '@/utils/index'
+import { getAccessToken } from '@/utils/auth'
+
+// 装配收货申请
+defineOptions({ name: 'ProductreceiptRequestMainA' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptRequestMain.allSchemas.tableColumns)
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: 'Bom',
+    name: 'bom',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+//创建标签
+const detailListTableColumns = ProductreceiptRequestLabel.allSchemas
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const labelType = ref('') // 标签类别 采购还是制造等 
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// Bom查看
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BackflushRequestDetailbApi.getBackflushRequestDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      if (formField == 'secondPackUnit') {
+        row['secondPackUnit'] = val[0]['packUnit']
+        row['secondPackQty'] = val[0]['packQty']
+      }
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptRequestMainApi.getProductreceiptRequestMainAssemblePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productreceipt-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productreceipt-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭
+      defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceipt-request-main:reAdd'}), // 重新添加
+      defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:submit'}), // 提交审批
+      defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:refused'}), // 驳回
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:agree'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productreceipt-request-main:handle'}), // 处理
+      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:update'}), // 编辑
+      {
+        label: '创建标签',
+        name: 'cjbq',
+        hide: isShowMainButton(row,['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+      defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productreceipt-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'cjbq') { // 创建标签
+
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (isCreateLabel) {
+      message.warning('已创建过标签！！！')
+      return
+    }
+    detatableData.params = {
+      masterId:row.id
+    }
+    await getDetailList()
+    // 打开创建标签页面
+    // dialogVisible.value = true
+    formLabelRef.value.open('create', row)
+    detatableData.tableList.map((item) => {
+      // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
+      ItembasicApi.getItembasicPage({
+        pageSize: 10,
+        pageNo: 1,
+        code: item.itemCode,
+        sort: '',
+        by: 'ASC',
+      }).then(res => {
+        if (res.list.length > 0) {
+          // 判断物料 可采购 可制造
+          if (res.list[0].enableMake == "FALSE") {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'productionLineCodePackage') {
+              // itemColumns.tableForm.isInpuFocusShow = false
+              // itemColumns.tableForm.disabled = true
+              ProductreceiptRequestLabelRules.productionLineCodePackage[0].required = false
+            }
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = true
+              itemColumns.tableForm.disabled = false
+              ProductreceiptRequestLabelRules.supplierItemCode[0].required = true
+            }
+          })
+          } else {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = false
+              itemColumns.tableForm.disabled = true
+              ProductreceiptRequestLabelRules.supplierItemCode[0].required = false
+            }
+            if(itemColumns.field == 'productionLineCodePackage') {
+              item.productionLineCodePackage = item.productionLineCode
+              // itemColumns.tableForm.isInpuFocusShow = true
+              // itemColumns.tableForm.disabled = false
+              ProductreceiptRequestLabelRules.productionLineCodePackage[0].required = true
+            }
+          })
+          }
+        } else {
+          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          return
+        }
+      })
+    })
+
+  } else if (val == 'mainHandle') { // 处理
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (!isCreateLabel) {
+      message.warning('请先创建标签')
+      return
+    }
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 编辑时 车间代码不可修改
+  if (type == 'update') {
+    // 修改 tableform 属性
+    ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
+    })
+  } else {
+    // 修改 tableform 属性
+    ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestProductreceiptMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductreceiptRequestMainApi.deleteProductreceiptRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMainAssemble(tableObject.params)
+    download.excel(data, '制品收货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  let tfk = JSON.parse(JSON.stringify(tableFormKeys))
+  tfk.batch = formatTime(new Date(), 'yyyyMMdd')
+  tableData.value.push(tfk)
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  if(data.subList.find(item => (item.qty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      await ProductreceiptRequestMainApi.createProductreceiptRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductreceiptRequestMainApi.updateProductreceiptRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '装配收货申请导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 创建标签
+const submitFormLabel = async (formType, data) => {
+  try {
+    detatableData.tableList.forEach(async (item) => {
+      // 创建标签 要物料库区配置表中 入库包装规格
+      item.packUnit = null
+      item.inOfOut = 'in'
+      await PackageApi.createPackageLabel(item).then(res => {
+        isCreateLabel.value = true
+        message.success('创建标签成功')
+      }).catch(err => {
+        isCreateLabel.value = false
+        console.log(err)
+        message.error('创建标签失败')
+      })
+    })
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+// 标签打印
+const handlePoint = async (row) => {
+  // 查询是否已创建过标签
+  await PackageApi.getPackagePage({
+    requestNumber: row.number
+  }).then((res) => {
+    if(res.list.length > 0) {
+      isCreateLabel.value = true
+      if (res.list[0].productionLineCode != null) {
+        labelType.value = 'zz'
+      } else {
+        labelType.value = 'cg'
+      }
+    } else {
+      isCreateLabel.value = false
+    }
+  }).catch(err => {
+    isCreateLabel.value = false
+    console.log(err)
+  })
+  // 判断是采购还是制造
+  if (isCreateLabel.value) {
+    if (labelType.value == 'cg') {
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      window.open(src.value+'&request_number='+row.number)
+    } else {
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      window.open(src.value+'&request_number='+row.number)
+    }
+  } else {
+    message.warning('请先创建标签')
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductreceiptRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
new file mode 100644
index 000000000..e5926c672
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -0,0 +1,1774 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+
+import * as WorkstationApi from '@/api/wms/workstation'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+
+import * as ProcessApi from '@/api/wms/process'
+import { Process } from '@/views/wms/basicDataManage/factoryModeling/process/process.data'
+
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as BomApi from '@/api/wms/bom'
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+import * as SupplieritemApi  from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductReceiptRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 制品收货申请主表
+ */
+export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '收货类型',
+    field: 'type',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductreceiptRequestMainRules = reactive({
+  workshopCode: [
+    { required: true, message: '请选择车间代码', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组代码', trigger: 'change' }
+  ],
+  shift: [
+    { required: true, message: '请选择班次代码', trigger: 'change' }
+  ],
+  // departmentCode: [
+  //   { required: true, message: '请输入部门', trigger: 'blur' }
+  // ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货申请子表
+ */
+export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码',
+      searchField: 'code',
+      searchTitle: '生产线信息',
+      searchAllSchemas: Productionline.allSchemas,
+      searchPage: ProductionlineApi.getProductionlinePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线代码',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位代码',
+      searchField: 'code',
+      searchTitle: '工位信息',
+      searchAllSchemas: Workstation.allSchemas,
+      searchPage: WorkstationApi.getWorkstationPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择工位代码',
+        searchField: 'code',
+        searchTitle: '工位信息',
+        searchAllSchemas: Workstation.allSchemas,
+        searchPage: WorkstationApi.getWorkstationPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工序代码',
+      searchField: 'code',
+      searchTitle: '工序信息',
+      searchAllSchemas: Process.allSchemas,
+      searchPage: ProcessApi.getProcessPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择工序代码',
+        searchField: 'code',
+        searchTitle: '工序信息',
+        searchAllSchemas: Process.allSchemas,
+        searchPage: ProcessApi.getProcessPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '生产线物料关系信息',
+      searchAllSchemas: Productionlineitem.allSchemas,
+      searchPage: ProductionlineitemApi.getProductionlineitemPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '生产线物料关系信息',
+        searchAllSchemas: Productionlineitem.allSchemas,
+        searchPage: ProductionlineitemApi.getProductionlineitemPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+    
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      type: 'FormDate',
+      valueFormat: 'x',
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      type: 'FormDate',
+      valueFormat: 'x',
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductreceiptRequestDetailRules = reactive({
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择过期日期', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  bomVersion: [
+    { required: true, message: '请选择Bom版本', trigger: 'change' }
+  ],
+  workStationCode: [
+    { required: true, message: '请选择工位代码', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货申请子表
+ */
+export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  }
+]))
+
+//表单校验
+export const BackflushRequestDetailbRules = reactive({
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+  
+})
+
+
+
+
+
+/**
+ * @returns {Array} 制品收货申请子表二子表
+ */
+export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+]))
+
+
+/**
+ * @returns {Array} 制品收货申请创建标签
+ */
+export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCodePackage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+      // isInpuFocusShow: true,
+      // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      // searchField: 'productionLineCode', // 查询弹窗赋值字段
+      // searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      // searchCondition:[{
+      //   key: 'itemCode',
+      //   value: 'itemCode',
+      //   isMainValue: true
+      // }]
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装规格1',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      disabled: true
+    },
+  },
+  {
+    label: '包装数量1',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '包装规格2',
+    field: 'secondPackUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装数量2',
+    field: 'secondPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+]))
+
+//表单校验
+export const ProductreceiptRequestLabelRules = reactive({
+  supplierItemCode: [
+    { required: true, message: '请选择供应商', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ]
+})
+
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
new file mode 100644
index 000000000..d99b2eb65
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
@@ -0,0 +1,301 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptJobMainRules"
+    :formAllSchemas="ProductreceiptJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ProductreceiptJobDetail.allSchemas"
+    :tableFormRules="ProductreceiptJobDetailRules"
+    :apiUpdate="ProductreceiptJobMainApi.updateProductreceiptJobMain"
+    :apiCreate="ProductreceiptJobMainApi.createProductreceiptJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptJobMain.allSchemas"
+    :detailAllSchemas="ProductreceiptJobDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="ProductreceiptJobDetailApi.getProductreceiptJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductreceiptJobMain,ProductreceiptJobMainRules,ProductreceiptJobDetail,ProductreceiptJobDetailRules } from './productreceiptscrapJobMain.data'
+import * as ProductreceiptJobMainApi from '@/api/wms/productreceiptJobMain'
+import * as ProductreceiptJobDetailApi from '@/api/wms/productreceiptJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 制品收货任务主
+defineOptions({ name: 'ProductreceiptJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptJobMainApi.getProductreceiptscapJobMainPage // 报废收货分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    let aaa = {
+    "id": "1809190001478278226",
+    "requestNumber": "REC4620231212-0011",
+    "productionPlanNumber": "WP20231212-0002",
+    "workShopCode": "work2",
+    "team": "7",
+    "shift": "8",
+    "details": null,
+    "requestTime": 1702376849000,
+    "requestDueTime": null,
+    "status": "2",
+    "expiredTime": null,
+    "updateTime": 1702376904000,
+    "updater": "超级管理员",
+    "jobStageStatus": null,
+    "priority": null,
+    "priorityIncrement": null,
+    "departmentCode": "103",
+    "acceptUserId": "1",
+    "acceptTime": 1702376913000,
+    "completeUserId": "1",
+    "completeTime": 1702377036000,
+    "toWarehouseCode": null,
+    "toAreaCodes": "",
+    "fromAreaTypes": "WIP",
+    "toAreaTypes": "WIP",
+    "number": "JOB2120231212-0001",
+    "businessType": "ProductReceipt",
+    "remark": null,
+    "createTime": 1702376904000,
+    "creator": "超级管理员",
+    "autoComplete": "FALSE",
+    "allowModifyLocation": "FALSE",
+    "allowModifyQty": "TRUE",
+    "allowBiggerQty": "TRUE",
+    "allowSmallerQty": "TRUE",
+    "allowModifyInventoryStatus": "TRUE",
+    "allowContinuousScanning": "TRUE",
+    "allowPartialComplete": "TRUE",
+    "allowModifyBatch": "FALSE",
+    "allowModifyPackingNumber": "FALSE",
+    "inInventoryStatuses": "OK",
+    "outInventoryStatuses": "OK",
+    "concurrencyStamp": null,
+      subList: [
+      {
+    "id": "1809190000003953999",
+    "productionLineCode": "line4",
+    "workStationCode": "station4",
+    "processCode": null,
+    "packingNumber": "PN-00113",
+    "containerNumber": null,
+    "batch": "20231212",
+    "produceDate": null,
+    "expireDate": null,
+    "inventoryStatus": "OK",
+    "woNumber": null,
+    "woLine": null,
+    "packQty": 8,
+    "packUnit": "BOX",
+    "itemCode": "item01",
+    "itemName": "物料01",
+    "itemDesc1": "",
+    "itemDesc2": "",
+    "projectCode": "xm01",
+    "qty": 2,
+    "uom": "EA",
+    "number": "JOB2120231212-0001",
+    "remark": null,
+    "createTime": 1702376904000,
+    "creator": "1",
+    "toOwnerCode": null,
+          handleQty: 10,
+          toPackingNumber: '12',
+          toContainerNumber: '001',
+          toBatch: '21',
+          toInventoryStatus: 'OK',
+          toLocationCode: 'H03',
+        }
+      ]
+    }
+    ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
+  } else if (val == 'mainJobAba') { // 放弃
+    ProductreceiptJobMainApi.abandonProductreceiptMain(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    ProductreceiptJobMainApi.closeProductreceiptMain(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    ProductreceiptJobMainApi.acceptProductreceiptMain(row.id)
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobProductreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(tableObject.params)
+    download.excel(data, '制品收货任务.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
new file mode 100644
index 000000000..d88c730ec
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
@@ -0,0 +1,903 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品收货任务主表
+ */
+export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '生产线代码',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
+]))
+
+//表单校验
+export const ProductreceiptJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货任务子表
+ */
+export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const ProductreceiptJobDetailRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  woNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  woLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
new file mode 100644
index 000000000..6f9360198
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
@@ -0,0 +1,229 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptRecordMainRules"
+    :formAllSchemas="ProductreceiptRecordMain.allSchemas"
+    :tableAllSchemas="ProductreceiptRecordDetail.allSchemas"
+    :tableFormRules="ProductreceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptRecordMain.allSchemas"
+    :detailAllSchemas="ProductreceiptRecordDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptRecordDetailRules"
+    :apiPage="ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPage"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- bom列表 -->
+  <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushRecordDetailb.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, BackflushRecordDetailb } from './productreceiptscrapRecordMain.data'
+import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain'
+import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 制品收货记录主
+defineOptions({ name: 'ProductreceiptRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptRecordMain.allSchemas.tableColumns)
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: 'Bom',
+    name: 'bom',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// Bom查看
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BackflushRecordDetailbApi.getBackflushRecordDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptRecordMainApi.getProductreceiptRecordMainScrapPage // 报废收货分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordProductreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(tableObject.params)
+    download.excel(data, '制品收货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts
new file mode 100644
index 000000000..6c3fc3bcf
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts
@@ -0,0 +1,945 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品收货记录主表
+ */
+export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductreceiptRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货记录子表
+ */
+export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionlineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductreceiptRecordDetailRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  woNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  woLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货记录子表
+ */
+export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const BackflushRecordDetailbRules = reactive({
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
new file mode 100644
index 000000000..3541ec885
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -0,0 +1,670 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptRequestMainRules"
+    :formAllSchemas="ProductreceiptRequestMain.allSchemas"
+    :tableAllSchemas="ProductreceiptRequestDetail.allSchemas"
+    :tableFormRules="ProductreceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductreceiptRequestMainApi.updateProductreceiptRequestMain"
+    :apiCreate="ProductreceiptRequestMainApi.createProductreceiptRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptRequestMain.allSchemas"
+    :detailAllSchemas="ProductreceiptRequestDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptRequestDetailRules"
+    :apiCreate="ProductreceiptRequestDetailApi.createProductreceiptRequestDetail"
+    :apiUpdate="ProductreceiptRequestDetailApi.updateProductreceiptRequestDetail"
+    :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage"
+    :apiDelete="ProductreceiptRequestDetailApi.deleteProductreceiptRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+    :detailValidate="detailValidate"
+  />
+
+    <!-- 创建标签 -->
+    <BasicForm
+      ref="formLabelRef"
+      @success="getList"
+      :tableAllSchemas="detailListTableColumns"
+      :tableFormRules="ProductreceiptRequestLabelRules"
+      :tableData="detatableData.tableList"
+      :isBusiness="true"
+      :isShowButton="false"
+      @handleAddTable="handleAddTable"
+      @handleDeleteTable="handleDeleteTable"
+      @searchTableSuccess="searchTableSuccess"
+      @submitForm="submitFormLabel"
+    />
+
+    <!-- bom列表 -->
+    <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushDetailRequest.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,
+  ProductreceiptRequestDetailRules, BackflushDetailRequest,
+  ProductreceiptRequestLabel,ProductreceiptRequestLabelRules } from './productreceiptscrapRequestMain.data'
+import * as ProductreceiptRequestMainApi from '@/api/wms/productreceiptRequestMain'
+import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequestDetail'
+import * as BackflushRequestDetailbApi from '@/api/wms/backflushRequestDetailb'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import * as PackageApi from '@/api/wms/package'
+import { formatTime } from '@/utils/index'
+import { getAccessToken } from '@/utils/auth'
+
+// 制品收货申请
+defineOptions({ name: 'ProductreceiptRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptRequestMain.allSchemas.tableColumns)
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: 'Bom',
+    name: 'bom',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+//创建标签
+const detailListTableColumns = ProductreceiptRequestLabel.allSchemas
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const labelType = ref('') // 标签类别 采购还是制造等 
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// Bom查看
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BackflushRequestDetailbApi.getBackflushRequestDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      if (formField == 'secondPackUnit') {
+        row['secondPackUnit'] = val[0]['packUnit']
+        row['secondPackQty'] = val[0]['packQty']
+      }
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptRequestMainApi.getProductreceiptRequestMainScrapPage // 报废收货分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productreceipt-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productreceipt-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭
+      defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceipt-request-main:reAdd'}), // 重新添加
+      defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:submit'}), // 提交审批
+      defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:refused'}), // 驳回
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:agree'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productreceipt-request-main:handle'}), // 处理
+      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:update'}), // 编辑
+      {
+        label: '创建标签',
+        name: 'cjbq',
+        hide: isShowMainButton(row,['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+      defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productreceipt-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'cjbq') { // 创建标签
+
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (isCreateLabel) {
+      message.warning('已创建过标签！！！')
+      return
+    }
+    detatableData.params = {
+      masterId:row.id
+    }
+    await getDetailList()
+    // 打开创建标签页面
+    // dialogVisible.value = true
+    formLabelRef.value.open('create', row)
+    detatableData.tableList.map((item) => {
+      // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
+      ItembasicApi.getItembasicPage({
+        pageSize: 10,
+        pageNo: 1,
+        code: item.itemCode,
+        sort: '',
+        by: 'ASC',
+      }).then(res => {
+        if (res.list.length > 0) {
+          // 判断物料 可采购 可制造
+          if (res.list[0].enableMake == "FALSE") {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'productionLineCodePackage') {
+              // itemColumns.tableForm.isInpuFocusShow = false
+              // itemColumns.tableForm.disabled = true
+              ProductreceiptRequestLabelRules.productionLineCodePackage[0].required = false
+            }
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = true
+              itemColumns.tableForm.disabled = false
+              ProductreceiptRequestLabelRules.supplierItemCode[0].required = true
+            }
+          })
+          } else {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = false
+              itemColumns.tableForm.disabled = true
+              ProductreceiptRequestLabelRules.supplierItemCode[0].required = false
+            }
+            if(itemColumns.field == 'productionLineCodePackage') {
+              item.productionLineCodePackage = item.productionLineCode
+              // itemColumns.tableForm.isInpuFocusShow = true
+              // itemColumns.tableForm.disabled = false
+              ProductreceiptRequestLabelRules.productionLineCodePackage[0].required = true
+            }
+          })
+          }
+        } else {
+          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          return
+        }
+      })
+    })
+
+  } else if (val == 'mainHandle') { // 处理
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (!isCreateLabel) {
+      message.warning('请先创建标签')
+      return
+    }
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 编辑时 车间代码不可修改
+  if (type == 'update') {
+    // 修改 tableform 属性
+    ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
+    })
+  } else {
+    // 修改 tableform 属性
+    ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestProductreceiptMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductreceiptRequestMainApi.deleteProductreceiptRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain(tableObject.params)
+    download.excel(data, '制品收货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  let tfk = JSON.parse(JSON.stringify(tableFormKeys))
+  tfk.batch = formatTime(new Date(), 'yyyyMMdd')
+  tableData.value.push(tfk)
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  if(data.subList.find(item => (item.qty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      await ProductreceiptRequestMainApi.createProductreceiptRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductreceiptRequestMainApi.updateProductreceiptRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '制品收货申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 创建标签
+const submitFormLabel = async (formType, data) => {
+  try {
+    detatableData.tableList.forEach(async (item) => {
+      // 创建标签 要物料库区配置表中 入库包装规格
+      // item.packUnit = null
+      // item.inOfOut = 'in'
+      await PackageApi.createPackageLabel(item).then(res => {
+        isCreateLabel.value = true
+        message.success('创建标签成功')
+      }).catch(err => {
+        isCreateLabel.value = false
+        console.log(err)
+        message.error('创建标签失败')
+      })
+    })
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+// 标签打印
+const handlePoint = async (row) => {
+  // 查询是否已创建过标签
+  await PackageApi.getPackagePage({
+    requestNumber: row.number
+  }).then((res) => {
+    if(res.list.length > 0) {
+      isCreateLabel.value = true
+      if (res.list[0].productionLineCode != null) {
+        labelType.value = 'zz'
+      } else {
+        labelType.value = 'cg'
+      }
+    } else {
+      isCreateLabel.value = false
+    }
+  }).catch(err => {
+    isCreateLabel.value = false
+    console.log(err)
+  })
+  // 判断是采购还是制造
+  if (isCreateLabel.value) {
+    if (labelType.value == 'cg') {
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      window.open(src.value+'&request_number='+row.number)
+    } else {
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      window.open(src.value+'&request_number='+row.number)
+    }
+  } else {
+    message.warning('请先创建标签')
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductreceiptRequestMainApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
new file mode 100644
index 000000000..535b4adc7
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -0,0 +1,1779 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+
+import * as WorkstationApi from '@/api/wms/workstation'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+
+import * as ProcessApi from '@/api/wms/process'
+import { Process } from '@/views/wms/basicDataManage/factoryModeling/process/process.data'
+
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as BomApi from '@/api/wms/bom'
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+import * as SupplieritemApi  from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductReceiptRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 制品收货申请主表
+ */
+export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '收货类型',
+    field: 'type',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'scrap',
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductreceiptRequestMainRules = reactive({
+  workshopCode: [
+    { required: true, message: '请选择车间代码', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组代码', trigger: 'change' }
+  ],
+  shift: [
+    { required: true, message: '请选择班次代码', trigger: 'change' }
+  ],
+  // departmentCode: [
+  //   { required: true, message: '请输入部门', trigger: 'blur' }
+  // ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货申请子表
+ */
+export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码',
+      searchField: 'code',
+      searchTitle: '生产线信息',
+      searchAllSchemas: Productionline.allSchemas,
+      searchPage: ProductionlineApi.getProductionlinePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线代码',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位代码',
+      searchField: 'code',
+      searchTitle: '工位信息',
+      searchAllSchemas: Workstation.allSchemas,
+      searchPage: WorkstationApi.getWorkstationPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择工位代码',
+        searchField: 'code',
+        searchTitle: '工位信息',
+        searchAllSchemas: Workstation.allSchemas,
+        searchPage: WorkstationApi.getWorkstationPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工序代码',
+      searchField: 'code',
+      searchTitle: '工序信息',
+      searchAllSchemas: Process.allSchemas,
+      searchPage: ProcessApi.getProcessPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择工序代码',
+        searchField: 'code',
+        searchTitle: '工序信息',
+        searchAllSchemas: Process.allSchemas,
+        searchPage: ProcessApi.getProcessPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '生产线物料关系信息',
+      searchAllSchemas: Productionlineitem.allSchemas,
+      searchPage: ProductionlineitemApi.getProductionlineitemPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '生产线物料关系信息',
+        searchAllSchemas: Productionlineitem.allSchemas,
+        searchPage: ProductionlineitemApi.getProductionlineitemPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+    
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      type: 'FormDate',
+      valueFormat: 'x',
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      type: 'FormDate',
+      valueFormat: 'x',
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductreceiptRequestDetailRules = reactive({
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择过期日期', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  bomVersion: [
+    { required: true, message: '请选择Bom版本', trigger: 'change' }
+  ],
+  workStationCode: [
+    { required: true, message: '请选择工位代码', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货申请子表
+ */
+export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  }
+]))
+
+//表单校验
+export const BackflushRequestDetailbRules = reactive({
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+  
+})
+
+
+
+
+
+/**
+ * @returns {Array} 制品收货申请子表二子表
+ */
+export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+]))
+
+
+/**
+ * @returns {Array} 制品收货申请创建标签
+ */
+export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCodePackage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+      // isInpuFocusShow: true,
+      // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      // searchField: 'productionLineCode', // 查询弹窗赋值字段
+      // searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      // searchCondition:[{
+      //   key: 'itemCode',
+      //   value: 'itemCode',
+      //   isMainValue: true
+      // }]
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装规格1',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      disabled: true
+    },
+  },
+  {
+    label: '包装数量1',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '包装规格2',
+    field: 'secondPackUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装数量2',
+    field: 'secondPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+]))
+
+//表单校验
+export const ProductreceiptRequestLabelRules = reactive({
+  supplierItemCode: [
+    { required: true, message: '请选择供应商', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ]
+})
+
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
new file mode 100644
index 000000000..0f5b83f11
--- /dev/null
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductredressJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductredressJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ProductredressJobMainRules"
+    :formAllSchemas="ProductredressJobMain.allSchemas"
+    :apiUpdate="ProductredressJobMainApi.updateProductredressJobMain"
+    :apiCreate="ProductredressJobMainApi.createProductredressJobMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ProductredressJobMain.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productredress-job-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductredressJobMain,ProductredressJobMainRules } from './productredressJobMain.data'
+import * as ProductredressJobMainApi from '@/api/wms/productredressJobMain'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'ProductredressJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductredressJobMain.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductredressJobMainApi.getProductredressJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productredressJobMain:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productredressJobMain:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productredressJobMain:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:productredressJobMain:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:productredressJobMain:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =ProductredressJobMain.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await ProductredressJobMainApi.createProductredressJobMain(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ProductredressJobMainApi.updateProductredressJobMain(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicProductredressJobMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ProductredressJobMainApi.deleteProductredressJobMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductredressJobMainApi.exportProductredressJobMain(tableObject.params)
+    download.excel(data, '制品回收任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '制品回收任务主导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductredressJobMainApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
new file mode 100644
index 000000000..1bd45da80
--- /dev/null
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -0,0 +1,523 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ProductredressJobMainRules = reactive({
+})
+
+export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '车间代码',
+    field: 'workShopCode',
+    sort: 'custom',
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+  },
+  {
+    label: '明细',
+    field: 'details',
+    sort: 'custom',
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '最后更新者Id',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'jobStageStatus',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+  },
+  {
+    label: '用户组',
+    field: 'userGroupCode',
+    sort: 'custom',
+  },
+  {
+    label: '承接人用户ID',
+    field: 'acceptUserId',
+    sort: 'custom',
+  },
+  {
+    label: '承接人用户名',
+    field: 'acceptUserName',
+    sort: 'custom',
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '完成人用户ID',
+    field: 'completeUserId',
+    sort: 'custom',
+  },
+  {
+    label: '完成人用户名',
+    field: 'completeUserName',
+    sort: 'custom',
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    sort: 'custom',
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    sort: 'custom',
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+  },
+  {
+    label: '收货类型',
+    field: 'type',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '创建者id',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    sort: 'custom',
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    sort: 'custom',
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    sort: 'custom',
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    sort: 'custom',
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    sort: 'custom',
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    sort: 'custom',
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    sort: 'custom',
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    sort: 'custom',
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    sort: 'custom',
+  },
+  {
+    label: '入库库存状态范围',
+    field: 'inInventoryStatuses',
+    sort: 'custom',
+  },
+  {
+    label: '出库库存状态范围',
+    field: 'outInventoryStatuses',
+    sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ProductredressJobDetailRules = reactive({
+})
+
+export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '创建者Id',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '最后更新者Id',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
new file mode 100644
index 000000000..753878fa1
--- /dev/null
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductredressRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductredressRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ProductredressRecordMainRules"
+    :formAllSchemas="ProductredressRecordMain.allSchemas"
+    :apiUpdate="ProductredressRecordMainApi.updateProductredressRecordMain"
+    :apiCreate="ProductredressRecordMainApi.createProductredressRecordMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ProductredressRecordMain.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productredress-record-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductredressRecordMain,ProductredressRecordMainRules } from './productredressRecordMain.data'
+import * as ProductredressRecordMainApi from '@/api/wms/productredressRecordMain'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'ProductredressRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductredressRecordMain.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductredressRecordMainApi.getProductredressRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productredressRecordMain:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productredressRecordMain:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productredressRecordMain:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:productredressRecordMain:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:productredressRecordMain:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =ProductredressRecordMain.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await ProductredressRecordMainApi.createProductredressRecordMain(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ProductredressRecordMainApi.updateProductredressRecordMain(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicProductredressRecordMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ProductredressRecordMainApi.deleteProductredressRecordMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductredressRecordMainApi.exportProductredressRecordMain(tableObject.params)
+    download.excel(data, '制品回收记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '制品回收记录主导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductredressRecordMainApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
new file mode 100644
index 000000000..47e4fad1c
--- /dev/null
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
@@ -0,0 +1,446 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ProductredressRecordMainRules = reactive({
+})
+
+export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+  },
+  {
+    label: '明细',
+    field: 'details',
+    sort: 'custom',
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+  },
+  {
+    label: '收货类型',
+    field: 'type',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '创建者Id',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    sort: 'custom',
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '最后更新者用户名',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+
+// 表单校验
+export const ProductredressRecordDetailRules = reactive({
+  productionlineCode: [required],
+  masterId: [required],
+})
+
+export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '生产线代码',
+    field: 'productionlineCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+  },
+  {
+    label: '明细',
+    field: 'backFlushDetails',
+    sort: 'custom',
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '创建者Id',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '最后更新者用户名',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
new file mode 100644
index 000000000..f00d7de53
--- /dev/null
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
@@ -0,0 +1,501 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductredressRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductredressRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductredressRequestMainRules"
+    :formAllSchemas="ProductredressRequestMain.allSchemas"
+    :tableAllSchemas="ProductredressRequestDetail.allSchemas"
+    :tableFormRules="ProductredressRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductredressRequestMainApi.updateProductredressRequestMain"
+    :apiCreate="ProductredressRequestMainApi.createProductredressRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductredressRequestMain.allSchemas"
+    :detailAllSchemas="ProductredressRequestDetail.allSchemas"
+    :detailAllSchemasRules="ProductredressRequestDetailRules"
+    :apiCreate="ProductredressRequestDetailApi.createProductredressRequestDetail"
+    :apiUpdate="ProductredressRequestDetailApi.updateProductredressRequestDetail"
+    :apiPage="ProductredressRequestDetailApi.getProductredressRequestDetailPage"
+    :apiDelete="ProductredressRequestDetailApi.deleteProductredressRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+    :detailValidate="detailValidate"
+  />
+    <!-- bom列表 
+    <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushDetailRequest.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>-->
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productredress-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ProductredressRequestMain,ProductredressRequestMainRules,ProductredressRequestDetail,ProductredressRequestDetailRules } from './productredressRequestMain.data'
+import * as ProductredressRequestMainApi from '@/api/wms/productredressRequestMain'
+import * as ProductredressRequestDetailApi from '@/api/wms/productredressRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'ProductredressRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductredressRequestMain.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      if (formField == 'itemCode') {
+        row['itemCode'] = val[0]['itemCode']
+        row['qty'] = val[0]['qty']
+        row['uom'] = val[0]['uom']
+        row['packingNumber'] = val[0]['packingNumber']
+        row['batch'] = val[0]['batch']
+        row['packQty'] = val[0]['packQty']
+        row['packUnit'] = val[0]['packUnit']
+        row['inventoryStatus'] = val[0]['inventoryStatus']
+      }
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if (formField == 'itemCode') {
+        setV['itemCode'] = val[0]['itemCode']
+        setV['qty'] = val[0]['qty']
+        setV['uom'] = val[0]['uom']
+        setV['packingNumber'] = val[0]['packingNumber']
+        setV['batch'] = val[0]['batch']
+        setV['packQty'] = val[0]['packQty']
+        setV['packUnit'] = val[0]['packUnit']
+        setV['inventoryStatus'] = val[0]['inventoryStatus']
+      }
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductredressRequestMainApi.getProductredressRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productredress-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productredress-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productredress-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+      defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productredress-request-main:close'}), // 关闭
+      defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productredress-request-main:reAdd'}), // 重新添加
+      defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productredress-request-main:submit'}), // 提交审批
+      defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productredress-request-main:refused'}), // 驳回
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productredress-request-main:agree'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productredress-request-main:handle'}), // 处理
+      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productredress-request-main:update'}), // 编辑
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    ProductredressRequestMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    ProductredressRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    ProductredressRequestMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    ProductredressRequestMainApi.refused(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    ProductredressRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  }
+  else if (val == 'mainHandle') { // 处理
+    tableObject.loading = true
+    ProductredressRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 编辑时 车间代码不可修改
+  if (type == 'update') {
+    // 修改 tableform 属性
+    ProductredressRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
+    })
+  } else {
+    // 修改 tableform 属性
+    ProductredressRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestProductreceiptMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductredressRequestMainApi.deleteProductredressRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductredressRequestMainApi.exportProductredressRequestMain(tableObject.params)
+    download.excel(data, '制品回收申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductredressRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  let tfk = JSON.parse(JSON.stringify(tableFormKeys))
+  // tfk.batch = formatTime(new Date(), 'yyyyMMdd')
+  tableData.value.push(tfk)
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  if(data.subList.find(item => (item.qty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      await ProductredressRequestMainApi.createProductredressRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductredressRequestMainApi.updateProductredressRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '制品回收申请导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 查看 Bom 按钮回调事件
+// const tableFormButton = async (val , row) => {
+//   if (val == 'bom') { // 查看 bom
+//     bomModelVisible.value = true
+//     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+//     detatableDataBom.params = {
+//       masterId: row.id
+//     }
+//     await getDetailListBom()
+//   }
+// }
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+// const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+// // 标签打印
+// const handlePoint = async (row) => {
+//   // 查询是否已创建过标签
+//   await PackageApi.getPackagePage({
+//     requestNumber: row.number
+//   }).then((res) => {
+//     if(res.list.length > 0) {
+//       isCreateLabel.value = true
+//       if (res.list[0].productionLineCode != null) {
+//         labelType.value = 'zz'
+//       } else {
+//         labelType.value = 'cg'
+//       }
+//     } else {
+//       isCreateLabel.value = false
+//     }
+//   }).catch(err => {
+//     isCreateLabel.value = false
+//     console.log(err)
+//   })
+//   // 判断是采购还是制造
+//   if (isCreateLabel.value) {
+//     if (labelType.value == 'cg') {
+//       const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+//       window.open(src.value+'&request_number='+row.number)
+//     } else {
+//       const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+//       window.open(src.value+'&request_number='+row.number)
+//     }
+//   } else {
+//     message.warning('请先创建标签')
+//   }
+// }
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductredressRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
new file mode 100644
index 000000000..c49fca4f8
--- /dev/null
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -0,0 +1,595 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+// 表单校验
+export const ProductredressRequestMainRules = reactive({
+  autoCommit: [required],
+  autoAgree: [required],
+  autoExecute: [required],
+  directCreateRecord: [required],
+})
+
+export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  // {
+  //   label: '生产计划单号',
+  //   field: 'productionPlanNumber',
+  //   sort: 'custom',
+  // },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  // {
+  //   label: '车间代码',
+  //   field: 'workshopCode',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '班组',
+  //   field: 'team',
+  //   sort: 'custom',
+  // },
+  // {
+  //   label: '班次',
+  //   field: 'shift',
+  //   sort: 'custom',
+  // },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '入库库存状态范围',
+    field: 'inInventoryStatuses',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '出库库存状态范围',
+    field: 'outInventoryStatuses',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '创建者用户名',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者用户名',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ProductredressRequestDetailRules = reactive({
+})
+
+export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: '生产线代码',
+  //   field: 'productionLineCode',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '工位代码',
+  //   field: 'workStationCode',
+  //   sort: 'custom',
+  // },
+  // {
+  //   label: '目标库位',
+  //   field: 'toLocationCode',
+  //   sort: 'custom',
+  // },
+  // {
+  //   label: '工序代码',
+  //   field: 'processCode',
+  //   sort: 'custom',
+  // },
+
+  // {
+  //   label: '器具号',
+  //   field: 'containerNumber',
+  //   sort: 'custom',
+  // },
+  
+  // {
+  //   label: '生产日期',
+  //   field: 'produceDate',
+  //   sort: 'custom',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false
+  // },
+  // {
+  //   label: '过期日期',
+  //   field: 'expireDate',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false
+  // },
+
+  // {
+  //   label: '订单号',
+  //   field: 'woNumber',
+  //   sort: 'custom',
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'woLine',
+  //   sort: 'custom',
+  // },
+
+  // {
+  //   label: 'BOM版本',
+  //   field: 'bomVersion',
+  //   sort: 'custom',
+  // },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '库存余额信息', // 查询弹窗标题
+        searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+        searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
+        searchCondition:[
+        {
+          key: 'inventoryStatus',
+          value: 'OK',
+          isMainValue: false
+        },{
+          key: 'packingNumber', // 查询列表中字段
+          value: '', // 指查询具体值
+          action: '!=', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '库存余额信息', // 查询弹窗标题
+      searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+      searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
+      searchCondition:[
+      {
+        key: 'inventoryStatus',
+        value: 'OK',
+        isMainValue: false
+      },{
+        key: 'packingNumber', // 查询列表中字段
+        value: '', // 指查询具体值
+        action: '!=', // 查询拼接条件
+        isSearch: true, // 使用自定义拼接条件
+        isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+      }]
+    },
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建者用户名',
+    field: 'creator',
+    sort: 'custom',
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者用户名',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    isTableForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
new file mode 100644
index 000000000..5a9d88c7f
--- /dev/null
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
@@ -0,0 +1,283 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductrepairRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductrepairRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductrepairRecordMainRules"
+    :formAllSchemas="ProductrepairRecordMain.allSchemas"
+    :tableAllSchemas="ProductrepairRecordDetail.allSchemas"
+    :tableFormRules="ProductrepairRecordDetailRules"
+    :isBusiness="true"
+    @buttonOperationClick="buttonOperationClick"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductrepairRecordMain.allSchemas"
+    :detailAllSchemas="ProductrepairRecordDetail.allSchemas"
+    :detailAllSchemasRules="ProductrepairRecordDetailRules"
+    :apiPage="ProductrepairRecordDetailApi.getProductrepairRecordDetailPage"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+
+  <!-- bom列表 -->
+  <Dialog
+    :title="DialogTitle"
+    v-model="bomModelVisible"
+    width="80%"
+    :scroll="true"
+    max-height="450px"
+  >
+    <TableForm
+      ref="tableFormRef"
+      class="w-[100%]"
+      :tableFields="BomDismantle.allSchemas.tableColumns"
+      :tableData="detatableDataBom.tableList"
+      :isShowButton="false"
+      :isShowReduceButton="false"
+    />
+    <template #footer>
+      <ButtonBase :Butttondata="ButttondataBom" @button-base-click="buttonBaseClickBom" />
+    </template>
+  </Dialog>
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductrepairRecordMain,ProductrepairRecordMainRules,ProductrepairRecordDetail,ProductrepairRecordDetailRules, BomDismantle } from './productrepairRecordMain.data'
+import * as ProductrepairRecordMainApi from '@/api/wms/productrepairRecordMain'
+import * as ProductrepairRecordDetailApi from '@/api/wms/productrepairRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as BomDismantleApi from "@/api/wms/bomDismantle";
+import {getBomDismantleRecordPage} from "@/api/wms/bomDismantle";
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 制品返修记录主
+defineOptions({ name: 'ProductrepairRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductrepairRecordMain.allSchemas.tableColumns)
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+  label: 'Bom',
+  name: 'bom',
+  hide: false,
+  type: 'primary',
+  icon: '',
+  color: '',
+  hasPermi: '',
+  link: true, // 文本展现按钮
+}])
+
+// Bom 窗口
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const tableListBom = ref()
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BomDismantleApi.getBomDismantleRecordPage
+})
+
+const { getList:getDetailListBom } = detatableMethodsBom
+
+// 新增 tableform 按钮
+const buttonOperationClick = async (row, label, index)=> {
+  if (row.itemCode == '') {
+    message.warning('请选择物料代码！')
+    return
+  }
+  detatableDataBom.params.itemCode = row.itemCode
+  DialogTitle.value = '物料代码:【' + row.itemCode + '】 Bom 信息'
+  bomModelVisible.value = true
+  await getDetailListBom()
+  detatableDataBom.tableList.map(item => {
+    item.rowId = index
+    if(tableData.value[index].childList) {
+      tableData.value[index].childList.forEach(itemChild => {
+        if (itemChild.itemCode == item.itemCode) {
+          item.qty = itemChild.qty
+        }
+      })
+    }
+  })
+}
+
+/** bom 列表 表单 按钮 */
+const ButttondataBom = [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+]
+// bom 列表 表单 按钮
+const buttonBaseClickBom = (val) => {
+  // 保存
+  if (val == 'save') {
+    // 根据 填写的数量 为基准 不填写数量的忽略
+    tableListBom.value = detatableDataBom.tableList.filter(item => (item.qty!=0))
+    tableData.value.forEach((item, index) => {
+      if(tableListBom.value[0].rowId == index) {
+        item.childList = tableListBom.value
+      }
+    })
+    console.log(157, tableData.value)
+    bomModelVisible.value = false
+  }
+  // 关闭
+  else if (val == 'close') {
+    bomModelVisible.value = false
+  }
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductrepairRecordMainApi.getProductrepairRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productrepair-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordProductrepairMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductrepairRecordMainApi.exportProductrepairRecordMain(tableObject.params)
+    download.excel(data, '制品返修记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
new file mode 100644
index 000000000..19d07630a
--- /dev/null
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
@@ -0,0 +1,854 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import {Bom} from "@/views/wms/basicDataManage/itemManage/bom/bom.data";
+import * as BomApi from "@/api/wms/bom";
+
+/**
+ * @returns {Array} 制品返修记录主表
+ */
+export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductrepairRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品返修记录子表
+ */
+export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show:false
+    },
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '成品库位代码',
+    field: 'fgFromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm: true,
+    tableForm: {
+      type: 'action',
+      buttonText: 'Bom',
+      buttonName: 'Bom'
+    }
+  },
+]))
+
+//表单校验
+export const ProductrepairRecordDetailRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} bom 拆解
+ */
+export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '行标记',
+    field: 'rowId',
+    isTableForm: false,
+    isForm: false,
+    tableForm:{
+      disabled: true
+    },
+    table: {
+      show: false
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    tableForm:{
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  }
+]))
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
new file mode 100644
index 000000000..c4964c0bc
--- /dev/null
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -0,0 +1,685 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductrepairRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductrepairRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductrepairRequestMainRules"
+    :formAllSchemas="ProductrepairRequestMain.allSchemas"
+    :tableAllSchemas="ProductrepairRequestDetaila.allSchemas"
+    :tableFormRules="ProductrepairRequestDetailaRules"
+    :tableData="tableData"
+    :apiUpdate="ProductrepairRequestMainApi.updateProductrepairRequestMain"
+    :apiCreate="ProductrepairRequestMainApi.createProductrepairRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @buttonOperationClick="buttonOperationClick"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductrepairRequestMain.allSchemas"
+    :detailAllSchemas="ProductrepairRequestDetaila.allSchemas"
+    :detailAllSchemasRules="ProductrepairRequestDetailaRules"
+    :apiCreate="ProductrepairRequestDetailApi.createProductrepairRequestDetaila"
+    :apiUpdate="ProductrepairRequestDetailApi.updateProductrepairRequestDetaila"
+    :apiPage="ProductrepairRequestDetailApi.getProductrepairRequestDetailaPage"
+    :apiDelete="ProductrepairRequestDetailApi.deleteProductrepairRequestDetaila"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+    :detailValidate="detailValidate"
+  />
+
+  <!-- bom列表 -->
+  <Dialog
+    :title="DialogTitle"
+    v-model="bomModelVisible"
+    width="80%"
+    :scroll="true"
+    max-height="450px"
+  >
+      <TableForm
+        ref="tableFormRef"
+        class="w-[100%]"
+        :tableFields="BomDismantle.allSchemas.tableColumns"
+        :tableData="detatableDataBom.tableList"
+        :tableFormRules="ProductrepairBomDismantleRules"
+        :isShowButton="false"
+        :isShowReduceButton="false"
+      />
+    <template #footer>
+      <ButtonBase :Butttondata="ButttondataBom" @button-base-click="buttonBaseClickBom" />
+    </template>
+  </Dialog>
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productrepair-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ProductrepairRequestMain,ProductrepairRequestMainRules,ProductrepairRequestDetaila,ProductrepairRequestDetailaRules, ConsumereRequestDetailb, BomDismantle,ProductrepairBomDismantleRules } from './productrepairRequestMain.data'
+import * as ProductrepairRequestMainApi from '@/api/wms/productrepairRequestMain'
+import * as ProductrepairRequestDetailApi from '@/api/wms/productrepairRequestDetaila'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as BomDismantleApi from '@/api/wms/bomDismantle'
+import * as dismantleRequestDetailbApi from "@/api/wms/dismantleRequestDetailb";
+import {updateProductscrapDetailRequestBom} from "@/api/wms/productrepairRequestMain";
+
+
+// 制品返修申请
+defineOptions({ name: 'ProductrepairRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductrepairRequestMain.allSchemas.tableColumns)
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+  label: 'Bom',
+  name: 'bom',
+  hide: false,
+  type: 'primary',
+  icon: '',
+  color: '',
+  hasPermi: '',
+  link: true, // 文本展现按钮
+}])
+
+// Bom 窗口
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const tableListBom = ref()
+const lsBomSave = ref()
+const detailQty = ref()
+const rowId = ref()
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BomDismantleApi.getBomDismantlePage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+/** bom 列表 表单 按钮 */
+
+const ButttondataBom = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// bom 列表 表单 按钮
+const buttonBaseClickBom = (val) => {
+  // 保存
+  if (val == 'save') {
+    // 根据 填写的数量 为基准 不填写数量的忽略
+    let flag = false;
+    let bomQty = 0;
+    detatableDataBom.tableList.forEach((item) => {
+       if(item.qty!=0 && (item.bomQty * detailQty.value < item.qty)){
+        flag = true;
+        bomQty = item.bomQty * detailQty.value;
+        return;
+      }
+    })
+    if(flag){
+      message.warning('数量需要小于'+bomQty+'(子表数量乘以Bom数量的值)！')
+      return
+    }
+    tableListBom.value = detatableDataBom.tableList.filter(item => (item.qty!=0 && (item.bomQty * detailQty.value >= item.qty)))
+    if(lsBomSave.value){
+      tableData.value.forEach((item, index) => {
+        if(tableListBom.value[0].rowId == index) {
+          item.childList = tableListBom.value
+        }
+      })
+    }else {
+      if(tableListBom.value.length > 0){
+         // 详情下的 bom编辑功能 调用接口 保存数据
+        ProductrepairRequestMainApi.updateProductscrapDetailRequestBom(rowId.value, tableListBom.value)
+        message.success(t('common.updateSuccess'))
+      }else{
+        message.warning('数量不能为0！')
+        return
+      }
+    }
+    bomModelVisible.value = false
+  }
+  // 关闭
+  else if (val == 'close') {
+    bomModelVisible.value = false
+  }
+}
+// 新增 tableform 按钮
+const buttonOperationClick = async (row, label, index)=> {
+  if (row.itemCode == '') {
+    message.warning('请选择物料代码！')
+    return
+  }
+  detatableDataBom.params.itemCode = row.itemCode
+  detatableDataBom.params.bomVersion = row.bomVersion
+  DialogTitle.value = '物料代码:【' + row.itemCode + '】 Bom 信息'
+  detailQty.value = row.qty
+  bomModelVisible.value = true
+  await getDetailListBom()
+  detatableDataBom.tableList.map(item => {
+    item.rowId = index
+    if(tableData.value[index].childList > 0) {
+      tableData.value[index].childList.forEach(itemChild => {
+        if (itemChild.itemCode == item.itemCode) {
+          item.qty = itemChild.qty
+        }
+      })
+    }else {
+      item.qty = item.bomQty * row.qty
+    }
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if(formField == 'packingNumber'){
+        row['containerNumber'] = val[0]['containerNumber']
+        row['itemCode'] = val[0]['itemCode']
+        row['packingNumber'] = val[0]['packingNumber']
+        row['batch'] = val[0]['batch']
+        row['uom'] = val[0]['uom']
+        row['inventoryStatus'] = val[0]['inventoryStatus']
+        row['fgFromLocationCode'] = val[0]['locationCode']
+        row['bomVersion'] = ''
+        row['childList'] = []
+      } else if(formField == 'productionLineCode'){
+        row['productionLineCode'] = val[0]['code']
+      } else if(formField == 'workStationCode'){
+        row['fromLocationCode'] = val[0]['rawLocationCode']
+        row['workStationCode'] = val[0]['code']
+      } else if(formField == 'formField'){
+        row['workStationCode'] = val[0]['code']
+      } else if(formField == 'bomVersion'){
+        row['bomVersion'] = val[0]['version']
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if(formField == 'packingNumber'){
+      setV['containerNumber'] = val[0]['containerNumber']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['packingNumber'] = val[0]['packingNumber']
+      setV['batch'] = val[0]['batch']
+      setV['uom'] = val[0]['uom']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
+      setV['fgFromLocationCode'] = val[0]['locationCode']
+      // setV['fromLocationCode'] = val[0]['locationCode']
+      setV['bomVersion'] = ''
+      setV['childList'] = []
+    } else if(formField == 'productionLineCode'){
+      setV['productionLineCode'] = val[0]['code']
+    } else if(formField == 'workStationCode'){
+      setV['fromLocationCode'] = val[0]['rawLocationCode']
+      setV['workStationCode'] = val[0]['code']
+    } else if(formField == 'formField'){
+      setV['workStationCode'] = val[0]['code']
+    } else if(formField == 'bomVersion'){
+      setV['bomVersion'] = val[0]['version']
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductrepairRequestMainApi.getProductrepairRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productrepair-request-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:productrepair-request-main:import'}), // 导入 暂时不做主子子表结构
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productrepair-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+      defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productrepair-request-main:close'}), // 关闭
+      defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productrepair-request-main:reAdd'}), // 重新添加
+      defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productrepair-request-main:submit'}), // 提交审批
+      defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productrepair-request-main:refused'}), // 驳回
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productrepair-request-main:handle'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productrepair-request-main:update'}), // 处理
+      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productrepair-request-main:update'}), // 编辑
+      // defaultButtons.mainListDeleteBtn({hasPermi:'wms:issue-request-main:delete'}), // 删除
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
+  } else if (val == 'mainReAdd') { // 重新添加
+    console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
+  } else if (val == 'mainSubmit') { // 提交审批
+    console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
+  } else if (val == 'mainTurnDown') { // 驳回
+    console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
+  } else if (val == 'mainApprove') { // 审批通过
+    console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    console.log('列表-操作按钮事件-处理')
+    handleHandle(row.id)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await ProductrepairRequestMainApi.closeProductrepairRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await ProductrepairRequestMainApi.reAddProductrepairRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await ProductrepairRequestMainApi.submitProductrepairRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await ProductrepairRequestMainApi.refusedProductrepairRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await ProductrepairRequestMainApi.agreeProductrepairRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await ProductrepairRequestMainApi.handleProductrepairRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  detatableDataBom.params = []; // 重置Bom请求参数
+  lsBomSave.value = true
+  mainStatus.value = '1'
+  ButttondataBom.value = [
+    defaultButtons.formSaveBtn({ hide : mainStatus.value != 1 }), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+  if(type == 'create'){
+    ProductrepairRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'workshopCode') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = true
+      }
+    })
+  }
+  if(type == 'update'){
+    ProductrepairRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'workshopCode') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = false
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const mainStatus = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  mainStatus.value = row.status;
+  console.log("mainStatus.value：",mainStatus.value)
+  // 弹窗按钮是否展示控制
+  ButttondataBom.value = [
+    defaultButtons.formSaveBtn({ hide : mainStatus.value != 1 }), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+  lsBomSave.value = false
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestProductrepairMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductrepairRequestMainApi.deleteProductrepairRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductrepairRequestMainApi.exportProductrepairRequestMain(tableObject.params)
+    download.excel(data, '制品返修申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductrepairRequestDetaila.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  if(formRef.value.formRef.formModel.workshopCode === ''){
+    message.warning("请选择车间代码");
+    return;
+  }
+
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  // 判断 bom 是否添加
+  let childListRs = true
+  // 根据 填写的数量 为基准 不填写数量的忽略
+  tableData.value.forEach((item) => {
+    if (!item.childList) {
+      childListRs = false
+    }
+  })
+  if (!childListRs) {
+    message.warning('请填写Bom信息！')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      if(data.subList.length == 0){
+        message.warning("请添加子列表数据")
+        return;
+      }
+      let flag = false;
+      data.subList.forEach((item) => {
+        if(item.qty == 0){
+          message.warning("数量不能为0")
+          flag = true;
+          return;
+        }
+      })
+      if(flag){
+        formRef.value.formLoading = false
+        return
+      }
+      await ProductrepairRequestMainApi.createProductrepairRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductrepairRequestMainApi.updateProductrepairRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '制品返修申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+       itemCode: row.itemCode,
+       bomVersion: row.bomVersion,
+       masterId: row.id
+    }
+    detailQty.value = row.qty
+    rowId.value =  row.id
+    await getDetailListBom()
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductrepairRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
new file mode 100644
index 000000000..539b14b05
--- /dev/null
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -0,0 +1,1343 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as WorkstationApi from '@/api/wms/workstation'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+
+import * as ProcessApi from '@/api/wms/process'
+import { Process } from '@/views/wms/basicDataManage/factoryModeling/process/process.data'
+
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+import {Bom} from "@/views/wms/basicDataManage/itemManage/bom/bom.data";
+import * as BomApi from "@/api/wms/bom";
+import {getBalanceItemPage} from "@/api/wms/balance";
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductRepairRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 制品返修申请主表
+ */
+export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductRepair',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductrepairRequestMainRules = reactive({
+  workshopCode: [
+    { required: true, message: '请选择车间代码', trigger: 'change' }
+  ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品返修申请子表
+ */
+export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show: false
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '返修生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '生产线信息', // 查询弹窗标题
+      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '返修工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '工位信息', // 查询弹窗标题
+      searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+      searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: 'Bom来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工序代码',
+      searchField: 'code',
+      searchTitle: '工序信息',
+      searchAllSchemas: Process.allSchemas,
+      searchPage: ProcessApi.getProcessPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择工序代码',
+        searchField: 'code',
+        searchTitle: '工序信息',
+        searchAllSchemas: Process.allSchemas,
+        searchPage: ProcessApi.getProcessPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalanceItemPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalanceItemPage
+      }
+    }
+  },
+  {
+    label: '成品库位代码',
+    field: 'fgFromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    }
+  },
+
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+    tableForm: {
+      type: 'action',
+      buttonText: 'Bom',
+      buttonName: 'Bom'
+    }
+  }
+]))
+
+//表单校验
+export const ProductrepairRequestDetailaRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请输入库存状态', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  bomVersion: [
+    { required: true, message: '请选择Bom版本', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品返修申请子表
+ */
+export const ConsumereRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
+]))
+
+
+/**
+ * @returns {Array} bom 拆解
+ */
+export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '行标记',
+    field: 'rowId',
+    isTableForm: false,
+    isForm: false,
+    tableForm:{
+      disabled: true
+    },
+    table: {
+      show: false
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: 'Bom数量',
+    field: 'bomQty',
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    tableForm:{
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  }
+]))
+
+//表单校验
+export const ProductrepairBomDismantleRules = reactive({
+  qty: [
+    { required: true, message: '请选择生产线代码', trigger: 'change'}
+  ]
+})
diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
new file mode 100644
index 000000000..197bf7cf8
--- /dev/null
+++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
@@ -0,0 +1,241 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductscrapJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductscrapJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductscrapJobMainRules"
+    :formAllSchemas="ProductscrapJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ProductscrapJobDetail.allSchemas"
+    :tableFormRules="ProductscrapJobDetailRules"
+    :apiUpdate="ProductscrapJobMainApi.updateProductscrapJobMain"
+    :apiCreate="ProductscrapJobMainApi.createProductscrapJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductscrapJobMain.allSchemas"
+    :detailAllSchemas="ProductscrapJobDetail.allSchemas"
+    :detailAllSchemasRules="ProductscrapJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="ProductscrapJobDetailApi.getProductscrapJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductscrapJobMain,ProductscrapJobMainRules,ProductscrapJobDetail,ProductscrapJobDetailRules } from './productscrapJobMain.data'
+import * as ProductscrapJobMainApi from '@/api/wms/productscrapJobMain'
+import * as ProductscrapJobDetailApi from '@/api/wms/productscrapJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 制品报废任务主
+defineOptions({ name: 'ProductscrapJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductscrapJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductscrapJobMainApi.getProductscrapJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productscrap-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+  } else if (val == 'mainJobClo') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobProductscrapMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductscrapJobMainApi.exportProductscrapJobMain(tableObject.params)
+    download.excel(data, '制品报废任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
new file mode 100644
index 000000000..ad21962a7
--- /dev/null
+++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
@@ -0,0 +1,757 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品报废任务主表
+ */
+export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    form: {
+      component: 'InputNumber',
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    form: {
+      component: 'InputNumber',
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductscrapJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品报废任务子表
+ */
+export const ProductscrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.SCRAP_REASON,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+]))
+
+//表单校验
+export const ProductscrapJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
new file mode 100644
index 000000000..6b16ba8f9
--- /dev/null
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
@@ -0,0 +1,282 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductscrapRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductscrapRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductscrapRecordMainRules"
+    :formAllSchemas="ProductscrapRecordMain.allSchemas"
+    :tableAllSchemas="ProductscrapRecordDetail.allSchemas"
+    :tableFormRules="ProductscrapRecordDetailRules"
+    :isBusiness="true"
+    @buttonOperationClick="buttonOperationClick"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductscrapRecordMain.allSchemas"
+    :detailAllSchemas="ProductscrapRecordDetail.allSchemas"
+    :detailAllSchemasRules="ProductscrapRecordDetailRules"
+    :apiPage="ProductscrapRecordDetailApi.getProductscrapRecordDetailPage"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- bom列表 -->
+  <Dialog
+    :title="DialogTitle"
+    v-model="bomModelVisible"
+    width="80%"
+    :scroll="true"
+    max-height="450px"
+  >
+    <TableForm
+      ref="tableFormRef"
+      class="w-[100%]"
+      :tableFields="ProdcutscrapRecordBomDismantle.allSchemas.tableColumns"
+      :tableData="detatableDataBom.tableList"
+      :isShowButton="false"
+      :isShowReduceButton="false"
+    />
+    <template #footer>
+      <ButtonBase :Butttondata="ButttondataBom" @button-base-click="buttonBaseClickBom" />
+    </template>
+  </Dialog>
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductscrapRecordMain,ProductscrapRecordMainRules,ProductscrapRecordDetail,ProductscrapRecordDetailRules,ProdcutscrapRecordBomDismantle } from './productscrapRecordMain.data'
+import * as ProductscrapRecordMainApi from '@/api/wms/productscrapRecordMain'
+import * as ProductscrapRecordDetailApi from '@/api/wms/productscrapRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as BomDismantleApi from "@/api/wms/bomDismantle";
+import {getProductscrapBomDismantleRecordPage} from "@/api/wms/bomDismantle";
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 制品报废记录主
+defineOptions({ name: 'ProductscrapRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductscrapRecordMain.allSchemas.tableColumns)
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+  label: 'Bom',
+  name: 'bom',
+  hide: false,
+  type: 'primary',
+  icon: '',
+  color: '',
+  hasPermi: '',
+  link: true, // 文本展现按钮
+}])
+
+// Bom 窗口
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const tableListBom = ref()
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BomDismantleApi.getProductscrapBomDismantleRecordPage
+})
+
+const { getList:getDetailListBom } = detatableMethodsBom
+
+// 新增 tableform 按钮
+const buttonOperationClick = async (row, label, index)=> {
+  if (row.itemCode == '') {
+    message.warning('请选择物料代码！')
+    return
+  }
+  detatableDataBom.params.itemCode = row.itemCode
+  DialogTitle.value = '物料代码:【' + row.itemCode + '】 Bom 信息'
+  bomModelVisible.value = true
+  await getDetailListBom()
+  detatableDataBom.tableList.map(item => {
+    item.rowId = index
+    if(tableData.value[index].childList) {
+      tableData.value[index].childList.forEach(itemChild => {
+        if (itemChild.itemCode == item.itemCode) {
+          item.qty = itemChild.qty
+        }
+      })
+    }
+  })
+}
+
+/** bom 列表 表单 按钮 */
+const ButttondataBom = [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+]
+// bom 列表 表单 按钮
+const buttonBaseClickBom = (val) => {
+  // 保存
+  if (val == 'save') {
+    // 根据 填写的数量 为基准 不填写数量的忽略
+    tableListBom.value = detatableDataBom.tableList.filter(item => (item.qty!=0))
+    tableData.value.forEach((item, index) => {
+      if(tableListBom.value[0].rowId == index) {
+        item.childList = tableListBom.value
+      }
+    })
+    console.log(157, tableData.value)
+    bomModelVisible.value = false
+  }
+  // 关闭
+  else if (val == 'close') {
+    bomModelVisible.value = false
+  }
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductscrapRecordMainApi.getProductscrapRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productscrap-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordProductscrapMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductscrapRecordMainApi.exportProductscrapRecordMain(tableObject.params)
+    download.excel(data, '制品报废记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
new file mode 100644
index 000000000..5fddad79c
--- /dev/null
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -0,0 +1,811 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
+import * as WorkshopApi from "@/api/wms/workshop";
+import {Team} from "@/views/wms/basicDataManage/orderManage/team/team.data";
+import * as TeamApi from "@/api/wms/team";
+import {Shift} from "@/views/wms/basicDataManage/orderManage/shift/shift.data";
+import * as ShiftApi from "@/api/wms/shift";
+import {
+  Productionline
+} from "@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data";
+import * as ProductionlineApi from "@/api/wms/productionline";
+import {
+  Workstation
+} from "@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data";
+import * as WorkstationApi from "@/api/wms/workstation";
+import {Process} from "@/views/wms/basicDataManage/factoryModeling/process/process.data";
+import * as ProcessApi from "@/api/wms/process";
+import {
+  Productionlineitem
+} from "@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data";
+import * as ProductionlineitemApi from "@/api/wms/productionlineitem";
+
+/**
+ * @returns {Array} 制品报废记录主表
+ */
+export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+      show:false
+    },
+    isSearch: true
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show: false
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductscrapRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品报废记录子表
+ */
+export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show: false
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show: false
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show: false
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show: false
+    },
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '来源工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.SCRAP_REASON,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm: true,
+    tableForm: {
+      type: 'action',
+      buttonText: 'Bom',
+      buttonName: 'Bom'
+    }
+  },
+]))
+
+//表单校验
+export const ProductscrapRecordDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} bom 拆解 record记录页面
+ */
+export const ProdcutscrapRecordBomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '行标记',
+    field: 'rowId',
+    isTableForm: false,
+    isForm: false,
+    tableForm:{
+      disabled: true
+    },
+    table: {
+      show: false
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    tableForm:{
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  }
+]))
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
new file mode 100644
index 000000000..94a03692a
--- /dev/null
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -0,0 +1,739 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductscrapRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductscrapRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductscrapRequestMainRules"
+    :formAllSchemas="ProductscrapRequestMain.allSchemas"
+    :tableAllSchemas="ProductscrapRequestDetail.allSchemas"
+    :tableFormRules="ProductscrapRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductscrapRequestMainApi.updateProductscrapRequestMain"
+    :apiCreate="ProductscrapRequestMainApi.createProductscrapRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @inputNumberChange="inputNumberChange"
+    @submitForm="submitForm"
+    @buttonOperationClick="buttonOperationClick"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductscrapRequestMain.allSchemas"
+    :detailAllSchemas="ProductscrapRequestDetail.allSchemas"
+    :detailAllSchemasRules="ProductscrapRequestDetailRules"
+    :apiCreate="ProductscrapRequestDetailApi.createProductscrapRequestDetail"
+    :apiUpdate="ProductscrapRequestDetailApi.updateProductscrapRequestDetail"
+    :apiPage="ProductscrapRequestDetailApi.getProductscrapRequestDetailPage"
+    :apiDelete="ProductscrapRequestDetailApi.deleteProductscrapRequestDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @detailBasicFormOnChange="qtyOnChange"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+    :detailValidate="detailValidate"
+  />
+
+ <!-- BOM弹窗列表 -->
+ <BasicForm
+    ref="detailBomRef"
+    @success="getList"
+    :tableAllSchemas="ProdcutscrapBomScrap.allSchemas"
+    :tableFormRules="ProdcutscrapBomScrapRules"
+    :tableData="detatableDataBom.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="true"
+    :Butttondata="ButttondataBom"
+    @searchTableSuccess="searchTableBomSuccess"
+    :footButttondata="footButttondata"
+    @footButtonClick="buttonBaseClickBom"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productscrap-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ProductscrapRequestMain,
+  ProductscrapRequestMainRules,
+  ProductscrapRequestDetail,
+  ProductscrapRequestDetailRules,
+  ProdcutscrapBomScrap,
+  ProdcutscrapBomScrapRules } from './productscrapRequestMain.data'
+import * as ProductscrapRequestMainApi from '@/api/wms/productscrapRequestMain'
+import * as ProductscrapRequestDetailApi from '@/api/wms/productscrapRequestDetail'
+import * as StdcostpriceApi from '@/api/wms/stdcostprice'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as BomDismantleApi from "@/api/wms/bomDismantle"
+
+// 制品报废申请
+defineOptions({ name: 'ProductscrapRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductscrapRequestMain.allSchemas.tableColumns)
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+  label: 'Bom',
+  name: 'bom',
+  hide: false,
+  type: 'primary',
+  icon: '',
+  color: '',
+  hasPermi: '',
+  link: true, // 文本展现按钮
+}])
+
+// Bom 窗口
+
+const bomModelVisible = ref(false)
+const tableListBom = ref()
+const lsBomSave = ref()
+const rowId = ref()
+const detailQty = ref()
+const footButttondata = ref([
+  defaultButtons.formSaveBtn(null), // BOM保存
+  defaultButtons.formCloseBtn(null) // BOM关闭
+])
+// 子包装数据
+const detailBomRef = ref()
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BomDismantleApi.getProductscrapBomDismantlePage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+/** bom 列表 表单 按钮 */
+const ButttondataBom = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// bom 列表 表单 按钮
+const buttonBaseClickBom = (val) => {
+  // 保存
+  if (val == 'save') {
+    // 根据 填写的数量 为基准 不填写数量的忽略
+    let flag = false;
+    let bomQty = 0;
+    detatableDataBom.tableList.forEach((item) => {
+      if(item.qty!=0 && (item.bomQty * detailQty.value < item.qty)){
+        flag = true;
+        bomQty = item.bomQty * detailQty.value;
+        return;
+      }
+    })
+    if(flag){
+      message.warning('数量需要小于'+bomQty+'(子表数量乘以Bom数量的值)！')
+      return
+    }
+    tableListBom.value = detatableDataBom.tableList.filter(item => (item.qty!=0 && (item.bomQty * detailQty.value >= item.qty)))
+    console.log("tableListBom",tableListBom.value)
+    console.log("lsBomSave",lsBomSave.value)
+    if (lsBomSave.value) {
+
+      tableData.value.forEach((item, index) => {
+        if(tableListBom.value[0].rowId == index) {
+          item.childList = tableListBom.value
+        }
+      })
+    }else {
+      if(tableListBom.value.length > 0){
+        // 更新操作
+        // 详情下的 bom编辑功能 调用接口 保存数据
+        ProductscrapRequestMainApi.updateProductscrapDetailRequestBom(rowId.value, tableListBom.value)
+        message.success(t('common.updateSuccess'))
+      }else{
+        message.warning('数量不能为0！')
+        return
+      }
+    }
+    detailBomRef.value.dialogVisible = false
+  }
+  // 关闭
+  else if (val == 'close') {
+    detailBomRef.value.dialogVisible = false
+  }
+}
+// 新增 tableform 按钮
+const buttonOperationClick = async (row, label, index)=> {
+  if (row.itemCode == '') {
+    message.warning('请选择物料代码！')
+    return
+  }
+  if(row.qty <= 0){
+    message.warning('数量需要大于0！')
+    return
+  }
+  detatableDataBom.params.itemCode = row.itemCode
+  detatableDataBom.params.bomVersion =  row.bomVersion
+  detailQty.value = row.qty
+  bomModelVisible.value = true
+  await getDetailListBom()
+  console.log(row.fromLocationCode);
+  detatableDataBom.tableList.forEach(item => {
+    ProdcutscrapBomScrap.allSchemas.tableFormColumns.map((bomItem) => {
+      if (bomItem.field == 'batch') {
+        let condition = [{
+          key:'location_code',
+          action: '==',
+          value: row.fromLocationCode,
+          isSearch: true,
+          isMainValue:false
+        },{
+          key:'item_code',
+          action: '==',
+          value:item.itemCode,
+          isSearch: true,
+          isMainValue: false
+        }]
+        bomItem.tableForm.searchCondition = condition
+      }
+    })
+    item.rowId = index
+    if(tableData.value[index].childList.length > 0) {
+      tableData.value[index].childList.forEach(itemChild => {
+        if (itemChild.itemCode == item.itemCode) {
+          item.qty = itemChild.qty
+        }
+      })
+    }else {
+      item.qty = item.bomQty * row.qty
+    }
+  })
+  detailBomRef.value.open('create', row, null,'viewDetail')//查看明细数据
+}
+
+// 查询页面返回
+const searchTableBomSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if (formField == 'batch') {
+        row['batch'] = val[0]['batch']
+        row['packingNumber'] = val[0]['packingNumber']
+      }
+    } 
+  })
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    detatableDataBom.params = {
+      itemCode: row.itemCode,
+      bomVersion: row.bomVersion,
+      masterId: row.id
+    }
+    rowId.value =  row.id
+    detailQty.value = row.qty
+    await getDetailListBom()
+    detailBomRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if(formField == 'productionLineCode'){
+        row['productionLineCode'] = val[0]['code']
+      }else if(formField == 'workStationCode'){
+        row['workStationCode'] = val[0]['code']
+        row['fromLocationCode'] = val[0]['rawLocationCode']
+      }else if(formField == 'processCode'){
+        row['processCode'] = val[0]['code']
+      }else if(formField == 'itemCode'){
+        row['itemCode'] = val[0]['itemCode']
+        row['bomVersion'] = ''
+        row['childList'] = []
+        // 查询标准价格
+        let param = {'itemCode':val[0]['itemCode'] as string}
+        StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
+          console.log(res)
+          row['uom'] = res.uom
+          row['singlePrice'] = res.price
+        })
+      }else if(formField == 'bomVersion'){
+        row['bomVersion'] = val[0]['version']
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    console.log("formField=="+formField+",val=="+val)
+    // 明细查询页赋值
+    if(formField == 'productionLineCode'){
+      setV['productionLineCode'] = val[0]['code']
+    }else if(formField == 'workStationCode'){
+      setV['workStationCode'] = val[0]['code']
+      setV['fromLocationCode'] = val[0]['fgLocationCode']
+    }else if(formField == 'processCode'){
+      setV['processCode'] = val[0]['code']
+    }else if(formField == 'itemCode'){
+      setV['itemCode'] = val[0]['itemCode']
+      setV['bomVersion'] = ''
+      setV['childList'] = []
+      // 查询标准价格
+      let param = {'itemCode':val[0]['itemCode'] as string}
+      StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
+        console.log(res)
+      })
+    }else if(formField == 'bomVersion'){
+      setV['bomVersion'] = val[0]['version']
+    }
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductscrapRequestMainApi.getProductscrapRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productscrap-request-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:productscrap-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productscrap-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:productscrap-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:productscrap-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:productscrap-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:productscrap-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:productscrap-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:productscrap-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:productscrap-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productscrap-request-main:delete'}), // 删除
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
+  } else if (val == 'mainReAdd') { // 重新添加
+    console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
+  } else if (val == 'mainSubmit') { // 提交审批
+    console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
+  } else if (val == 'mainTurnDown') { // 驳回
+    console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
+  } else if (val == 'mainApprove') { // 审批通过
+    console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    console.log('列表-操作按钮事件-处理')
+    handleHandle(row.id)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await ProductscrapRequestMainApi.closeProductscrapRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await ProductscrapRequestMainApi.reAddProductscrapRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await ProductscrapRequestMainApi.submitProductscrapRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await ProductscrapRequestMainApi.refusedProductscrapRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await ProductscrapRequestMainApi.agreeProductscrapRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await ProductscrapRequestMainApi.handleProductscrapRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  detatableDataBom.params = []; // 重置Bom请求参数
+  lsBomSave.value = true
+  mainStatus.value = '1'
+  ButttondataBom.value = [
+    defaultButtons.formSaveBtn({ hide : mainStatus.value != 1 }), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+  if(type == 'create'){
+    ProductscrapRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'workshopCode') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = true
+      }
+    })
+  }
+  if(type == 'update'){
+    ProductscrapRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'workshopCode') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = false
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const mainStatus = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  lsBomSave.value = false
+  mainStatus.value = row.status;
+  console.log("mainStatus.value：",mainStatus.value)
+  ButttondataBom.value = [
+    defaultButtons.formSaveBtn({ hide : mainStatus.value != 1 }), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestProductscrapMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductscrapRequestMainApi.deleteProductscrapRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductscrapRequestMainApi.exportProductscrapRequestMain(tableObject.params)
+    download.excel(data, '制品报废申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductscrapRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  // 判断 bom 是否添加
+  let childListRs = true
+  // 根据 填写的数量 为基准 不填写数量的忽略
+  tableData.value.forEach((item) => {
+    if (!item.childList) {
+      childListRs = false
+    }
+  })
+  if (!childListRs) {
+    message.warning('请填写Bom信息！')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      if(data.subList.length == 0){
+        message.warning("请添加子列表数据")
+        return;
+      }
+      let flag = false;
+      data.subList.forEach((item) => {
+        if(item.qty == 0){
+          message.warning("数量不能为0")
+          flag = true;
+          return;
+        }
+      })
+      if(flag){
+        formRef.value.formLoading = false
+        return
+      }
+      await ProductscrapRequestMainApi.createProductscrapRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductscrapRequestMainApi.updateProductscrapRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+const inputNumberChange = (field, index, row, val) => {
+  if(field == 'qty' || field == 'singlePrice'){
+    row.amount = row.qty * row.singlePrice
+  }
+}
+
+const qtyOnChange = (field,val) =>{
+  if(field == 'qty' || field == 'singlePrice'){
+    detailRef.value.formRef.formRef.formModel.amount = detailRef.value.formRef.formRef.formModel.qty * detailRef.value.formRef.formRef.formModel.singlePrice
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '制品报废申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductscrapRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
new file mode 100644
index 000000000..a59b9e10a
--- /dev/null
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -0,0 +1,1234 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
+import * as WorkshopApi from "@/api/wms/workshop";
+import {Team} from "@/views/wms/basicDataManage/orderManage/team/team.data";
+import * as TeamApi from "@/api/wms/team";
+import {Shift} from "@/views/wms/basicDataManage/orderManage/shift/shift.data";
+import * as ShiftApi from "@/api/wms/shift";
+import {
+  Productionline
+} from "@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data";
+import * as ProductionlineApi from "@/api/wms/productionline";
+import {
+  Workstation
+} from "@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data";
+import * as WorkstationApi from "@/api/wms/workstation";
+import {Process} from "@/views/wms/basicDataManage/factoryModeling/process/process.data";
+import * as ProcessApi from "@/api/wms/process";
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+import {Bom} from "@/views/wms/basicDataManage/itemManage/bom/bom.data";
+import * as BomApi from "@/api/wms/bom";
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductScrapRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+
+/**
+ * @returns {Array} 制品报废申请主表
+ */
+export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show: false
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductScrap',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductscrapRequestMainRules = reactive({
+  workshopCode: [
+    { required: true, message: '请选择车间代码', trigger: 'change' }
+  ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品报废申请子表
+ */
+export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show: false
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '生产线信息', // 查询弹窗标题
+      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '来源工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '工位信息', // 查询弹窗标题
+      searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+      searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工序代码',
+      searchField: 'code',
+      searchTitle: '工序信息',
+      searchAllSchemas: Process.allSchemas,
+      searchPage: ProcessApi.getProcessPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择工序代码',
+        searchField: 'code',
+        searchTitle: '工序信息',
+        searchAllSchemas: Process.allSchemas,
+        searchPage: ProcessApi.getProcessPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '生产线物料关系信息', // 查询弹窗标题
+        searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productionLineCode',
+        value:'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }],
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show: false
+    },
+    isTable: false,
+    isTableForm: false,
+    isForm: false,
+    tableForm:{
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalancePage
+      }
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show: false
+    },
+    isTable: false,
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show: false
+    },
+    isTable: false,
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    isTable: false,
+    isTableForm: false,
+    table: {
+      width: 150,
+      show: false
+    },
+    isForm: false,
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.SCRAP_REASON,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      disabled:true,
+      min: 0,
+      precision: 6,
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    tableForm: {
+      type: 'action',
+      buttonText: 'Bom',
+      buttonName: 'Bom'
+    }
+  },
+]))
+
+//表单校验
+export const ProductscrapRequestDetailRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  workStationCode: [
+    { required: true, message: '请选择工位代码', trigger: 'change' }
+  ],
+  processCode: [
+    { required: true, message: '请选择工序代码', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  bomVersion: [
+    { required: true, message: '请选择Bom版本', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} bom 拆解
+ */
+export const ProdcutscrapBomScrap = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '行标记',
+    field: 'rowId',
+    isTableForm: false,
+    isForm: false,
+    tableForm:{
+      disabled: true
+    },
+    table: {
+      show: false
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: 'Bom数量',
+    field: 'bomQty',
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择批次',
+      searchField: 'batch',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePage,
+    }
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    tableForm:{
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  }
+]))
+
+//表单校验
+export const ProdcutscrapBomScrapRules = reactive({
+ 
+})
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
new file mode 100644
index 000000000..182b008ee
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
@@ -0,0 +1,251 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InspectJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InspectJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="InspectJobMainRules"
+    :formAllSchemas="InspectJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="InspectJobDetail.allSchemas"
+    :tableFormRules="InspectJobDetailRules"
+    :apiUpdate="InspectJobMainApi.updateInspectJobMain"
+    :apiCreate="InspectJobMainApi.createInspectJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InspectJobMain.allSchemas"
+    :detailAllSchemas="InspectJobDetail.allSchemas"
+    :detailAllSchemasRules="InspectJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="InspectJobDetailApi.getInspectJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { InspectJobMain,InspectJobMainRules,InspectJobDetail,InspectJobDetailRules } from './inspectJobMain.data'
+import * as InspectJobMainApi from '@/api/wms/inspectJobMain'
+import * as InspectJobDetailApi from '@/api/wms/inspectJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 检验任务主
+defineOptions({ name: 'InspectJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InspectJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InspectJobMainApi.getInspectJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:inspect-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inspect-job-main:close'}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+  } else if (val == 'mainJobClo') { // 关闭
+    handleClose(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await InspectJobMainApi.closeInspectJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobInspectMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await InspectJobMainApi.exportInspectJobMain(tableObject.params)
+    download.excel(data, '检验任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
new file mode 100644
index 000000000..5282de81f
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
@@ -0,0 +1,835 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 检验任务主表
+ */
+export const InspectJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '采购收货记录单号',
+    field: 'purchaseReceiptRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '检验类型',
+    field: 'inspectType',
+    dictType: DICT_TYPE.INSPECT_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '下一步检验动作',
+    field: 'nextAction',
+    dictType: DICT_TYPE.NEXT_ACTION,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '抽检方式',
+    field: 'sampleMethod',
+    dictType: DICT_TYPE.SAMPLE_METHOD,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '收货数量',
+    field: 'receiveQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '样品数量',
+    field: 'sampleQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '货主代码',
+    field: 'owner',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const InspectJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  purchaseReceiptRecordNumber: [
+    { required: true, message: '请输入选择采购收货记录单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  warehouseCode: [
+    { required: true, message: '请选择仓库代码', trigger: 'change' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请选择订单行', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inspectType: [
+    { required: true, message: '请选择检验类型', trigger: 'change' }
+  ],
+  nextAction: [
+    { required: true, message: '请选择下一步检验动作', trigger: 'change' }
+  ],
+  receiveQty: [
+    { required: true, message: '请输入收货数量', trigger: 'blur' }
+  ],
+  sampleQty: [
+    { required: true, message: '请输入样品数量', trigger: 'blur' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 检验任务子表
+ */
+export const InspectJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const InspectJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
new file mode 100644
index 000000000..fa9cac48e
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
@@ -0,0 +1,201 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InspectRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InspectRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="InspectRecordMainRules"
+    :formAllSchemas="InspectRecordMain.allSchemas"
+    :tableAllSchemas="InspectRecordDetail.allSchemas"
+    :tableFormRules="InspectRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InspectRecordMain.allSchemas"
+    :detailAllSchemas="InspectRecordDetail.allSchemas"
+    :detailAllSchemasRules="InspectRecordDetailRules"
+    :apiPage="InspectRecordDetailApi.getInspectRecordDetailPage"
+    fromeWhere="inspectRecordMain"
+    @openImage="openImage"
+  />
+   <Preview  ref="preview"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { InspectRecordMain,InspectRecordMainRules,InspectRecordDetail,InspectRecordDetailRules } from './inspectRecordMain.data'
+import * as InspectRecordMainApi from '@/api/wms/inspectRecordMain'
+import * as InspectRecordDetailApi from '@/api/wms/inspectRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import  Preview  from '@/components/UploadFile/src/Preview.vue'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 检验记录主
+defineOptions({ name: 'InspectRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InspectRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InspectRecordMainApi.getInspectRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:inspect-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:inspectRecordMain:putawayRequest',hide:!row.putawayRequestFlag}), // 生成采购上架申请
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'putawayRequest') { // 生成采购上架申请
+      handlePutawayRequest(row.number)
+    }
+}
+
+
+/** 生成采购上架申请按钮操作 */
+const handlePutawayRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成上架申请吗？'))
+    tableObject.loading = true
+    await InspectRecordMainApi.createPutAwayRequest(number)
+    message.success(t('上架申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordInspectMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await InspectRecordMainApi.exportInspectRecordMain(tableObject.params)
+    download.excel(data, '检验记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+// 打开图片
+const preview = ref()
+const openImage=(item)=>{
+  preview.value.preview(item)
+}
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
new file mode 100644
index 000000000..a0928f3c5
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
@@ -0,0 +1,854 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 检验记录主表
+ */
+export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '采购收货记录单号',
+    field: 'purchaseReceiptRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter : dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter : dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter : dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter : dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    isTable: true,
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter : dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '检验类型',
+    field: 'inspectType',
+    isTable: true,
+    dictType: DICT_TYPE.INSPECT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '下一步检验动作',
+    field: 'nextAction',
+    isTable: true,
+    dictType: DICT_TYPE.NEXT_ACTION,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '抽检方式',
+    field: 'sampleMethod',
+    isTable: true,
+    dictType: DICT_TYPE.SAMPLE_METHOD,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    isTable: true,
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '收货数量',
+    field: 'receiveQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '样品数量',
+    field: 'sampleQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '合格数量',
+    field: 'batchGoodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '不合格数量',
+    field: 'batchFaildQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '破坏数量',
+    field: 'batchCrackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '最终不合格数量',
+    field: 'batchNotPassedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    isTable: true,
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    isSearch: true,
+    isTable: true,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const InspectRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  purchaseReceiptRecordNumber: [
+    { required: true, message: '请选择采购收货记录单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请选择订单行', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inspectType: [
+    { required: true, message: '请选择检验类型', trigger: 'change' }
+  ],
+  nextAction: [
+    { required: true, message: '请选择下一步检验动作', trigger: 'change' }
+  ],
+  receiveQty: [
+    { required: true, message: '请选择收货数量', trigger: 'blur' }
+  ],
+  sampleQty: [
+    { required: true, message: '请输入样品数量', trigger: 'blur' }
+  ],
+  batchGoodQty: [
+    { required: true, message: '请输入合格数量', trigger: 'blur' }
+  ],
+  batchFaildQty: [
+    { required: true, message: '请输入不合格数量', trigger: 'blur' }
+  ],
+  batchCrackQty: [
+    { required: true, message: '请输入破坏数量', trigger: 'blur' }
+  ],
+  batchNotPassedQty: [
+    { required: true, message: '请输入最终不合格数量', trigger: 'blur' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 检验记录子表
+ */
+export const InspectRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '样品数量',
+    field: 'sampleQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '合格数量',
+    field: 'goodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '不合格数量',
+    field: 'failedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '破坏数量',
+    field: 'crackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '最终不合格数量',
+    field: 'notPassedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '不合格原因',
+    field: 'failedReason',
+    dictType: DICT_TYPE.INSPECT_FAILED_REASON,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '异常照片',
+    field: 'photos',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '检验人',
+    field: 'inspectUser',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '检验结果',
+    field: 'inspectResult',
+    dictType: DICT_TYPE.INSPECT_RESULT,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '外观',
+    field: 'appearance',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '尺寸',
+    field: 'volume',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '重量',
+    field: 'weight',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '其他属性',
+    field: 'otherProperties',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+]))
+
+//表单校验
+export const InspectRecordDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  sampleQty: [
+    { required: true, message: '请输入样品数量', trigger: 'blur' }
+  ],
+  goodQty: [
+    { required: true, message: '请输入合格数量', trigger: 'blur' }
+  ],
+  failedQty: [
+    { required: true, message: '请输入不合格数量', trigger: 'blur' }
+  ],
+  crackQty: [
+    { required: true, message: '请输入破坏数量', trigger: 'blur' }
+  ],
+  notPassedQty: [
+    { required: true, message: '请输入最终不合格数量', trigger: 'blur' }
+  ],
+  inspectResult: [
+    { required: true, message: '请选择检验结果', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
new file mode 100644
index 000000000..53732d8a3
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
@@ -0,0 +1,395 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InspectRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="InspectRequestMain.allSchemas" />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+        total: tableObject.total
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort">
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm ref="formRef" @success="getList" :rules="InspectRequestMainRules"
+    :formAllSchemas="InspectRequestMain.allSchemas" :tableAllSchemas="InspectRequestDetail.allSchemas"
+    :tableFormRules="InspectRequestDetailRules" :tableData="tableData"
+    :apiUpdate="InspectRequestMainApi.updateInspectRequestMain"
+    :apiCreate="InspectRequestMainApi.createInspectRequestMain" :isBusiness="true" @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="InspectRequestMain.allSchemas"
+    :detailAllSchemas="InspectRequestDetail.allSchemas" :detailAllSchemasRules="InspectRequestDetailRules"
+    :apiPage="InspectRequestDetailApi.getInspectRequestDetailPage"
+    @searchTableSuccessDetail="searchTableSuccessDetail" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/inspect-request-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+  import download from '@/utils/download'
+  import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+  import { InspectRequestMain, InspectRequestMainRules, InspectRequestDetail, InspectRequestDetailRules } from './inspectRequestMain.data'
+  import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain'
+  import * as InspectRequestDetailApi from '@/api/wms/inspectRequestDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+  // 到货检验申请
+  defineOptions({ name: 'InspectRequestMain' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(InspectRequestMain.allSchemas.tableColumns)
+
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+    nextTick(() => {
+      const setV = {}
+      if (type == 'tableForm') {
+        // 明细查询页赋值
+        if(formField == 'fromLocationCode'){
+          row['fromLocationCode'] = val[0]['code']
+        }else if(formField == 'itemCode'){
+          row['itemCode'] = val[0]['itemCode']
+        }
+      } else {
+        setV[formField] = val[0][searchField]
+        setV['purchaseReceiptRecordNumber'] = val[0]['number']
+        // setV['supplierCode'] = val[0]['supplierCode']
+      }
+      formRef.setValues(setV)
+    })
+  }
+  // 查询页面返回——详情
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+    nextTick(() => {
+      const setV = {}
+      if(formField == 'fromLocationCode'){
+        setV['fromLocationCode'] = val[0]['code']
+      }else if(formField == 'itemCode'){
+        setV['itemCode'] = val[0]['itemCode']
+      }else {
+        setV[formField] = val[0][searchField]
+      }
+      formRef.setValues(setV)
+    })
+  }
+
+  // 子表新增的时候选择表格之后需要会显得字段
+  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+  const Echo = []
+
+  const { tableObject, tableMethods } = useTable({
+    getListApi: InspectRequestMainApi.getInspectRequestMainPage // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    // defaultButtons.defaultAddBtn({ hasPermi: 'wms:inspect-request-main:create' }), // 新增
+    // defaultButtons.defaultImportBtn({hasPermi:'wms:inspect-request-main:import'}), // 导入
+    defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspect-request-main:export' }), // 导出
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+    // {
+    //   label: '自定义扩展按钮',
+    //   name: 'zdy',
+    //   hide: false,
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   color: ''
+    // },
+  ]
+
+  // 头部按钮事件
+  const buttonBaseClick = (val, item) => {
+    if (val == 'add') { // 新增
+      openForm('create')
+    } else if (val == 'import') { // 导入
+      handleImport()
+    } else if (val == 'export') { // 导出
+      handleExport()
+    } else if (val == 'refresh') { // 刷新
+      if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+    } else if (val == 'filtrate') { // 筛选
+    } else { // 其他按钮
+      console.log('其他按钮', item)
+    }
+  }
+
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton = (row, val) => {
+    if (val.indexOf(row.status) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }
+
+  // 列表-操作按钮
+  const butttondata = (row) => {
+    return [
+      defaultButtons.mainListCloseBtn({ hide: isShowMainButton(row, ['1', '2', '3', '4', '6']), hasPermi: 'wms:purchasereceipt-request-main:close' }), // 关闭
+      defaultButtons.mainListReAddBtn({ hide: isShowMainButton(row, ['5']), hasPermi: 'wms:purchasereceipt-request-main:reAdd' }), //重新添加
+      defaultButtons.mainListSubmitBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchasereceipt-request-main:submit' }), // 提交审批
+      defaultButtons.mainListTurnDownBtn({ hide: isShowMainButton(row, ['2']), hasPermi: 'wms:purchasereceipt-request-main:refused' }), // 驳回
+      defaultButtons.mainListApproveBtn({ hide: isShowMainButton(row, ['2']), hasPermi: 'wms:purchasereceipt-request-main:agree' }), // 审批通过
+      defaultButtons.mainListHandleBtn({ hide: isShowMainButton(row, ['3']), hasPermi: 'wms:purchasereceipt-request-main:handle' }), // 处理
+      // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
+    ]
+  }
+
+
+
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val, row) => {
+    if (val == 'mainClose') { // 关闭
+      handleClose(row.id)
+    } else if (val == 'mainReAdd') { // 重新添加
+      handleReAdd(row.id)
+    } else if (val == 'mainSubmit') { // 提交审批
+      handleSubmit(row.id)
+    } else if (val == 'mainTurnDown') { // 驳回
+      handleRefused(row.id)
+    } else if (val == 'mainApprove') { // 审批通过
+      handleAgree(row.id)
+    } else if (val == 'mainHandle') { // 处理
+      handleHandle(row.id)
+    } else if (val == 'edit') { // 编辑
+      openForm('update', row)
+    }
+  }
+
+  /** 关闭按钮操作 */
+  const handleClose = async (id : number) => {
+    try{
+      await message.confirm(t('common.confirmColse'))
+      tableObject.loading = true
+      await InspectRequestMainApi.closeInspectRequestMain(id)
+      message.success(t('common.closeSuccess'))
+      await getList()
+    }catch{}finally{
+      tableObject.loading = false
+    }
+      
+  }
+
+  /** 重新添加按钮操作 */
+  const handleReAdd = async (id : number) => {
+    try{
+      await message.confirm(t('common.confirmReAdd'))
+      tableObject.loading = true
+      await InspectRequestMainApi.reAddInspectRequestMain(id)
+      message.success(t('common.reAddSuccess'))
+      await getList()
+    }catch{}finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 审批通过按钮操作 */
+  const handleAgree = async (id : number) => {
+    try{
+      await message.confirm(t('common.confirmAgree'))
+      tableObject.loading = true
+      await InspectRequestMainApi.agreeInspectRequestMain(id)
+      message.success(t('common.agreeSuccess'))
+      await getList()
+    }catch{}finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 审批驳回按钮操作 */
+  const handleRefused = async (id : number) => {
+    try{
+      await message.confirm(t('common.confirmRefused'))
+      tableObject.loading = true
+      await InspectRequestMainApi.refusedInspectRequestMain(id)
+      message.success(t('common.refusedSuccess'))
+      await getList()
+    }catch{}finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 处理按钮操作 */
+  const handleHandle = async (id : number) => {
+    try{
+      await message.confirm(t('common.confirmHandle'))
+      tableObject.loading = true
+      await InspectRequestMainApi.handleInspectRequestMain(id)
+      message.success(t('common.handleSuccess'))
+      await getList()
+    }catch{}finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 提交按钮操作 */
+  const handleSubmit = async (id : number) => {
+    try{
+      await message.confirm(t('common.confirmSubmit'))
+      tableObject.loading = true
+      await InspectRequestMainApi.submitInspectRequestMain(id)
+      message.success(t('common.submitSuccess'))
+      await getList()
+    }catch{}finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = async (type : string, row ?: number) => {
+    tableData.value = [] // 重置明细数据
+    formRef.value.open(type, row)
+  }
+
+  // 获取部门 用于详情 部门回显
+  const { wsCache } = useCache()
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+    if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+    detailRef.value.openDetail(row, titleName, titleValue,'requestInspectMain')
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      tableObject.loading = true
+      // 发起删除
+      await InspectRequestMainApi.deleteInspectRequestMain(id)
+      message.success(t('common.delSuccess'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 导出按钮操作 */
+  const exportLoading = ref(false) // 导出的加载中
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await InspectRequestMainApi.exportInspectRequestMain(tableObject.params)
+      download.excel(data, '检验申请主.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  InspectRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  const tableData = ref([])
+
+  // 添加明细
+  const handleAddTable = () => {
+    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  }
+  // 删除明细
+  const handleDeleteTable = (item, index) => {
+    tableData.value.splice(index, 1)
+  }
+
+  // 主子数据 提交
+  const submitForm = async (formType, data) => {
+    data.subList = tableData.value // 拼接子表数据参数
+    try {
+      if (formType === 'create') {
+        await InspectRequestMainApi.createInspectRequestMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await InspectRequestMainApi.updateInspectRequestMain(data)
+        message.success(t('common.updateSuccess'))
+      }
+      formRef.value.dialogVisible = false
+      // 刷新当前列表
+      getList()
+    } finally {
+      formRef.value.formLoading = false
+    }
+  }
+
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '检验申请主导入模版.xlsx'
+  })
+
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
+  }
+
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await InspectRequestMainApi.importTemplate()
+  })
+</script>
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
new file mode 100644
index 000000000..38787a872
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
@@ -0,0 +1,689 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+
+import { Warehouse } from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import * as LocationApi from '@/api/wms/location'
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize: 10,
+  pageNo: 1,
+  code: 'InspectRequest'
+}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 检验申请主表
+ */
+export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '采购收货记录单号',
+    field: 'purchaseReceiptRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      labelMessage: '影响明细中物料代码，需在供应商物料中维护',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  
+  {
+    label: '收货数量',
+    field: 'receiveQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: true,
+    isForm: true,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '从月台代码',
+    field: 'fromDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'PurchaseReturn',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const InspectRequestMainRules = reactive({
+  purchaseReceiptRecordNumber: [
+    { required: true, message: '请输入采购收货记录单号', trigger: 'blur' }
+  ],
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请输入从仓库代码', trigger: 'blur' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  poNumber: [
+    { required: true, message: '请输入订单号', trigger: 'blur' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inspectType: [
+    { required: true, message: '请选择检验类型', trigger: 'change' }
+  ],
+  nextAction: [
+    { required: true, message: '请选择下一步检验动作', trigger: 'change' }
+  ],
+  receiveQty: [
+    { required: true, message: '请输入收货数量', trigger: 'blur' }
+  ],
+  sampleQty: [
+    { required: true, message: '请输入样品数量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 检验申请子表
+ */
+export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择从库位代码',
+      searchField: 'code',
+      searchTitle: '库位基础信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择从库位代码',
+        searchField: 'code',
+        searchTitle: '库位基础信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.getLocationPage
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      earchListPlaceholder: '请选择包装号',
+      searchField: 'itemCode',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePagePutaway
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  }
+]))
+
+//表单校验
+export const InspectRequestDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请输入包装号', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请输入库位代码', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
new file mode 100644
index 000000000..58a73593d
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -0,0 +1,308 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchasereceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereceiptJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasereceiptJobMainRules"
+    :formAllSchemas="PurchasereceiptJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="PurchasereceiptJobDetail.allSchemas"
+    :tableFormRules="PurchasereceiptJobDetailRules"
+    :apiUpdate="PurchasereceiptJobMainApi.updatePurchasereceiptJobMain"
+    :apiCreate="PurchasereceiptJobMainApi.createPurchasereceiptJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptJobMain.allSchemas"
+    :detailAllSchemas="PurchasereceiptJobDetail.allSchemas"
+    :detailAllSchemasRules="PurchasereceiptJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 子包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptJobDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptJobDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
+</template>
+
+  
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PurchasereceiptJobMain,
+  PurchasereceiptJobMainRules,
+  PurchasereceiptJobDetail,
+  PurchasereceiptJobDetailRules,
+  PurchasereceiptJobDetailPackingNumber } from './purchasereceiptJobMain.data'
+import * as PurchasereceiptJobMainApi from '@/api/wms/purchasereceiptJobMain'
+import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 采购收货任务主
+defineOptions({ name: 'PurchasereceiptJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchasereceiptJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereceiptJobMainApi.getPurchasereceiptJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    {
+      label: '拒收',
+      name: 'mainJobClo',
+      hide: isShowMainButton(row, ['1']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: 'wms:purchasereceipt-job-main:close',
+      link: true // 文本展现按钮
+    }]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+  } else if (val == 'mainJobClo') { // 拒收
+    handleClose(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await PurchasereceiptJobMainApi.closePurchasereceiptJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PurchasereceiptJobDetailApi.queryPurchaseceiptChildPackingNumber
+})
+const { getList:queryDetailList } = packDetatableMethods
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobPurchasereceiptMain')
+}
+
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: '查看其他包装规格',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+        packingDetatableData.params = {
+          masterId:row.masterId,
+          parentPackingNumber:row.packingNumber
+        }
+        await queryDetailList()
+        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params)
+    download.excel(data, '采购收货任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
new file mode 100644
index 000000000..02bec99c8
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -0,0 +1,1457 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 采购收货任务主表
+ */
+export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数据来源',
+    field: 'sourceType',
+    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: false,
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '岗位',
+    field: 'userPositionCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PurchasereceiptJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购收货任务子表
+ */
+export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    fiield: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
+]))
+
+//表单校验
+export const PurchasereceiptJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  arriveDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+
+/**
+ * @returns {Array} 采购收货任务子表
+ */
+export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true,
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '备注',
+    fiield: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
+  },
+]))
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
new file mode 100644
index 000000000..5792a4069
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -0,0 +1,302 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchasereceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereceiptRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasereceiptRecordMainRules"
+    :formAllSchemas="PurchasereceiptRecordMain.allSchemas"
+    :tableAllSchemas="PurchasereceiptRecordDetail.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptRecordMain.allSchemas"
+    :detailAllSchemas="detailAllSchemas"
+    :detailAllSchemasRules="PurchasereceiptRecordDetailRules"
+    :apiPage="apiPage"
+    :tabs="PurchasereceiptRequestTabsList"
+    @changeTabs="changeTabs"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 记录子包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRecordDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
+ <!-- 缺货子包装弹窗 -->
+ <BasicForm
+    ref="outStockDetailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRecordDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :tableData="outStockPackingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PurchasereceiptRecordMain,
+  PurchasereceiptRecordMainRules,
+  PurchasereceiptRecordDetail,
+  PurchasereceiptRecordDetailRules,
+  PurchasereceiptRecordDetailPackingNumber } from './purchasereceiptRecordMain.data'
+import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain'
+import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 采购收货记录主
+defineOptions({ name: 'PurchasereceiptRecordMain' })
+
+const apiPage = ref(PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage)
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchasereceiptRecordMain.allSchemas.tableColumns)
+const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereceiptRecordMainApi.getPurchasereceiptRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:!row.inspectRequestFlag}),// 生成到货检验申请
+   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:!row.putawayRequestFlag}),// 生成采购上架申请
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'putawayRequest') { // 生成采购上架申请
+    handleCreatePutawayRequest(row.number)
+  }else if(val == 'inspectRequest'){//生成到货检验申请
+    handleCreateInspectRequest(row.number)
+  }
+}
+
+/** 生成采购上架申请按钮操作 */
+const handleCreatePutawayRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成上架申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPutawayRequest(number)
+    message.success(t('上架申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 生成到货检验申请按钮操作 */
+const handleCreateInspectRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成到货检验申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPutawayRequest(number)
+    message.success(t('到货检验申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PurchasereceiptRecordDetailApi.queryPurchaseceiptChildPackingNumber
+})
+const { getList:queryDetailList } = packDetatableMethods
+
+
+// 缺货子包装数据
+const outStockDetailParenPackingRef = ref()
+const { tableObject: outStockPackingDetatableData, tableMethods: outStockPackDetatableMethods } = useTable({
+  getListApi: PurchasereceiptRecordDetailApi.queryPurchaseshortageChildPackingNumber
+})
+const { getList:queryOutStockDetailList } = outStockPackDetatableMethods
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordPurchasereceiptMain')
+}
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: '查看其他包装规格',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+
+const tabeKey = ref("receiptDetail");  
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber' && tabeKey.value == 'receiptDetail') { //查看其他包装规格
+      packingDetatableData.params = {
+        masterId:row.masterId,
+        parentPackingNumber:row.packingNumber
+      }
+      await queryDetailList()
+      detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+  if (val == 'viewParentPickingNumber' && tabeKey.value == 'scarceGoodsDetail') { //查看其他包装规格
+      outStockPackingDetatableData.params = {
+        masterId:row.masterId,
+        parentPackingNumber:row.packingNumber
+      }
+      await queryOutStockDetailList()
+      outStockDetailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
+    download.excel(data, '采购收货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+// tabs 切换事件
+const changeTabs = (data) =>{
+  if(data.prop == 'receiptDetail'){
+  console.log(data)
+    apiPage.value = PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    tabeKey.value = 'receiptDetail'
+  }else if(data.prop == 'scarceGoodsDetail'){
+    apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    tabeKey.value = 'scarceGoodsDetail'
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
new file mode 100644
index 000000000..621efb7ce
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -0,0 +1,1669 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+
+
+/**
+ * @returns {Array} 采购收货记录主表
+ */
+export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数据来源',
+    field: 'sourceType',
+    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: false,
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransaction',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransaction',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+// 表单校验
+export const PurchasereceiptRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库位类型服务', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请选择创建时间', trigger: 'change' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购收货记录子表
+ */
+export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '目检结果',
+    field: 'visualInspectResult',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '目检照片',
+    field: 'visualInspectPhotos',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '不合格原因',
+    field: 'failedReason',
+    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+ 
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
+]))
+
+// 表单校验
+export const PurchasereceiptRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  arriveDate: [
+    { required: true, message: '请选择到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请选择订单行', trigger: 'change' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  visualInspectResult: [
+    { required: true, message: '请选择目检结果', trigger: 'change' }
+  ],
+})
+
+
+/**
+ * @returns {Array} 采购收货记录子表-子包装数据
+ */
+export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+        }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+        }
+    },
+    tableForm: {
+      disabled: true,
+    }
+    
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+    
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+        }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '目检结果',
+    field: 'visualInspectResult',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '目检照片',
+    field: 'visualInspectPhotos',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '不合格原因',
+    field: 'failedReason',
+    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  }
+]))
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
new file mode 100644
index 000000000..b41407d7e
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -0,0 +1,586 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchasereceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereceiptRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasereceiptRequestMainRules"
+    :formAllSchemas="PurchasereceiptRequestMain.allSchemas"
+    :tableAllSchemas="PurchasereceiptRequestDetail.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain"
+    :apiCreate="PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @formFormDateChange="formFormDateChange"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptRequestMain.allSchemas"
+    :detailAllSchemas="detailAllSchemas"
+    :detailAllSchemasRules="PurchasereceiptRequestDetailRules"
+    :apiCreate="PurchasereceiptRequestDetailApi.createPurchasereceiptRequestDetail"
+    :apiUpdate="PurchasereceiptRequestDetailApi.updatePurchasereceiptRequestDetail"
+    :apiPage="apiPage"
+    :apiDelete="PurchasereceiptRequestDetailApi.deletePurchasereceiptRequestDetail"
+    fromeWhere="purchasereceipt"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 导入 -->
+  <ImportForm 
+    ref="importFormRef" 
+    url="/wms/purchasereceipt-request-main/import" 
+    :importTemplateData="importTemplateData" 
+    @success="importSuccess" 
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
+
+  <!-- 创建标签 -->
+  <BasicForm
+    ref="formLabelRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRequestDetailLabel.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    @submitForm="submitFormLabel"
+  />
+
+    <!-- 子包装弹窗 -->
+    <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRequestDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { 
+  PurchasereceiptRequestMain,
+  PurchasereceiptRequestMainRules,
+  PurchasereceiptRequestDetail,
+  PurchasereceiptRequestDetailRules,
+  PurchasereceiptRequestDetailLabel,
+  PurchasereceiptRequestDetailPackingNumber
+ } from './purchasereceiptRequestMain.data'
+import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
+import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { getAccessToken } from '@/utils/auth'
+
+// 采购收货申请
+defineOptions({ name: 'PurchasereceiptRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const genLabelId = ref(); //主表ID
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchasereceiptRequestMain.allSchemas.tableColumns)
+
+const apiPage = ref(PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage)
+const detailAllSchemas = ref(PurchasereceiptRequestDetail.allSchemas)
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  //console.log("formRef",formRef)
+  //console.log("supplierCode",formRef.value.formRef.formModel.supplierCode)
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      if(formField == 'itemCode') {
+        row['itemCode'] = val[0]['code']
+      } else if(formField == 'poNumber') {
+        row['poNumber'] = val[0]['number']
+      } else if(formField == 'poLine'){
+        row['poLine'] = val[0]['lineNumber']
+        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['uom']
+        let supplierCode = formRef.formModel.supplierCode;
+        let itemCode = val[0]['itemCode']
+        let queryData = {
+          supplierCode:supplierCode,
+          itemCode:itemCode
+        } 
+        SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{
+          row['defaultToLocationCode'] = res
+        })
+      }else if (formField == 'packQty'){
+        row['packQty'] = val[0]['packQty']
+        row['packUnit'] = val[0]['packUnit']
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      setV['supplierCode'] = val[0]['code']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if(formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+    } else {
+      setV['poNumber'] = val[0]['number']
+      setV['poLine'] = val[0]['lineNumber']
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereceiptRequestMainApi.getPurchasereceiptRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {// 新增
+    openForm('create')
+  } else if (val == 'import') {// 导入
+    handleImport()
+  }else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isASNShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if(row.sourceType == 'ASN_ExternalReceipt'){
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:purchasereceipt-request-main:reAdd'}), //重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
+    // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
+    {
+      label: '生成标签',
+      name: 'ssbq',
+      hide: isASNShowMainButton(row, ['3']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    },
+    defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','8']) }), // 标签打印
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    handleClose(row.id)
+  } else if (val == 'mainReAdd') { // 重新添加
+    handleReAdd(row.id)
+  } else if (val == 'mainSubmit') { // 提交审批
+    handleSubmit(row.id)
+  } else if (val == 'mainTurnDown') { // 驳回
+    handleRefused(row.id)
+  } else if (val == 'mainApprove') { // 审批通过
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.id)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if(val == 'ssbq'){ // 生成标签
+     // 生成标签
+     detatableData.params = {
+      masterId:row.id
+     }
+    genLabelId.value = row.id
+    await getDetailList()
+    formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
+  }else if (val == 'point') {
+    // 标签打印
+    labelPrint(row)
+  } 
+}
+
+
+// 生成标签
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// 生成标签按钮操作
+const submitFormLabel = async (formType, data) => {
+  try {
+    await message.confirm('是否为此数据生成标签？')
+    await PurchasereceiptRequestMainApi.genLabel(genLabelId.value)
+    isCreateLabel.value = true
+    message.success('创建标签成功')
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+
+// 标签打印
+const labelPrint = async (row) => {
+  window.open(src.value + '&asn_number=' + row.asnNumber)
+}
+
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PurchasereceiptRequestDetailApi.queryPurchaseceiptChildPackingNumber
+})
+const { getList:queryDetailList } = packDetatableMethods
+
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestPurchasereceiptMain')
+}
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: '查看其他包装规格',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+        packingDetatableData.params = {
+          masterId:row.masterId,
+          parentPackingNumber:row.packingNumber
+        }
+        await queryDetailList()
+        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.closePurchasereceiptRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.reAddPurchasereceiptRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.agreePurchasereceiptRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.refusedPurchasereceiptRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.handlePurchasereceiptRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.submitPurchasereceiptRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
+    download.excel(data, '采购收货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+PurchasereceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '采购收货申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// tabs 切换事件
+// const changeTabs = (data) =>{
+//   if(data.prop == 'receiptDetail'){
+//     apiPage.value = PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage
+//     detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas    
+//   }else if(data.prop == 'scarceGoodsDetail'){
+//     apiPage.value = PurchasereceiptRequestDetailApi.getScarceGoodsDetailPage
+//     detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas    
+//   }
+// }
+
+const formFormDateChange = (field, val,row, index) => {
+  if(field == 'produceDate'){
+    let produceDateStr = formatDate(val,'YYYYMMDD');
+    row.batch = produceDateStr
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await PurchasereceiptRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
new file mode 100644
index 000000000..d9686d459
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -0,0 +1,2245 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import { PurchasePlanMain } from '../../supplierdeliver/purchasePlanMain/purchasePlanMain.data'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+
+
+const { t } = useI18n() // 国际化
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'PurchaseReceiptRequest'
+}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData =data?.list[0]||{}
+
+
+// 获取当前操作人的部门
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 采购收货申请主表
+ */
+export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: true,
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '要货计划信息', // 查询弹窗标题
+        searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
+        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'supplierCode',
+            value: 'supplierCode',
+            message: '请填写供应商代码！',
+            isMainValue: true
+          },
+          {
+            key: 'status',
+            value: 4,
+            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: "TRUE",
+            isMainValue: false
+          }]
+      }
+    },
+    isForm: true,
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数据来源',
+    field: 'sourceType',
+    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ASN_ExternalReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: false,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'PurchaseReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '标签状态',
+    field: 'labelStatus',
+    sort: 'custom',
+    dictType: DICT_TYPE.LABEL_STATUS,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isSearch: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PurchasereceiptRequestMainRules = reactive({
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请输入到仓库代码', trigger: 'blur' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请输入到库区类型范围', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购收货申请子表
+ */
+export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+      }]
+    },
+    form: {
+      labelMessage: '该订单号会影响订单行的选择',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择订单行', // 输入框占位文本
+        searchField: 'lineNumber', // 查询弹窗赋值字段
+        searchTitle: '订单信息', // 查询弹窗标题
+        searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'number',
+          value:'poNumber',
+          message: '请填写订单号！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单行', // 输入框占位文本
+      searchField: 'lineNumber', // 查询弹窗赋值字段
+      searchTitle: '订单信息', // 查询弹窗标题
+      searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'number',
+        value:'poNumber',
+        message: '请填写订单号！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '默认到库位代码',
+    field: 'defaultToLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    isTableForm: true,
+    isForm: false
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      type:'FormDate',
+      placeholder: '请选择到货日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      type:'FormDate',
+      placeholder: '请选择过期日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
+]))
+
+//表单校验
+export const PurchasereceiptRequestDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请输入包装号', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  arriveDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  poNumber: [
+    { required: true, message: '请输入订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'change' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'change' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购收货申请子表--子包装号
+ */
+export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+      }]
+    },
+    form: {
+      labelMessage: '该订单号会影响订单行的选择',
+      componentProps: {
+        disabled:true,
+        isSearchList: false,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择订单行', // 输入框占位文本
+        searchField: 'lineNumber', // 查询弹窗赋值字段
+        searchTitle: '订单信息', // 查询弹窗标题
+        searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'number',
+          value:'poNumber',
+          message: '请填写订单号！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单行', // 输入框占位文本
+      searchField: 'lineNumber', // 查询弹窗赋值字段
+      searchTitle: '订单信息', // 查询弹窗标题
+      searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'number',
+        value:'poNumber',
+        message: '请填写订单号！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '默认到库位代码',
+    field: 'defaultToLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    isTableForm: true,
+    isForm: false
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择到货日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择过期日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select',
+      disabled: true,
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+    },
+    tableForm: {
+      disabled: true,
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  }
+]))
+
+
+export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+      }]
+    },
+    form: {
+      labelMessage: '该订单号会影响订单行的选择',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择订单行', // 输入框占位文本
+        searchField: 'lineNumber', // 查询弹窗赋值字段
+        searchTitle: '订单信息', // 查询弹窗标题
+        searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'number',
+          value:'poNumber',
+          message: '请填写订单号！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单行', // 输入框占位文本
+      searchField: 'lineNumber', // 查询弹窗赋值字段
+      searchTitle: '订单信息', // 查询弹窗标题
+      searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'number',
+        value:'poNumber',
+        message: '请填写订单号！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled:true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '默认到库位代码',
+    field: 'defaultToLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    isTableForm: true,
+    isForm: false
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled:true,
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择到货日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择过期日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
new file mode 100644
index 000000000..2fb352085
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
@@ -0,0 +1,252 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchasereturnJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereturnJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasereturnJobMainRules"
+    :formAllSchemas="PurchasereturnJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="PurchasereturnJobDetail.allSchemas"
+    :tableFormRules="PurchasereturnJobDetailRules"
+    :apiUpdate="PurchasereturnJobMainApi.updatePurchasereturnJobMain"
+    :apiCreate="PurchasereturnJobMainApi.createPurchasereturnJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereturnJobMain.allSchemas"
+    :detailAllSchemas="PurchasereturnJobDetail.allSchemas"
+    :detailAllSchemasRules="PurchasereturnJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="PurchasereturnJobDetailApi.getPurchasereturnJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PurchasereturnJobMain,PurchasereturnJobMainRules,PurchasereturnJobDetail,PurchasereturnJobDetailRules } from './purchasereturnJobMain.data'
+import * as PurchasereturnJobMainApi from '@/api/wms/purchasereturnJobMain'
+import * as PurchasereturnJobDetailApi from '@/api/wms/purchasereturnJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+// 采购退货任务主
+defineOptions({ name: 'PurchasereturnJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchasereturnJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereturnJobMainApi.getPurchasereturnJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereturn-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+  } else if (val == 'mainJobClo') { // 关闭
+    handleClose(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await PurchasereturnJobMainApi.closePurchasereturnJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobPurchasereturnMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(tableObject.params)
+    download.excel(data, '采购退货任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
new file mode 100644
index 000000000..8d947536b
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
@@ -0,0 +1,867 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 采购退货任务主表
+ */
+export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '采购收货记录单号',
+    field: 'purchaseReceiptRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '发货月台',
+    field: 'deliverDock',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从月台代码',
+    field: 'fromDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PurchasereturnJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购退货任务子表
+ */
+export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  }
+]))
+
+//表单校验
+export const PurchasereturnJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  reason: [
+    { required: true, message: '请选择原因', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
new file mode 100644
index 000000000..c4b1b8e00
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@@ -0,0 +1,186 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchasereturnRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereturnRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasereturnRecordMainRules"
+    :formAllSchemas="PurchasereturnRecordMain.allSchemas"
+    :tableAllSchemas="PurchasereturnRecordDetail.allSchemas"
+    :tableFormRules="PurchasereturnRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereturnRecordMain.allSchemas"
+    :detailAllSchemas="PurchasereturnRecordDetail.allSchemas"
+    :detailAllSchemasRules="PurchasereturnRecordDetailRules"
+    :apiPage="PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PurchasereturnRecordMain,PurchasereturnRecordMainRules,PurchasereturnRecordDetail,PurchasereturnRecordDetailRules } from './purchasereturnRecordMain.data'
+import * as PurchasereturnRecordMainApi from '@/api/wms/purchasereturnRecordMain'
+import * as PurchasereturnRecordDetailApi from '@/api/wms/purchasereturnRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { getAccessToken } from '@/utils/auth'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 采购退货记录主
+defineOptions({ name: 'PurchasereturnRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchasereturnRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereturnRecordMainApi.getPurchasereturnRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereturn-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [defaultButtons.mainListDocumentPrintBtn(null)]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'documentPrint') {
+    // 单据打印
+    handleDocumentPrint(row.id)
+  }
+}
+
+// 单据打印
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken())
+const handleDocumentPrint = async (id) => {
+  window.open(documentSrc.value + '&id=' + id)
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordPurchasereturnMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params)
+    download.excel(data, '采购退货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
new file mode 100644
index 000000000..ee35586a8
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -0,0 +1,741 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 采购退货记录主表
+ */
+export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '采购收货记录单号',
+    field: 'purchaseReceiptRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '从月台代码',
+    field: 'fromDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'available',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PurchasereturnRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请选择创建时间', trigger: 'change' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购退货记录子表
+ */
+export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poline',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const PurchasereturnRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  reason: [
+    { required: true, message: '请选择原因', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poline: [
+    { required: true, message: '请选择订单行', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
new file mode 100644
index 000000000..0308e6729
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -0,0 +1,721 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="PurchasereturnRequestMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="PurchasereturnRequestMain.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasereturnRequestMainRules"
+    :formAllSchemas="PurchasereturnRequestMain.allSchemas"
+    :tableAllSchemas="PurchasereturnRequestDetail.allSchemas"
+    :tableFormRules="PurchasereturnRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="PurchasereturnRequestMainApi.updatePurchasereturnRequestMain"
+    :apiCreate="PurchasereturnRequestMainApi.createPurchasereturnRequestMain"
+    :isBusiness="true"
+    :isShowButton="isShowButton"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereturnRequestMain.allSchemas"
+    :detailAllSchemas="PurchasereturnRequestDetail.allSchemas"
+    :detailAllSchemasRules="PurchasereturnRequestDetailRules"
+    :apiCreate="PurchasereturnRequestDetailApi.createPurchasereturnRequestDetail"
+    :apiUpdate="PurchasereturnRequestDetailApi.updatePurchasereturnRequestDetail"
+    :apiPage="PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage"
+    :apiDelete="PurchasereturnRequestDetailApi.deletePurchasereturnRequestDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @detailOpenForm="detailOpenForm"
+    :detailValidate="detailValidate"
+  />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/purchasereturn-request-main/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import {
+  PurchasereturnRequestMain,
+  PurchasereturnRequestMainRules,
+  PurchasereturnRequestDetail,
+  PurchasereturnRequestDetailRules
+} from './purchasereturnRequestMain.data'
+import * as PurchasereturnRequestMainApi from '@/api/wms/purchasereturnRequestMain'
+import * as PurchasereturnRequestDetailApi from '@/api/wms/purchasereturnRequestDetail'
+import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+
+// 采购退货申请
+defineOptions({ name: 'PurchasereturnRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchasereturnRequestMain.allSchemas.tableColumns)
+
+const isShowButton = ref(true)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      row['supplierCode'] = val[0]['supplierCode']
+      row['poNumber'] = val[0]['poNumber']
+      row['poLine'] = val[0]['poLine']
+      row['itemCode'] = val[0]['itemCode']
+      row['itemName'] = val[0]['itemName']
+      row['itemDesc1'] = val[0]['itemDesc1']
+      row['itemDesc2'] = val[0]['itemDesc2']
+      row['batch'] = val[0]['batch']
+      row['altBatch'] = val[0]['altBatch']
+      row['packingNumber'] = val[0]['packingNumber']
+      row['containerNumber'] = val[0]['containerNumber']
+      row['qty'] = val[0]['qty']
+      row['uom'] = val[0]['uom']
+      row['supplierQty'] = val[0]['supplierQty']
+      row['supplierUom'] = val[0]['supplierUom']
+      row['inventoryStatus'] = val[0]['inventoryStatus']
+      row['fromLocationCode'] = val[0]['toLocationCode']
+      row['toLocationCode'] = val[0]['toLocationCode']
+      row['fromLocationGroupCode'] = val[0]['locationGroupCode']
+      row['toLocationGroupCode'] = null
+      row['toWarehouseCode'] = null
+      row['toAreaTypes'] = null
+      row['fromAreaCode'] = val[0]['areaCode']
+      row['toAreaCode'] = val[0]['toAreaCode']
+      row['fromQwnerCode'] = val[0]['fromQwnerCode']
+      row['toOwnerCode'] = val[0]['toOwnerCode']
+      row['arriveDate'] = val[0]['arriveDate']
+      row['produceDate'] = val[0]['produceDate']
+      row['expireDate'] = val[0]['expireDate']
+      row['convertRate'] = val[0]['convertRate']
+      row['visualInspectResult'] = val[0]['visualInspectResult']
+      row['visualInspectPhotos'] = val[0]['visualInspectPhotos']
+      row['failedReason'] = val[0]['failedReason']
+      row['singlePrice'] = val[0]['singlePrice']
+      row['amount'] = val[0]['amount']
+      row['projectCode'] = val[0]['projectCode']
+
+      if(formField == 'itemCode'){
+        row['batch'] = val[0]['toBatch']
+        row['packingNumber'] = val[0]['toPackingNumber']
+        row['containerNumber'] = val[0]['toContainerNumber']
+        row['containerNumber'] = val[0]['containerNumber']
+        row['containerNumber'] = val[0]['containerNumber']
+        row['fromLocationCode'] = val[0]['fromLocationCode']
+        row['toLocationCode'] = val[0]['toLocationCode']
+      }
+    } else {
+      const setV = {}
+      if(formField == 'purchaseReceiptRecordNumber'){
+        isShowButton.value = false
+        setV[formField] = val[0][searchField]
+        setV['purchaseReceiptRecordNumber'] = val[0]['number']
+        setV['supplierCode'] = val[0]['supplierCode']
+        setV['asnNumber'] = val[0]['asnNumber']
+        setV['ppNumber'] = val[0]['ppNumber']
+
+        // 获取子表数据 getBomDisassemble
+        PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailList({
+          masterId: val[0]['id']
+        }).then((res) => {
+            if (res) tableData.value = res
+            tableData.value.forEach((item) => {
+              item.batch = item.toBatch
+              item.packingNumber = item.toPackingNumber
+              item.containerNumber = item.toContainerNumber
+              item.containerNumber = item.toContainerNumber
+              item.toLocationGroupCode = null
+              item.toWarehouseCode = null
+              item.toAreaTypes = null
+              item.toLocationCode = null
+              // item.fromLocationCode = item.fromLocationCode
+              // item.fromLocationGroupCode = item.fromLocationGroupCode
+            })
+            
+            PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+              if (item.field == 'supplierCode') {
+                item.componentProps.disabled = true
+              }
+            })
+            PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => {
+              item.tableForm.disabled = true
+              if (item.field == 'remark') {
+                item.tableForm.disabled = false
+              }
+              if (item.field == 'qty') {
+                item.tableForm.disabled = false
+              }
+              if (item.field == 'reason') {
+                item.tableForm.disabled = false
+              }
+              if (item.field == 'itemCode') {
+                item.tableForm.isInpuFocusShow = false
+              }
+            })
+        }).catch((err) => {
+          console.log(err)
+        })
+      }
+      if(formField == 'supplierCode'){
+        isShowButton.value = true
+        setV['supplierCode'] = val[0]['code']
+        setV['purchaseReceiptRecordNumber'] = ''
+        tableData.value = []
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'poLine' || formField == 'itemCode'){
+      console.log(val)
+      setV['poLine'] = val[0]['poLine']
+      setV['poNumber'] = val[0]['poNumber']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['itemName'] = val[0]['itemName']
+      setV['itemDesc1'] = val[0]['itemDesc1']
+      setV['itemDesc2'] = val[0]['itemDesc2']
+      setV['batch'] = val[0]['toBatch']
+      setV['altBatch'] = val[0]['altBatch']
+      setV['packingNumber'] = val[0]['toPackingNumber']
+      setV['containerNumber'] = val[0]['toContainerNumber']
+      setV['qty'] = val[0]['qty']
+      setV['uom'] = val[0]['uom']
+      setV['supplierQty'] = val[0]['supplierQty']
+      setV['supplierUom'] = val[0]['supplierUom']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
+      setV['fromLocationCode'] = val[0]['toLocationCode']
+      setV['toLocationCode'] = val[0]['toLocationCode']
+      setV['fromLocationGroupCode'] = val[0]['locationGroupCode']
+      setV['toLocationGroupCode'] = null
+      setV['toWarehouseCode'] = null
+      setV['toAreaTypes'] = null
+      setV['fromAreaCode'] = val[0]['areaCode']
+      setV['toAreaCode'] = val[0]['toAreaCode']
+      setV['fromQwnerCode'] = val[0]['fromQwnerCode']
+      setV['toOwnerCode'] = val[0]['toOwnerCode']
+      setV['arriveDate'] = val[0]['arriveDate']
+      setV['produceDate'] = val[0]['produceDate']
+      setV['expireDate'] = val[0]['expireDate']
+      setV['convertRate'] = val[0]['convertRate']
+      setV['visualInspectResult'] = val[0]['visualInspectResult']
+      setV['visualInspectPhotos'] = val[0]['visualInspectPhotos']
+      setV['failedReason'] = val[0]['failedReason']
+      setV['singlePrice'] = val[0]['singlePrice']
+      setV['amount'] = val[0]['amount']
+      setV['projectCode'] = val[0]['projectCode']
+
+      if(formField == 'itemCode'){
+        setV['batch'] = val[0]['toBatch']
+        setV['packingNumber'] = val[0]['toPackingNumber']
+        setV['containerNumber'] = val[0]['toContainerNumber']
+        setV['containerNumber'] = val[0]['containerNumber']
+        setV['containerNumber'] = val[0]['containerNumber']
+        setV['fromLocationCode'] = val[0]['fromLocationCode']
+        setV['toLocationCode'] = val[0]['toLocationCode']
+      }
+    }else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo = []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereturnRequestMainApi.getPurchasereturnRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:purchasereturn-request-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:purchasereturn-request-main:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereturn-request-main:export'}), // 导出
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListCloseBtn({
+      hide: isShowMainButton(row, ['1', '2', '3', '4', '6']),
+      hasPermi: 'wms:purchasereceipt-request-main:close'
+    }), // 关闭
+    defaultButtons.mainListReAddBtn({
+      hide: isShowMainButton(row, ['5']),
+      hasPermi: 'wms:purchasereceipt-request-main:reAdd'
+    }), //重新添加
+    defaultButtons.mainListSubmitBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'wms:purchasereceipt-request-main:submit'
+    }), // 提交审批
+    defaultButtons.mainListTurnDownBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'wms:purchasereceipt-request-main:refused'
+    }), // 驳回
+    defaultButtons.mainListApproveBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'wms:purchasereceipt-request-main:agree'
+    }), // 审批通过
+    defaultButtons.mainListHandleBtn({
+      hide: isShowMainButton(row, ['3']),
+      hasPermi: 'wms:purchasereceipt-request-main:handle'
+    }), // 处理
+    defaultButtons.mainListEditBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'wms:purchasereceipt-request-main:update'
+    }) // 编辑
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') {
+    // 关闭
+    handleClose(row.id)
+  } else if (val == 'mainReAdd') {
+    // 重新添加
+    handleReAdd(row.id)
+  } else if (val == 'mainSubmit') {
+    // 提交审批
+    handleSubmit(row.id)
+  } else if (val == 'mainTurnDown') {
+    // 驳回
+    handleRefused(row.id)
+  } else if (val == 'mainApprove') {
+    // 审批通过
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') {
+    // 处理
+    handleHandle(row.id)
+  } else if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  isShowButton.value = true
+  if(type == 'create'){
+    PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'supplierCode') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = true
+      }
+      if(item.field == 'purchaseReceiptRecordNumber'){
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = true
+      }
+    })
+  }
+  if(type == 'update'){
+    PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'supplierCode') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = false
+      }
+      if(item.field == 'purchaseReceiptRecordNumber'){
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = false
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const purchaseReceiptRecordNumberRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  purchaseReceiptRecordNumberRef.value = row.purchaseReceiptRecordNumber;
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestPurchasereturnMain')
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await PurchasereturnRequestMainApi.closePurchasereturnRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await PurchasereturnRequestMainApi.reAddPurchasereturnRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await PurchasereturnRequestMainApi.agreePurchasereturnRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    await getList()
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await PurchasereturnRequestMainApi.refusedPurchasereturnRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    await getList()
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await PurchasereturnRequestMainApi.handlePurchasereturnRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    await getList()
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await PurchasereturnRequestMainApi.submitPurchasereturnRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    await getList()
+    tableObject.loading = false
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(tableObject.params)
+    download.excel(data, '采购退货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+ * tableForm方法
+ */
+const tableFormKeys = {}
+PurchasereturnRequestDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  let purchaseReceiptRecordNumber = formRef.value.formRef.formModel.purchaseReceiptRecordNumber
+  PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => {
+    item.tableForm.disabled = true
+    if (item.field == 'remark') {
+      item.tableForm.disabled = false
+    }
+    if (item.field == 'reason') {
+      item.tableForm.disabled = false
+    }
+    if (item.field == 'qty') {
+      item.tableForm.disabled = false
+    }
+    if(purchaseReceiptRecordNumber == ''){
+      if (item.field == 'itemCode') {
+        item.tableForm.isInpuFocusShow = true
+      }
+      if(item.field == 'poLine'){
+        item.tableForm.isInpuFocusShow = false
+      }
+    }else{
+      if (item.field == 'itemCode') {
+        item.tableForm.isInpuFocusShow = false
+      }
+      if(item.field == 'poLine'){
+        item.tableForm.isInpuFocusShow = true
+      }
+    }
+  })
+}
+// 删除明细
+const handleDeleteTable = (item, index, formRef) => {
+  tableData.value.splice(index, 1)
+  if (tableData.value.length == 0) {
+    isShowButton.value = true
+    PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'supplierCode') {
+        item.componentProps.disabled = false
+      }
+    })
+    nextTick(() => {
+      const setV = {}
+      setV['purchaseReceiptRecordNumber'] = ''
+      setV['supplierCode'] = ''
+      formRef.setValues(setV)
+    })
+  }
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      let flag = false;
+      data.subList.forEach((item) => {
+          if(item.qty == 0){
+            message.warning("数量不能为0")
+            flag = true;
+            return;
+          }
+      })
+      if(flag){
+        formRef.value.formLoading = false
+        return
+      }
+      await PurchasereturnRequestMainApi.createPurchasereturnRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PurchasereturnRequestMainApi.updatePurchasereturnRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '采购退货申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+const detailOpenForm = (type, row) =>{
+  console.log("type",type);
+  console.log("row",row);
+  console.log("AAAAAA",purchaseReceiptRecordNumberRef.value);
+  PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => {
+    if(purchaseReceiptRecordNumberRef.value == ''){
+      if (item.field == 'itemCode') {
+        item.form.componentProps.disabled = true
+        item.form.componentProps.isSearchList = true
+      }
+      if(item.field == 'poLine'){
+        item.form.componentProps.disabled = true
+        item.form.componentProps.isSearchList = false
+      }
+    }else{
+      if (item.field == 'itemCode') {
+        item.form.componentProps.disabled = true
+        item.form.componentProps.isSearchList = false
+      }
+      if(item.field == 'poLine'){
+        item.form.componentProps.disabled = true
+        item.form.componentProps.isSearchList = true
+      }
+    }
+  })
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
new file mode 100644
index 000000000..91d87f30a
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -0,0 +1,1061 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain'
+import {
+  PurchasereceiptRecordDetail,
+  PurchasereceiptRecordMain
+} from '../../purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data'
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
+import { Supplier } from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data";
+import * as SupplierApi from "@/api/wms/supplier";
+
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'PurchaseReturnRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 采购退货申请主表
+ */
+export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '采购收货记录单号',
+    field: 'purchaseReceiptRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '采购收货记录', // 查询弹窗标题
+        searchAllSchemas: PurchasereceiptRecordMain.allSchemas, // 查询弹窗所需类
+        searchPage: PurchasereceiptRecordMainApi.getPurchasereceiptRecordMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form:{
+      componentProps:{
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm:false,
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm:false,
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm:false,
+  },
+  {
+    label: '从月台代码',
+    field: 'fromDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'PurchaseReturn',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PurchasereturnRequestMainRules = reactive({
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+  ],
+  carrierCode: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+  ],
+  vehiclePlateNumber: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请输入从仓库代码', trigger: 'blur' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购退货申请子表
+ */
+export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择订单行',
+      searchField: 'poLine',
+      searchTitle: '采购收货记录信息',
+      searchAllSchemas: PurchasereceiptRecordDetail.allSchemas,
+      searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage,
+      searchCondition: [{
+        key: 'number',
+        value: 'purchaseReceiptRecordNumber',
+        message: '请填写采购收货记录号！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'poLine',
+        searchTitle: '采购收货记录信息',
+        searchAllSchemas: PurchasereceiptRecordDetail.allSchemas,
+        searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage,
+        searchCondition: [{
+          key: 'number',
+          value: 'purchaseReceiptRecordNumber',
+          message: '请填写采购收货记录号！',
+          isMainValue: true
+        }]
+      }
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      // labelMessage: '信息提示说明！！！',
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择订单行',
+      searchField: 'poLine',
+      searchTitle: '采购收货记录信息',
+      searchAllSchemas: PurchasereceiptRecordDetail.allSchemas,
+      searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageBySupplierCode,
+      searchCondition: [{
+        key: 'supplierCode',
+        value: 'supplierCode',
+        message: '请填写采购收货记录号！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'poLine',
+        searchTitle: '采购收货记录信息',
+        searchAllSchemas: PurchasereceiptRecordDetail.allSchemas,
+        searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageBySupplierCode,
+        searchCondition: [{
+          key: 'supplierCode',
+          value: 'supplierCode',
+          message: '请填写采购收货记录号！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  // {
+  //   label: '从批次',
+  //   field: 'fromBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   }, 
+  //   tableForm:{
+  //     disabled:true
+  //   }
+  // },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm:{
+      type:'InputNumber',
+      min:0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true,
+      type: 'Select',
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true,
+      type: 'Select',
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    }, 
+    tableForm:{
+      disabled:true,
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    }, 
+    tableForm:{
+      disabled:true,
+      type: 'FormDate',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    }, 
+    tableForm:{
+      disabled:true,
+      type: 'FormDate',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '任务明细ID',
+    field: 'jobDetailId',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    isTableForm:false,
+    isForm:false,
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    },
+  },
+ 
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    },
+  },
+
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    isTableForm:false,
+    isForm:false
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    isForm:false,
+    isTableForm:false,
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    isTableForm:false,
+    isForm:false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    isTableForm:false,
+    isForm:false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const PurchasereturnRequestDetailRules = reactive({
+  // packingNumber: [
+  //   { required: true, message: '请输入包装号', trigger: 'blur' }
+  // ],
+  // batch: [
+  //   { required: true, message: '请输入批次', trigger: 'blur' }
+  // ],
+  // inventoryStatus: [
+  //   { required: true, message: '请选择库存状态', trigger: 'change' }
+  // ],
+  // poNumber: [
+  //   { required: true, message: '请输入订单号', trigger: 'blur' }
+  // ],
+  // poLine: [
+  //   { required: true, message: '请输入订单行', trigger: 'blur' }
+  // ],
+  // reason: [
+  //   { required: true, message: '请选择原因', trigger: 'change' }
+  // ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
new file mode 100644
index 000000000..9a39229a8
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -0,0 +1,305 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PutawayJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PutawayJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PutawayJobMainRules"
+    :formAllSchemas="PutawayJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="PutawayJobDetail.allSchemas"
+    :tableFormRules="PutawayJobDetailRules"
+    :apiUpdate="PutawayJobMainApi.updatePutawayJobMain"
+    :apiCreate="PutawayJobMainApi.createPutawayJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PutawayJobMain.allSchemas"
+    :detailAllSchemas="PutawayJobDetail.allSchemas"
+    :detailAllSchemasRules="PutawayJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="PutawayJobDetailApi.getPutawayJobDetailPage"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 子包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PutawayJobDetailPackingNumber.allSchemas"
+    :tableFormRules="PutawayJobDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PutawayJobMain,
+  PutawayJobMainRules,
+  PutawayJobDetail,
+  PutawayJobDetailRules,
+  PutawayJobDetailPackingNumber } from './putawayJobMain.data'
+import * as PutawayJobMainApi from '@/api/wms/putawayJobMain'
+import * as PutawayJobDetailApi from '@/api/wms/putawayJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 上架任务主
+defineOptions({ name: 'PutawayJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PutawayJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PutawayJobMainApi.getPutawayJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+  } else if (val == 'mainJobClo') { // 关闭
+    handleClose(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+  }
+}
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PutawayJobDetailApi.getPutawayJobDetailPageChildPackingNumber
+})
+const { getList:queryDetailList } = packDetatableMethods
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobPutawayMain')
+}
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: '查看其他包装规格',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+        packingDetatableData.params = {
+          masterId:row.masterId,
+          parentPackingNumber:row.packingNumber
+        }
+        await queryDetailList()
+        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await PutawayJobMainApi.closePutawayJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PutawayJobMainApi.exportPutawayJobMain(tableObject.params)
+    download.excel(data, '上架任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
new file mode 100644
index 000000000..3bb41dcd2
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
@@ -0,0 +1,1153 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 上架任务主表
+ */
+export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PutawayJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 上架任务子表
+ */
+export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemdesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
+]))
+
+//表单校验
+export const PutawayJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+
+/**
+ * @returns {Array} 上架任务子表
+ */
+export const PutawayJobDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemdesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type:'FormDateTime',
+      format:'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+]))
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
new file mode 100644
index 000000000..c2cec817e
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
@@ -0,0 +1,229 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PutawayRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PutawayRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PutawayRecordMainRules"
+    :formAllSchemas="PutawayRecordMain.allSchemas"
+    :tableAllSchemas="PutawayRecordDetail.allSchemas"
+    :tableFormRules="PutawayRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PutawayRecordMain.allSchemas"
+    :detailAllSchemas="PutawayRecordDetail.allSchemas"
+    :detailAllSchemasRules="PutawayRecordDetailRules"
+    :apiPage="PutawayRecordDetailApi.getPutawayRecordDetailPage"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 子包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PutawayRecordDetailChildPackingNumber.allSchemas"
+    :tableFormRules="PutawayRecordDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PutawayRecordMain,
+  PutawayRecordMainRules,
+  PutawayRecordDetail,
+  PutawayRecordDetailRules,
+  PutawayRecordDetailChildPackingNumber } from './putawayRecordMain.data'
+import * as PutawayRecordMainApi from '@/api/wms/putawayRecordMain'
+import * as PutawayRecordDetailApi from '@/api/wms/putawayRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 上架记录主
+defineOptions({ name: 'PutawayRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PutawayRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PutawayRecordMainApi.getPutawayRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PutawayRecordDetailApi.getPutawayJobDetailPageChildPackingNumber
+})
+const { getList:queryDetailList } = packDetatableMethods
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordPutawayMain')
+}
+
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: '查看其他包装规格',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+        packingDetatableData.params = {
+          masterId:row.masterId,
+          parentPackingNumber:row.packingNumber
+        }
+        await queryDetailList()
+        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PutawayRecordMainApi.exportPutawayRecordMain(tableObject.params)
+    download.excel(data, '上架记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
new file mode 100644
index 000000000..6d3453d75
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
@@ -0,0 +1,1168 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 上架记录主表
+ */
+export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const PutawayRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 上架记录子表
+ */
+export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
+]))
+
+//表单校验
+export const PutawayRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+
+/**
+ * @returns {Array} 上架记录子表--子包装展示
+ */
+export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type:'FormDateTime',
+      format:'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+]))
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
new file mode 100644
index 000000000..ff53fd1f7
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -0,0 +1,477 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PutawayRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PutawayRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PutawayRequestMainRules"
+    :formAllSchemas="PutawayRequestMain.allSchemas"
+    :tableAllSchemas="PutawayRequestDetail.allSchemas"
+    :tableFormRules="PutawayRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="PutawayRequestMainApi.updatePutawayRequestMain"
+    :apiCreate="PutawayRequestMainApi.createPutawayRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PutawayRequestMain.allSchemas"
+    :detailAllSchemas="PutawayRequestDetail.allSchemas"
+    :detailAllSchemasRules="PutawayRequestDetailRules"
+    :apiCreate="PutawayRequestDetailApi.createPutawayRequestDetail"
+    :apiUpdate="PutawayRequestDetailApi.updatePutawayRequestDetail"
+    :apiPage="PutawayRequestDetailApi.getPutawayRequestDetailPage"
+    :apiDelete="PutawayRequestDetailApi.deletePutawayRequestDetail"
+    fromeWhere="putawayRequest"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/putaway-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+
+  
+  <!-- 子包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PutawayRequestDetailChildPackingNumber.allSchemas"
+    :tableFormRules="PutawayRequestDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { PutawayRequestMain,
+  PutawayRequestMainRules,
+  PutawayRequestDetail,
+  PutawayRequestDetailRules,
+  PutawayRequestDetailChildPackingNumber } from './putawayRequestMain.data'
+import * as PutawayRequestMainApi from '@/api/wms/putawayRequestMain'
+import * as PutawayRequestDetailApi from '@/api/wms/putawayRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 上架申请
+defineOptions({ name: 'PutawayRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PutawayRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      if (formField == 'itemCode') {
+       row['poNumber'] = val[0]['poNumber']
+       row['poLine'] = val[0]['poLine']
+       row['itemCode'] = val[0]['itemCode']
+       row['uom'] = val[0]['uom']
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      setV['inspectRecordNumber'] = val[0]['number']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    setV['itemCode'] = val[0]['code']
+    setV['poNumber'] = val[0]['number']
+    setV['poLine'] = val[0]['lineNumber']
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PutawayRequestMainApi.getPutawayRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:putaway-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+      defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭
+      defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:purchasereceipt-request-main:reAdd'}), //重新添加
+      defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:submit'}), // 提交审批
+      defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
+      // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    handleClose(row.id)
+  } else if (val == 'mainReAdd') { // 重新添加
+    handleReAdd(row.id)
+  } else if (val == 'mainSubmit') { // 提交审批
+    handleSubmit(row.id)
+  } else if (val == 'mainTurnDown') { // 驳回
+    handleRefused(row.id)
+  } else if (val == 'mainApprove') { // 审批通过
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.id)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  }
+}
+
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await PutawayRequestMainApi.closePutawayRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await PutawayRequestMainApi.reAddPutawayRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await PutawayRequestMainApi.agreePutawayRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+    
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await PutawayRequestMainApi.refusedPutawayRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await PutawayRequestMainApi.handlePutawayRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await PutawayRequestMainApi.submitPutawayRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PutawayRequestDetailApi.getPutawayRequestDetailPageChildPackingNumber
+})
+const { getList:queryDetailList } = packDetatableMethods
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestPutawayMain')
+}
+
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: '查看其他包装规格',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+        packingDetatableData.params = {
+          masterId:row.masterId,
+          parentPackingNumber:row.packingNumber
+        }
+        await queryDetailList()
+        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PutawayRequestMainApi.deletePutawayRequestMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PutawayRequestMainApi.exportPutawayRequestMain(tableObject.params)
+    download.excel(data, '上架申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+PutawayRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await PutawayRequestMainApi.createPutawayRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PutawayRequestMainApi.updatePutawayRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '上架申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await PutawayRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
new file mode 100644
index 000000000..dda309149
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -0,0 +1,1215 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain'
+import { InspectRequestMain } from '@/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as PurchaseDetail from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+
+import * as PurchaseMain from '@/api/wms/purchaseMain'
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+
+
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import { Warehouse } from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize: 10,
+  pageNo: 1,
+  code: 'MaterialPutawayRequest'
+}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 上架申请主表
+ */
+export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  // {
+  //   label: '从仓库代码',
+  //   field: 'fromWarehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
+  // },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      },
+      value: new Date().getTime()
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PutawayRequestMainRules = reactive({
+  fromWarehouseCode: [
+    { required: true, message: '请输入从仓库代码', trigger: 'blur' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请输入到仓库代码', trigger: 'blur' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 上架申请子表
+ */
+export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      earchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePagePutaway,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }, {
+        key: 'workshopCode',
+        value: 'workshopCode',
+        isMainValue: true
+      }]
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseMainPage
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseDetail.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'lineNumber',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单行',
+      searchField: 'lineNumber',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseDetail.allSchemas,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择从库位代码',
+      searchField: 'code',
+      searchTitle: '库位基础信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择从库位代码',
+        searchField: 'code',
+        searchTitle: '库位基础信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.getLocationPage
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm: true,
+  }
+]))
+
+//表单校验
+export const PutawayRequestDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请输入包装号', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请输入从库位代码', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
+})
+
+
+/**
+ * @returns {Array} 上架申请子表--子包装展示
+ */
+export const PutawayRequestDetailChildPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: false,
+      earchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePagePutaway,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }, {
+        key: 'workshopCode',
+        value: 'workshopCode',
+        isMainValue: true
+      }]
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: false,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseMainPage
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseDetail.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: false,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'lineNumber',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单行',
+      searchField: 'lineNumber',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseDetail.allSchemas,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择从库位代码',
+      searchField: 'code',
+      searchTitle: '库位基础信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true,
+        isSearchList: false,
+        searchListPlaceholder: '请选择从库位代码',
+        searchField: 'code',
+        searchTitle: '库位基础信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.getLocationPage
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled: true,
+      type:'FormDateTime',
+      format:'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  }
+]))
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
new file mode 100644
index 000000000..e20fb51a8
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
@@ -0,0 +1,276 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchasereceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereceiptJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasereceiptJobMainRules"
+    :formAllSchemas="PurchasereceiptJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="PurchasereceiptJobDetail.allSchemas"
+    :tableFormRules="PurchasereceiptJobDetailRules"
+    :apiUpdate="PurchasereceiptJobMainApi.updatePurchasereceiptJobMain"
+    :apiCreate="PurchasereceiptJobMainApi.createPurchasereceiptJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptJobMain.allSchemas"
+    :detailAllSchemas="PurchasereceiptJobDetail.allSchemas"
+    :detailAllSchemasRules="PurchasereceiptJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PurchasereceiptJobMain,PurchasereceiptJobMainRules,PurchasereceiptJobDetail,PurchasereceiptJobDetailRules } from './sparereceiptJobMain.data'
+import * as PurchasereceiptJobMainApi from '@/api/wms/purchasereceiptJobMain'
+import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 采购收货任务主
+defineOptions({ name: 'PurchasereceiptJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchasereceiptJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereceiptJobMainApi.getPurchasereceiptJobMainPageSpare // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:accept'}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-job-main:abandon'}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-job-main:execute'}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+    handleExecuteSpare(row.id)
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+    handleAbandon(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    handleClose(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+    handleAccept(row.id)
+  }
+}
+
+/** 执行按钮操作 */
+const handleExecuteSpare = async (id: number) => {
+  try {
+    await message.confirm("是否确认执行任务!")
+    await PurchasereceiptJobMainApi.executePurchasereceiptJobMainSpare(id)
+    message.success("执行成功")
+    await getList()
+  } catch {}
+}
+
+/** 放弃按钮操作 */
+const handleAbandon = async (id: number) => {
+  try {
+    await message.confirm("是否确认放弃任务!")
+    await PurchasereceiptJobMainApi.abandonPurchasereceiptJobMainSpare(id)
+    message.success("放弃成功")
+    await getList()
+  } catch {}
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await PurchasereceiptJobMainApi.closePurchasereceiptJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 承接按钮操作 */
+const handleAccept = async (id: number) => {
+  try {
+    await message.confirm("是否承接任务!")
+    await PurchasereceiptJobMainApi.acceptPurchasereceiptJobMain(id)
+    message.success("承接成功")
+    await getList()
+  } catch {}
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'jobPurchasereceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params)
+    download.excel(data, '采购收货任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
new file mode 100644
index 000000000..3ce781e10
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
@@ -0,0 +1,1007 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 采购收货任务主表
+ */
+export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '数据来源',
+    field: 'sourceType',
+    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: false,
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '岗位',
+    field: 'userPositionCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PurchasereceiptJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购收货任务子表
+ */
+export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    fiield: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+]))
+
+//表单校验
+export const PurchasereceiptJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  arriveDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
new file mode 100644
index 000000000..b28f7a874
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
@@ -0,0 +1,188 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchasereceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereceiptRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasereceiptRecordMainRules"
+    :formAllSchemas="PurchasereceiptRecordMain.allSchemas"
+    :tableAllSchemas="PurchasereceiptRecordDetail.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptRecordMain.allSchemas"
+    :detailAllSchemas="detailAllSchemas"
+    :detailAllSchemasRules="PurchasereceiptRecordDetailRules"
+    :apiPage="apiPage"
+    :tabs="PurchasereceiptRequestTabsList"
+    @changeTabs="changeTabs"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PurchasereceiptRecordMain,PurchasereceiptRecordMainRules,PurchasereceiptRecordDetail,PurchasereceiptRecordDetailRules } from './sparereceiptRecordMain.data'
+import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain'
+import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 采购收货记录主
+defineOptions({ name: 'PurchasereceiptRecordMain' })
+
+const apiPage = ref(PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage)
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchasereceiptRecordMain.allSchemas.tableColumns)
+const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereceiptRecordMainApi.getPurchasereceiptRecordMainPageSpare // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+ 
+}
+
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordPurchasereceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
+    download.excel(data, '采购收货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+// tabs 切换事件
+const changeTabs = (data) =>{
+  if(data.prop == 'receiptDetail'){
+  console.log(data)
+    apiPage.value = PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas    
+  }else if(data.prop == 'scarceGoodsDetail'){
+    apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas    
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
new file mode 100644
index 000000000..fe4fc4ed0
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
@@ -0,0 +1,930 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+
+
+/**
+ * @returns {Array} 采购收货记录主表
+ */
+export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数据来源',
+    field: 'sourceType',
+    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: false,
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransaction',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransaction',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isTable:false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+  }
+]))
+
+// 表单校验
+export const PurchasereceiptRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库位类型服务', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请选择创建时间', trigger: 'change' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购收货记录子表
+ */
+export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '目检结果',
+    field: 'visualInspectResult',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '目检照片',
+    field: 'visualInspectPhotos',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '不合格原因',
+    field: 'failedReason',
+    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+ 
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  }
+]))
+
+// 表单校验
+export const PurchasereceiptRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  arriveDate: [
+    { required: true, message: '请选择到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请选择订单行', trigger: 'change' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  visualInspectResult: [
+    { required: true, message: '请选择目检结果', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
new file mode 100644
index 000000000..36fd8b9c8
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -0,0 +1,534 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchasereceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereceiptRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasereceiptRequestMainRules"
+    :formAllSchemas="PurchasereceiptRequestMain.allSchemas"
+    :tableAllSchemas="PurchasereceiptRequestDetail.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain"
+    :apiCreate="PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @formFormDateChange="formFormDateChange"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptRequestMain.allSchemas"
+    :detailAllSchemas="detailAllSchemas"
+    :detailAllSchemasRules="PurchasereceiptRequestDetailRules"
+    :apiCreate="PurchasereceiptRequestDetailApi.createPurchasereceiptRequestDetail"
+    :apiUpdate="PurchasereceiptRequestDetailApi.updatePurchasereceiptRequestDetail"
+    :apiPage="apiPage"
+    :apiDelete="PurchasereceiptRequestDetailApi.deletePurchasereceiptRequestDetail"
+    fromeWhere="purchasereceipt"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="false"
+  />
+
+  <!-- 备件导入 -->
+  <ImportForm 
+    ref="importFormRef" 
+    url="/wms/purchasereceipt-request-main/importSpare" 
+    :importTemplateData="importTemplateData" 
+    @success="importSuccess" 
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
+
+  <!-- 创建标签 -->
+  <BasicForm
+    ref="formLabelRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRequestDetailLabel.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    @submitForm="submitFormLabel"
+  />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { 
+  PurchasereceiptRequestMain,
+  PurchasereceiptRequestMainRules,
+  PurchasereceiptRequestDetail,
+  PurchasereceiptRequestDetailRules,
+  PurchasereceiptRequestDetailLabel,
+ } from './sparereceiptRequestMain.data'
+import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
+import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { getAccessToken } from '@/utils/auth'
+
+// 采购收货申请
+defineOptions({ name: 'PurchasereceiptRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const genLabelId = ref(); //主表ID
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchasereceiptRequestMain.allSchemas.tableColumns)
+
+const apiPage = ref(PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage)
+const detailAllSchemas = ref(PurchasereceiptRequestDetail.allSchemas)
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      if(formField == 'itemCode') {
+        row['itemCode'] = val[0]['code']
+      } else if(formField == 'poNumber') {
+        row['poNumber'] = val[0]['number']
+      } else if(formField == 'poLine'){
+        row['poLine'] = val[0]['lineNumber']
+        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['uom']
+        let supplierCode = formRef.formModel.supplierCode;
+        let itemCode = val[0]['itemCode']
+        let queryData = {
+          supplierCode:supplierCode,
+          itemCode:itemCode
+        } 
+        SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{
+          row['defaultToLocationCode'] = res
+        })
+      }else if (formField == 'packQty'){
+        row['packQty'] = val[0]['packQty']
+        row['packUnit'] = val[0]['packUnit']
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      setV['supplierCode'] = val[0]['code']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if(formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+    } else {
+      setV['poNumber'] = val[0]['number']
+      setV['poLine'] = val[0]['lineNumber']
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereceiptRequestMainApi.getPurchasereceiptRequestMainPageSpare // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {// 新增
+    openForm('create')
+  } else if (val == 'import') {// 导入
+    handleImport()
+  }else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isASNShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if(row.sourceType == 'spare_PartsReceipt' && row.labelStatus == '3'){
+      return true
+    }
+    if(row.sourceType == 'spare_PartsReceipt' && row.labelStatus == '1'){
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:purchasereceipt-request-main:reAdd'}), //重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
+    // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
+    {
+      label: '生成标签',
+      name: 'ssbq',
+      hide: isASNShowMainButton(row, ['3']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    },
+    defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','8']) }), // 标签打印
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    handleClose(row.id)
+  } else if (val == 'mainReAdd') { // 重新添加
+    handleReAdd(row.id)
+  } else if (val == 'mainSubmit') { // 提交审批
+    handleSubmit(row.id)
+  } else if (val == 'mainTurnDown') { // 驳回
+    handleRefused(row.id)
+  } else if (val == 'mainApprove') { // 审批通过
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.id)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if(val == 'ssbq'){ // 生成标签
+     // 生成标签
+     detatableData.params = {
+      masterId:row.id
+     }
+    genLabelId.value = row.id
+    await getDetailList()
+    formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
+  }else if (val == 'point') {
+    // 标签打印
+    labelPrint(row)
+  } 
+}
+
+// 生成标签
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// 生成标签按钮操作
+const submitFormLabel = async (formType, data) => {
+  try {
+    await message.confirm('是否为此数据生成标签？')
+    await PurchasereceiptRequestMainApi.genLabel(genLabelId.value)
+    isCreateLabel.value = true
+    message.success('创建标签成功')
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+
+// 标签打印
+const labelPrint = async (row) => {
+  window.open(src.value + '&asn_number=' + row.asnNumber)
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestPurchasereceiptMain')
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.closePurchasereceiptRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.reAddPurchasereceiptRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.agreePurchasereceiptRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.refusedPurchasereceiptRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.handlePurchasereceiptRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.submitPurchasereceiptRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
+    download.excel(data, '采购收货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+PurchasereceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMainSpare(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '采购收货申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// tabs 切换事件
+// const changeTabs = (data) =>{
+//   if(data.prop == 'receiptDetail'){
+//     apiPage.value = PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage
+//     detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas    
+//   }else if(data.prop == 'scarceGoodsDetail'){
+//     apiPage.value = PurchasereceiptRequestDetailApi.getScarceGoodsDetailPage
+//     detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas    
+//   }
+// }
+
+const formFormDateChange = (field, val,row, index) => {
+  if(field == 'produceDate'){
+    let produceDateStr = formatDate(val,'YYYYMMDD');
+    row.batch = produceDateStr
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await PurchasereceiptRequestMainApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
new file mode 100644
index 000000000..1a0cc7b73
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -0,0 +1,1646 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import { PurchasePlanMain } from '../../supplierdeliver/purchasePlanMain/purchasePlanMain.data'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'PurchaseReceiptRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
+
+// 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+
+/**
+ * @returns {Array} 采购收货申请主表
+ */
+export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: true,
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '要货计划信息', // 查询弹窗标题
+        searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
+        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'supplierCode',
+            value: 'supplierCode',
+            message: '请填写供应商代码！',
+            isMainValue: true
+          },
+          {
+            key: 'status',
+            value: 4,
+            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: "TRUE",
+            isMainValue: false
+          }]
+      }
+    },
+    isForm: true,
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数据来源',
+    field: 'sourceType',
+    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'spare_PartsReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: false,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'PurchaseReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '标签状态',
+    field: 'labelStatus',
+    dictType: DICT_TYPE.LABEL_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isSearch: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PurchasereceiptRequestMainRules = reactive({
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请输入到仓库代码', trigger: 'blur' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请输入到库区类型范围', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购收货申请子表
+ */
+export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+      }]
+    },
+    form: {
+      labelMessage: '该订单号会影响订单行的选择',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择订单行', // 输入框占位文本
+        searchField: 'lineNumber', // 查询弹窗赋值字段
+        searchTitle: '订单信息', // 查询弹窗标题
+        searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'number',
+          value:'poNumber',
+          message: '请填写订单号！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单行', // 输入框占位文本
+      searchField: 'lineNumber', // 查询弹窗赋值字段
+      searchTitle: '订单信息', // 查询弹窗标题
+      searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'number',
+        value:'poNumber',
+        message: '请填写订单号！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '默认到库位代码',
+    field: 'defaultToLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    isTableForm: true,
+    isForm: false
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      type:'FormDate',
+      placeholder: '请选择到货日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      type:'FormDate',
+      placeholder: '请选择过期日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:false,
+  // }
+]))
+
+//表单校验
+export const PurchasereceiptRequestDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请输入包装号', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  arriveDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  poNumber: [
+    { required: true, message: '请输入订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'change' }
+  ],
+})
+
+
+
+export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+      }]
+    },
+    form: {
+      labelMessage: '该订单号会影响订单行的选择',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择订单行', // 输入框占位文本
+        searchField: 'lineNumber', // 查询弹窗赋值字段
+        searchTitle: '订单信息', // 查询弹窗标题
+        searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'number',
+          value:'poNumber',
+          message: '请填写订单号！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单行', // 输入框占位文本
+      searchField: 'lineNumber', // 查询弹窗赋值字段
+      searchTitle: '订单信息', // 查询弹窗标题
+      searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'number',
+        value:'poNumber',
+        message: '请填写订单号！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled:true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '默认到库位代码',
+    field: 'defaultToLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    isTableForm: true,
+    isForm: false
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled:true,
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择到货日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择过期日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
new file mode 100644
index 000000000..48b05bcd3
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -0,0 +1,567 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.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'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 要货预测主表
+ */
+export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      labelMessage: '影响明细中物料代码，需在供应商物料中维护',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '版本号',
+    field: 'version',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '发布时间',
+    field: 'publishTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      value: 'PurchasePrediction',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const DemandforecastingMainRules = reactive({
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  version:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 要货预测子表
+ */
+export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disbaled: true
+      }
+    }
+  },
+  {
+    label: '预测时间类型',
+    field: 'predictTimeType',
+    dictType: DICT_TYPE.PREDICT_TIME_TYPE,
+    sort: 'custom',
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '预测日期',
+    field: 'predictTime',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }, {
+        key: 'supplierCode',
+        value: 'supplierCode',
+        message: '请填写供应商代码！',
+        isMainValue: true
+      }
+        , {
+        key: 'status',
+        value: 2,
+        isMainValue: false
+      }
+      ]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'lineNumber',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage,
+        searchCondition: [{
+          key: 'number',
+          value: 'poNumber',
+          message: '请填写订单号！',
+          isMainValue: true
+        }, {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单行',
+      searchField: 'lineNumber',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseDetail.allSchemas,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage,
+      searchCondition: [{
+        key: 'number',
+        value: 'poNumber',
+        message: '请填写订单号！',
+        isMainValue: true
+      }, {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm: false,
+  }
+]))
+
+//表单校验
+export const DemandforecastingDetailRules = reactive({
+  predictTimeType: [
+    { required: true, message: '请选择预测时间类型', trigger: 'change' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  predictTime: [
+    { required: true, message: '请输入预测时间', trigger: 'change' }
+  ],
+  planQty: [
+    { required: true, message: '请输入计划数量', trigger: 'blur' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
new file mode 100644
index 000000000..38e3afb7e
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -0,0 +1,338 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="DemandforecastingMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="DemandforecastingMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="DemandforecastingMainRules"
+    :formAllSchemas="DemandforecastingMain.allSchemas"
+    :tableAllSchemas="DemandforecastingDetail.allSchemas"
+    :tableFormRules="DemandforecastingDetailRules"
+    :tableData="tableData"
+    :apiUpdate="DemandforecastingMainApi.updateDemandforecastingMain"
+    :apiCreate="DemandforecastingMainApi.createDemandforecastingMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="DemandforecastingMain.allSchemas"
+    :detailAllSchemas="DemandforecastingDetail.allSchemas"
+    :detailAllSchemasRules="DemandforecastingDetailRules"
+    :apiCreate="DemandforecastingDetailApi.createDemandforecastingDetail"
+    :apiUpdate="DemandforecastingDetailApi.updateDemandforecastingDetail"
+    :apiPage="DemandforecastingDetailApi.getDemandforecastingDetailPage"
+    :apiDelete="DemandforecastingDetailApi.deleteDemandforecastingDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/demandforecasting-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { DemandforecastingMain,DemandforecastingMainRules,DemandforecastingDetail,DemandforecastingDetailRules } from './demandforecastingMain.data'
+import * as DemandforecastingMainApi from '@/api/wms/demandforecastingMain'
+import * as DemandforecastingDetailApi from '@/api/wms/demandforecastingDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 要货预测
+defineOptions({ name: 'DemandforecastingMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(DemandforecastingMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      if (formField == 'poLine') {
+        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['uom']
+        row['available'] = val[0]['available']
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    setV['itemCode'] = val[0]['code']
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: DemandforecastingMainApi.getDemandforecastingMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:demandforecasting-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:demandforecasting-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
+        defaultButtons.mainListEditBtn({hasPermi:'wms:demandforecasting-main:update'}), // 编辑
+        defaultButtons.mainListDeleteBtn({hasPermi:'wms:demandforecasting-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+  } else if (val == 'mainReAdd') { // 重新添加
+    console.log('列表-操作按钮事件-重新添加')
+  } else if (val == 'mainSubmit') { // 提交审批
+    console.log('列表-操作按钮事件-提交审批')
+  } else if (val == 'mainTurnDown') { // 驳回
+    console.log('列表-操作按钮事件-驳回')
+  } else if (val == 'mainApprove') { // 审批通过
+    console.log('列表-操作按钮事件-审批通过')
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'planDemandforecastingMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await DemandforecastingMainApi.deleteDemandforecastingMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DemandforecastingMainApi.exportDemandforecastingMain(tableObject.params)
+    download.excel(data, '要货预测主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+DemandforecastingDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await DemandforecastingMainApi.createDemandforecastingMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DemandforecastingMainApi.updateDemandforecastingMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '要货预测主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
new file mode 100644
index 000000000..ac0a5bd4d
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -0,0 +1,474 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchaseMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="PurchaseMain.allSchemas" />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+        total: tableObject.total
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort">
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm ref="formRef" 
+    @success="getList" 
+    :rules="PurchaseMainRules" 
+    :formAllSchemas="PurchaseMain.allSchemas"
+    :tableAllSchemas="PurchaseDetail.allSchemas" 
+    :tableFormRules="PurchaseDetailRules" 
+    :tableData="tableData"
+    :apiUpdate="PurchaseMainApi.updatePurchaseMain" 
+    :apiCreate="PurchaseMainApi.createPurchaseMain" 
+    :isBusiness="true"
+    @handleAddTable="handleAddTable" 
+    @handleDeleteTable="handleDeleteTable" 
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @onChange="onChangeQty" />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" 
+    :isBasic="false" 
+    :allSchemas="PurchaseMain.allSchemas"
+    :detailAllSchemas="PurchaseDetail.allSchemas" 
+    :detailAllSchemasRules="PurchaseDetailRules"
+    :apiCreate="PurchaseDetailApi.createPurchaseDetail" 
+    :apiUpdate="PurchaseDetailApi.updatePurchaseDetail"
+    :apiPage="PurchaseDetailApi.getPurchaseDetailPage" 
+    :apiDelete="PurchaseDetailApi.deletePurchaseDetail" 
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail" />
+
+  <!-- 导入 -->
+  <ImportForm 
+  ref="importFormRef" 
+  url="/wms/purchase-main/import" 
+  :importTemplateData="importTemplateData"
+    @success="importSuccess" 
+    :isShowOut="true" 
+    :updateIsDisable="true" 
+    :coverIsDisable="true" 
+    :mode="2" />
+</template>
+
+<script setup lang="ts">
+  import download from '@/utils/download'
+  import { PurchaseMain, PurchaseMainRules, PurchaseDetail, PurchaseDetailRules } from './purchaseMain.data'
+  import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+  import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import * as ItembasicApi from '@/api/wms/itembasic'
+
+  // 采购订单
+  defineOptions({ name: 'PurchaseMain' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(PurchaseMain.allSchemas.tableColumns)
+
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+    nextTick(async() => {
+      if (type == 'tableForm') {
+        // 明细查询页赋值
+        if(formField == 'itemCode'){
+          let subList = tableData.value
+          let flag = false;
+          if(subList.length > 0){
+            subList.forEach((item) => {
+              if(item.itemCode == val[0]['itemCode']){
+                flag = true;
+              }
+            })
+          }
+          if(flag){
+            message.warning("物料代码已经存在");
+            return;
+          }
+          row[formField] = val[0][searchField]
+          await ItembasicApi.getItembasicPage({
+            code: row['itemCode']
+          }).then(res => {
+            row['uom'] = res.list[0].uom
+          })
+        }
+      } else {
+        const setV = {}
+        setV[formField] = val[0][searchField]
+        if(formField == 'supplierCode'){
+          tableData.value = [] // 清空子表数据
+          setV['contactName']=val[0]['contacts']
+          setV['contactPhone']=val[0]['phone']
+          setV['contactEmail']=val[0]['email']
+        }
+        formRef.setValues(setV)
+      }
+    })
+  }
+  // 查询页面返回——详情
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+    nextTick(async() => {
+      const setV = {}
+      if(formField == 'itemCode'){
+          await ItembasicApi.getItembasicPage({
+            code: setV['itemCode']
+          }).then(res => {
+            setV['uom'] = res.list[0].uom
+            setV[formField] = val[0][searchField]
+          })
+        }
+      formRef.setValues(setV)
+    })
+  }
+
+  // 子表新增的时候选择表格之后需要会显得字段
+  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+  const Echo = []
+
+  const { tableObject, tableMethods } = useTable({
+    getListApi: PurchaseMainApi.getPurchaseMainPage // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-main:create' }), // 新增
+    defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-main:import' }), // 导入
+    defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-main:export' }), // 导出
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+    // {
+    //   label: '自定义扩展按钮',
+    //   name: 'zdy',
+    //   hide: false,
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   color: ''
+    // },
+  ]
+
+  // 头部按钮事件
+  const buttonBaseClick = (val, item) => {
+    if (val == 'add') { // 新增
+      openForm('create')
+    } else if (val == 'import') { // 导入
+      handleImport()
+    } else if (val == 'export') { // 导出
+      handleExport()
+    } else if (val == 'refresh') { // 刷新
+      if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+    } else if (val == 'filtrate') { // 筛选
+    } else { // 其他按钮
+      console.log('其他按钮', item)
+    }
+  }
+
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton = (row, val) => {
+    if (val.indexOf(row.status) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }
+
+  // 列表-操作按钮
+  const butttondata = (row) => {
+    return [
+      defaultButtons.mainListOrderCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭
+      defaultButtons.mainListOrderOpeBtn({ hide: isShowMainButton(row, ['3']) }), // 打开
+      defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
+      defaultButtons.mainListOrderWitBtn({ hide: isShowMainButton(row, ['2']) }), // 下架
+      defaultButtons.mainListEditBtn({ hasPermi: 'wms:purchase-main:update', hide: isShowMainButton(row, ['1']) }), // 编辑
+      // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:purchase-main:delete', hide: isShowMainButton(row, ['1']) }), // 删除
+    ]
+  }
+
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val, row) => {
+    if (val == 'edit') { // 编辑
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      openForm('update', row)
+    } else if (val == 'delete') { // 删除
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      handleDelete(row.id)
+    } else if (val == 'mainOrderClo') { // 关闭
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      handleClose(row.id)
+    } else if (val == 'mainOrderOpe') { // 打开
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      handleOpen(row.id)
+    } else if (val == 'mainOrderPub') { // 发布
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      handlePublish(row.id)
+    } else if (val == 'mainOrderWit') { // 下架
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      handleWit(row.id)
+    }
+  }
+
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = async (type : string, row ?: number) => {
+    console.log("【purchaseMain】type类型:",type);
+    tableData.value = [] // 重置明细数据
+    if(type == 'create'){
+      PurchaseMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'supplierCode') {
+          item.componentProps.isSearchList = true
+          item.componentProps.disabled = true
+        }
+      })
+    }
+    if(type == 'update'){
+      PurchaseMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'supplierCode') {
+          item.componentProps.isSearchList = false
+          item.componentProps.disabled = true
+        }
+      })
+    }
+    formRef.value.open(type, row)
+  }
+
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    if(row.type == 'DISCRETE'){
+      PurchaseDetail.allSchemas.formSchema.map((item) => {
+        if (item.field == 'orderQty') {
+          item.componentProps.disabled = false
+        }
+      })
+    }else{
+      PurchaseDetail.allSchemas.formSchema.map((item) => {
+        if (item.field == 'orderQty') {
+          item.componentProps.disabled = true
+        }
+      })
+    }
+    detailRef.value.openDetail(row, titleName, titleValue,'orderPurchaseMain')
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      tableObject.loading = true
+      // 发起删除
+      await PurchaseMainApi.deletePurchaseMain(id)
+      message.success(t('common.delSuccess'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch {}finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 关闭按钮操作 */
+  const handleClose = async (id : number) => {
+    try {
+      // 关闭的二次确认
+      await message.confirm('是否关闭所选中数据？')
+      tableObject.loading = true
+      // 发起关闭
+      await PurchaseMainApi.closePurchaseMain(id)
+      message.success(t('关闭成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 打开按钮操作 */
+  const handleOpen = async (id : number) => {
+    try {
+      // 打开的二次确认
+      await message.confirm('是否打开所选中数据？')
+      tableObject.loading = true
+      // 发起打开
+      await PurchaseMainApi.openPurchaseMain(id)
+      message.success(t('打开成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 发布按钮操作 */
+  const handlePublish = async (id : number) => {
+    try {
+      // 发布的二次确认
+      await message.confirm('是否发布所选中数据？')
+      tableObject.loading = true
+      // 发起发布
+      await PurchaseMainApi.publishPurchaseMain(id)
+      message.success(t('发布成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 下架按钮操作 */
+  const handleWit = async (id : number) => {
+    try {
+      // 下架的二次确认
+      await message.confirm('是否下架所选中数据？')
+      tableObject.loading = true
+      // 发起下架
+      await PurchaseMainApi.witPurchaseMain(id)
+      message.success(t('下架成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 导出按钮操作 */
+  const exportLoading = ref(false) // 导出的加载中
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await PurchaseMainApi.exportPurchaseMain(tableObject.params)
+      download.excel(data, '采购订单主.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  PurchaseDetail.allSchemas.tableFormColumns.forEach(item => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  const tableData = ref([])
+
+  // 添加明细
+  const handleAddTable = () => {
+    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  }
+  // 删除明细
+  const handleDeleteTable = (item, index) => {
+    tableData.value.splice(index, 1)
+  }
+
+  // 主子数据 提交
+  const submitForm = async (formType, data) => {
+    data.subList = tableData.value // 拼接子表数据参数
+    try {
+      if (formType === 'create') {
+        await PurchaseMainApi.createPurchaseMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await PurchaseMainApi.updatePurchaseMain(data)
+        message.success(t('common.updateSuccess'))
+      }
+      formRef.value.dialogVisible = false
+      // 刷新当前列表
+      getList()
+    } finally {
+      formRef.value.formLoading = false
+    }
+  }
+
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '采购订单主导入模版.xlsx'
+  })
+
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
+  }
+  const onChangeQty = (field, cur) => {
+    if(field == 'type' && cur == 'DISCRETE'){
+      PurchaseDetail.allSchemas.tableFormColumns.map((item) => {
+        if (item.field == 'orderQty') {
+          console.log("AAAAAA",item)
+          item.tableForm.disabled = false
+        }
+      })
+    }
+    if(field == 'type' && cur == 'SCHEDULE'){
+      PurchaseDetail.allSchemas.tableFormColumns.map((item) => {
+        if (item.field == 'orderQty') {
+          console.log("BBBBB",item)
+          item.tableForm.disabled = true
+        }
+      })
+    }
+
+  }
+
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await PurchaseMainApi.importTemplate()
+  })
+</script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
new file mode 100644
index 000000000..023d6051e
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -0,0 +1,866 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+import {validateHanset,validateEmail} from '@/utils/validator'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 采购订单主表
+ */
+export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      labelMessage: '影响明细中物料代码，需在供应商物料中维护',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '订单类型',
+    field: 'type',
+    dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '订单日期',
+    field: 'orderDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      },
+      value: new Date().getTime()
+    },
+  },
+  {
+    label: '截止日期',
+    field: 'dueDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    detail:{
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '税率',
+    field: 'taxRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        style: {width:'100%'},
+        min: 0
+      }
+    }
+  },
+  {
+    label: '版本',
+    field: 'version',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '当前阶段',
+    field: 'currentStage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        style: {width:'100%'},
+        min: 0
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '是否寄存订单',
+    field: 'isConsignment',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '联系人姓名',
+    field: 'contactName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人电话',
+    field: 'contactPhone',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人电子邮件',
+    field: 'contactEmail',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+    form: {
+      value: 'PurchaseReceipt',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 200,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const PurchaseMainRules = reactive({
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'change' }
+  ],
+  type:  [
+    { required: true, message: '请选择订单类型', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  orderDate: [
+    { required: true, message: '请输入订单日期', trigger: 'change' }
+  ],
+  taxRate:  [
+    { required: true, message: '请输入税率', trigger: 'blur' }
+  ],
+  version:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactName:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactPhone:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
+  ],
+  contactEmail:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateEmail, message: '请输入正确的手机号', trigger: 'blur'}
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购订单子表
+ */
+export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    isTableForm: false,
+    table: {
+      width: 180
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '行号',
+    field: 'lineNumber',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isSearchList: true, // 开启查询弹窗
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商物料',
+      searchField: 'itemCode',
+      searchTitle: '供应商物料信息',
+      searchAllSchemas: Supplieritem.allSchemas,
+      searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem,
+      searchCondition: [{
+        key:'supplierCode',
+        value:'supplierCode',
+        message: '请填写供应商代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+        }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择供应商物料',
+        searchField: 'itemCode',
+        searchTitle: '供应商物料信息',
+        searchAllSchemas: Supplieritem.allSchemas,
+      searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem,
+      searchCondition: [{
+        key:'supplierCode',
+        value:'supplierCode',
+        message: '请填写供应商代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+        }]
+      }
+    }
+  },
+ {
+   label: '计量单位',
+   field: 'uom',
+   sort: 'custom',
+   dictType: DICT_TYPE.UOM,
+   dictClass: 'string',
+   isSearch: true,
+   isTable: true,
+   table: {
+     width: 150
+   },
+   tableForm: {
+     disabled:true,
+     type: 'Select'
+   }
+ },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:false,
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled:false,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+  },
+  {
+    label: 'ERP库位',
+    field: 'erpLocationCode',
+    dictType : DICT_TYPE.ERP_LOCATION,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+     table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '已计划数量',
+    field: 'plannedQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+      value: 1
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '已发货数量',
+    field: 'shippedQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+      value: 1
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '已收货数量',
+    field: 'receivedQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      value: 0,
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '已退货数量',
+    field: 'returnedQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      value: 0,
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '已上架数量',
+    field: 'putawayQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      value: 1,
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type:'Select',
+      default: 'TRUE',
+      inactiveValue: 'FALSE',
+      activeValue: 'TRUE'
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '超收百分比',
+    field: 'overReceivingPercent',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+    isTable:false,
+    isTableForm:false,
+    tableForm: {
+      type: 'InputNumber',
+      min: 0
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isTableForm: false,
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    isTableForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isTableForm: false,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    isTableForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const PurchaseDetailRules = reactive({
+  lineNumber: [
+    { required: true, message: '请输入行号', trigger: 'blur' }, 
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  packQty:  [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  taxRate:  [
+    { required: true, message: '请输入税率', trigger: 'blur' }
+  ],
+  shippedQty:  [
+    { required: true, message: '请输入已发货数量', trigger: 'blur' }
+  ],
+  receivedQty:  [
+    { required: true, message: '请输入已收货数量', trigger: 'blur' }
+  ],
+  returnedQty:  [
+    { required: true, message: '请输入已退货数量', trigger: 'blur' }
+  ],
+  putawayQty:  [
+    { required: true, message: '请输入已上架数量', trigger: 'blur' }
+  ],
+  overReceivingPercent:  [
+    { required: true, message: '请输入超收百分比', trigger: 'blur' }
+  ],
+  orderQty:  [
+    { required: true, message: '请输入订单数量', trigger: 'blur' }
+  ],
+  uom:  [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  nuumber:  [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode:  [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
new file mode 100644
index 000000000..8330d5564
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -0,0 +1,549 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchasePlanMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="PurchasePlanMain.allSchemas" />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+        total: tableObject.total
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort">
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm ref="formRef" @success="getList" 
+    :rules="PurchasePlanMainRules"
+    :formAllSchemas="PurchasePlanMain.allSchemas" 
+    :tableAllSchemas="PurchasePlanDetail.allSchemas"
+    :tableFormRules="PurchasePlanDetailRules" 
+    :tableData="tableData"
+    :apiUpdate="PurchasePlanMainApi.updatePurchasePlanMain" 
+    :apiCreate="PurchasePlanMainApi.createPurchasePlanMain"
+    :isBusiness="true" 
+    @handleAddTable="handleAddTable" 
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess" 
+    @submitForm="submitForm" />
+
+  <!-- 详情 -->
+  <!-- 隐藏子表编辑和删除是因为要货计划以后是接口发过来的，而且我们的计划数量是放入到采购订单已计划数量里，无法再次编辑数量-->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasePlanMain.allSchemas"
+    :detailAllSchemas="PurchasePlanDetail.allSchemas"
+    :detailAllSchemasRules="PurchasePlanDetailRules"
+    :apiCreate="PurchasePlanDetailApi.createPurchasePlanDetail"
+    :apiUpdate="PurchasePlanDetailApi.updatePurchasePlanDetail"
+    :apiPage="PurchasePlanDetailApi.getPurchasePlanDetailPage"
+    :apiDelete="PurchasePlanDetailApi.deletePurchasePlanDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailValidate="detailValidate" 
+    :detailButtonIsShowDelete="false"
+    :detailButtonIsShowEdit="false"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+  import download from '@/utils/download'
+  import { PurchasePlanMain, PurchasePlanMainRules, PurchasePlanDetail, PurchasePlanDetailRules } from './purchasePlanMain.data'
+  import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
+  import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+  import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+  // 要货计划
+  defineOptions({ name: 'PurchasePlanMain' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(PurchasePlanMain.allSchemas.tableColumns)
+
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+    nextTick(async () => {
+      if (type == 'tableForm') {
+        // 明细查询页赋值
+        row[formField] = val[0][searchField]
+        row['itemCode'] = val[0]['code']
+        row['poNumber'] = val[0]['number']
+        row['poLine'] = val[0]['lineNumber']
+        if (formField == 'poLine') {
+          row['itemCode'] = val[0]['itemCode']
+          row['uom'] = val[0]['uom']
+          row['orderQty'] = val[0]['orderQty']
+          row['planQty'] = val[0]['orderQty']-val[0]['plannedQty']
+          row['available'] = val[0]['available']
+        }
+      } else {
+        const setV = {}
+        setV[formField] = val[0][searchField]
+        setV['itemCode'] = val[0]['code']
+        setV['poNumber'] = val[0]['number']
+        setV['poLine'] = val[0]['lineNumber']
+        if(formField == 'supplierCode'){
+          setV['supplierCode'] = val[0]['code']
+          await PurchasePlanMainApi.queryPurchasePlan(val[0]['code']).then(res => {
+            let beginTime = res.beginTime
+            var ms = beginTime.substring(0, 2)
+		        var me = beginTime.substring(3)
+            setV['beginTime'] = new Date(2024, 1, 1, Number(ms), Number(me))
+            let endTime = res.endTime
+            var ms = endTime.substring(0, 2)
+		        var me = endTime.substring(3)
+            setV['endTime'] = new Date(2024, 1, 1, Number(ms), Number(me))
+          })
+        }
+        if (formField == 'poLine') {
+          setV['itemCode'] = val[0]['itemCode']
+          setV['uom'] = val[0]['uom']
+          setV['orderQty'] = val[0]['orderQty']
+          setV['planQty'] = val[0]['orderQty']-val[0]['plannedQty']
+          setV['available'] = val[0]['available']
+        }
+        formRef.setValues(setV)
+      }
+    })
+  }
+  // 查询页面返回——详情
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+    nextTick(async () => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      setV['poNumber'] = val[0]['number']
+      setV['poLine'] = val[0]['lineNumber']
+      if (formField == 'poLine') {
+        setV['itemCode'] = val[0]['itemCode']
+        setV['uom'] = val[0]['uom']
+        setV['orderQty'] = val[0]['orderQty']
+        setV['planQty'] = val[0]['orderQty']-val[0]['plannedQty']
+        setV['available'] = val[0]['available']
+      }
+      // await PurchaseDetailApi.getPurchaseDetailPage({
+      //   number: setV['poNumber'],
+      //   lineNumber: setV['poLine'],
+      // }).then(res => {
+      //   if (res.list.length == 1) {
+      //     // 叶佳兴
+      //     setV['itemCode'] = res.list[0].itemCode
+      //   }
+      // })
+      formRef.setValues(setV)
+    })
+  }
+
+  const { tableObject, tableMethods } = useTable({
+    getListApi: PurchasePlanMainApi.getPurchasePlanMainPage // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), // 新增
+    defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入
+    defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+    // {
+    //   label: '自定义扩展按钮',
+    //   name: 'zdy',
+    //   hide: false,
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   color: ''
+    // },
+  ]
+
+  // 头部按钮事件
+  const buttonBaseClick = (val, item) => {
+    if (val == 'add') { // 新增
+      openForm('create')
+    } else if (val == 'import') { // 导入
+      handleImport()
+    } else if (val == 'export') { // 导出
+      handleExport()
+    } else if (val == 'refresh') { // 刷新
+      if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+    } else if (val == 'filtrate') { // 筛选
+    } else { // 其他按钮
+      console.log('其他按钮', item)
+    }
+  }
+
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton = (row, val) => {
+    if (val.indexOf(row.status) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }
+
+  // 列表-操作按钮
+  const butttondata = (row) => {
+    return [
+      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭
+      defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
+      defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受
+      defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受
+      defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) }), // 下架
+      defaultButtons.mainListPurchasePlanModBtn({ hide: isShowMainButton(row, ['5']) }), // 修改
+      // defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑
+      // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除
+    ]
+  }
+
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val, row) => {
+    if (val == 'mainPurPlanOpe') { // 打开
+      handleOpen(row.id)
+    } else if (val == 'mainPurPlanClo') {// 关闭
+      handleClose(row.id)
+    } else if (val == 'mainPurPlanPub') { // 发布
+      handlePublish(row.id)
+    } else if (val == 'mainPurPlanAcc') { // 接受
+      handleAcc(row.id)
+    } else if (val == 'mainPurPlanRej') { // 不接受
+      handleRej(row.id)
+    } else if (val == 'mainPurPlanWit') { // 下架
+      handleWit(row.id)
+    } else if(val == 'mainPurPlanMod'){ // 修改
+      handleReOpen(row.id)
+    }else if (val == 'edit') { // 编辑
+      openForm('update', row)
+    } else if (val == 'delete') { // 删除
+      handleDelete(row.id)
+    }
+  }
+
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = async (type : string, row ?: number) => {
+    tableData.value = [] // 重置明细数据
+    formRef.value.open(type, row)
+  }
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    detailRef.value.openDetail(row, titleName, titleValue,'planPurchaseMain')
+    const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+    if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      tableObject.loading = true
+      // 发起删除
+      await PurchasePlanMainApi.deletePurchasePlanMain(id)
+      message.success(t('common.delSuccess'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 关闭按钮操作 */
+  const handleClose = async (id : number) => {
+    try {
+      // 关闭的二次确认
+      await message.confirm('是否关闭所选中数据？')
+      // 发起关闭
+      await PurchasePlanMainApi.closePurchasePlanMain(id)
+      message.success(t('关闭成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 打开按钮操作 */
+  const handleOpen = async (id : number) => {
+    try {
+      // 打开的二次确认
+      await message.confirm('是否打开所选中数据？')
+      tableObject.loading = true
+      // 发起打开
+      await PurchasePlanMainApi.openPurchasePlanMain(id)
+      message.success(t('打开成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+
+  /** 打开按钮操作 */
+  const handleReOpen = async (id : number) => {
+    try {
+      // 打开的二次确认
+      await message.confirm('是否重新打开所选中数据？')
+      tableObject.loading = true
+      // 发起打开
+      await PurchasePlanMainApi.openPurchasePlanMain(id)
+      message.success(t('打开成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 发布按钮操作 */
+  const handlePublish = async (id : number) => {
+    try {
+      // 发布的二次确认
+      await message.confirm('是否发布所选中数据？')
+      tableObject.loading = true
+      // 发起发布
+      await PurchasePlanMainApi.publishPurchasePlanMain(id)
+      message.success(t('发布成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 下架按钮操作 */
+  const handleWit = async (id : number) => {
+    try {
+      // 下架的二次确认
+      await message.confirm('是否下架所选中数据？')
+      tableObject.loading = true
+      // 发起下架
+      await PurchasePlanMainApi.witPurchasePlanMain(id)
+      message.success(t('下架成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 接受按钮操作 */
+  const handleAcc = async (id : number) => {
+    try {
+      // 接受的二次确认
+      await message.confirm('是否接受所选中数据？')
+      tableObject.loading = true
+      // 发起接受
+      await PurchasePlanMainApi.accPurchasePlanMain(id)
+      message.success(t('接受成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 驳回按钮操作 */
+  const handleRej = async (id : number) => {
+    try {
+      // 驳回的二次确认
+      await message.confirm('是否驳回所选中数据？')
+      tableObject.loading = true
+      // 发起驳回
+      await PurchasePlanMainApi.rejPurchasePlanMain(id)
+      message.success(t('驳回成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 导出按钮操作 */
+  const exportLoading = ref(false) // 导出的加载中
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await PurchasePlanMainApi.exportPurchasePlanMain(tableObject.params)
+      download.excel(data, '要货计划主.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  PurchasePlanDetail.allSchemas.tableFormColumns.forEach(item => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  const tableData = ref([])
+
+  // 添加明细
+  const handleAddTable = () => {
+    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  }
+  // 删除明细
+  const handleDeleteTable = (item, index) => {
+    tableData.value.splice(index, 1)
+  }
+
+  // 主子数据 提交
+  const submitForm = async (formType, data) => {
+    data.subList = []
+    let flag = false
+    for (let item of tableData.value) {
+      await PurchaseDetailApi.getPurchaseDetailPageCheckData({
+        number: item.poNumber,
+        lineNumber: item.poLine,
+      }).then(res => {
+        console.log("【要货计划】-每条数据结果",item)
+        if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验
+          if (item.planQty > res.list[0].orderQty - res.list[0].plannedQty) {
+            flag = true;
+            message.error('要货计划数量不得大于订单数量-已计划数量')
+            return
+          }else{
+            data.subList.push(item) // 拼接子表数据参数
+          }
+        }else{
+          data.subList.push(item) // 拼接子表数据参数
+        }
+      })
+    }
+    if(flag){
+      formRef.value.formLoading = false
+      return;
+    }
+    if (data.subList.length == tableData.value.length) {
+      try {
+        if (formType === 'create') {
+          if(data.subList.length == 0){
+            message.error('子列表数量不能空')
+            return
+          }
+          await PurchasePlanMainApi.createPurchasePlanMain(data)
+          message.success(t('common.createSuccess'))
+        } else {
+          await PurchasePlanMainApi.updatePurchasePlanMain(data)
+          message.success(t('common.updateSuccess'))
+        }
+        formRef.value.dialogVisible = false
+        // 刷新当前列表
+        getList()
+      } finally {
+        formRef.value.formLoading = false
+      }
+    }
+    formRef.value.formLoading = false
+  }
+
+  // 子表新增/编辑校验
+  const detailValidate = async (data) => {
+    let tag = false
+    await PurchaseDetailApi.getPurchaseDetailPageCheckData({
+      number: data.poNumber,
+      lineNumber: data.poLine
+    }).then(res => {
+      if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验
+        if (data.planQty > res.list[0].orderQty - res.list[0].plannedQty) {
+          message.error('要货计划数量不得大于订单数量-已计划数量')
+          tag = false
+        } else {
+          tag = true
+        }
+      }else{
+        tag = true
+      }
+    }).catch(err =>{
+      console.log(err);
+    })
+    return tag
+  }
+
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '要货计划主导入模版.xlsx'
+  })
+
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
+  }
+
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await PurchasePlanMainApi.importTemplate()
+  })
+</script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
new file mode 100644
index 000000000..45cc14d71
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -0,0 +1,621 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
+import {getPurchaseDetailPagePoNumber} from "@/api/wms/purchaseDetail";
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 要货计划主表
+ */
+export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      labelMessage: '影响明细中物料代码，需在供应商物料中维护',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '送达日期',
+    field: 'deliveryDate',
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter2,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+  },
+  {
+    label: '时间窗口',
+    field: 'timeWindow',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      component:"TimePicker",
+      componentProps: {
+        format:"HH:mm",
+      }
+    }
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      component:"TimePicker",
+      componentProps: {
+        format:"HH:mm",
+      }
+    }
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '月台代码',
+    field: 'dockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      value: 'PurchaseReceipt',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.PURCHASE_PLAN_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  
+  {
+    label: '自动发布',
+    field: 'autoPublish',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: "TRUE",
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '自动接收',
+    field: 'autoAccept',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: "TRUE",
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    isSearch: true,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    isForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    isTable: true,
+    isForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 200,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const PurchasePlanMainRules = reactive({
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 要货计划子表
+ */
+export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isTableForm: false,
+    table: {
+      width: 180
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }, {
+        key: 'supplierCode',
+        value: 'supplierCode',
+        message: '请填写供应商代码！',
+        isMainValue: true
+      }, {
+        key: 'status',
+        value: 2,
+        isMainValue: false
+      }
+      ]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'supplierCode',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true
+        },{
+          key: 'status',
+          value: 2,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'lineNumber',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
+        searchCondition: [{
+          key: 'number',
+          value: 'poNumber',
+          message: '请填写订单号！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单行',
+      searchField: 'lineNumber',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseDetail.allSchemas,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
+      searchCondition: [{
+        key: 'number',
+        value: 'poNumber',
+        message: '请填写订单号！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '已发货数量',
+    field: 'shippedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      inactiveValue: 'FALSE',
+      disabled: true
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    isTableForm: false,
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isTableForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm: false,
+  }
+]))
+
+//表单校验
+export const PurchasePlanDetailRules = reactive({
+  // available: [
+  //   { required: true, message: '请选择是否可用', trigger: 'change' }
+  // ],
+  poNumber: [
+    { required: true, message: '请选择采购订单号', trigger: 'change' }
+  ],
+  shippedQty: [
+    { required: true, message: '请输入已发货数量', trigger: 'blur' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  planQty: [
+    { required: true, message: '请输入计划数量', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
new file mode 100644
index 000000000..ec595b436
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
@@ -0,0 +1,278 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Package.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="PackageRules" 
+    :formAllSchemas="Package.allSchemas" 
+    :searchTableParams="searchTableParams"
+    :apiUpdate="PackageApi.updatePackage"
+    :apiCreate="PackageApi.createPackage"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Package.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/package/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { Package,PackageRules } from './supplierPackage.data'
+import * as PackageApi from '@/api/wms/package'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'PurchasePackage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Package.allSchemas.tableColumns)
+
+
+/**
+ * PurchasePackage regularParams = procure采购件标签记录页面   
+ * ManufacturePackage regularParams = manufacture  制造件标签记录页面
+ * UtensilPackage regularParams = utensil  器具标签记录页面
+ * SupplierPackage regularParams = procure  供应商发货标签记录(用采购标签)
+ */
+const regularParams = ref(route.name == 'PurchasePackage'?'procure':route.name == 'ManufacturePackage'?'manufacture':route.name == 'UtensilPackage'?'utensil':route.name == 'SupplierPackage'?'procure':'')
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => {
+  nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      basicFormRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PackageApi.getPackagePage // 分页接口
+})
+tableObject.params.regularParams = regularParams.value
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+// const isShowMainButton = (row,val) => {
+//   if (val.indexOf(row.status) > -1) {
+//     return false
+//   } else {
+//     return true
+//   }
+// }
+
+// 列表-操作按钮
+// const butttondata = (row) => {
+//     return [
+//         defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+//         defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+//         defaultButtons.mainListPointBtn(null), // 标签打印
+//     ]
+// }
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+  defaultButtons.mainListPointBtn(null), // 标签打印
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm =async (type: string, row?: number) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'supplierPackage')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await PackageApi.deletePackage(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PackageApi.exportPackage(tableObject.params)
+    download.excel(data, '包装.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (id) => {
+  window.open(src.value+'&id='+id)
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '包装导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters,
+    regularParams:regularParams.value
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts
new file mode 100644
index 000000000..4e83aa894
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts
@@ -0,0 +1,424 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+// 表单校验
+export const PackageRules = reactive({
+  number: [required],
+  itemCode: [required],
+  itemName: [required],
+})
+export const Package2 = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+]))
+export const Package = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '有效期(日)',
+    field: 'validityDays',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+      value: 0
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '失效日期',
+    field: 'expireDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代计量单位',
+    field: 'altUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代数量',
+    field: 'altQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    // form: {
+    //   component: 'SelectV2'
+    // },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '供应商物料代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购计划单号',
+    field: 'rpNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 182,
+    },
+  },
+  {
+    label: '生产订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '班组代码',
+    field: 'teamCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '班次代码',
+    field: 'shiftCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户月台代码',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户物料代码',
+    field: 'customerItemCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '销售订单号',
+    field: 'soNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '销售订单行',
+    field: 'soLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '质量等级',
+    field: 'eqLevel',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '重量',
+    field: 'weight',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '面积',
+    field: 'area',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '体积',
+    field: 'volume',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
new file mode 100644
index 000000000..9119693f4
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -0,0 +1,257 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SupplierdeliverRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SupplierdeliverRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="SupplierdeliverRecordMainRules"
+    :formAllSchemas="SupplierdeliverRecordMain.allSchemas"
+    :tableAllSchemas="SupplierdeliverRecordDetail.allSchemas"
+    :tableFormRules="SupplierdeliverRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="SupplierdeliverRecordMain.allSchemas"
+    :detailAllSchemas="SupplierdeliverRecordDetail.allSchemas"
+    :detailAllSchemasRules="SupplierdeliverRecordDetailRules"
+    :apiPage="SupplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailPage"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 父包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="SupplierdeliverRecordDetailPickingNumer.allSchemas"
+    :tableFormRules="SupplierdeliverRecordDetailRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SupplierdeliverRecordMain,SupplierdeliverRecordMainRules,
+  SupplierdeliverRecordDetail,SupplierdeliverRecordDetailRules,SupplierdeliverRecordDetailPickingNumer } from './supplierdeliverRecordMain.data'
+import * as SupplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMain'
+import * as SupplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { getAccessToken } from '@/utils/auth'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 供应商发货记录主
+defineOptions({ name: 'SupplierdeliverRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SupplierdeliverRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierdeliverRecordMainApi.getSupplierdeliverRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:supplierdeliver-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+     defaultButtons.mainListGenerateApplicationBtn({hasPermi:'wms:supplierdeliver-record-main:createPurchasereceiptRequest',hide:!row.purchasereceiptRequestFlag}), // 生成采购申请
+     defaultButtons.mainListDocumentPrintBtn({})  // 单据打印
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if(val == 'generateApplication'){
+    handlerCreatePurchasereceiptRequest(row.number)
+  }else if (val == 'documentPrint') {
+    // 单据打印
+    handleDocumentPrint(row.id)
+  }
+}
+
+/** 生成采购收货申请按钮操作 */
+const handlerCreatePurchasereceiptRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成采购申请吗？'))
+    tableObject.loading = true
+    await SupplierdeliverRecordMainApi.createPurchasereceiptRequest(number)
+    message.success(t('采购申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+// 单据打印
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+//const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken())
+const documentSrc = ref(BASE_URL + '/jmreport/view/932556833517789184?token=' + getAccessToken())
+const handleDocumentPrint = async (id) => {
+  window.open(documentSrc.value + '&id=' + id)
+}
+
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } = useTable({
+  getListApi: SupplierdeliverRecordDetailApi.queryChildPickingNumber
+})
+const { getList:getDetailList } = detatableMethods
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordSupplierdeliverMain')
+}
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: '查看其他包装规格',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+      detatableData.params = {
+          masterId:row.masterId,
+          parentPackingNumber:row.packingNumber
+        }
+        await getDetailList()
+        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SupplierdeliverRecordMainApi.exportSupplierdeliverRecordMain(tableObject.params)
+    download.excel(data, '供应商发货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
new file mode 100644
index 000000000..4b28f9835
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
@@ -0,0 +1,1329 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 供应商发货记录主表
+ */
+export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '联系人姓名',
+    field: 'contactName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人电话',
+    field: 'contactPhone',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人电子邮件',
+    field: 'contactEmail',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '时间窗口',
+    field: 'timeWindow',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计划到货时间',
+    field: 'planArriveTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransaction',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransaction',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const SupplierdeliverRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请输入申请单号', trigger: 'blur' }
+  ],
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请输入从仓库代码', trigger: 'blur' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请输入到仓库代码', trigger: 'blur' }
+  ],
+  toDockCode: [
+    { required: true, message: '请输入到月台代码', trigger: 'blur' }
+  ],
+  planArriveTime: [
+    { required: true, message: '请输入计划到货时间', trigger: 'blur' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'blur' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 供应商发货记录子表
+ */
+export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+ 
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
+]))
+
+//表单校验
+export const SupplierdeliverRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请输入从包装号', trigger: 'blur' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请输入到包装号', trigger: 'blur' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  arriveDate: [
+    { required: true, message: '请输入到货日期', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'blur' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入到货日期', trigger: 'blur' }
+  ],
+  poNumber: [
+    { required: true, message: '请输入订单号', trigger: 'blur' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'blur' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请输入到库位代码', trigger: 'blur' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请输入到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请输入到库区代码', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+
+/**
+ * @returns {Array} 供应商发货记录子表根据包装号展示
+ */
+export const SupplierdeliverRecordDetailPickingNumer = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+ 
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  }
+]))
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
new file mode 100644
index 000000000..13a635690
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -0,0 +1,718 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="SupplierdeliverRequestMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="SupplierdeliverRequestMain.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="SupplierdeliverRequestMainRules"
+    :formAllSchemas="SupplierdeliverRequestMain.allSchemas"
+    :tableAllSchemas="SupplierdeliverRequestDetail.allSchemas"
+    :tableFormRules="SupplierdeliverRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="SupplierdeliverRequestMainApi.updateSupplierdeliverRequestMain"
+    :apiCreate="SupplierdeliverRequestMainApi.createSupplierdeliverRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @formFormDateChange="formFormDateChange"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="SupplierdeliverRequestMain.allSchemas"
+    :detailAllSchemas="SupplierdeliverRequestDetail.allSchemas"
+    :detailAllSchemasRules="SupplierdeliverRequestDetailRules"
+    :apiCreate="SupplierdeliverRequestDetailApi.createSupplierdeliverRequestDetail"
+    :apiUpdate="SupplierdeliverRequestDetailApi.updateSupplierdeliverRequestDetail"
+    :apiPage="SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage"
+    :apiDelete="SupplierdeliverRequestDetailApi.deleteSupplierdeliverRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/supplierdeliver-request-main/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
+
+<!-- 创建标签 -->
+<BasicForm
+    ref="formLabelRef"
+    @success="getList"
+    :tableAllSchemas="SupplierdeliverRequestDetailLabel.allSchemas"
+    :tableFormRules="SupplierdeliverRequestDetailRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    @searchTableSuccess="searchTableSuccessLabel"
+    @submitForm="submitFormLabel"
+    :isShowReduceButton="false"
+  />
+ 
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { getAccessToken } from '@/utils/auth'
+import {
+  SupplierdeliverRequestMain,
+  SupplierdeliverRequestMainRules,
+  SupplierdeliverRequestDetail,
+  SupplierdeliverRequestDetailRules,
+  SupplierdeliverRequestDetailLabel,
+} from './supplierdeliverRequestMain.data'
+import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
+import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
+
+// 供应商发货申请
+defineOptions({ name: 'SupplierdeliverRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const genLabelId = ref();
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SupplierdeliverRequestMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const planArriveTimeStr = ref()
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    console.log("formField:",formField)
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      if (formField == 'poNumber') {
+        row['poNumber'] = val[0]['poNumber']
+        row['itemCode'] = val[0]['itemCode']
+        row['poLine'] = val[0]['poLine']
+        row['orderQty'] = val[0]['orderQty']
+        row['uom'] = val[0]['uom']
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      if(formField == 'ppNumber'){
+        // 设置计划到货时间
+        let beginTime =  val[0]['endTime']
+        let deliveryDate =  formatDate(val[0]['deliveryDate'],'YYYY-MM-DD')
+        planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
+        setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
+        // 清空子表数据
+        tableData.value = []
+      }
+      if(formField == 'supplierCode'){
+        setV['contactName'] = val[0]['contacts']
+        setV['contactPhone'] = val[0]['phone']
+        setV['contactEmail'] = val[0]['email']
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if (formField == 'poNumber') {
+      setV['poNumber'] = val[0]['poNumber']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['poLine'] = val[0]['poLine']
+      setV['uom'] = val[0]['uom']
+      setV['orderQty'] = val[0]['orderQty']
+    }
+    formRef.setValues(setV)
+  })
+}
+
+// 查询页面返回
+const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    console.log("formField:",formField)
+    console.log("val:",val)
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      if (formField == 'packUnit') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      }
+      if (formField == 'secondPackUnit') {
+        row['secondPackUnit'] = val[0]['packUnit']
+        row['secondPackQty'] = val[0]['packQty']
+      }
+    } 
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierdeliverRequestMainApi.getSupplierdeliverRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplierdeliver-request-main:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:supplierdeliver-request-main:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierdeliver-request-main:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') {
+    // 筛选
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+
+// 根据状态返回该按钮是否显示
+const isShowMainButtonLabel = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    if(row.labelStatus == '2'){
+      return true
+    }else{
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开
+    defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2', '4']) }), // 关闭
+    defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
+    defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
+    defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
+    defaultButtons.mainListEditBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'wms:supplierdeliver-request-main:update'
+    }), // 编辑
+    // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplierdeliver-request-main:delete' }), // 删除
+    {
+      label: '生成标签',
+      name: 'ssbq',
+      hide: isShowMainButtonLabel(row, ['3']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    },
+    defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','8']) }), // 标签打印
+    //defaultButtons.mainListDocumentPrintBtn({ hide: isShowMainButton(row, ['3','8']) }), // 单据打印
+    // 生成记录
+    {
+      label: '发货',
+      name: 'genRecords',
+      hide: isShowMainButton(row, ['3']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    }
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainPurPlanOpe') {
+    // 打开
+    handleOpe(row.id)
+  } else if (val == 'mainPurPlanClo') {
+    // 关闭
+    handleClo(row.id)
+  } else if (val == 'mainPlanSub') {
+    // 提交审批
+    handleSub(row.id)
+  } else if (val == 'mainPlanApp') {
+    // 审批通过
+    handleApp(row.id)
+  } else if (val == 'mainPlanTur') {
+    // 驳回按钮
+    handleTur(row.id)
+  } else if (val == 'genRecords') {
+    // 处理
+    genRecords(row.id)
+  } else if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  } else if (val == 'ssbq') {
+    await SupplierdeliverRequestMainApi.selfCheckReport(row.id).then(async (res) => {
+      if(!res){
+          message.warning("请先上传自检报告!")
+          return
+      }else{
+        // 生成标签
+        detatableData.params = {
+          masterId:row.id
+        }
+        genLabelId.value = row.id
+        await getDetailList()
+        formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
+      }
+    }).catch(err => {
+      console.log("自检报告校验异常",err)
+    })
+  } else if (val == 'point') {
+    // 标签打印
+    labelPrint(row)
+  } else if (val == 'documentPrint') {
+    // 单据打印
+    handleDocumentPrint(row.id)
+  }
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestSupplierdeliverMain')
+}
+//添加/修改操作
+const formRef = ref()
+const openForm = async (type: string, row?: number) => {
+  if(type == "update"){
+    SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'supplierCode'){
+        item.componentProps.isSearchList = false
+        item.componentProps.disabled = true
+      }
+      if(item.field == 'ppNumber'){
+        item.componentProps.isSearchList = false
+        item.componentProps.disabled = true
+      }
+      if(item.field == 'asnNumber'){
+        item.componentProps.disabled = true
+      }
+      if(item.field == 'planArriveTime'){
+        item.componentProps.disabled = true
+      }
+    })
+  }else {
+    SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'supplierCode'){
+        item.componentProps.isSearchList = true
+      }
+      if(item.field == 'ppNumber'){
+        item.componentProps.isSearchList = true
+      }
+      if(item.field == 'asnNumber'){
+        item.componentProps.disabled = false
+      }
+      if(item.field == 'planArriveTime'){
+        item.componentProps.disabled = false
+      }
+    })
+  }
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await SupplierdeliverRequestMainApi.deleteSupplierdeliverRequestMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClo = async (id: number) => {
+  try {
+    // 关闭的二次确认
+    await message.confirm('是否关闭所选中数据？')
+    tableObject.loading = true
+    // 发起关闭
+    await SupplierdeliverRequestMainApi.cloSupplierdeliverRequestMain(id)
+    message.success(t('关闭成功!'))
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 打开按钮操作 */
+const handleOpe = async (id: number) => {
+  try {
+    // 打开的二次确认
+    await message.confirm('是否打开所选中数据？')
+    tableObject.loading = true
+    // 发起打开
+    await SupplierdeliverRequestMainApi.opeSupplierdeliverRequestMain(id)
+    message.success(t('打开成功!'))
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 提交审批按钮操作 */
+const handleSub = async (id: number) => {
+  try {
+    // 提交审批的二次确认
+    await message.confirm('是否提交审批所选中数据？')
+    tableObject.loading = true
+    // 发起提交审批
+    await SupplierdeliverRequestMainApi.subSupplierdeliverRequestMain(id)
+    message.success(t('提交审批成功!'))
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批通过按钮操作 */
+const handleApp = async (id: number) => {
+  try {
+    // 审批通过的二次确认
+    await message.confirm('是否审批通过所选中数据？')
+    tableObject.loading = true
+    // 发起审批通过
+    await SupplierdeliverRequestMainApi.appSupplierdeliverRequestMain(id)
+    message.success(t('审批通过成功!'))
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 驳回按钮操作 */
+const handleTur = async (id: number) => {
+  try {
+    // 驳回的二次确认
+    await message.confirm('是否驳回所选中数据？')
+    tableObject.loading = true
+    // 发起驳回
+    await SupplierdeliverRequestMainApi.rejSupplierdeliverRequestMain(id)
+    message.success(t('驳回成功!'))
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 处理按钮操作 */
+const genRecords = async (id: number) => {
+  try {
+    await SupplierdeliverRequestMainApi.selfCheckReport(id).then(res => {
+      if(!res){
+          message.warning("请先上传自检报告!")
+          return
+      }else{
+        // 处理的二次确认
+        message.confirm('是否处理所选中数据？')
+        tableObject.loading = true
+        // 发起处理
+        SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id).then(res => {
+          message.success(t('处理成功!'))
+          // 单据打印
+          handleDocumentPrint(res)
+        })
+        // 刷新列表
+        getList()
+      }
+    }).catch(err => {
+      console.log("自检报告校验异常",err)
+    })
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain(
+      tableObject.params
+    )
+    download.excel(data, '供应商发货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 生成标签
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+
+// 生成标签按钮操作
+const submitFormLabel = async (formType, data) => {
+  try {
+    console.log("formType==",formType)
+    console.log("data==",data)
+    data.subList = detatableData.tableList
+    console.log("detatableData",detatableData)
+    await message.confirm('是否为此数据生成标签？')
+    await SupplierdeliverRequestMainApi.genLabel(data)
+    isCreateLabel.value = true
+    message.success('创建标签成功')
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+
+// 标签打印
+const labelPrint = async (row) => {
+  window.open(src.value + '&asn_number=' + row.asnNumber)
+}
+
+const print = async () => {
+  window.open(src.value + '&number=' + detatableData.tableList[0].number)
+}
+
+// 单据打印
+// const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken())
+const documentSrc = ref(BASE_URL + '/jmreport/view/932556833517789184?token=' + getAccessToken())
+const handleDocumentPrint = async (id) => {
+  window.open(documentSrc.value + '&id=' + id)
+}
+
+/**
+ * tableForm方法
+ */
+const tableFormKeys = {}
+SupplierdeliverRequestDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  let isHave = data.subList.some((item) => {
+    console.log("CCCCC",item.expireDate)
+    if(item.expireDate != null){
+      item.produceDate > item.expireDate
+    }
+  })
+  if (isHave) {
+    message.error('生产日期不可以大于过期日期')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      let planArriveStr = formatDate(data.planArriveTime);
+      if(planArriveStr > planArriveTimeStr.value){
+        let confirmFlag = false;
+        await message.confirm("计划到货时间大于要货计划送达日期是否继续？").then(() => {
+          console.log("选择了OK")
+          //选择OK
+        }).catch(() => {
+          //选择取消
+          console.log("选择了cancel")
+          confirmFlag = true;
+          formRef.value.formLoading = false
+          return;
+        })
+        if(confirmFlag){
+          return;
+        }
+      }
+      if(tableData.value.length <= 0){
+        message.warning(`子表明细不能为空!`)
+        formRef.value.formLoading = false
+        return;
+      }
+      await SupplierdeliverRequestMainApi.createSupplierdeliverRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SupplierdeliverRequestMainApi.updateSupplierdeliverRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '供应商发货申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+const formFormDateChange = (field, val,row, index) => {
+  if(field == 'produceDate'){
+    let produceDateStr = formatDate(val,'YYYYMMDD');
+    row.batch = produceDateStr
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await SupplierdeliverRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
new file mode 100644
index 000000000..4e6aaa649
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -0,0 +1,1560 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+// import { PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
+import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
+import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
+import { PurchasePlanDetail, PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
+import { validateHanset, validateEmail } from '@/utils/validator'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize: 10,
+  pageNo: 1,
+  code: 'SupplierDeliverRequest'
+}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+import { tr } from 'element-plus/es/locale'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept] 
+
+/**
+ * @returns {Array} 供应商发货申请主表
+ */
+export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    isForm: true
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '要货计划信息', // 查询弹窗标题
+        searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
+        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'supplierCode',
+            value: 'supplierCode',
+            message: '请填写供应商代码！',
+            isMainValue: true
+          },
+          {
+            key: 'status',
+            value: 4,
+            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: "TRUE",
+            isMainValue: false
+          }]
+      }
+    }
+  },
+  {
+    label: '联系人姓名',
+    field: 'contactName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人电话',
+    field: 'contactPhone',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人电子邮件',
+    field: 'contactEmail',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '供应商发货仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disbaled: true
+      }
+    },
+    isForm: true
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '时间窗口',
+    field: 'timeWindow',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划到货时间',
+    field: 'planArriveTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'SupplierDeliver',
+      componentProps: {
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detaul: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detaul: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const SupplierdeliverRequestMainRules = reactive({
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+  ],
+  ppNumber: [
+    { required: true, message: '请输入要货计划单号', trigger: 'blur' }
+  ],
+  asnNumber: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactName: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactPhone: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator: validateHanset, message: '请输入正确的手机号', trigger: 'blur' }
+  ],
+  contactEmail: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator: validateEmail, message: '请输入正确的邮箱地址', trigger: 'blur' }
+  ],
+  carrierCode: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  transferMode: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  vehiclePlateNumber: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  planArriveTime: [
+    { required: true, message: '请输入计划到货时间', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  // businessType: [
+  //   { required: true, message: '请输入业务类型', trigger: 'blur' }
+  // ],
+})
+
+/**
+ * @returns {Array} 供应商发货申请子表
+ */
+export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '要货计划信息',
+        searchAllSchemas: PurchasePlanDetail.allSchemas,
+        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+        searchCondition: [
+          {
+            key: 'number',
+            value: 'ppNumber',
+            message: '请填写要货计划单号！',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '要货计划信息',
+      searchAllSchemas: PurchasePlanDetail.allSchemas,
+      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+      searchCondition: [
+        {
+          key: 'number',
+          value: 'ppNumber',
+          message: '请填写要货计划单号！',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'InputNumber',
+      min: 0
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 180,
+      fixed: 'right'
+    },
+    isTableForm: false,
+  }
+]))
+
+//表单校验
+export const SupplierdeliverRequestDetailRules = reactive({
+  // packingNumber: [
+  //   { required: true, message: '请输入包装号', trigger: 'blur' }
+  // ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请选择订单行', trigger: 'change' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled:true,
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled:true,
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD',
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled:true,
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: false,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '要货计划信息',
+        searchAllSchemas: PurchasePlanDetail.allSchemas,
+        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+        searchCondition: [
+          {
+            key: 'number',
+            value: 'ppNumber',
+            message: '请填写要货计划单号！',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: false,
+      disabled:true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '要货计划信息',
+      searchAllSchemas: PurchasePlanDetail.allSchemas,
+      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+      searchCondition: [
+        {
+          key: 'number',
+          value: 'ppNumber',
+          message: '请填写要货计划单号！',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled:true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled:true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled:true,
+      type: 'InputNumber',
+      min: 0
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled:true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled:true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '包装规格1',
+    field: 'packUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装数量1',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '包装规格2',
+    field: 'secondPackUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装数量2',
+    field: 'secondPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+]))
\ No newline at end of file
diff --git a/src/views/wms/reportList/index.vue b/src/views/wms/reportList/index.vue
new file mode 100644
index 000000000..a9fdf79dd
--- /dev/null
+++ b/src/views/wms/reportList/index.vue
@@ -0,0 +1,14 @@
+<template>
+  <ContentWrap>
+    <IFrame :src="url" style="width: 100%; height: calc(100vh - 180px)" />
+    <!-- <iframe :src="url" frameborder="0" style="width: 100%;height: 75vh;"></iframe> -->
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+// const url = ref('http://localhost:12080/jmreport/view/881686740529258496')
+const route = useRoute() // 路由对象
+const str = route.path.split('/')[3]
+const url = ref(import.meta.env.VITE_JMREPORT_BASE_URL + '/jmreport/view/'+ str)
+console.log(url);
+</script>
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
new file mode 100644
index 000000000..b7c14f4d9
--- /dev/null
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchaseclaimRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchaseclaimRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchaseclaimRecordMainRules"
+    :formAllSchemas="PurchaseclaimRecordMain.allSchemas"
+    :tableAllSchemas="PurchaseclaimRecordDetail.allSchemas"
+    :tableFormRules="PurchaseclaimRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchaseclaimRecordMain.allSchemas"
+    :detailAllSchemas="PurchaseclaimRecordDetail.allSchemas"
+    :detailAllSchemasRules="PurchaseclaimRecordDetailRules"
+    :apiPage="PurchaseclaimRecordDetailApi.getPurchaseclaimRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PurchaseclaimRecordMain,PurchaseclaimRecordMainRules,PurchaseclaimRecordDetail,PurchaseclaimRecordDetailRules } from './purchaseclaimRecordMain.data'
+import * as PurchaseclaimRecordMainApi from '@/api/wms/purchaseclaimRecordMain'
+import * as PurchaseclaimRecordDetailApi from '@/api/wms/purchaseclaimRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 采购索赔记录主
+defineOptions({ name: 'PurchaseclaimRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchaseclaimRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchaseclaimRecordMainApi.getPurchaseclaimRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchaseclaim-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchaseclaimRecordMainApi.exportPurchaseclaimRecordMain(tableObject.params)
+    download.excel(data, '采购索赔记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts
new file mode 100644
index 000000000..5bfb0c197
--- /dev/null
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts
@@ -0,0 +1,373 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 采购索赔记录主表
+ */
+export const PurchaseclaimRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    deatil: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    deatil: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    isTable: true,
+    formatter: dateFormatter,
+    deatil: {
+      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    isTable: true,
+    formatter: dateFormatter,
+    deatil: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form:{
+      component:'Switch',
+      componentProps:{
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    }
+  },
+]))
+
+//表单校验
+export const PurchaseclaimRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'blur' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购索赔记录子表
+ */
+export const PurchaseclaimRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    isTable: true,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form:{
+      component:'Switch',
+      componentProps:{
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    }
+  },
+]))
+
+//表单校验
+export const PurchaseclaimRecordDetailRules = reactive({
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  reason: [
+    { required: true, message: '请输入原因', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
new file mode 100644
index 000000000..b87fbab5f
--- /dev/null
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
@@ -0,0 +1,497 @@
+<!-- 采购索赔申请 -->
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchaseclaimRequestMain.allSchemas.searchSchema" @search="setSearchParams"
+      @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="PurchaseclaimRequestMain.allSchemas" />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+        total: tableObject.total
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort">
+      <template #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="buttondata(row)" @button-base-click="buttonTableClick($event, row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="formRef" 
+    :rules="PurchaseclaimRequestMainRules"
+    :formAllSchemas="PurchaseclaimRequestMain.allSchemas" 
+    :tableAllSchemas="PurchaseclaimRequestDetail.allSchemas"
+    :tableFormRules="PurchaseclaimRequestDetailRules" :tableData="tableData"
+    :apiUpdate="PurchaseclaimRequestMainApi.updatePurchaseclaimRequestMain"
+    :apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain" 
+    :isBusiness="true"
+    @success="getList" 
+    @handleAddTable="handleAddTable" 
+    @handleDeleteTable="handleDeleteTable" 
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @inputStringBlur="inputStringBlur"/>
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" 
+    :isBasic="false" 
+    :allSchemas="PurchaseclaimRequestMain.allSchemas"
+    :detailAllSchemas="PurchaseclaimRequestDetail.allSchemas" 
+    :detailAllSchemasRules="PurchaseclaimRequestDetailRules"
+    :apiCreate="PurchaseclaimRequestDetailApi.createPurchaseclaimRequestDetail"
+    :apiUpdate="PurchaseclaimRequestDetailApi.updatePurchaseclaimRequestDetail"
+    :apiPage="PurchaseclaimRequestDetailApi.getPurchaseclaimRequestDetailPage"
+    :apiDelete="PurchaseclaimRequestDetailApi.deletePurchaseclaimRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail" 
+    />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/purchaseclaim-request-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+  import { getAccessToken } from '@/utils/auth'
+  import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+  import download from '@/utils/download'
+  import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain'
+  import * as SupplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail'
+  import * as PurchaseclaimRequestDetailApi from '@/api/wms/purchaseclaimRequestDetail'
+  import { PurchaseclaimRequestMain, PurchaseclaimRequestMainRules, PurchaseclaimRequestDetail, PurchaseclaimRequestDetailRules } from './purchaseclaimRequestMain.data'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
+
+  // 供应商索赔申请
+  defineOptions({ name: 'PurchaseclaimRequestMain' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(PurchaseclaimRequestMain.allSchemas.tableColumns)
+
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+
+    nextTick(() => {
+      if (type == 'tableForm') {
+
+        // 子表查询页赋值
+        row[formField] = val[0][searchField]
+        row['poLine'] = val[0]['poLine']
+        row['batch'] = val[0]['toBatch']
+        row['altBatch'] = val[0]['altBatch']
+        row['itemCode'] = val[0]['itemCode']
+        row['itemName'] = val[0]['itemName']
+        row['itemDesc1'] = val[0]['itemDesc1']
+        row['itemDesc2'] = val[0]['itemDesc2']
+        row['projectCode'] = val[0]['projectCode']
+        row['qty'] = val[0]['qty']
+        row['uom'] = val[0]['uom']
+      } else {
+        // 主表查询页赋值
+        const setV = {}
+        setV[formField] = val[0][searchField]
+        if(formField=='asnNumber'){
+          // 获取子表数据 getSupplierdeliverRecordDetailList
+         SupplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailList({
+           asnNumber: val[0]['asnNumber']}).then(res => {
+             if (res) tableData.value = res;
+             tableData.value.forEach(item=>{
+               item.batch = item.toBatch
+               item.qty = 1
+             })
+           }).catch(err => {
+             console.log(err)
+           })
+        }
+        setV['ppNumber'] = val[0]['ppNumber']
+        setV['supplierCode'] = val[0]['supplierCode']
+        formRef.setValues(setV)
+      }
+    })
+  }
+  // 查询页面返回——详情
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+    console.log(456)
+    nextTick(() => {
+
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      setV['poLine'] = val[0]['poLine']
+      setV['batch'] = val[0]['toBatch']
+      setV['altBatch'] = val[0]['altBatch']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['itemName'] = val[0]['itemName']
+      setV['itemDesc1'] = val[0]['itemDesc1']
+      setV['itemDesc2'] = val[0]['itemDesc2']
+      setV['projectCode'] = val[0]['projectCode']
+      setV['qty'] = val[0]['qty']
+      setV['uom'] = val[0]['uom']
+      formRef.setValues(setV)
+    })
+  }
+
+  const exportLoading = ref(false) // 导出的加载中
+  const { tableObject, tableMethods } = useTable({
+    getListApi: PurchaseclaimRequestMainApi.getPurchaseclaimRequestMainPage // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchaseclaim-request-main:create' }), // 新增
+    defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchaseclaim-request-main:import' }), // 导入
+    defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchaseclaim-request-main:export' }), // 导出
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+    // {
+    //   label: '自定义扩展按钮',
+    //   name: 'zdy',
+    //   hide: false,
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   color: ''
+    // },
+  ]
+
+  // 头部按钮事件 
+  const buttonBaseClick = (val, item) => {
+    if (val == 'add') { // 新增
+      openForm('create')
+    } else if (val == 'import') { // 导入
+      handleImport()
+    } else if (val == 'export') { // 导出
+      handleExport()
+    } else if (val == 'refresh') { // 刷新
+      if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+    } else if (val == 'filtrate') { // 筛选
+    } else { // 其他按钮 
+      console.log('其他按钮', item)
+    }
+  }
+
+  // 列表-操作按钮
+  const buttondata = (row) => {
+    return [
+      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2',  '4']) }), // 关闭
+      defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
+      defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
+      defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
+      defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseclaim-request-main:update' }), // 编辑
+      defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseclaim-request-main:delete' }), // 删除
+      defaultButtons.mainListDocumentPrintBtn(null), // 打印
+      // 生成记录
+      {
+        label: '处理',
+        name: 'genRecords',
+        hide: isShowMainButton(row, ['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+    ]
+  }
+
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton = (row, val) => {
+    if (val.indexOf(row.status) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }
+
+  // 列表-操作按钮事件 
+  const buttonTableClick = async (val, row) => {
+    if (val == 'mainPurPlanOpe') { // 打开
+      handleOpe(row.id)
+    } else if (val == 'mainPurPlanClo') {// 关闭
+      handleClo(row.id)
+    } else if (val == 'mainPlanSub') { // 提交审批
+      handleSub(row.id)
+    } else if (val == 'mainPlanApp') { // 审批通过
+      handleApp(row.id)
+    } else if (val == 'mainPlanTur') { // 驳回按钮
+      handleTur(row.id)
+    }else if (val == 'genRecords') { // 驳回按钮
+      genRecords(row.id)
+    }else if (val == 'edit') { // 编辑
+      // const res = await ItempackagingApi.getItempackaging(row.id)
+      openForm('update', row)
+    } else if (val == 'delete') { // 删除
+      handleDelete(row.id)
+    } else if (val == 'documentPrint') { // 打印
+      handlePoint(row.id)
+    }
+  }
+
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = async (type : string, row ?: number) => {
+    tableData.value = [] // 重置明细数据
+    //  if (row?.id) {
+    //   const data= await PurchaseclaimRequestMainApi.getPurchaseclaimRequestMain(row.id)
+    //   tableData.value = data.subList
+    // }
+    formRef.value.open(type, row)
+  }
+
+  // 获取部门 用于详情 部门回显
+  const { wsCache } = useCache()
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+    if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+    detailRef.value.openDetail(row, titleName, titleValue)
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      tableObject.loading = true
+      // 发起删除
+      await PurchaseclaimRequestMainApi.deletePurchaseclaimRequestMain(id)
+      message.success(t('common.delSuccess'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+  
+  
+  /** 关闭按钮操作 */
+  const handleClo = async (id : number) => {
+    try {
+      // 关闭的二次确认
+      await message.confirm('是否关闭所选中数据？')
+      tableObject.loading = true
+      // 发起关闭
+      await PurchaseclaimRequestMainApi.cloPurchaseclaimRequestMain(id)
+      message.success(t('关闭成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+  
+  /** 打开按钮操作 */
+  const handleOpe = async (id : number) => {
+    try {
+      // 打开的二次确认
+      await message.confirm('是否打开所选中数据？')
+      tableObject.loading = true
+      // 发起打开
+      await PurchaseclaimRequestMainApi.opePurchaseclaimRequestMain(id)
+      message.success(t('打开成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+  
+  /** 提交审批按钮操作 */
+  const handleSub = async (id : number) => {
+    try {
+      // 提交审批的二次确认
+      await message.confirm('是否提交审批所选中数据？')
+      tableObject.loading = true
+      // 发起提交审批
+      await PurchaseclaimRequestMainApi.subPurchaseclaimRequestMain(id)
+      message.success(t('提交审批成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+  
+  /** 审批通过按钮操作 */
+  const handleApp = async (id : number) => {
+    try {
+      // 审批通过的二次确认
+      await message.confirm('是否审批通过所选中数据？')
+      tableObject.loading = true
+      // 发起审批通过
+      await PurchaseclaimRequestMainApi.appPurchaseclaimRequestMain(id)
+      message.success(t('审批通过成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+  
+  /** 驳回按钮操作 */
+  const handleTur = async (id : number) => {
+    try {
+      // 驳回的二次确认
+      await message.confirm('是否驳回所选中数据？')
+      tableObject.loading = true
+      // 发起驳回
+      await PurchaseclaimRequestMainApi.rejPurchaseclaimRequestMain(id)
+      message.success(t('驳回成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+  
+  /** 处理按钮操作 */
+  const genRecords = async (id : number) => {
+    try {
+      // 处理的二次确认
+      await message.confirm('是否处理所选中数据？')
+      tableObject.loading = true
+      // 发起处理
+      await PurchaseclaimRequestMainApi.genRecordsPurchaseclaimRequestMain(id)
+      message.success(t('处理成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 导出按钮操作 */
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await PurchaseclaimRequestMainApi.exportPurchaseclaimRequestMain(tableObject.params)
+      download.excel(data, '采购索赔申请主.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+  const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+  const src = ref(BASE_URL + '/jmreport/view/882550592342003712?token=' + getAccessToken())
+  console.log(src)
+  // 打印
+  const handlePoint = async (id) => {
+    window.open(src.value + '&id=' + id)
+  }
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  PurchaseclaimRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  const tableData = ref([])
+
+  // 添加明细
+  const handleAddTable = () => {
+    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  }
+  // 删除明细
+  const handleDeleteTable = (item, index) => {
+    tableData.value.splice(index, 1)
+  }
+
+  // 主子数据 提交
+  const submitForm = async (formType, data) => {
+    data.subList = tableData.value // 拼接子表数据参数
+    try {
+      if (formType === 'create') {
+        await PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await PurchaseclaimRequestMainApi.updatePurchaseclaimRequestMain(data)
+        message.success(t('common.updateSuccess'))
+      }
+      formRef.value.dialogVisible = false
+      // 刷新当前列表
+      getList()
+    } finally {
+      formRef.value.formLoading = false
+    }
+  }
+
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '采购索赔申请信息导入模版.xlsx'
+  })
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
+  }
+  const inputStringBlur =(headerItem,index,row) =>{
+    // console.log("headerItem:",headerItem)
+    //console.log("row:",row)
+    if(headerItem == 'singlePrice'){
+      // 输入完单价离开事件（金额 = 数量 乘以 单价）
+      row.amount = row.qty * row.singlePrice
+    }
+  }
+
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await PurchaseclaimRequestMainApi.importTemplate()
+  })
+</script>
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
new file mode 100644
index 000000000..410da7d8f
--- /dev/null
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
@@ -0,0 +1,582 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as supplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMain'
+import * as supplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail'
+import { SupplierdeliverRecordMain, SupplierdeliverRecordDetail } from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data'
+
+
+
+const { t } = useI18n() // 国际化
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'PurchaseClaimRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+/**
+ * @returns {Array} 采购索赔申请主表
+ */
+export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    isForm:false,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择发货单号', // 输入框占位文本
+        searchField: 'asnNumber', // 查询弹窗赋值字段
+        searchTitle: '供应商发货记录', // 查询弹窗标题
+        searchAllSchemas: SupplierdeliverRecordMain.allSchemas, // 查询弹窗所需类
+        searchPage: supplierdeliverRecordMainApi.getSupplierdeliverRecordMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    form:{
+      componentProps:{
+        disabled:true,
+      }
+    },
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    form:{
+      componentProps:{
+        disabled:true,
+      }
+    },
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+     form: {
+      value:'1',
+      componentProps:{
+        disabled:true,
+      }
+    },
+    table: {
+      width: 100
+    }
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    form:{
+      value:'PurchaseClaim',
+      componentProps:{
+      disabled:true,
+      }
+    },
+    table: {
+      width: 130
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    isTable: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    },
+    form:{
+      component:'Switch',
+      value:requestsettingData.autoCommit,
+      componentProps:{
+        disabled:true,
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    },
+    form:{
+      component:'Switch',
+      value:requestsettingData.autoAgree,
+      componentProps:{
+        disabled:true,
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 100
+    },
+    form:{
+      component:'Switch',
+      value:requestsettingData.autoExecute,
+      componentProps:{
+        disabled:true,
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 120
+    },
+    form:{
+      component:'Switch',
+      value:requestsettingData.available,
+      componentProps:{
+        disabled:true,
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isForm:false,
+    table: {
+      width: 120
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    isForm:false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isForm:false,
+    table: {
+      width: 120
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    isTable: true,
+    formatter: dateFormatter,
+    isForm:false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 300,
+      fixed: 'right'
+    }
+  }
+]))
+// 表单校验
+export const PurchaseclaimRequestMainRules = reactive({
+  asnNumber: [
+    { required: true, message: '请输入发货单号', trigger: 'blur' }
+  ],
+  ppNumber:  [
+    { required: true, message: '请输入要货计划单号', trigger: 'blur' }
+  ],
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'change' }
+  ],
+  requestTime:  [
+    { required: true, message: '请选择申请时间', trigger: 'change' }
+  ],
+  dueTime:  [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
+  departmentCode:  [
+    { required: true, message: '请选择部门', trigger: 'change' }
+  ],
+  status:  [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购索赔申请子表
+ */
+export const PurchaseclaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '订单号',
+    field: 'poNumber',
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'poNumber',
+      searchTitle: '供应商发货记录',
+      searchAllSchemas: SupplierdeliverRecordDetail.allSchemas,
+      searchPage: supplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailPage
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'poNumber',
+        searchTitle: '供应商发货记录',
+        searchAllSchemas: SupplierdeliverRecordDetail.allSchemas,
+        searchPage: supplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailPage
+      }
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    table: {
+      width: 150
+    },
+  },
+  {
+     label: '物料代码',
+     field: 'itemCode',
+     table: {
+       width: 150
+     },
+     
+   },
+   {
+     label: '物料名称',
+     field: 'itemName',
+     table: {
+       width: 150
+     },
+   },
+   {
+     label: '数量',
+     field: 'qty',
+     table: {
+       width: 150
+     },
+   },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    // dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '单据号',
+    field: 'number',
+    table: {
+      width: 180
+    },
+    form:{
+      componentProps:{
+        disabled:true,
+      }
+    },
+    isTableForm:false,
+    // tableForm:{
+    //   disabled:true,
+    // }
+  },
+  
+  {
+    label: '备注',
+    field: 'remark',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    isForm:false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    isForm:false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    isForm:false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    isForm:false
+  },
+   {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+// 表单校验
+export const PurchaseclaimRequestDetailRules = reactive({
+  poNumber: [
+    { required: true, message: '请输入订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'change' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  qty:  [
+    { required: true, message: '请输入数量', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  uom:  [
+    { required: true, message: '请输入计量单位', trigger: 'change' }
+  ],
+  itemCode:  [
+    { required: true, message: '请输入物料代码', trigger: 'change' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  itemName:  [
+    { required: true, message: '请输入物料名称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+
+  singlePrice:  [
+    { required: true, message: '请输入单价', trigger: 'change' }
+  ],
+  amount:  [
+    { required: true, message: '请输入金额', trigger: 'change' }
+  ],
+  reason:  [
+    { required: true, message: '请输入原因', trigger: 'change' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
new file mode 100644
index 000000000..64bc1145b
--- /dev/null
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SupplierinvoiceRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SupplierinvoiceRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="SupplierinvoiceRecordMainRules"
+    :formAllSchemas="SupplierinvoiceRecordMain.allSchemas"
+    :tableAllSchemas="SupplierinvoiceRecordDetail.allSchemas"
+    :tableFormRules="SupplierinvoiceRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="SupplierinvoiceRecordMain.allSchemas"
+    :detailAllSchemas="SupplierinvoiceRecordDetail.allSchemas"
+    :detailAllSchemasRules="SupplierinvoiceRecordDetailRules"
+    :apiPage="SupplierinvoiceRecordDetailApi.getSupplierinvoiceRecordDeatilPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SupplierinvoiceRecordMain,SupplierinvoiceRecordMainRules,SupplierinvoiceRecordDetail,SupplierinvoiceRecordDetailRules } from './supplierinvoiceRecordMain.data'
+import * as SupplierinvoiceRecordMainApi from '@/api/wms/supplierinvoiceRecordMain'
+import * as SupplierinvoiceRecordDetailApi from '@/api/wms/supplierinvoiceRecordDeatil'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 供应商发票记录主
+defineOptions({ name: 'SupplierinvoiceRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SupplierinvoiceRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierinvoiceRecordMainApi.getSupplierinvoiceRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SupplierinvoiceRecordMainApi.exportSupplierinvoiceRecordMain(tableObject.params)
+    download.excel(data, '供应商发票记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
new file mode 100644
index 000000000..07807ad56
--- /dev/null
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -0,0 +1,362 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 供应商发票记录主表
+ */
+export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field:'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '调增金额',
+    field: 'adjustAmount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '业务类型',
+    field:'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    deatil: {
+      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    isTable: true,
+    formatter: dateFormatter2,
+    deatil: {
+      dateFormatter: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    isTable: true,
+    formatter: dateFormatter,
+    deatil: {
+      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    isTable: true,
+    formatter: dateFormatter,
+    deatil: {
+      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+]))
+
+//表单校验
+export const SupplierinvoiceRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'blur' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 供应商发票记录子表
+ */
+export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '收货单号',
+    field: 'recordNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const SupplierinvoiceRecordDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请输入包装号', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  poNumber: [
+    { required: true, message: '请输入订单号', trigger: 'blur' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请输入包装规格', trigger: 'blur' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
new file mode 100644
index 000000000..7d81aadaa
--- /dev/null
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -0,0 +1,442 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SupplierinvoiceRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead 
+      :HeadButttondata="HeadButttondata" 
+      @button-base-click="buttonBaseClick" 
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns" 
+      @searchFormClick="searchFormClick"
+    :allSchemas="SupplierinvoiceRequestMain.allSchemas" 
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+        total: tableObject.total
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort">
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="formRef" 
+    @success="getList" 
+    :rules="SupplierinvoiceRequestMainRules"
+    :formAllSchemas="SupplierinvoiceRequestMain.allSchemas" 
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="SupplierinvoiceRequestDetail.allSchemas" 
+    :tableFormRules="SupplierinvoiceRequestDetailRules"
+    :tableData="tableData" 
+    :apiUpdate="SupplierinvoiceRequestMainApi.updateSupplierinvoiceRequestMain"
+    :apiCreate="SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain" 
+    :isBusiness="true"
+    @handleAddTable="handleAddTable" 
+    @handleDeleteTable="handleDeleteTable" 
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm" 
+  />
+
+  <!-- 详情 -->
+  <Detail 
+    ref="detailRef" 
+    :isBasic="false" 
+    :allSchemas="SupplierinvoiceRequestMain.allSchemas"
+    :detailAllSchemas="SupplierinvoiceRequestDetail.allSchemas"
+    :detailAllSchemasRules="SupplierinvoiceRequestDetailRules" 
+    :searchTableParams="searchTableParams"
+    :apiCreate="SupplierinvoiceRequestDetailApi.createSupplierinvoiceRequestDetail"
+    :apiUpdate="SupplierinvoiceRequestDetailApi.updateSupplierinvoiceRequestDetail"
+    :apiPage="SupplierinvoiceRequestDetailApi.getSupplierinvoiceRequestDetailPage"
+    :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail" 
+    :Echo="Echo" 
+  />
+
+</template>
+
+<script setup lang="ts">
+  import download from '@/utils/download'
+  import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+  import { SupplierinvoiceRequestMain, 
+    SupplierinvoiceRequestMainRules, 
+    SupplierinvoiceRequestDetail, 
+    SupplierinvoiceRequestDetailRules } from './supplierinvoiceRequestMain.data'
+  import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
+  import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import * as SupplierApi from '@/api/wms/supplier'
+  import { Supplier } from '../../../basicDataManage/supplierManage/supplier/supplier.data'
+
+  defineOptions({ name: 'SupplierinvoiceRequestMain' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(SupplierinvoiceRequestMain.allSchemas.tableColumns)
+
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+  // 查询列表页面参数设置
+  const searchTableParams = ref([
+    {
+      formField: 'supplierCode',
+      searchTableTitle: '供应商信息',
+      searchTableAllSchemas: Supplier.allSchemas,
+      searchTablePage: SupplierApi.getSupplierPage
+    }
+  ])
+
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+    nextTick(() => {
+      if (type == 'tableForm') {
+        // 明细查询页赋值
+        row[formField] = val[0][searchField]
+        if (formField == 'poNumber') {
+          row['poNumber'] = val[0]['poNumber']
+          row['poLine'] = val[0]['poLine']
+          row['itemCode'] = val[0]['itemCode']
+          row['ownerCode'] = val[0]['ownerCode']
+          row['batch'] = val[0]['batch']
+          row['singlePrice'] = val[0]['singlePrice']
+          row['amount'] = val[0]['amount']
+        }
+      } else {
+        const setV = {}
+        if(formField == 'recordNumber'){
+          setV['recordNumber'] = val[0]['number']
+          setV['asnBillNum'] = val[0]['asnNumber']
+        }
+        setV[formField] = val[0][searchField]
+        formRef.setValues(setV)
+      }
+    })
+  }
+  // 子表新增的时候选择表格之后需要会显得字段
+  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+  const Echo = []
+
+  const { tableObject, tableMethods } = useTable({
+    getListApi: SupplierinvoiceRequestMainApi.getSupplierinvoiceRequestMainPage // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplierinvoice-request-main:create' }), // 新增
+    defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierinvoice-request-main:export' }), // 导出
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+    // {
+    //   label: '自定义扩展按钮',
+    //   name: 'zdy',
+    //   hide: false,
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   color: ''
+    // },
+  ]
+
+  // 头部按钮事件
+  const buttonBaseClick = (val, item) => {
+    if (val == 'add') { // 新增
+      openForm('create')
+    } else if (val == 'import') { // 导入
+      handleImport()
+    } else if (val == 'export') { // 导出
+      handleExport()
+    } else if (val == 'refresh') { // 刷新
+      if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+    } else if (val == 'filtrate') { // 筛选
+    } else { // 其他按钮
+      console.log('其他按钮', item)
+    }
+  }
+
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton = (row, val) => {
+    if (val.indexOf(row.status) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }
+
+  // 列表-操作按钮
+  const butttondata = (row) => {
+    return [
+      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2', '4']) }), // 关闭
+      defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
+      defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
+      defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
+      defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1'])}), // 编辑
+      // 生成记录
+      {
+        label: '处理',
+        name: 'genRecords',
+        hide: isShowMainButton(row, ['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+      // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-request-main:delete'}), // 删除
+    ]
+  }
+
+
+
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val, row) => {
+    if (val == 'mainPurPlanOpe') { // 打开
+      handleOpe(row.id)
+    } else if (val == 'mainPurPlanClo') {// 关闭
+      handleClo(row.id)
+    } else if (val == 'mainPlanSub') { // 提交审批
+      handleSub(row.id)
+    } else if (val == 'mainPlanApp') { // 审批通过
+      handleApp(row.id)
+    } else if (val == 'mainPlanTur') { // 驳回按钮
+      handleTur(row.id)
+    } else if (val == 'genRecords') { // 处理
+      genRecords(row.id)
+    } else if (val == 'edit') { // 编辑
+      openForm('update', row)
+    } else if (val == 'delete') { // 删除
+      handleDelete(row.id)
+    }
+  }
+
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = async (type : string, row ?: number) => {
+    tableData.value = [] // 重置明细数据
+    formRef.value.open(type, row)
+  }
+
+  // 获取部门 用于详情 部门回显
+  const { wsCache } = useCache()
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+    if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+    detailRef.value.openDetail(row, titleName, titleValue)
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      tableObject.loading = true
+      // 发起删除
+      await SupplierinvoiceRequestMainApi.deleteSupplierinvoiceRequestMain(id)
+      message.success(t('common.delSuccess'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 关闭按钮操作 */
+  const handleClo = async (id : number) => {
+    try {
+      // 关闭的二次确认
+      await message.confirm('是否关闭所选中数据？')
+      tableObject.loading = true
+      // 发起关闭
+      await SupplierinvoiceRequestMainApi.cloSupplierinvoiceRequestMain(id)
+      message.success(t('关闭成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 打开按钮操作 */
+  const handleOpe = async (id : number) => {
+    try {
+      // 打开的二次确认
+      await message.confirm('是否打开所选中数据？')
+      tableObject.loading = true
+      // 发起打开
+      await SupplierinvoiceRequestMainApi.opeSupplierinvoiceRequestMain(id)
+      message.success(t('打开成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 提交审批按钮操作 */
+  const handleSub = async (id : number) => {
+    try {
+      // 提交审批的二次确认
+      await message.confirm('是否提交审批所选中数据？')
+      tableObject.loading = true
+      // 发起提交审批
+      await SupplierinvoiceRequestMainApi.subSupplierinvoiceRequestMain(id)
+      message.success(t('提交审批成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 审批通过按钮操作 */
+  const handleApp = async (id : number) => {
+    try {
+      // 审批通过的二次确认
+      await message.confirm('是否审批通过所选中数据？')
+      tableObject.loading = true
+      // 发起审批通过
+      await SupplierinvoiceRequestMainApi.appSupplierinvoiceRequestMain(id)
+      message.success(t('审批通过成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 驳回按钮操作 */
+  const handleTur = async (id : number) => {
+    try {
+      // 驳回的二次确认
+      await message.confirm('是否驳回所选中数据？')
+      tableObject.loading = true
+      // 发起驳回
+      await SupplierinvoiceRequestMainApi.rejSupplierinvoiceRequestMain(id)
+      message.success(t('驳回成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+  
+  /** 处理按钮操作 */
+  const genRecords = async (id : number) => {
+    try {
+      // 处理的二次确认
+      await message.confirm('是否处理所选中数据？')
+      tableObject.loading = true
+      // 发起处理
+      await SupplierinvoiceRequestMainApi.genRecordsSupplierinvoiceRequestMain(id)
+      message.success(t('处理成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 导出按钮操作 */
+  const exportLoading = ref(false) // 导出的加载中
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestMain(tableObject.params)
+      download.excel(data, '供应商发票申请主.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  SupplierinvoiceRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  const tableData = ref([])
+
+  // 添加明细
+  const handleAddTable = () => {
+    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  }
+  // 删除明细
+  const handleDeleteTable = (item, index) => {
+    tableData.value.splice(index, 1)
+  }
+
+  // 主子数据 提交
+  const submitForm = async (formType, data) => {
+    data.subList = tableData.value // 拼接子表数据参数
+    try {
+      if (formType === 'create') {
+        await SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await SupplierinvoiceRequestMainApi.updateSupplierinvoiceRequestMain(data)
+        message.success(t('common.updateSuccess'))
+      }
+      formRef.value.dialogVisible = false
+      // 刷新当前列表
+      getList()
+    } finally {
+      formRef.value.formLoading = false
+    }
+  }
+
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
+  }
+
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+  })
+</script>
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
new file mode 100644
index 000000000..9ddad94ca
--- /dev/null
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -0,0 +1,708 @@
+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'
+const { t } = useI18n() // 国际化
+
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+import * as supplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
+import * as supplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize: 10,
+  pageNo: 1,
+  code: 'PurchaseInvoiceRequest'
+}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+
+
+ export const PurchaseReceiptOrReturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number'
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode'
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber'
+  },
+  {
+    label: '备注',
+    field: 'remark',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isTableForm: false,
+    isForm: false
+  }
+]))
+
+/**
+ * @returns {Array} 采购订单或者采购退货单
+ */
+export const PurchaseReceiptOrReturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '订单号',
+    field: 'poNumber'
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode'
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode'
+  },
+  {
+    label: '批次',
+    field: 'batch'
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isTableForm: false,
+    isForm: false
+  }
+]))
+
+
+/**
+ * @returns {Array} 供应商发票申请主表
+ */
+export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '单据类型',
+    field: 'billType',
+    dictType: DICT_TYPE.BILL_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '记录单号',
+    field: 'recordNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '单号信息', // 查询弹窗标题
+        searchAllSchemas: PurchaseReceiptOrReturnRecordMain.allSchemas,
+        searchPage: supplierinvoiceRequestMainApi.getNumber,
+        searchCondition: [{
+          key: 'supplierCode',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true
+        },
+        {
+          key: 'billType',
+          value: 'billType',
+          message: '请填写单据类型！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择单号',
+      searchField: 'number',
+      searchTitle: '单号信息',
+      searchAllSchemas: PurchaseReceiptOrReturnRecordMain.allSchemas,
+      searchPage: supplierinvoiceRequestMainApi.getNumber,
+      searchCondition: [{
+        key: 'supplierCode',
+        value: 'supplierCode',
+        message: '请填写供应商代码！',
+        isMainValue: true
+      },
+      {
+        key: 'billType',
+        value: 'billType',
+        message: '请填写单据类型！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '发货单号',
+    field: 'asnBillNum',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Select',
+      componentProps:{
+        options:[{lablel:'',value:''}]
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      options:[{lablel:'',value:''}]
+    }
+  },
+  {
+    label: '调增金额',
+    field: 'adjustAmount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    isTable:false,
+    form: {
+      component: 'InputNumber',
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isForm:false,
+    form: {
+      value: 'SupplierInvoice',
+      componentProps: {
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm:false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm:false,
+    isTable:false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '跳过任务生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const SupplierinvoiceRequestMainRules = reactive({
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+
+/**
+ * @returns {Array} 供应商发票申请子表
+ */
+export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单号类型',
+    field: 'recordType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      initOptions: [{ label: '收货单号', value: '1' }, { label: '退货单号', value: '2' }],
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '订单号信息',
+        searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas,
+        searchPage: supplierinvoiceRequestDetailApi.getPoNumber
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '订单号信息',
+      searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas,
+      searchPage: supplierinvoiceRequestDetailApi.getPoNumber,
+      searchCondition: [
+        {
+          key: 'number',
+          value: 'recordNumber',
+          message: '请填写单号！',
+          isMainValue: true
+        }
+        ,
+        {
+          key: 'recordType',
+          value: 'recordType',
+          message: '请填写单号类型！',
+          isMainValue: true
+        }]
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode'
+  },
+  {
+    label: '批次',
+    field: 'batch'
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    form: {
+      component: 'InputNumber',
+    }
+  },
+
+  {
+    label: '备注',
+    field: 'remark',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm: false,
+  }
+]))
+
+//表单校验
+export const SupplierinvoiceRequestDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请输入包装号', trigger: 'blur' }
+  ],
+  poNumber: [
+    { required: true, message: '请输入订单号', trigger: 'blur' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请输入包装规格', trigger: 'blur' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ]
+})