Skip to content

Commit f7c5266

Browse files
committed
✨ ERP:增加 ERP 销售订单的实现 90%
1 parent b25d9c0 commit f7c5266

File tree

16 files changed

+67
-3
lines changed

16 files changed

+67
-3
lines changed

src/api/erp/finance/account/index.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ export const AccountApi = {
1818
return await request.get({ url: `/erp/account/page`, params })
1919
},
2020

21+
// 查询结算账户精简列表
22+
getAccountSimpleList: async () => {
23+
return await request.get({ url: `/erp/account/simple-list` })
24+
},
25+
2126
// 查询结算账户详情
2227
getAccount: async (id: number) => {
2328
return await request.get({ url: `/erp/account/get?id=` + id })

src/views/erp/sale/order/SaleOrderForm.vue

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<el-form-item label="客户" prop="customerId">
3030
<el-select
3131
v-model="formData.customerId"
32+
clearable
3233
filterable
3334
placeholder="请选择客户"
3435
class="!w-1/1"
@@ -93,6 +94,24 @@
9394
<el-input disabled v-model="formData.totalPrice" :formatter="erpPriceInputFormatter" />
9495
</el-form-item>
9596
</el-col>
97+
<el-col :span="8">
98+
<el-form-item label="结算账户" prop="accountId">
99+
<el-select
100+
v-model="formData.accountId"
101+
clearable
102+
filterable
103+
placeholder="请选择结算账户"
104+
class="!w-1/1"
105+
>
106+
<el-option
107+
v-for="item in accountList"
108+
:key="item.id"
109+
:label="item.name"
110+
:value="item.id"
111+
/>
112+
</el-select>
113+
</el-form-item>
114+
</el-col>
96115
<el-col :span="8">
97116
<el-form-item label="收取订金" prop="depositPrice">
98117
<el-input-number
@@ -119,7 +138,8 @@
119138
import { SaleOrderApi, SaleOrderVO } from '@/api/erp/sale/order'
120139
import SaleOrderItemForm from './components/SaleOrderItemForm.vue'
121140
import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer'
122-
import { erpPriceInputFormatter, erpPriceMultiply, getSumValue } from '@/utils'
141+
import { AccountApi, AccountVO } from '@/api/erp/finance/account'
142+
import { erpPriceInputFormatter, erpPriceMultiply } from '@/utils'
123143
124144
/** ERP 销售订单表单 */
125145
defineOptions({ name: 'SaleOrderForm' })
@@ -134,6 +154,7 @@ const formType = ref('') // 表单的类型:create - 新增;update - 修改
134154
const formData = ref({
135155
id: undefined,
136156
customerId: undefined,
157+
accountId: undefined,
137158
orderTime: undefined,
138159
remark: undefined,
139160
fileUrl: '',
@@ -151,6 +172,7 @@ const formRules = reactive({
151172
const disabled = computed(() => formType.value === 'detail')
152173
const formRef = ref() // 表单 Ref
153174
const customerList = ref<CustomerVO[]>([]) // 客户列表
175+
const accountList = ref<AccountVO[]>([]) // 账户列表
154176
155177
/** 子表的表单 */
156178
const subTabsName = ref('item')
@@ -189,6 +211,12 @@ const open = async (type: string, id?: number) => {
189211
}
190212
// 加载客户列表
191213
customerList.value = await CustomerApi.getCustomerSimpleList()
214+
// 加载账户列表
215+
accountList.value = await AccountApi.getAccountSimpleList()
216+
const defaultAccount = accountList.value.find((item) => item.defaultStatus)
217+
if (defaultAccount) {
218+
formData.value.accountId = defaultAccount.id
219+
}
192220
}
193221
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
194222
@@ -222,6 +250,7 @@ const resetForm = () => {
222250
formData.value = {
223251
id: undefined,
224252
customerId: undefined,
253+
accountId: undefined,
225254
orderTime: undefined,
226255
remark: undefined,
227256
fileUrl: undefined,

src/views/erp/sale/order/components/SaleOrderItemForm.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
1616
<el-select
1717
v-model="row.productId"
18+
clearable
1819
filterable
1920
@change="onChangeProduct($event, row)"
2021
placeholder="请选择产品"

src/views/erp/sale/order/index.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<el-form-item label="客户" prop="customerId">
4848
<el-select
4949
v-model="queryParams.customerId"
50+
clearable
5051
filterable
5152
placeholder="请选择供客户"
5253
class="!w-240px"
@@ -62,6 +63,7 @@
6263
<el-form-item label="创建人" prop="creator">
6364
<el-select
6465
v-model="queryParams.creator"
66+
clearable
6567
filterable
6668
placeholder="请选择创建人"
6769
class="!w-240px"

src/views/erp/stock/check/components/StockCheckItemForm.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
>
2020
<el-select
2121
v-model="row.warehouseId"
22+
clearable
2223
filterable
2324
placeholder="请选择仓库名字"
2425
@change="onChangeWarehouse($event, row)"
@@ -38,6 +39,7 @@
3839
<el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
3940
<el-select
4041
v-model="row.productId"
42+
clearable
4143
filterable
4244
@change="onChangeProduct($event, row)"
4345
placeholder="请选择产品"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<el-form-item label="仓库" prop="warehouseId">
4848
<el-select
4949
v-model="queryParams.warehouseId"
50+
clearable
5051
filterable
5152
placeholder="请选择仓库"
5253
class="!w-240px"
@@ -62,6 +63,7 @@
6263
<el-form-item label="创建人" prop="creator">
6364
<el-select
6465
v-model="queryParams.creator"
66+
clearable
6567
filterable
6668
placeholder="请选择创建人"
6769
class="!w-240px"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<el-form-item label="供应商" prop="supplierId">
3030
<el-select
3131
v-model="formData.supplierId"
32+
clearable
3233
filterable
3334
placeholder="请选择供应商"
3435
class="!w-1/1"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
>
2020
<el-select
2121
v-model="row.warehouseId"
22+
clearable
2223
filterable
2324
placeholder="请选择仓库"
2425
@change="onChangeWarehouse($event, row)"
@@ -38,6 +39,7 @@
3839
<el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
3940
<el-select
4041
v-model="row.productId"
42+
clearable
4143
filterable
4244
@change="onChangeProduct($event, row)"
4345
placeholder="请选择产品"

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<el-form-item label="供应商" prop="supplierId">
4848
<el-select
4949
v-model="queryParams.supplierId"
50+
clearable
5051
filterable
5152
placeholder="请选择供应商"
5253
class="!w-240px"
@@ -62,6 +63,7 @@
6263
<el-form-item label="仓库" prop="warehouseId">
6364
<el-select
6465
v-model="queryParams.warehouseId"
66+
clearable
6567
filterable
6668
placeholder="请选择仓库"
6769
class="!w-240px"
@@ -77,6 +79,7 @@
7779
<el-form-item label="创建人" prop="creator">
7880
<el-select
7981
v-model="queryParams.creator"
82+
clearable
8083
filterable
8184
placeholder="请选择创建人"
8285
class="!w-240px"

src/views/erp/stock/move/components/StockMoveItemForm.vue

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
>
2020
<el-select
2121
v-model="row.fromWarehouseId"
22+
clearable
2223
filterable
2324
placeholder="请选择调出仓库"
2425
@change="onChangeWarehouse($event, row)"
@@ -40,7 +41,12 @@
4041
:rules="formRules.toWarehouseId"
4142
class="mb-0px!"
4243
>
43-
<el-select v-model="row.toWarehouseId" filterable placeholder="请选择调入仓库">
44+
<el-select
45+
v-model="row.toWarehouseId"
46+
clearable
47+
filterable
48+
placeholder="请选择调入仓库"
49+
>
4450
<el-option
4551
v-for="item in warehouseList"
4652
:key="item.id"
@@ -56,6 +62,7 @@
5662
<el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
5763
<el-select
5864
v-model="row.productId"
65+
clearable
5966
filterable
6067
@change="onChangeProduct($event, row)"
6168
placeholder="请选择产品"

0 commit comments

Comments
 (0)