From 318d5261ad9184d4d3fd024945c5ba318f465707 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 7 Feb 2024 12:29:34 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20ERP=EF=BC=9A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=E7=9A=84=E5=9B=9B=E8=88=8D?=
 =?UTF-8?q?=E4=BA=94=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/erp/product/product/index.vue       | 22 ++++++++++++++++---
 .../erp/purchase/supplier/SupplierForm.vue    |  1 +
 src/views/erp/stock/record/index.vue          | 17 +++++++++++---
 src/views/erp/stock/stock/index.vue           |  8 ++++++-
 src/views/erp/stock/warehouse/index.vue       | 15 +++++++++++--
 5 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/src/views/erp/product/product/index.vue b/src/views/erp/product/product/index.vue
index 3b7fc9cf..1e8f89e3 100644
--- a/src/views/erp/product/product/index.vue
+++ b/src/views/erp/product/product/index.vue
@@ -61,9 +61,24 @@
       <el-table-column label="规格" align="center" prop="standard" />
       <el-table-column label="分类" align="center" prop="categoryName" />
       <el-table-column label="单位" align="center" prop="unitName" />
-      <el-table-column label="采购价格" align="center" prop="purchasePrice" />
-      <el-table-column label="销售价格" align="center" prop="salePrice" />
-      <el-table-column label="最低价格" align="center" prop="minPrice" />
+      <el-table-column
+        label="采购价格"
+        align="center"
+        prop="purchasePrice"
+        :formatter="erpPriceTableColumnFormatter"
+      />
+      <el-table-column
+        label="销售价格"
+        align="center"
+        prop="salePrice"
+        :formatter="erpPriceTableColumnFormatter"
+      />
+      <el-table-column
+        label="最低价格"
+        align="center"
+        prop="minPrice"
+        :formatter="erpPriceTableColumnFormatter"
+      />
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
@@ -118,6 +133,7 @@ import { ProductCategoryApi, ProductCategoryVO } from '@/api/erp/product/categor
 import ProductForm from './ProductForm.vue'
 import { DICT_TYPE } from '@/utils/dict'
 import { defaultProps, handleTree } from '@/utils/tree'
+import { erpPriceTableColumnFormatter } from '@/utils'
 
 /** ERP 产品列表 */
 defineOptions({ name: 'ErpProduct' })
diff --git a/src/views/erp/purchase/supplier/SupplierForm.vue b/src/views/erp/purchase/supplier/SupplierForm.vue
index 0249ecb1..d3c433c8 100644
--- a/src/views/erp/purchase/supplier/SupplierForm.vue
+++ b/src/views/erp/purchase/supplier/SupplierForm.vue
@@ -71,6 +71,7 @@
             <el-input-number
               v-model="formData.taxPercent"
               :min="0"
+              :precision="2"
               placeholder="请输入税率"
               class="!w-1/1"
             />
diff --git a/src/views/erp/stock/record/index.vue b/src/views/erp/stock/record/index.vue
index 3a9e599c..35807642 100644
--- a/src/views/erp/stock/record/index.vue
+++ b/src/views/erp/stock/record/index.vue
@@ -110,7 +110,7 @@
           <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="出入库单号" align="center" prop="bizNo" width="200" />
       <el-table-column
         label="出入库日期"
         align="center"
@@ -118,8 +118,18 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="出入库数量" align="center" prop="count" />
-      <el-table-column label="库存量" align="center" prop="totalCount" />
+      <el-table-column
+        label="出入库数量"
+        align="center"
+        prop="count"
+        :formatter="erpCountTableColumnFormatter"
+      />
+      <el-table-column
+        label="库存量"
+        align="center"
+        prop="totalCount"
+        :formatter="erpCountTableColumnFormatter"
+      />
       <el-table-column label="操作人" align="center" prop="creatorName" />
     </el-table>
     <!-- 分页 -->
@@ -139,6 +149,7 @@ import download from '@/utils/download'
 import { StockRecordApi, StockRecordVO } from '@/api/erp/stock/record'
 import { ProductApi, ProductVO } from '@/api/erp/product/product'
 import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
+import { erpCountTableColumnFormatter } from '@/utils'
 
 /** ERP 产品库存明细列表 */
 defineOptions({ name: 'ErpStockRecord' })
diff --git a/src/views/erp/stock/stock/index.vue b/src/views/erp/stock/stock/index.vue
index 6c30bc90..5135b0fd 100644
--- a/src/views/erp/stock/stock/index.vue
+++ b/src/views/erp/stock/stock/index.vue
@@ -69,7 +69,12 @@
       <el-table-column label="产品名称" align="center" prop="productName" />
       <el-table-column label="产品单位" align="center" prop="unitName" />
       <el-table-column label="产品分类" align="center" prop="categoryName" />
-      <el-table-column label="库存量" align="center" prop="count" />
+      <el-table-column
+        label="库存量"
+        align="center"
+        prop="count"
+        :formatter="erpCountTableColumnFormatter"
+      />
       <el-table-column label="仓库" align="center" prop="warehouseName" />
     </el-table>
     <!-- 分页 -->
@@ -87,6 +92,7 @@ import download from '@/utils/download'
 import { StockApi, StockVO } from '@/api/erp/stock/stock'
 import { ProductApi, ProductVO } from '@/api/erp/product/product'
 import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
+import { erpCountTableColumnFormatter } from '@/utils'
 
 /** ERP 产品库存列表 */
 defineOptions({ name: 'ErpStock' })
diff --git a/src/views/erp/stock/warehouse/index.vue b/src/views/erp/stock/warehouse/index.vue
index e0532b95..6d112565 100644
--- a/src/views/erp/stock/warehouse/index.vue
+++ b/src/views/erp/stock/warehouse/index.vue
@@ -62,8 +62,18 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="仓库名称" align="center" prop="name" />
       <el-table-column label="仓库地址" align="center" prop="address" />
-      <el-table-column label="仓储费" align="center" prop="warehousePrice" />
-      <el-table-column label="搬运费" align="center" prop="truckagePrice" />
+      <el-table-column
+        label="仓储费"
+        align="center"
+        prop="warehousePrice"
+        :formatter="erpPriceTableColumnFormatter"
+      />
+      <el-table-column
+        label="搬运费"
+        align="center"
+        prop="truckagePrice"
+        :formatter="erpPriceTableColumnFormatter"
+      />
       <el-table-column label="负责人" align="center" prop="principal" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="排序" align="center" prop="sort" />
@@ -129,6 +139,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
 import WarehouseForm from './WarehouseForm.vue'
+import { erpPriceTableColumnFormatter } from '@/utils'
 
 /** ERP 仓库列表 */
 defineOptions({ name: 'ErpWarehouse' })