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
f7c52660
authored
Feb 10, 2024
by
YunaiV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
ERP:增加 ERP 销售订单的实现 90%
parent
b25d9c0f
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
67 additions
and
3 deletions
+67
-3
src/api/erp/finance/account/index.ts
+5
-0
src/views/erp/sale/order/SaleOrderForm.vue
+30
-1
src/views/erp/sale/order/components/SaleOrderItemForm.vue
+1
-0
src/views/erp/sale/order/index.vue
+2
-0
src/views/erp/stock/check/components/StockCheckItemForm.vue
+2
-0
src/views/erp/stock/check/index.vue
+2
-0
src/views/erp/stock/in/StockInForm.vue
+1
-0
src/views/erp/stock/in/components/StockInItemForm.vue
+2
-0
src/views/erp/stock/in/index.vue
+3
-0
src/views/erp/stock/move/components/StockMoveItemForm.vue
+8
-1
src/views/erp/stock/move/index.vue
+3
-1
src/views/erp/stock/out/StockOutForm.vue
+1
-0
src/views/erp/stock/out/components/StockOutItemForm.vue
+2
-0
src/views/erp/stock/out/index.vue
+3
-0
src/views/erp/stock/record/index.vue
+1
-0
src/views/erp/stock/stock/index.vue
+1
-0
No files found.
src/api/erp/finance/account/index.ts
View file @
f7c52660
...
...
@@ -18,6 +18,11 @@ export const AccountApi = {
return
await
request
.
get
({
url
:
`/erp/account/page`
,
params
})
},
// 查询结算账户精简列表
getAccountSimpleList
:
async
()
=>
{
return
await
request
.
get
({
url
:
`/erp/account/simple-list`
})
},
// 查询结算账户详情
getAccount
:
async
(
id
:
number
)
=>
{
return
await
request
.
get
({
url
:
`/erp/account/get?id=`
+
id
})
...
...
src/views/erp/sale/order/SaleOrderForm.vue
View file @
f7c52660
...
...
@@ -29,6 +29,7 @@
<el-form-item
label=
"客户"
prop=
"customerId"
>
<el-select
v-model=
"formData.customerId"
clearable
filterable
placeholder=
"请选择客户"
class=
"!w-1/1"
...
...
@@ -94,6 +95,24 @@
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"结算账户"
prop=
"accountId"
>
<el-select
v-model=
"formData.accountId"
clearable
filterable
placeholder=
"请选择结算账户"
class=
"!w-1/1"
>
<el-option
v-for=
"item in accountList"
:key=
"item.id"
:label=
"item.name"
:value=
"item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"收取订金"
prop=
"depositPrice"
>
<el-input-number
v-model=
"formData.depositPrice"
...
...
@@ -119,7 +138,8 @@
import
{
SaleOrderApi
,
SaleOrderVO
}
from
'@/api/erp/sale/order'
import
SaleOrderItemForm
from
'./components/SaleOrderItemForm.vue'
import
{
CustomerApi
,
CustomerVO
}
from
'@/api/erp/sale/customer'
import
{
erpPriceInputFormatter
,
erpPriceMultiply
,
getSumValue
}
from
'@/utils'
import
{
AccountApi
,
AccountVO
}
from
'@/api/erp/finance/account'
import
{
erpPriceInputFormatter
,
erpPriceMultiply
}
from
'@/utils'
/** ERP 销售订单表单 */
defineOptions
({
name
:
'SaleOrderForm'
})
...
...
@@ -134,6 +154,7 @@ const formType = ref('') // 表单的类型:create - 新增;update - 修改
const
formData
=
ref
({
id
:
undefined
,
customerId
:
undefined
,
accountId
:
undefined
,
orderTime
:
undefined
,
remark
:
undefined
,
fileUrl
:
''
,
...
...
@@ -151,6 +172,7 @@ const formRules = reactive({
const
disabled
=
computed
(()
=>
formType
.
value
===
'detail'
)
const
formRef
=
ref
()
// 表单 Ref
const
customerList
=
ref
<
CustomerVO
[]
>
([])
// 客户列表
const
accountList
=
ref
<
AccountVO
[]
>
([])
// 账户列表
/** 子表的表单 */
const
subTabsName
=
ref
(
'item'
)
...
...
@@ -189,6 +211,12 @@ const open = async (type: string, id?: number) => {
}
// 加载客户列表
customerList
.
value
=
await
CustomerApi
.
getCustomerSimpleList
()
// 加载账户列表
accountList
.
value
=
await
AccountApi
.
getAccountSimpleList
()
const
defaultAccount
=
accountList
.
value
.
find
((
item
)
=>
item
.
defaultStatus
)
if
(
defaultAccount
)
{
formData
.
value
.
accountId
=
defaultAccount
.
id
}
}
defineExpose
({
open
})
// 提供 open 方法,用于打开弹窗
...
...
@@ -222,6 +250,7 @@ const resetForm = () => {
formData
.
value
=
{
id
:
undefined
,
customerId
:
undefined
,
accountId
:
undefined
,
orderTime
:
undefined
,
remark
:
undefined
,
fileUrl
:
undefined
,
...
...
src/views/erp/sale/order/components/SaleOrderItemForm.vue
View file @
f7c52660
...
...
@@ -15,6 +15,7 @@
<el-form-item
:prop=
"`$
{$index}.productId`" :rules="formRules.productId" class="mb-0px!">
<el-select
v-model=
"row.productId"
clearable
filterable
@
change=
"onChangeProduct($event, row)"
placeholder=
"请选择产品"
...
...
src/views/erp/sale/order/index.vue
View file @
f7c52660
...
...
@@ -47,6 +47,7 @@
<el-form-item
label=
"客户"
prop=
"customerId"
>
<el-select
v-model=
"queryParams.customerId"
clearable
filterable
placeholder=
"请选择供客户"
class=
"!w-240px"
...
...
@@ -62,6 +63,7 @@
<el-form-item
label=
"创建人"
prop=
"creator"
>
<el-select
v-model=
"queryParams.creator"
clearable
filterable
placeholder=
"请选择创建人"
class=
"!w-240px"
...
...
src/views/erp/stock/check/components/StockCheckItemForm.vue
View file @
f7c52660
...
...
@@ -19,6 +19,7 @@
>
<el-select
v-model=
"row.warehouseId"
clearable
filterable
placeholder=
"请选择仓库名字"
@
change=
"onChangeWarehouse($event, row)"
...
...
@@ -38,6 +39,7 @@
<el-form-item
:prop=
"`$
{$index}.productId`" :rules="formRules.productId" class="mb-0px!">
<el-select
v-model=
"row.productId"
clearable
filterable
@
change=
"onChangeProduct($event, row)"
placeholder=
"请选择产品"
...
...
src/views/erp/stock/check/index.vue
View file @
f7c52660
...
...
@@ -47,6 +47,7 @@
<el-form-item
label=
"仓库"
prop=
"warehouseId"
>
<el-select
v-model=
"queryParams.warehouseId"
clearable
filterable
placeholder=
"请选择仓库"
class=
"!w-240px"
...
...
@@ -62,6 +63,7 @@
<el-form-item
label=
"创建人"
prop=
"creator"
>
<el-select
v-model=
"queryParams.creator"
clearable
filterable
placeholder=
"请选择创建人"
class=
"!w-240px"
...
...
src/views/erp/stock/in/StockInForm.vue
View file @
f7c52660
...
...
@@ -29,6 +29,7 @@
<el-form-item
label=
"供应商"
prop=
"supplierId"
>
<el-select
v-model=
"formData.supplierId"
clearable
filterable
placeholder=
"请选择供应商"
class=
"!w-1/1"
...
...
src/views/erp/stock/in/components/StockInItemForm.vue
View file @
f7c52660
...
...
@@ -19,6 +19,7 @@
>
<el-select
v-model=
"row.warehouseId"
clearable
filterable
placeholder=
"请选择仓库"
@
change=
"onChangeWarehouse($event, row)"
...
...
@@ -38,6 +39,7 @@
<el-form-item
:prop=
"`$
{$index}.productId`" :rules="formRules.productId" class="mb-0px!">
<el-select
v-model=
"row.productId"
clearable
filterable
@
change=
"onChangeProduct($event, row)"
placeholder=
"请选择产品"
...
...
src/views/erp/stock/in/index.vue
View file @
f7c52660
...
...
@@ -47,6 +47,7 @@
<el-form-item
label=
"供应商"
prop=
"supplierId"
>
<el-select
v-model=
"queryParams.supplierId"
clearable
filterable
placeholder=
"请选择供应商"
class=
"!w-240px"
...
...
@@ -62,6 +63,7 @@
<el-form-item
label=
"仓库"
prop=
"warehouseId"
>
<el-select
v-model=
"queryParams.warehouseId"
clearable
filterable
placeholder=
"请选择仓库"
class=
"!w-240px"
...
...
@@ -77,6 +79,7 @@
<el-form-item
label=
"创建人"
prop=
"creator"
>
<el-select
v-model=
"queryParams.creator"
clearable
filterable
placeholder=
"请选择创建人"
class=
"!w-240px"
...
...
src/views/erp/stock/move/components/StockMoveItemForm.vue
View file @
f7c52660
...
...
@@ -19,6 +19,7 @@
>
<el-select
v-model=
"row.fromWarehouseId"
clearable
filterable
placeholder=
"请选择调出仓库"
@
change=
"onChangeWarehouse($event, row)"
...
...
@@ -40,7 +41,12 @@
:rules="formRules.toWarehouseId"
class="mb-0px!"
>
<el-select
v-model=
"row.toWarehouseId"
filterable
placeholder=
"请选择调入仓库"
>
<el-select
v-model=
"row.toWarehouseId"
clearable
filterable
placeholder=
"请选择调入仓库"
>
<el-option
v-for=
"item in warehouseList"
:key=
"item.id"
...
...
@@ -56,6 +62,7 @@
<el-form-item
:prop=
"`$
{$index}.productId`" :rules="formRules.productId" class="mb-0px!">
<el-select
v-model=
"row.productId"
clearable
filterable
@
change=
"onChangeProduct($event, row)"
placeholder=
"请选择产品"
...
...
src/views/erp/stock/move/index.vue
View file @
f7c52660
...
...
@@ -20,7 +20,7 @@
<el-form-item
label=
"产品"
prop=
"productId"
>
<el-select
v-model=
"queryParams.productId"
productId
clearable
filterable
placeholder=
"请选择产品"
class=
"!w-240px"
...
...
@@ -47,6 +47,7 @@
<el-form-item
label=
"仓库"
prop=
"fromWarehouseId"
>
<el-select
v-model=
"queryParams.fromWarehouseId"
clearable
filterable
placeholder=
"请选择仓库"
class=
"!w-240px"
...
...
@@ -62,6 +63,7 @@
<el-form-item
label=
"创建人"
prop=
"creator"
>
<el-select
v-model=
"queryParams.creator"
clearable
filterable
placeholder=
"请选择创建人"
class=
"!w-240px"
...
...
src/views/erp/stock/out/StockOutForm.vue
View file @
f7c52660
...
...
@@ -29,6 +29,7 @@
<el-form-item
label=
"客户"
prop=
"customerId"
>
<el-select
v-model=
"formData.customerId"
clearable
filterable
placeholder=
"请选择客户"
class=
"!w-1/1"
...
...
src/views/erp/stock/out/components/StockOutItemForm.vue
View file @
f7c52660
...
...
@@ -19,6 +19,7 @@
>
<el-select
v-model=
"row.warehouseId"
clearable
filterable
placeholder=
"请选择仓库"
@
change=
"onChangeWarehouse($event, row)"
...
...
@@ -38,6 +39,7 @@
<el-form-item
:prop=
"`$
{$index}.productId`" :rules="formRules.productId" class="mb-0px!">
<el-select
v-model=
"row.productId"
clearable
filterable
@
change=
"onChangeProduct($event, row)"
placeholder=
"请选择产品"
...
...
src/views/erp/stock/out/index.vue
View file @
f7c52660
...
...
@@ -47,6 +47,7 @@
<el-form-item
label=
"客户"
prop=
"customerId"
>
<el-select
v-model=
"queryParams.customerId"
clearable
filterable
placeholder=
"请选择供客户"
class=
"!w-240px"
...
...
@@ -62,6 +63,7 @@
<el-form-item
label=
"仓库"
prop=
"warehouseId"
>
<el-select
v-model=
"queryParams.warehouseId"
clearable
filterable
placeholder=
"请选择仓库"
class=
"!w-240px"
...
...
@@ -77,6 +79,7 @@
<el-form-item
label=
"创建人"
prop=
"creator"
>
<el-select
v-model=
"queryParams.creator"
clearable
filterable
placeholder=
"请选择创建人"
class=
"!w-240px"
...
...
src/views/erp/stock/record/index.vue
View file @
f7c52660
...
...
@@ -28,6 +28,7 @@
<el-form-item
label=
"仓库"
prop=
"warehouseId"
>
<el-select
v-model=
"queryParams.warehouseId"
clearable
filterable
placeholder=
"请选择仓库"
class=
"!w-240px"
...
...
src/views/erp/stock/stock/index.vue
View file @
f7c52660
...
...
@@ -28,6 +28,7 @@
<el-form-item
label=
"仓库"
prop=
"warehouseId"
>
<el-select
v-model=
"queryParams.warehouseId"
clearable
filterable
placeholder=
"请选择仓库"
class=
"!w-240px"
...
...
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