Skip to content

Commit 9cbdfe0

Browse files
committed
✨ ERP:初始化其它入库的表单 50%
1 parent 53c94af commit 9cbdfe0

File tree

7 files changed

+19
-26
lines changed

7 files changed

+19
-26
lines changed

src/api/erp/product/category/index.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import request from '@/config/axios'
22

3-
// ERP 商品分类 VO
3+
// ERP 产品分类 VO
44
export interface ProductCategoryVO {
55
id: number // 分类编号
66
parentId: number // 父分类编号
@@ -10,39 +10,39 @@ export interface ProductCategoryVO {
1010
status: number // 开启状态
1111
}
1212

13-
// ERP 商品分类 API
13+
// ERP 产品分类 API
1414
export const ProductCategoryApi = {
15-
// 查询商品分类列表
15+
// 查询产品分类列表
1616
getProductCategoryList: async (params) => {
1717
return await request.get({ url: `/erp/product-category/list`, params })
1818
},
1919

20-
// 查询商品分类精简列表
20+
// 查询产品分类精简列表
2121
getProductCategorySimpleList: async () => {
2222
return await request.get({ url: `/erp/product-category/simple-list` })
2323
},
2424

25-
// 查询商品分类详情
25+
// 查询产品分类详情
2626
getProductCategory: async (id: number) => {
2727
return await request.get({ url: `/erp/product-category/get?id=` + id })
2828
},
2929

30-
// 新增商品分类
30+
// 新增产品分类
3131
createProductCategory: async (data: ProductCategoryVO) => {
3232
return await request.post({ url: `/erp/product-category/create`, data })
3333
},
3434

35-
// 修改商品分类
35+
// 修改产品分类
3636
updateProductCategory: async (data: ProductCategoryVO) => {
3737
return await request.put({ url: `/erp/product-category/update`, data })
3838
},
3939

40-
// 删除商品分类
40+
// 删除产品分类
4141
deleteProductCategory: async (id: number) => {
4242
return await request.delete({ url: `/erp/product-category/delete?id=` + id })
4343
},
4444

45-
// 导出商品分类 Excel
45+
// 导出产品分类 Excel
4646
exportProductCategory: async (params) => {
4747
return await request.download({ url: `/erp/product-category/export-excel`, params })
4848
}

src/api/erp/product/unit/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const ProductUnitApi = {
1414
return await request.get({ url: `/erp/product-unit/page`, params })
1515
},
1616

17-
// 查询商品单位精简列表
17+
// 查询产品单位精简列表
1818
getProductUnitSimpleList: async () => {
1919
return await request.get({ url: `/erp/product-unit/simple-list` })
2020
},

src/views/erp/stock/in/components/StockInItemForm.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</el-form-item>
8585
</template>
8686
</el-table-column>
87-
<el-table-column label="商品单价" fixed="right" min-width="120">
87+
<el-table-column label="产品单价" fixed="right" min-width="120">
8888
<template #default="{ row, $index }">
8989
<el-form-item
9090
:prop="`${$index}.productPrice`"
@@ -139,7 +139,7 @@ const formRules = reactive({
139139
inId: [{ required: true, message: '入库编号不能为空', trigger: 'blur' }],
140140
warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'blur' }],
141141
productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
142-
count: [{ required: true, message: '商品数量不能为空', trigger: 'blur' }]
142+
count: [{ required: true, message: '产品数量不能为空', trigger: 'blur' }]
143143
})
144144
const formRef = ref([]) // 表单 Ref
145145
const productList = ref<ProductVO[]>([]) // 产品列表

src/views/erp/stock/in/index.vue

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
class="!w-240px"
1818
/>
1919
</el-form-item>
20-
<!-- TODO 芋艿:商品信息 -->
20+
<!-- TODO 芋艿:产品信息 -->
2121
<el-form-item label="入库时间" prop="inTime">
2222
<el-date-picker
2323
v-model="queryParams.inTime"
@@ -95,23 +95,16 @@
9595
<ContentWrap>
9696
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
9797
<el-table-column label="入库单号" align="center" prop="no" />
98+
<el-table-column label="产品信息" align="center" prop="productNames" min-width="200" />
9899
<el-table-column label="供应商" align="center" prop="supplierId" />
99-
<!-- TODO 商品信息 -->
100100
<el-table-column
101101
label="入库时间"
102102
align="center"
103103
prop="inTime"
104104
:formatter="dateFormatter"
105105
width="180px"
106106
/>
107-
<el-table-column
108-
label="入库时间"
109-
align="center"
110-
prop="inTime"
111-
:formatter="dateFormatter"
112-
width="180px"
113-
/>
114-
<!-- TODO 芋艿:创建人 -->
107+
<el-table-column label="创建人" align="center" prop="creatorName" />
115108
<el-table-column label="数量" align="center" prop="totalCount" />
116109
<el-table-column label="金额合计" align="center" prop="totalPrice" />
117110
<el-table-column label="状态" align="center" prop="status">
@@ -233,7 +226,7 @@ const handleExport = async () => {
233226
// 发起导出
234227
exportLoading.value = true
235228
const data = await StockInApi.exportStockIn(queryParams)
236-
download.excel(data, 'ERP 其它入库单.xls')
229+
download.excel(data, '其它入库单.xls')
237230
} catch {
238231
} finally {
239232
exportLoading.value = false

src/views/erp/stock/stockRecord/index.vue renamed to src/views/erp/stock/recrod/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
137137
import { dateFormatter } from '@/utils/formatTime'
138138
import download from '@/utils/download'
139-
import { StockRecordApi, StockRecordVO } from '@/api/erp/stock/stockRecord'
139+
import { StockRecordApi, StockRecordVO } from '@/api/erp/stock/record'
140140
import { ProductApi, ProductVO } from '@/api/erp/product/product'
141141
import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
142142
@@ -214,7 +214,7 @@ const handleExport = async () => {
214214
// 发起导出
215215
exportLoading.value = true
216216
const data = await StockRecordApi.exportStockRecord(queryParams)
217-
download.excel(data, 'ERP 产品库存明细.xls')
217+
download.excel(data, '产品库存明细.xls')
218218
} catch {
219219
} finally {
220220
exportLoading.value = false

src/views/erp/stock/warehouse/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ const handleExport = async () => {
215215
// 发起导出
216216
exportLoading.value = true
217217
const data = await WarehouseApi.exportWarehouse(queryParams)
218-
download.excel(data, 'ERP 仓库.xls')
218+
download.excel(data, '仓库.xls')
219219
} catch {
220220
} finally {
221221
exportLoading.value = false

0 commit comments

Comments
 (0)