Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
9cbdfe0e
authored
Feb 06, 2024
by
YunaiV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
ERP:初始化其它入库的表单 50%
parent
53c94af0
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
26 deletions
+19
-26
src/api/erp/product/category/index.ts
+9
-9
src/api/erp/product/unit/index.ts
+1
-1
src/api/erp/stock/record/index.ts
+0
-0
src/views/erp/stock/in/components/StockInItemForm.vue
+2
-2
src/views/erp/stock/in/index.vue
+4
-11
src/views/erp/stock/recrod/index.vue
+2
-2
src/views/erp/stock/warehouse/index.vue
+1
-1
No files found.
src/api/erp/product/category/index.ts
View file @
9cbdfe0e
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
})
}
...
...
src/api/erp/product/unit/index.ts
View file @
9cbdfe0e
...
...
@@ -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`
})
},
...
...
src/api/erp/stock/
stockR
ecord/index.ts
→
src/api/erp/stock/
r
ecord/index.ts
View file @
9cbdfe0e
File moved
src/views/erp/stock/in/components/StockInItemForm.vue
View file @
9cbdfe0e
...
...
@@ -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
[]
>
([])
// 产品列表
...
...
src/views/erp/stock/in/index.vue
View file @
9cbdfe0e
...
...
@@ -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
...
...
src/views/erp/stock/
stockRecor
d/index.vue
→
src/views/erp/stock/
recro
d/index.vue
View file @
9cbdfe0e
...
...
@@ -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/
stockR
ecord'
import
{
StockRecordApi
,
StockRecordVO
}
from
'@/api/erp/stock/
r
ecord'
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
...
...
src/views/erp/stock/warehouse/index.vue
View file @
9cbdfe0e
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment