From 35a8de2ede571ac93b62987f86b208047d115488 Mon Sep 17 00:00:00 2001
From: yangchunlong <292345300@qq.com>
Date: Thu, 16 Apr 2026 16:11:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=9A=80=20=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/auto-import.d.ts                          |  1 +
 src/components/ProTable/index.vue             |  3 ++
 .../SearchForm/components/SearchFormItem.vue  | 10 ++++++
 src/hooks/useTable.ts                         | 35 +++++++++++--------
 .../code/barCode/constant/printCode/search.ts |  4 +--
 src/views/supplier/code/barCode/index.vue     |  2 --
 src/views/supplier/code/boxCode/index.vue     |  3 +-
 src/views/supplier/code/boxCode/init/save.ts  |  3 +-
 8 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/src/auto-import.d.ts b/src/auto-import.d.ts
index 44bf070..8095d30 100644
--- a/src/auto-import.d.ts
+++ b/src/auto-import.d.ts
@@ -5,6 +5,7 @@
 export {}
 declare global {
     const EffectScope: typeof import("vue")["EffectScope"];
+    const ElMessage: typeof import("element-plus/es")["ElMessage"];
     const computed: typeof import("vue")["computed"];
     const createApp: typeof import("vue")["createApp"];
     const customRef: typeof import("vue")["customRef"];
diff --git a/src/components/ProTable/index.vue b/src/components/ProTable/index.vue
index c0df4c9..8a537b2 100644
--- a/src/components/ProTable/index.vue
+++ b/src/components/ProTable/index.vue
@@ -158,6 +158,9 @@ const { selectionChange, selectedList, selectedListIds, isSelected } = useSelect
 
 // 清空选中数据列表
 const clearSelection = () => tableRef.value!.clearSelection();
+
+console.log(props.initParam, "=props.initParam=");
+
 // 表格操作 Hooks
 const { tableData, pageable, searchParam, searchInitParam, getTableList, search, reset, handleSizeChange, handleCurrentChange } =
     useTable(
diff --git a/src/components/SearchForm/components/SearchFormItem.vue b/src/components/SearchForm/components/SearchFormItem.vue
index 85a761d..bc98ed7 100644
--- a/src/components/SearchForm/components/SearchFormItem.vue
+++ b/src/components/SearchForm/components/SearchFormItem.vue
@@ -384,6 +384,16 @@ const handleEmitClear = (item: any) => {
         $Bus.emit("clearBoxMarkIndexCreator");
     }
 };
+//
+// $Bus.on("setBarCodeFormCreateUser", () => {
+//     if (routeName.value === "boxCode" || routeName.value === "barCode" || routeName.value === "antiCode") {
+//         _searchParam.value.createUser = userStore.userInfo.nickname;
+//         console.log(_searchParam.value, "= _searchParam.value.createUser=");
+//     }
+//     if (routeName.value === "boxMarkIndex") {
+//         _searchParam.value.creator = userStore.userInfo.nickname;
+//     }
+// });
 </script>
 <style lang="scss" scope>
 @import "../index.scss";
diff --git a/src/hooks/useTable.ts b/src/hooks/useTable.ts
index ac9f695..ea16504 100644
--- a/src/hooks/useTable.ts
+++ b/src/hooks/useTable.ts
@@ -1,7 +1,7 @@
 import { Table } from "./interface";
 import { reactive, computed, toRefs } from "vue";
 import $Bus from "@/utils/mittBus";
-
+import { useUserStore } from "@/stores/modules/user";
 /**
  * @description table 页面操作方法封装
  * @param {Function} api 获取表格数据 api 方法 (必传)
@@ -62,9 +62,6 @@ export const useTable = (
         try {
             // 先把初始化参数和分页参数放到总参数里面 initParam
             Object.assign(state.totalParam, isPageable ? pageParam.value : {});
-            // console.log(state.searchInitParam, "=========state.searchInitParam===");
-            // console.log(initParam, "=========initParam===");
-
             let { data, totalCount } = await api({ ...state.searchInitParam, ...initParam, ...state.totalParam });
             state.tableData = data;
 
@@ -141,21 +138,31 @@ export const useTable = (
         state.searchParam = {};
         // 重置搜索表单的时，如果有默认搜索参数，则重置默认的搜索参数
         Object.keys(state.searchInitParam).forEach(key => {
+            console.log(key, "=============");
             state.searchParam[key] = state.searchInitParam[key];
         });
-        console.log(routeName, "=routeName=");
-        if (routeName === "barCode") {
-            $Bus.emit("clearBarCodeCreateUser");
-        }
-        if (routeName === "boxCode") {
-            $Bus.emit("clearBoxCodeCreateUser");
+        const userStore: any = useUserStore();
+        if (routeName === "boxCode" || routeName === "barCode" || routeName === "antiCode") {
+            state.searchParam.createUser = userStore.userInfo.nickname;
         }
         if (routeName === "boxMarkIndex") {
-            $Bus.emit("clearBoxMarkIndexCreator");
-        }
-        if (routeName === "antiCode") {
-            $Bus.emit("clearBoxAntiCodeCreator");
+            state.searchParam.creator = userStore.userInfo.nickname;
         }
+
+        // // console.log(routeName, "=routeName=");
+        // if (routeName === "barCode") {
+        //     // $Bus.emit("setBarCodeFormCreateUser");
+        //     // $Bus.emit("clearBarCodeCreateUser");
+        // }
+        // if (routeName === "boxCode") {
+        //     $Bus.emit("clearBoxCodeCreateUser");
+        // }
+        // if (routeName === "boxMarkIndex") {
+        //     $Bus.emit("clearBoxMarkIndexCreator");
+        // }
+        // if (routeName === "antiCode") {
+        //     $Bus.emit("clearBoxAntiCodeCreator");
+        // }
         updatedTotalParam();
         getTableList();
     };
diff --git a/src/views/supplier/code/barCode/constant/printCode/search.ts b/src/views/supplier/code/barCode/constant/printCode/search.ts
index a71a912..a1a0112 100644
--- a/src/views/supplier/code/barCode/constant/printCode/search.ts
+++ b/src/views/supplier/code/barCode/constant/printCode/search.ts
@@ -58,7 +58,7 @@ export const PRINT_CODE_FORM_DATA: FormItem[] = [
     {
         prop: "serialNumbers",
         placeholder: "请输入序列号",
-        type: "input",
+        type: "inputBtn",
         isArray: true,
         label: "序列号: "
     },
@@ -108,7 +108,7 @@ export const PRINT_CODE_FORM_DATA: FormItem[] = [
     {
         prop: "numberCodes",
         placeholder: "请输入数字序列号",
-        type: "input",
+        type: "inputBtn",
         isArray: true,
         label: "数字序列号: "
     },
diff --git a/src/views/supplier/code/barCode/index.vue b/src/views/supplier/code/barCode/index.vue
index a749c6d..f3124d9 100644
--- a/src/views/supplier/code/barCode/index.vue
+++ b/src/views/supplier/code/barCode/index.vue
@@ -718,7 +718,6 @@ const handleRemoteClear = () => {
 
 // 规格型号转换确认
 const handleSpecificationConfirm = async () => {
-    console.log(datas.remoteSelectItem, "=datas.printCodeRuleFormData=");
     let params: any = {
         generateRecordId: datas.printCodeRuleFormData.generateRecordId,
         serialNumbers: [],
@@ -998,7 +997,6 @@ onMounted(() => {
         datas.ruleForm.createUser = createUser;
         datas.initParam.createUser = createUser;
     });
-    //searchBarCodeSsDownLoad
     $Bus.on("searchBarCodeSsDownLoad", () => {
         resetVisibleGroups();
         datas.printCodeRuleFormData.isDownLoad = false;
diff --git a/src/views/supplier/code/boxCode/index.vue b/src/views/supplier/code/boxCode/index.vue
index 1c7554a..7cbd7d0 100644
--- a/src/views/supplier/code/boxCode/index.vue
+++ b/src/views/supplier/code/boxCode/index.vue
@@ -301,7 +301,8 @@ const handleBeforeClose = async () => {
                     let obj = {
                         materialNumber: item.materialNumber,
                         serialNumber: item.isNumber ? item.numberCode : item.serialNumber,
-                        twoSerialNumber: item?.twoSerialNumber ? item?.twoSerialNumber : ""
+                        twoSerialNumber: item?.twoSerialNumber ? item?.twoSerialNumber : "",
+                        specifications: item.specifications
                         // twoNumberCode: item?.twoNumberCode ? item?.twoNumberCode : ""
                     };
                     newParamsArray.push(obj);
diff --git a/src/views/supplier/code/boxCode/init/save.ts b/src/views/supplier/code/boxCode/init/save.ts
index a14e960..89ff797 100644
--- a/src/views/supplier/code/boxCode/init/save.ts
+++ b/src/views/supplier/code/boxCode/init/save.ts
@@ -54,7 +54,8 @@ export const initSave = (datas: any, type: any, formTableRef: any, refInput: any
             let obj = {
                 materialNumber: item.materialNumber,
                 serialNumber: item.isNumber ? item.numberCode : item.serialNumber,
-                twoSerialNumber: item?.twoSerialNumber ? item?.twoSerialNumber : ""
+                twoSerialNumber: item?.twoSerialNumber ? item?.twoSerialNumber : "",
+                specifications: item.specifications
             };
             newParamsArray.push(obj);
         }