From 954543a091583124630ffa60ad3351d078bd8a48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=A1=E9=92=B1?= <shenzehai@163.com>
Date: Tue, 18 Mar 2025 11:50:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E7=BC=96=E8=BE=91=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             |   2 +-
 package.json                                  |   2 +-
 .../in/components/PurchaseInItemForm.vue      |   4 +-
 .../purchase/return/PurchaseReturnForm.vue    |   5 +
 .../components/PurchaseReturnItemForm.vue     |  35 ++++-
 .../erp/stock/record/stockrecordqr/index.vue  |  16 ++-
 src/views/erp/stock/stock/stockqr/index.vue   | 124 +++++++-----------
 7 files changed, 100 insertions(+), 88 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b89d3ca7d..00d4b3d50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46,7 +46,7 @@
         "nprogress": "^0.2.0",
         "pinia": "^2.1.7",
         "pinia-plugin-persistedstate": "^3.2.1",
-        "qrcode": "^1.5.3",
+        "qrcode": "^1.5.4",
         "qs": "^6.12.0",
         "sortablejs": "^1.15.3",
         "steady-xml": "^0.1.0",
diff --git a/package.json b/package.json
index 28427ae64..bc914af01 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "nprogress": "^0.2.0",
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",
-    "qrcode": "^1.5.3",
+    "qrcode": "^1.5.4",
     "qs": "^6.12.0",
     "sortablejs": "^1.15.3",
     "steady-xml": "^0.1.0",
diff --git a/src/views/erp/purchase/in/components/PurchaseInItemForm.vue b/src/views/erp/purchase/in/components/PurchaseInItemForm.vue
index 348c174a1..69d0acd54 100644
--- a/src/views/erp/purchase/in/components/PurchaseInItemForm.vue
+++ b/src/views/erp/purchase/in/components/PurchaseInItemForm.vue
@@ -414,7 +414,7 @@ const handleAdd = () => {
 }
 const queryLocationParams = reactive({
   pageNo: 1,
-  pageSize: 10,
+  pageSize: 100,
   warehouseId: undefined as unknown
 })
 
@@ -471,6 +471,6 @@ defineExpose({ validate })
 onMounted(async () => {
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
   defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus)
-  locationList.value = onChangeWarehouse({pageNo: 1,pageSize: 10,warehouseId: defaultWarehouse.value?.id})
+  locationList.value = onChangeWarehouse({pageNo: 1,pageSize: 100,warehouseId: defaultWarehouse.value?.id})
 })
 </script>
