File tree Expand file tree Collapse file tree 7 files changed +19
-26
lines changed Expand file tree Collapse file tree 7 files changed +19
-26
lines changed Original file line number Diff line number Diff line change 1
1
import request from '@/config/axios'
2
2
3
- // ERP 商品分类 VO
3
+ // ERP 产品分类 VO
4
4
export interface ProductCategoryVO {
5
5
id : number // 分类编号
6
6
parentId : number // 父分类编号
@@ -10,39 +10,39 @@ export interface ProductCategoryVO {
10
10
status : number // 开启状态
11
11
}
12
12
13
- // ERP 商品分类 API
13
+ // ERP 产品分类 API
14
14
export const ProductCategoryApi = {
15
- // 查询商品分类列表
15
+ // 查询产品分类列表
16
16
getProductCategoryList : async ( params ) => {
17
17
return await request . get ( { url : `/erp/product-category/list` , params } )
18
18
} ,
19
19
20
- // 查询商品分类精简列表
20
+ // 查询产品分类精简列表
21
21
getProductCategorySimpleList : async ( ) => {
22
22
return await request . get ( { url : `/erp/product-category/simple-list` } )
23
23
} ,
24
24
25
- // 查询商品分类详情
25
+ // 查询产品分类详情
26
26
getProductCategory : async ( id : number ) => {
27
27
return await request . get ( { url : `/erp/product-category/get?id=` + id } )
28
28
} ,
29
29
30
- // 新增商品分类
30
+ // 新增产品分类
31
31
createProductCategory : async ( data : ProductCategoryVO ) => {
32
32
return await request . post ( { url : `/erp/product-category/create` , data } )
33
33
} ,
34
34
35
- // 修改商品分类
35
+ // 修改产品分类
36
36
updateProductCategory : async ( data : ProductCategoryVO ) => {
37
37
return await request . put ( { url : `/erp/product-category/update` , data } )
38
38
} ,
39
39
40
- // 删除商品分类
40
+ // 删除产品分类
41
41
deleteProductCategory : async ( id : number ) => {
42
42
return await request . delete ( { url : `/erp/product-category/delete?id=` + id } )
43
43
} ,
44
44
45
- // 导出商品分类 Excel
45
+ // 导出产品分类 Excel
46
46
exportProductCategory : async ( params ) => {
47
47
return await request . download ( { url : `/erp/product-category/export-excel` , params } )
48
48
}
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ export const ProductUnitApi = {
14
14
return await request . get ( { url : `/erp/product-unit/page` , params } )
15
15
} ,
16
16
17
- // 查询商品单位精简列表
17
+ // 查询产品单位精简列表
18
18
getProductUnitSimpleList : async ( ) => {
19
19
return await request . get ( { url : `/erp/product-unit/simple-list` } )
20
20
} ,
File renamed without changes.
Original file line number Diff line number Diff line change 84
84
</el-form-item >
85
85
</template >
86
86
</el-table-column >
87
- <el-table-column label =" 商品单价 " fixed =" right" min-width =" 120" >
87
+ <el-table-column label =" 产品单价 " fixed =" right" min-width =" 120" >
88
88
<template #default =" { row , $index } " >
89
89
<el-form-item
90
90
:prop =" `${$index}.productPrice`"
@@ -139,7 +139,7 @@ const formRules = reactive({
139
139
inId: [{ required: true , message: ' 入库编号不能为空' , trigger: ' blur' }],
140
140
warehouseId: [{ required: true , message: ' 仓库不能为空' , trigger: ' blur' }],
141
141
productId: [{ required: true , message: ' 产品不能为空' , trigger: ' blur' }],
142
- count: [{ required: true , message: ' 商品数量不能为空 ' , trigger: ' blur' }]
142
+ count: [{ required: true , message: ' 产品数量不能为空 ' , trigger: ' blur' }]
143
143
})
144
144
const formRef = ref ([]) // 表单 Ref
145
145
const productList = ref <ProductVO []>([]) // 产品列表
Original file line number Diff line number Diff line change 17
17
class =" !w-240px"
18
18
/>
19
19
</el-form-item >
20
- <!-- TODO 芋艿:商品信息 -->
20
+ <!-- TODO 芋艿:产品信息 -->
21
21
<el-form-item label =" 入库时间" prop =" inTime" >
22
22
<el-date-picker
23
23
v-model =" queryParams.inTime"
95
95
<ContentWrap >
96
96
<el-table v-loading =" loading" :data =" list" :stripe =" true" :show-overflow-tooltip =" true" >
97
97
<el-table-column label =" 入库单号" align =" center" prop =" no" />
98
+ <el-table-column label =" 产品信息" align =" center" prop =" productNames" min-width =" 200" />
98
99
<el-table-column label =" 供应商" align =" center" prop =" supplierId" />
99
- <!-- TODO 商品信息 -->
100
100
<el-table-column
101
101
label =" 入库时间"
102
102
align =" center"
103
103
prop =" inTime"
104
104
:formatter =" dateFormatter"
105
105
width =" 180px"
106
106
/>
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" />
115
108
<el-table-column label =" 数量" align =" center" prop =" totalCount" />
116
109
<el-table-column label =" 金额合计" align =" center" prop =" totalPrice" />
117
110
<el-table-column label =" 状态" align =" center" prop =" status" >
@@ -233,7 +226,7 @@ const handleExport = async () => {
233
226
// 发起导出
234
227
exportLoading .value = true
235
228
const data = await StockInApi .exportStockIn (queryParams )
236
- download .excel (data , ' ERP 其它入库单.xls' )
229
+ download .excel (data , ' 其它入库单.xls' )
237
230
} catch {
238
231
} finally {
239
232
exportLoading .value = false
Original file line number Diff line number Diff line change 136
136
import { getIntDictOptions , DICT_TYPE } from ' @/utils/dict'
137
137
import { dateFormatter } from ' @/utils/formatTime'
138
138
import download from ' @/utils/download'
139
- import { StockRecordApi , StockRecordVO } from ' @/api/erp/stock/stockRecord '
139
+ import { StockRecordApi , StockRecordVO } from ' @/api/erp/stock/record '
140
140
import { ProductApi , ProductVO } from ' @/api/erp/product/product'
141
141
import { WarehouseApi , WarehouseVO } from ' @/api/erp/stock/warehouse'
142
142
@@ -214,7 +214,7 @@ const handleExport = async () => {
214
214
// 发起导出
215
215
exportLoading .value = true
216
216
const data = await StockRecordApi .exportStockRecord (queryParams )
217
- download .excel (data , ' ERP 产品库存明细.xls' )
217
+ download .excel (data , ' 产品库存明细.xls' )
218
218
} catch {
219
219
} finally {
220
220
exportLoading .value = false
Original file line number Diff line number Diff line change @@ -215,7 +215,7 @@ const handleExport = async () => {
215
215
// 发起导出
216
216
exportLoading .value = true
217
217
const data = await WarehouseApi .exportWarehouse (queryParams )
218
- download .excel (data , ' ERP 仓库.xls' )
218
+ download .excel (data , ' 仓库.xls' )
219
219
} catch {
220
220
} finally {
221
221
exportLoading .value = false
You can’t perform that action at this time.
0 commit comments