diff --git a/src/api/erp/finance/account/index.ts b/src/api/erp/finance/account/index.ts
new file mode 100644
index 00000000..85b90080
--- /dev/null
+++ b/src/api/erp/finance/account/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+// ERP 结算账户 VO
+export interface AccountVO {
+ id: number // 结算账户编号
+ no: string // 账户编码
+ remark: string // 备注
+ status: number // 开启状态
+ sort: number // 排序
+ defaultStatus: boolean // 是否默认
+ name: string // 账户名称
+}
+
+// ERP 结算账户 API
+export const AccountApi = {
+ // 查询结算账户分页
+ getAccountPage: async (params: any) => {
+ return await request.get({ url: `/erp/account/page`, params })
+ },
+
+ // 查询结算账户详情
+ getAccount: async (id: number) => {
+ return await request.get({ url: `/erp/account/get?id=` + id })
+ },
+
+ // 新增结算账户
+ createAccount: async (data: AccountVO) => {
+ return await request.post({ url: `/erp/account/create`, data })
+ },
+
+ // 修改结算账户
+ updateAccount: async (data: AccountVO) => {
+ return await request.put({ url: `/erp/account/update`, data })
+ },
+
+ // 修改结算账户默认状态
+ updateAccountDefaultStatus: async (id: number, defaultStatus: boolean) => {
+ return await request.put({
+ url: `/erp/account/update-default-status`,
+ params: {
+ id,
+ defaultStatus
+ }
+ })
+ },
+
+ // 删除结算账户
+ deleteAccount: async (id: number) => {
+ return await request.delete({ url: `/erp/account/delete?id=` + id })
+ },
+
+ // 导出结算账户 Excel
+ exportAccount: async (params: any) => {
+ return await request.download({ url: `/erp/account/export-excel`, params })
+ }
+}
diff --git a/src/views/erp/finance/account/AccountForm.vue b/src/views/erp/finance/account/AccountForm.vue
new file mode 100644
index 00000000..2f2e6f40
--- /dev/null
+++ b/src/views/erp/finance/account/AccountForm.vue
@@ -0,0 +1,124 @@
+
+
+
+
diff --git a/src/views/erp/finance/account/index.vue b/src/views/erp/finance/account/index.vue
new file mode 100644
index 00000000..06578a22
--- /dev/null
+++ b/src/views/erp/finance/account/index.vue
@@ -0,0 +1,230 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+ 新增
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/erp/sale/order/SaleOrderForm.vue b/src/views/erp/sale/order/SaleOrderForm.vue
index 0f553aa3..16e7ffbd 100644
--- a/src/views/erp/sale/order/SaleOrderForm.vue
+++ b/src/views/erp/sale/order/SaleOrderForm.vue
@@ -15,7 +15,7 @@
-
+
+
+
+
+
+
@@ -128,10 +140,12 @@ const formData = ref({
discountPercent: 0,
discountPrice: 0,
totalPrice: 0,
+ depositPrice: 0,
items: [],
no: undefined // 订单单号,后端返回
})
const formRules = reactive({
+ customerId: [{ required: true, message: '客户不能为空', trigger: 'blur' }],
orderTime: [{ required: true, message: '订单时间不能为空', trigger: 'blur' }]
})
const disabled = computed(() => formType.value === 'detail')
@@ -214,6 +228,7 @@ const resetForm = () => {
discountPercent: 0,
discountPrice: 0,
totalPrice: 0,
+ depositPrice: 0,
items: []
}
formRef.value?.resetFields()
diff --git a/src/views/erp/sale/order/components/SaleOrderItemForm.vue b/src/views/erp/sale/order/components/SaleOrderItemForm.vue
index dd71b062..4b034ac6 100644
--- a/src/views/erp/sale/order/components/SaleOrderItemForm.vue
+++ b/src/views/erp/sale/order/components/SaleOrderItemForm.vue
@@ -240,7 +240,7 @@ const onChangeProduct = (productId, row) => {
if (product) {
row.productUnitName = product.unitName
row.productBarCode = product.barCode
- row.productPrice = product.minPrice
+ row.productPrice = product.salePrice
}
// 加载库存
setStockCount(row)
diff --git a/src/views/erp/sale/order/index.vue b/src/views/erp/sale/order/index.vue
index be40a6f6..90cdabd7 100644
--- a/src/views/erp/sale/order/index.vue
+++ b/src/views/erp/sale/order/index.vue
@@ -160,7 +160,7 @@
@selection-change="handleSelectionChange"
>
-
+
-
+
-
+
-
+
-
+