feat: 🚀 新旧代码合并

src/components.d.ts

@@ -7,14 +7,6 @@ export {}
 
 declare module 'vue' {
   export interface GlobalComponents {
-    403: typeof import('./components/ErrorMessage/403.vue')['default']
-    404: typeof import('./components/ErrorMessage/404.vue')['default']
-    500: typeof import('./components/ErrorMessage/500.vue')['default']
-    Add: typeof import('./components/DetailsBtns/components/Add.vue')['default']
-    ColSetting: typeof import('./components/ProTable/components/ColSetting.vue')['default']
-    Del: typeof import('./components/ListBtns/components/Del.vue')['default']
-    DetailsBtns: typeof import('./components/DetailsBtns/index.vue')['default']
-    DetailsSearch: typeof import('./components/DetailsSearch/index.vue')['default']
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
@@ -47,11 +39,6 @@ declare module 'vue' {
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
-    Export: typeof import('./components/ListBtns/components/Export.vue')['default']
-    ExprotSelect: typeof import('./components/ListBtns/components/ExprotSelect.vue')['default']
-    Generate: typeof import('./components/DetailsBtns/components/Generate.vue')['default']
-    Grid: typeof import('./components/Grid/index.vue')['default']
-    GridItem: typeof import('./components/Grid/components/GridItem.vue')['default']
     IEpArrowDown: typeof import('~icons/ep/arrow-down')['default']
     IEpCircleClose: typeof import('~icons/ep/circle-close')['default']
     IEpFolderDelete: typeof import('~icons/ep/folder-delete')['default']
@@ -60,24 +47,7 @@ declare module 'vue' {
     IEpRemove: typeof import('~icons/ep/remove')['default']
     IEpSearch: typeof import('~icons/ep/search')['default']
     IEpSwitchButton: typeof import('~icons/ep/switch-button')['default']
-    ImportExcel: typeof import('./components/ImportExcel/index.vue')['default']
-    ListBtns: typeof import('./components/ListBtns/index.vue')['default']
-    ListResultDig: typeof import('./components/ListResultDig/index.vue')['default']
-    Loading: typeof import('./components/Loading/index.vue')['default']
-    Merge: typeof import('./components/ListBtns/components/Merge.vue')['default']
-    NoToVoid: typeof import('./components/ListBtns/components/noToVoid.vue')['default']
-    Pagination: typeof import('./components/ProTable/components/Pagination.vue')['default']
-    Print: typeof import('./components/DetailsBtns/components/Print.vue')['default']
-    ProTable: typeof import('./components/ProTable/index.vue')['default']
-    Refresh: typeof import('./components/ListBtns/components/Refresh.vue')['default']
-    Retransmission: typeof import('./components/ListBtns/components/Retransmission.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    Search: typeof import('./components/Search/index.vue')['default']
-    Submit: typeof import('./components/DetailsBtns/components/Submit.vue')['default']
-    Switch: typeof import('./components/DetailsBtns/components/Switch.vue')['default']
-    Synchronous: typeof import('./components/ListBtns/components/Synchronous.vue')['default']
-    TableColumn: typeof import('./components/ProTable/components/TableColumn.vue')['default']
-    ToVoid: typeof import('./components/ListBtns/components/ToVoid.vue')['default']
   }
 }

src/views/deliveryAndOutbound/outboundOrderList/index.vue

@@ -40,6 +40,9 @@
 </template>
 
 <script setup lang="ts" name="outboundOrderList">
+import ListBtns from "@/components/ListBtns/index.vue";
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getOutStockListApi } from "@/api/modules/deliveryAndOutbound";

src/views/deliveryAndOutbound/outboundTaskList/index.vue

@@ -30,6 +30,9 @@
 </template>
 
 <script setup lang="ts" name="outboundTaskList">
+import ListBtns from "@/components/ListBtns/index.vue";
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getOutStockTaskListApi } from "@/api/modules/deliveryAndOutbound";

src/views/export/list/index.vue

@@ -42,6 +42,8 @@
 </template>
 
 <script setup lang="ts">
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
 import { ref, reactive } from "vue";
 
 import { getListApi, getStatusApi } from "@/api/modules/exportList";

src/views/inOtherLibraries/boxModificationsList/index.vue

@@ -23,6 +23,9 @@
 </template>
 
 <script setup lang="ts" name="boxModificationsList">
+import ListBtns from "@/components/ListBtns/index.vue";
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getChangeBoxRecordListApi } from "@/api/modules/inOtherLibraries";

