From 1cd943473fbce0c59e6468446a836d3a260653f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Thu, 24 Jul 2025 10:08:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=89=AB=E7=A0=81=E6=9E=AA?=
 =?UTF-8?q?=E5=92=8C=E6=89=8B=E5=8A=A8=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-ui/src/App.vue                            |   5 +-
 klp-ui/src/views/login.vue                    |   1 +
 klp-ui/src/views/wms/stockIo/index.vue        |   2 +-
 .../src/views/wms/stockIo/panels/barcode.vue  |   6 +-
 .../src/views/wms/stockIo/panels/detail.vue   | 202 ++++++++++--------
 5 files changed, 126 insertions(+), 90 deletions(-)

diff --git a/klp-ui/src/App.vue b/klp-ui/src/App.vue
index 1f1fbc74..df2ff63b 100644
--- a/klp-ui/src/App.vue
+++ b/klp-ui/src/App.vue
@@ -13,7 +13,10 @@ export default {
   components: { ThemePicker },
   created() {
     // 应用启动时全局初始化分类数据
-    this.$store.dispatch('category/getCategoryList');
+    if (this.$store.getters.token) {
+      this.$store.dispatch('category/getCategoryList');
+    }
+    console.log(this.$store)
   },
     metaInfo() {
         return {
diff --git a/klp-ui/src/views/login.vue b/klp-ui/src/views/login.vue
index 485542f5..c7b9a6df 100644
--- a/klp-ui/src/views/login.vue
+++ b/klp-ui/src/views/login.vue
@@ -141,6 +141,7 @@ export default {
             Cookies.remove('rememberMe');
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
+            this.$store.dispatch('category/getCategoryList');
             this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
           }).catch(() => {
             this.loading = false;
diff --git a/klp-ui/src/views/wms/stockIo/index.vue b/klp-ui/src/views/wms/stockIo/index.vue
index 05e0379e..29060cb2 100644
--- a/klp-ui/src/views/wms/stockIo/index.vue
+++ b/klp-ui/src/views/wms/stockIo/index.vue
@@ -443,7 +443,7 @@ export default {
       const res = await listStockIoDetail({ stockIoId: row.stockIoId });
       const details = res.data || res.rows || [];
       // 拼接条码内容 stockIoId_warehouseId_materialId_quantity
-      const barcodes = details.map(item => {
+      const barcodes = details.filter(el => el.recordType == 0).map(item => {
         return encodeURIComponent(`${row.stockIoId}_${item.warehouseId || ''}_${item.itemId || ''}_${item.quantity || ''}`);
       });
       this.drawerBarcodeData = {
diff --git a/klp-ui/src/views/wms/stockIo/panels/barcode.vue b/klp-ui/src/views/wms/stockIo/panels/barcode.vue
index f3b1a326..c50bf942 100644
--- a/klp-ui/src/views/wms/stockIo/panels/barcode.vue
+++ b/klp-ui/src/views/wms/stockIo/panels/barcode.vue
@@ -39,7 +39,11 @@
         <el-form v-else label-width="80px" size="small" label-position="top">
           <el-form-item label="条码明细">
             <el-table :data="barcodeConfigs" size="mini" border style="width:100%;">
-              <el-table-column label="条码内容" prop="code" width="90" align="center" show-overflow-tooltip />
+              <el-table-column label="条码内容" prop="code" width="90" align="center" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <el-input type="textarea" v-model="scope.row.code" size="mini" :autosize="{ minRows: 1, maxRows: 3 }" placeholder="请输入条码内容" />
+                </template>
+              </el-table-column>
               <el-table-column label="数量" width="180" align="center">
                 <template slot-scope="scope">
                   <el-input-number v-model.number="scope.row.count" :min="1" :max="100" size="mini" />
diff --git a/klp-ui/src/views/wms/stockIo/panels/detail.vue b/klp-ui/src/views/wms/stockIo/panels/detail.vue
index ab873457..bba37149 100644
--- a/klp-ui/src/views/wms/stockIo/panels/detail.vue
+++ b/klp-ui/src/views/wms/stockIo/panels/detail.vue
@@ -22,92 +22,107 @@
       </el-descriptions>
       <br />
       <!-- 明细表格 -->
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            :disabled="stockIo.status >= 2"
-            
-          >新增</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single || stockIo.status >= 2"
-            @click="handleUpdate"
-            
-          >修改</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple || stockIo.status >= 2"
-            @click="handleDelete"
-            
-          >删除</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            
-          >导出</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-      <el-table v-loading="loading" :data="stockIoDetailList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="库区/库位" align="center" prop="warehouseName" />
-        <el-table-column 
-          v-if="stockIo.ioType === 'transfer'" 
-          label="源库区/库位" 
-          align="center" 
-          prop="fromWarehouseName" 
-        />
-        <el-table-column label="物品类型" align="center" prop="itemType">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.stock_item_type" :value="scope.row.itemType" />
-          </template>
-        </el-table-column>
-        <el-table-column label="物品ID" align="center" prop="itemId" />
-        <el-table-column label="数量" align="center" prop="quantity" />
-        <el-table-column label="单位" align="center" prop="unit" />
-        <el-table-column label="批次号" align="center" prop="batchNo" />
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              :disabled="stockIo.status >= 2"
-              
-            >修改</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              :disabled="stockIo.status >= 2"
-              
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
+      <el-tabs v-model="activeTab" style="margin-bottom: 10px;">
+        <el-tab-pane label="手动录入" name="manual">
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+                :disabled="stockIo.status >= 2"
+              >新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="success"
+                plain
+                icon="el-icon-edit"
+                size="mini"
+                :disabled="single || stockIo.status >= 2"
+                @click="handleUpdate"
+              >修改</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="danger"
+                plain
+                icon="el-icon-delete"
+                size="mini"
+                :disabled="multiple || stockIo.status >= 2"
+                @click="handleDelete"
+              >删除</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="warning"
+                plain
+                icon="el-icon-download"
+                size="mini"
+                @click="handleExport"
+              >导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          </el-row>
+          <el-table v-loading="loading" :data="manualList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="库区/库位" align="center" prop="warehouseName" />
+            <el-table-column 
+              v-if="stockIo.ioType === 'transfer'" 
+              label="源库区/库位" 
+              align="center" 
+              prop="fromWarehouseName" 
+            />
+            <el-table-column label="物品类型" align="center" prop="itemType">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.stock_item_type" :value="scope.row.itemType" />
+              </template>
+            </el-table-column>
+            <el-table-column label="物品ID" align="center" prop="itemId" />
+            <el-table-column label="数量" align="center" prop="quantity" />
+            <el-table-column label="单位" align="center" prop="unit" />
+            <el-table-column label="批次号" align="center" prop="batchNo" />
+            <el-table-column label="备注" align="center" prop="remark" />
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleUpdate(scope.row)"
+                  :disabled="stockIo.status >= 2"
+                >修改</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  :disabled="stockIo.status >= 2"
+                >删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="扫码枪" name="scanner">
+          <el-table :data="scannerList" :show-header="true" :border="true" style="width: 100%;" :default-sort="{}" :highlight-current-row="true">
+            <el-table-column type="index" width="55" align="center" label="#" />
+            <el-table-column label="库区/库位" align="center" prop="warehouseName" />
+            <el-table-column v-if="stockIo.ioType === 'transfer'" label="源库区/库位" align="center" prop="fromWarehouseName" />
+            <el-table-column label="物品类型" align="center" prop="itemType">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.stock_item_type" :value="scope.row.itemType" />
+              </template>
+            </el-table-column>
+            <el-table-column label="物品ID" align="center" prop="itemId" />
+            <el-table-column label="数量" align="center" prop="quantity" />
+            <el-table-column label="单位" align="center" prop="unit" />
+            <el-table-column label="批次号" align="center" prop="batchNo" />
+            <el-table-column label="备注" align="center" prop="remark" />
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
       <pagination
         v-show="total>0"
         :total="total"
@@ -267,7 +282,8 @@ export default {
       multiple: true,
       statusLoading: false, // 新增状态修改按钮加载状态
       cancelLoading: false, // 撤回按钮加载状态
-      unitDisabled: false // 新增：单位输入框是否禁用
+      unitDisabled: false, // 新增：单位输入框是否禁用
+      activeTab: 'manual' // 新增：当前激活的标签页
     };
   },
   watch: {
@@ -281,6 +297,16 @@ export default {
       immediate: true
     }
   },
+  computed: {
+    // 手动录入的列表,使用recordType区分为0
+    manualList() {
+      return this.stockIoDetailList.filter(item => item.recordType === 0);
+    },
+    // 来自扫码枪的列表，为1
+    scannerList() {
+      return this.stockIoDetailList.filter(item => item.recordType === 1);
+    }
+  },
   mounted() {
     if (this.stockIo && this.stockIo.stockIoId) {
       this.queryParams.stockIoId = this.stockIo.stockIoId;
@@ -334,6 +360,7 @@ export default {
     handleAdd() {
       this.reset();
       this.form.stockIoId = this.stockIo.stockIoId;
+      this.form.recordType = 0; // 新增时设为手动录入
       this.open = true;
       this.title = "添加出入库单明细";
     },
@@ -344,6 +371,7 @@ export default {
       getStockIoDetail(detailId).then(response => {
         this.loading = false;
         this.form = response.data;
+        this.form.recordType = 0; // 修改时强制设为手动录入
         this.open = true;
         this.title = "修改出入库单明细";
       });