diff --git a/src/views/erp/purchase/return/PurchaseReturnForm.vue b/src/views/erp/purchase/return/PurchaseReturnForm.vue
index db352909c..d59b18221 100644
--- a/src/views/erp/purchase/return/PurchaseReturnForm.vue
+++ b/src/views/erp/purchase/return/PurchaseReturnForm.vue
@@ -242,6 +242,11 @@ const open = async (type: string, id?: number) => {
     formLoading.value = true
     try {
       formData.value = await PurchaseReturnApi.getPurchaseReturn(id)
+      formData.value.items.forEach((item) => {
+        if(item.ifQr===0){
+        item.qrCodeLineCount = item.count
+        }
+      })
     } finally {
       formLoading.value = false
     }
diff --git a/src/views/erp/purchase/return/components/PurchaseReturnItemForm.vue b/src/views/erp/purchase/return/components/PurchaseReturnItemForm.vue
index bad5f0a5d..4b5fdcd50 100644
--- a/src/views/erp/purchase/return/components/PurchaseReturnItemForm.vue
+++ b/src/views/erp/purchase/return/components/PurchaseReturnItemForm.vue
@@ -15,6 +15,30 @@
               </el-form-item>
             </template>
           </el-table-column>
+          <el-table-column label="货位" min-width="125">
+        <template #default="{ row, $index }">
+          <el-form-item
+            :prop="`${$index}.warehouseLocationId`"
+            :rules="formRules.warehouseLocationId"
+            class="mb-0px!"
+          >
+            <el-select
+              v-model="row.warehouseLocationId"
+              clearable
+              filterable
+              placeholder="请选择货位"
+            
+            >
+              <el-option
+                v-for="item in locationList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
           <el-table-column label="产品名称" min-width="180">
             <template #default="{ row }">
               <el-form-item class="mb-0px!">
@@ -164,6 +188,8 @@ import {
 } from '@/utils'
 import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
 
+const locationList = ref<WarehouseLocationVO[]>([]) // 仓库列表
+
 const props = defineProps<{
   items: undefined
   disabled: false
@@ -171,6 +197,7 @@ const props = defineProps<{
 const formLoading = ref(false) // 表单的加载中
 const formData = ref([])
 const formRules = reactive({
+  warehouseLocationId: [{ required: true, message: '货位不能为空', trigger: 'blur' }],
   warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'blur' }],
   productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
   count: [{ required: true, message: '产品数量不能为空', trigger: 'blur' }]
@@ -195,6 +222,7 @@ const message = useMessage() // 消息弹窗
 const qrNeedCount = computed(() => {
   return currentRow.value?.count
 })
+
 // 监听二维码文本域内容的变化
 const onQrCodeChange = () => {
   // 检查 qrCode.value 是否为 undefined 或 null
@@ -317,7 +345,11 @@ const getSummaries = (param: SummaryMethodProps) => {
 
   return sums
 }
-
+const queryLocationParams = reactive({
+  pageNo: 1,
+  pageSize: 100,
+  warehouseId: undefined as unknown
+})
 
 //仓库变更，同步变更货位列表
 const onChangeWarehouse = async (row: typeof props.items[0]) => {
@@ -391,5 +423,6 @@ defineExpose({ validate })
 onMounted(async () => {
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
   defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus)
+  locationList.value = onChangeWarehouse({pageNo: 1,pageSize: 100,warehouseId: defaultWarehouse.value?.id})
 })
 </script>
diff --git a/src/views/erp/stock/record/stockrecordqr/index.vue b/src/views/erp/stock/record/stockrecordqr/index.vue
index cd9ba0ad2..e71beb365 100644
--- a/src/views/erp/stock/record/stockrecordqr/index.vue
+++ b/src/views/erp/stock/record/stockrecordqr/index.vue
@@ -120,13 +120,16 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="二维码" align="center" prop="qr" min-width="100" />
       <el-table-column label="明细编号" align="center" prop="recordId" />
-      <el-table-column label="产品编号" align="center" prop="productId" />
-      <el-table-column label="仓库编号" align="center" prop="warehouseId" />
-      <el-table-column label="货位编号" align="center" prop="warehouseLocationId" />
-      <el-table-column label="业务类型" align="center" prop="bizType" />
-      <el-table-column label="业务编号" align="center" prop="bizId" />
-      <el-table-column label="业务项编号" align="center" prop="bizItemId" />
+      <el-table-column label="产品名称" align="center" prop="productName" />
+      <el-table-column label="仓库" align="center" prop="warehouseName" />
+      <el-table-column label="货位" align="center" prop="warehouseLocationName" />
+      <el-table-column label="类型" align="center" prop="bizType" min-width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ERP_STOCK_RECORD_BIZ_TYPE" :value="scope.row.bizType" />
+        </template>
+      </el-table-column>
       <el-table-column label="业务单号" align="center" prop="bizNo" />
       <el-table-column
         label="创建时间"
@@ -170,6 +173,7 @@
 </template>
 
 <script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { StockRecordQrApi, StockRecordQrVO } from '@/api/erp/stock/record/stockrecordqr'
diff --git a/src/views/erp/stock/stock/stockqr/index.vue b/src/views/erp/stock/stock/stockqr/index.vue
index a1125b23b..f96efe067 100644
--- a/src/views/erp/stock/stock/stockqr/index.vue
+++ b/src/views/erp/stock/stock/stockqr/index.vue
@@ -1,70 +1,36 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
       <el-form-item label="二维码" prop="qr">
-        <el-input
-          v-model="queryParams.qr"
-          placeholder="请输入二维码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.qr" placeholder="请输入二维码" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item label="产品编号" prop="productId">
-        <el-select
-          v-model="queryParams.productId"
-          placeholder="请选择产品编号"
-          clearable
-          class="!w-240px"
-        >
+        <el-select v-model="queryParams.productId" placeholder="请选择产品编号" clearable class="!w-240px">
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
       <el-form-item label="仓库编号" prop="warehouseId">
-        <el-input
-          v-model="queryParams.warehouseId"
-          placeholder="请输入仓库编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.warehouseId" 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-220px"
-        />
+        <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-220px" />
       </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="['erp:stock-qr:create']"
-        >
+        <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="['erp:stock-qr:create']">
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['erp:stock-qr:export']"
-        >
+        <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['erp:stock-qr:export']">
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
       </el-form-item>
@@ -76,44 +42,29 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="二维码" align="center" prop="qr" />
+      <el-table-column label="二维码图片" align="center" prop="qrImg">
+        <template #default="scope">
+          <img :src="scope.row.qrImgUrl" alt="二维码图片" class="w-50px h-50px" />
+        </template>
+      </el-table-column>
       <el-table-column label="产品名称" align="center" prop="productName" />
       <el-table-column label="仓库" align="center" prop="warehouseName" />
       <el-table-column label="货位" align="center" prop="warehouseLocationName" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
       <el-table-column label="操作" align="center" min-width="120px">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['erp:stock-qr:update']"
-          >
+          <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['erp:stock-qr:update']">
             编辑
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['erp:stock-qr:delete']"
-          >
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['erp:stock-qr:delete']">
             删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -125,6 +76,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { StockQrApi, StockQrVO } from '@/api/erp/stock/stock/stockqr'
 import StockQrForm from './StockQrForm.vue'
+import QRCode from 'qrcode' // 引入 qrcode 库
 
 /** ERP 产品库存二维码 列表 */
 defineOptions({ name: 'ErpStockQr' })
@@ -146,6 +98,17 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
+// 生成二维码图片的函数
+const generateQrCodeImage = async (qrValue: string): Promise<string> => {
+  try {
+    const base64 = await QRCode.toDataURL(qrValue)
+    return base64
+  } catch (error) {
+    console.error('生成二维码失败:', error)
+    return ''
+  }
+}
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
@@ -153,6 +116,13 @@ const getList = async () => {
     const data = await StockQrApi.getStockQrPage(queryParams)
     list.value = data.list
     total.value = data.total
+    // 遍历列表，为每个元素生成二维码图片
+    for (const item of list.value) {
+      if (item.qr) {
+        const imageUrl = await generateQrCodeImage(item.qr)
+        item.qrImgUrl = imageUrl // 假设添加一个新的属性 qrImgUrl 来存储图片链接
+      }
+    }
   } finally {
     loading.value = false
   }
@@ -186,7 +156,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 
 /** 导出按钮操作 */