src/views/inOtherLibraries/inboundOutboundRollbackList/constant/list/search.ts

@@ -33,6 +33,12 @@ export const FORMDATA: any[] = [
         placeholder: "请选择操作人",
         type: "input",
         label: "操作人："
+    },
+    {
+        prop: "materialNumber",
+        placeholder: "请输入物料名称/规格型号/编码",
+        type: "input",
+        label: "物料："
     }
 ];
 
@@ -43,5 +49,6 @@ export const RULEFORM: any = {
     subStockCode: "",
     type: "",
     createBeginDate: "",
-    createEndDate: ""
+    createEndDate: "",
+    materialNumber: ""
 };

src/views/inOtherLibraries/inboundOutboundRollbackList/index.vue

@@ -24,6 +24,9 @@
 </template>
 
 <script setup lang="ts" name="inboundOutboundRollbackList">
+import ListBtns from "@/components/ListBtns/index.vue";
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
 import { cloneDeep } from "lodash-es";
 import { useSetSearchData, useSearchStockCodeInfoArray } from "@/hooks/useSearch";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";

src/views/inOtherLibraries/movingBoxesList/index.vue

@@ -18,6 +18,9 @@
 </template>
 
 <script setup lang="ts" name="movingBoxesList">
+import ListBtns from "@/components/ListBtns/index.vue";
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getmovingBoxesListApi } from "@/api/modules/inOtherLibraries";

src/views/inventory/inventoryList/index.vue

@@ -23,6 +23,9 @@
 </template>
 
 <script setup lang="ts" name="inventoryList">
+import ListBtns from "@/components/ListBtns/index.vue";
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getTakeStockListApi } from "@/api/modules/inventory";

src/views/receiptAndWarehousing/ofInboundInstructionsList/index.vue

@@ -29,6 +29,9 @@
     </div>
 </template>
 <script setup lang="ts" name="ofInboundInstructionsList">
+import ListBtns from "@/components/ListBtns/index.vue";
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { initSearch } from "./init/index";

src/views/receiptAndWarehousing/warehouseReceiptList/index.vue

@@ -66,6 +66,9 @@
 </template>
 
 <script setup lang="ts" name="warehouseReceiptList">
+import ListBtns from "@/components/ListBtns/index.vue";
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getInStockListApi, getInStockSyncSuccessApi } from "@/api/modules/receiptAndWarehousing";

src/views/reportForm/boxStorage/index.vue

@@ -30,6 +30,10 @@
 </template>
 
 <script setup lang="ts" name="boxStorage">
+import ListBtns from "@/components/ListBtns/index.vue";
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
+
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getBoxListApi } from "@/api/modules/reportForm";

src/views/reportForm/finishedProduct/index.vue

@@ -18,6 +18,9 @@
 </template>
 
 <script setup lang="ts" name="finishedProductIndex">
+import ListBtns from "@/components/ListBtns/index.vue";
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getProductInventoryListApi } from "@/api/modules/finishedProduct";

src/views/reportForm/immediately/index.vue

@@ -25,6 +25,9 @@
 </template>
 
 <script setup lang="ts" name="immediately">
+import ListBtns from "@/components/ListBtns/index.vue";
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
 import { useValidateInput } from "@/hooks/useValidateInput";
 import { useSetSearchData, useSearchStockCodeInfoArray } from "@/hooks/useSearch";
 import { cloneDeep } from "lodash-es";

src/views/reportForm/material/index.vue

@@ -18,6 +18,9 @@
 </template>
 
 <script setup lang="ts" name="material">
+import ListBtns from "@/components/ListBtns/index.vue";
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getInOutistApi } from "@/api/modules/reportForm";

src/views/setUp/boxMark/index.vue

@@ -30,6 +30,9 @@
 </template>
 
 <script setup lang="ts" name="boxMark">
+import ListBtns from "@/components/ListBtns/index.vue";
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getBoxMarkListApi } from "@/api/modules/boxMark";

src/views/setUp/subscription/index.vue

@@ -24,6 +24,9 @@
 </template>
 
 <script setup lang="ts" name="subscriptionIndex">
+import ListBtns from "@/components/ListBtns/index.vue";
+import Search from "@/components/Search/index.vue";
+import ProTable from "@/components/ProTable/index.vue";
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getSubscriptionListApi } from "@/api/modules/subscription";