From 8a6bf548e01bbc2b5d8681d56a9c78ca3422d71a Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 12 Feb 2025 17:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=93=E5=82=A8--=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98--=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/views/storage/inventory/inventory.vue       | 6 +++---
 yxt-as-ui/src/views/storage/inventory/inventoryRecord.vue | 6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/yxt-as-ui/src/views/storage/inventory/inventory.vue b/yxt-as-ui/src/views/storage/inventory/inventory.vue
index 120e3b1891..0a52a179a2 100644
--- a/yxt-as-ui/src/views/storage/inventory/inventory.vue
+++ b/yxt-as-ui/src/views/storage/inventory/inventory.vue
@@ -47,7 +47,7 @@
         </div>
         <!--End查询列表部分-->
         <div class="listtop">
-          <div class="tit">商品信息列表</div>
+          <div class="tit">商品库存列表</div>
           <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <!--Start 主页面主要部分 -->
@@ -65,8 +65,8 @@
             <el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
             <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
             <el-table-column prop="unit" label="单位" align="center" width="80" />
-            <el-table-column prop="supplierName" label="供应商" align="center" min-width="100" />
             <el-table-column prop="manufacturerName" label="厂家" align="center" min-width="100" />
+            <el-table-column prop="supplierName" label="供应商" align="center" min-width="100" />
             <el-table-column prop="warehouseName" label="仓库" min-width="100" />
             <el-table-column prop="warehouseRackCode" label="库位" width="100" />
             <el-table-column prop="count" label="现有库存" align="center" width="100" />
@@ -285,7 +285,7 @@ export default {
         const fileName = '库存表' + '.xls'
         const elink = document.createElement('a')
         elink.download = fileName
-        elink.style.display = 'nonde'
+        elink.style.display = 'none'
         elink.href = URL.createObjectURL(blob)
         document.body.appendChild(elink)
         elink.click()
diff --git a/yxt-as-ui/src/views/storage/inventory/inventoryRecord.vue b/yxt-as-ui/src/views/storage/inventory/inventoryRecord.vue
index c48208c797..fbef7893b0 100644
--- a/yxt-as-ui/src/views/storage/inventory/inventoryRecord.vue
+++ b/yxt-as-ui/src/views/storage/inventory/inventoryRecord.vue
@@ -11,11 +11,7 @@
         <el-table :key="tableKey" :data="formobj.list" :index="index" border style="width: 100%">
           <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
           <el-table-column prop="billNo" label="来源单号" align="center" width="100" />
-          <el-table-column label="单据类型" align="center" width="100">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billType == '1' ? '入库' : scope.row.billType == '0' ? '出库' : '' }}</span>
-            </template>
-          </el-table-column>
+          <el-table-column prop="billType" label="单据类型" align="center" width="100" />
           <el-table-column prop="createTime" label="发生时间" align="center" width="100" />
           <el-table-column prop="busTypeValue" label="业务类型" align="center" width="100" />
           <el-table-column prop="supplierName" label="供应商" align="center" min-width="150" />