From 9cbdfe0ecbf4d6391d24f32cfba0dab1e9c7292f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 6 Feb 2024 15:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20ERP=EF=BC=9A=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E5=85=B6=E5=AE=83=E5=85=A5=E5=BA=93=E7=9A=84=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=2050%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/erp/product/category/index.ts          | 18 +++++++++---------
 src/api/erp/product/unit/index.ts              |  2 +-
 .../erp/stock/{stockRecord => record}/index.ts |  0
 .../stock/in/components/StockInItemForm.vue    |  4 ++--
 src/views/erp/stock/in/index.vue               | 15 ++++-----------
 .../stock/{stockRecord => recrod}/index.vue    |  4 ++--
 src/views/erp/stock/warehouse/index.vue        |  2 +-
 7 files changed, 19 insertions(+), 26 deletions(-)
 rename src/api/erp/stock/{stockRecord => record}/index.ts (100%)
 rename src/views/erp/stock/{stockRecord => recrod}/index.vue (98%)

diff --git a/src/api/erp/product/category/index.ts b/src/api/erp/product/category/index.ts
index dd8a1dc2..72f47dc9 100644
--- a/src/api/erp/product/category/index.ts
+++ b/src/api/erp/product/category/index.ts
@@ -1,6 +1,6 @@
 import request from '@/config/axios'
 
-// ERP 商品分类 VO
+// ERP 产品分类 VO
 export interface ProductCategoryVO {
   id: number // 分类编号
   parentId: number // 父分类编号
@@ -10,39 +10,39 @@ export interface ProductCategoryVO {
   status: number // 开启状态
 }
 
-// ERP 商品分类 API
+// ERP 产品分类 API
 export const ProductCategoryApi = {
-  // 查询商品分类列表
+  // 查询产品分类列表
   getProductCategoryList: async (params) => {
     return await request.get({ url: `/erp/product-category/list`, params })
   },
 
-  // 查询商品分类精简列表
+  // 查询产品分类精简列表
   getProductCategorySimpleList: async () => {
     return await request.get({ url: `/erp/product-category/simple-list` })
   },
 
-  // 查询商品分类详情
+  // 查询产品分类详情
   getProductCategory: async (id: number) => {
     return await request.get({ url: `/erp/product-category/get?id=` + id })
   },
 
-  // 新增商品分类
+  // 新增产品分类
   createProductCategory: async (data: ProductCategoryVO) => {
     return await request.post({ url: `/erp/product-category/create`, data })
   },
 
-  // 修改商品分类
+  // 修改产品分类
   updateProductCategory: async (data: ProductCategoryVO) => {
     return await request.put({ url: `/erp/product-category/update`, data })
   },
 
-  // 删除商品分类
+  // 删除产品分类
   deleteProductCategory: async (id: number) => {
     return await request.delete({ url: `/erp/product-category/delete?id=` + id })
   },
 
-  // 导出商品分类 Excel
+  // 导出产品分类 Excel
   exportProductCategory: async (params) => {
     return await request.download({ url: `/erp/product-category/export-excel`, params })
   }
diff --git a/src/api/erp/product/unit/index.ts b/src/api/erp/product/unit/index.ts
index e6af6125..1e1c8ac3 100644
--- a/src/api/erp/product/unit/index.ts
+++ b/src/api/erp/product/unit/index.ts
@@ -14,7 +14,7 @@ export const ProductUnitApi = {
     return await request.get({ url: `/erp/product-unit/page`, params })
   },
 
-  // 查询商品单位精简列表
+  // 查询产品单位精简列表
   getProductUnitSimpleList: async () => {
     return await request.get({ url: `/erp/product-unit/simple-list` })
   },
diff --git a/src/api/erp/stock/stockRecord/index.ts b/src/api/erp/stock/record/index.ts
similarity index 100%
rename from src/api/erp/stock/stockRecord/index.ts
rename to src/api/erp/stock/record/index.ts
diff --git a/src/views/erp/stock/in/components/StockInItemForm.vue b/src/views/erp/stock/in/components/StockInItemForm.vue
index a3adc1b8..8b67d547 100644
--- a/src/views/erp/stock/in/components/StockInItemForm.vue
+++ b/src/views/erp/stock/in/components/StockInItemForm.vue
@@ -84,7 +84,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="商品单价" fixed="right" min-width="120">
+      <el-table-column label="产品单价" fixed="right" min-width="120">
         <template #default="{ row, $index }">
           <el-form-item
             :prop="`${$index}.productPrice`"
@@ -139,7 +139,7 @@ const formRules = reactive({
   inId: [{ required: true, message: '入库编号不能为空', trigger: 'blur' }],
   warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'blur' }],
   productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
-  count: [{ required: true, message: '商品数量不能为空', trigger: 'blur' }]
+  count: [{ required: true, message: '产品数量不能为空', trigger: 'blur' }]
 })
 const formRef = ref([]) // 表单 Ref
 const productList = ref<ProductVO[]>([]) // 产品列表
diff --git a/src/views/erp/stock/in/index.vue b/src/views/erp/stock/in/index.vue
index 66ac31f9..0db4f32f 100644
--- a/src/views/erp/stock/in/index.vue
+++ b/src/views/erp/stock/in/index.vue
@@ -17,7 +17,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <!-- TODO 芋艿：商品信息 -->
+      <!-- TODO 芋艿：产品信息 -->
       <el-form-item label="入库时间" prop="inTime">
         <el-date-picker
           v-model="queryParams.inTime"
@@ -95,8 +95,8 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="入库单号" align="center" prop="no" />
+      <el-table-column label="产品信息" align="center" prop="productNames" min-width="200" />
       <el-table-column label="供应商" align="center" prop="supplierId" />
-      <!-- TODO 商品信息 -->
       <el-table-column
         label="入库时间"
         align="center"
@@ -104,14 +104,7 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column
-        label="入库时间"
-        align="center"
-        prop="inTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <!-- TODO 芋艿：创建人 -->
+      <el-table-column label="创建人" align="center" prop="creatorName" />
       <el-table-column label="数量" align="center" prop="totalCount" />
       <el-table-column label="金额合计" align="center" prop="totalPrice" />
       <el-table-column label="状态" align="center" prop="status">
@@ -233,7 +226,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await StockInApi.exportStockIn(queryParams)
-    download.excel(data, 'ERP 其它入库单.xls')
+    download.excel(data, '其它入库单.xls')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/erp/stock/stockRecord/index.vue b/src/views/erp/stock/recrod/index.vue
similarity index 98%
rename from src/views/erp/stock/stockRecord/index.vue
rename to src/views/erp/stock/recrod/index.vue
index 6b4c189f..3a9e599c 100644
--- a/src/views/erp/stock/stockRecord/index.vue
+++ b/src/views/erp/stock/recrod/index.vue
@@ -136,7 +136,7 @@
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
-import { StockRecordApi, StockRecordVO } from '@/api/erp/stock/stockRecord'
+import { StockRecordApi, StockRecordVO } from '@/api/erp/stock/record'
 import { ProductApi, ProductVO } from '@/api/erp/product/product'
 import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
 
@@ -214,7 +214,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await StockRecordApi.exportStockRecord(queryParams)
-    download.excel(data, 'ERP 产品库存明细.xls')
+    download.excel(data, '产品库存明细.xls')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/erp/stock/warehouse/index.vue b/src/views/erp/stock/warehouse/index.vue
index ebd87b3e..e0532b95 100644
--- a/src/views/erp/stock/warehouse/index.vue
+++ b/src/views/erp/stock/warehouse/index.vue
@@ -215,7 +215,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await WarehouseApi.exportWarehouse(queryParams)
-    download.excel(data, 'ERP 仓库.xls')
+    download.excel(data, '仓库.xls')
   } catch {
   } finally {
     exportLoading.value = false