diff --git a/klp-ui/src/api/crm/customer.js b/klp-ui/src/api/crm/customer.js new file mode 100644 index 00000000..5a25a60e --- /dev/null +++ b/klp-ui/src/api/crm/customer.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询客户信息列表 +export function listCustomer(query) { + return request({ + url: '/crm/customer/list', + method: 'get', + params: query + }) +} + +// 查询客户信息详细 +export function getCustomer(customerId) { + return request({ + url: '/crm/customer/' + customerId, + method: 'get' + }) +} + +// 新增客户信息 +export function addCustomer(data) { + return request({ + url: '/crm/customer', + method: 'post', + data: data + }) +} + +// 修改客户信息 +export function updateCustomer(data) { + return request({ + url: '/crm/customer', + method: 'put', + data: data + }) +} + +// 删除客户信息 +export function delCustomer(customerId) { + return request({ + url: '/crm/customer/' + customerId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/crm/order.js b/klp-ui/src/api/crm/order.js new file mode 100644 index 00000000..6cb3c7fe --- /dev/null +++ b/klp-ui/src/api/crm/order.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询正式订单主列表 +export function listOrder(query) { + return request({ + url: '/crm/order/list', + method: 'get', + params: query + }) +} + +// 查询正式订单主详细 +export function getOrder(orderId) { + return request({ + url: '/crm/order/' + orderId, + method: 'get' + }) +} + +// 新增正式订单主 +export function addOrder(data) { + return request({ + url: '/crm/order', + method: 'post', + data: data + }) +} + +// 修改正式订单主 +export function updateOrder(data) { + return request({ + url: '/crm/order', + method: 'put', + data: data + }) +} + +// 删除正式订单主 +export function delOrder(orderId) { + return request({ + url: '/crm/order/' + orderId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/crm/orderItem.js b/klp-ui/src/api/crm/orderItem.js new file mode 100644 index 00000000..3ae03d02 --- /dev/null +++ b/klp-ui/src/api/crm/orderItem.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询正式订单明细列表 +export function listOrderItem(query) { + return request({ + url: '/crm/orderItem/list', + method: 'get', + params: query + }) +} + +// 查询正式订单明细详细 +export function getOrderItem(itemId) { + return request({ + url: '/crm/orderItem/' + itemId, + method: 'get' + }) +} + +// 新增正式订单明细 +export function addOrderItem(data) { + return request({ + url: '/crm/orderItem', + method: 'post', + data: data + }) +} + +// 修改正式订单明细 +export function updateOrderItem(data) { + return request({ + url: '/crm/orderItem', + method: 'put', + data: data + }) +} + +// 删除正式订单明细 +export function delOrderItem(itemId) { + return request({ + url: '/crm/orderItem/' + itemId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/crm/orderOperationTrace.js b/klp-ui/src/api/crm/orderOperationTrace.js new file mode 100644 index 00000000..ecd21686 --- /dev/null +++ b/klp-ui/src/api/crm/orderOperationTrace.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询订单操作追溯列表 +export function listOrderOperationTrace(query) { + return request({ + url: '/crm/orderOperationTrace/list', + method: 'get', + params: query + }) +} + +// 查询订单操作追溯详细 +export function getOrderOperationTrace(traceId) { + return request({ + url: '/crm/orderOperationTrace/' + traceId, + method: 'get' + }) +} + +// 新增订单操作追溯 +export function addOrderOperationTrace(data) { + return request({ + url: '/crm/orderOperationTrace', + method: 'post', + data: data + }) +} + +// 修改订单操作追溯 +export function updateOrderOperationTrace(data) { + return request({ + url: '/crm/orderOperationTrace', + method: 'put', + data: data + }) +} + +// 删除订单操作追溯 +export function delOrderOperationTrace(traceId) { + return request({ + url: '/crm/orderOperationTrace/' + traceId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/crm/salesContract.js b/klp-ui/src/api/crm/salesContract.js new file mode 100644 index 00000000..bc697750 --- /dev/null +++ b/klp-ui/src/api/crm/salesContract.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询销售合同列表 +export function listSalesContract(query) { + return request({ + url: '/crm/salesContract/list', + method: 'get', + params: query + }) +} + +// 查询销售合同详细 +export function getSalesContract(contractId) { + return request({ + url: '/crm/salesContract/' + contractId, + method: 'get' + }) +} + +// 新增销售合同 +export function addSalesContract(data) { + return request({ + url: '/crm/salesContract', + method: 'post', + data: data + }) +} + +// 修改销售合同 +export function updateSalesContract(data) { + return request({ + url: '/crm/salesContract', + method: 'put', + data: data + }) +} + +// 删除销售合同 +export function delSalesContract(contractId) { + return request({ + url: '/crm/salesContract/' + contractId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/crm/salesObjection.js b/klp-ui/src/api/crm/salesObjection.js new file mode 100644 index 00000000..d71f6f2a --- /dev/null +++ b/klp-ui/src/api/crm/salesObjection.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询销售异议管理列表 +export function listSalesObjection(query) { + return request({ + url: '/crm/salesObjection/list', + method: 'get', + params: query + }) +} + +// 查询销售异议管理详细 +export function getSalesObjection(objectionId) { + return request({ + url: '/crm/salesObjection/' + objectionId, + method: 'get' + }) +} + +// 新增销售异议管理 +export function addSalesObjection(data) { + return request({ + url: '/crm/salesObjection', + method: 'post', + data: data + }) +} + +// 修改销售异议管理 +export function updateSalesObjection(data) { + return request({ + url: '/crm/salesObjection', + method: 'put', + data: data + }) +} + +// 删除销售异议管理 +export function delSalesObjection(objectionId) { + return request({ + url: '/crm/salesObjection/' + objectionId, + method: 'delete' + }) +} diff --git a/klp-ui/src/assets/styles/element-ui.scss b/klp-ui/src/assets/styles/element-ui.scss index 6fa58aa5..7ea86558 100644 --- a/klp-ui/src/assets/styles/element-ui.scss +++ b/klp-ui/src/assets/styles/element-ui.scss @@ -294,14 +294,14 @@ body { .el-button--medium { padding: 4px 8px !important; font-size: 12px; - height: $--btn-height - 4px; + height: $--btn-height; } // 迷你按钮(超紧凑) .el-button--mini { padding: 4px 8px !important; font-size: 12px; - height: $--btn-height - 4px; + height: $--btn-height; &.is-circle { padding: 4px !important; } @@ -310,7 +310,7 @@ body { .el-button--small { padding: 4px 8px !important; font-size: 12px; - height: $--btn-height - 4px; + height: $--btn-height; } diff --git a/klp-ui/src/components/KLPUI/KLPList/index.vue b/klp-ui/src/components/KLPUI/KLPList/index.vue index 74a81b5c..f822090b 100644 --- a/klp-ui/src/components/KLPUI/KLPList/index.vue +++ b/klp-ui/src/components/KLPUI/KLPList/index.vue @@ -19,7 +19,6 @@ diff --git a/klp-ui/src/views/crm/customer/index.vue b/klp-ui/src/views/crm/customer/index.vue new file mode 100644 index 00000000..da3d39be --- /dev/null +++ b/klp-ui/src/views/crm/customer/index.vue @@ -0,0 +1,284 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/crm/js/actions.js b/klp-ui/src/views/crm/js/actions.js new file mode 100644 index 00000000..383124b6 --- /dev/null +++ b/klp-ui/src/views/crm/js/actions.js @@ -0,0 +1,26 @@ +// 需要被记录的操作 +const actions = { + // 创建预订单 + createPreOrder: { + type: 'createPreOrder', + name: '创建预订单', + description: '创建一个预订单', + // 预订单的相关信息 + async handler(payload, ) { + + } + }, + // 修改预订单 + + // 预订单明细变更 + + // 预订单取消 + + // 预订单审批为正式订单 + + // 直接创建正式订单 + + // 正式订单修改 + + // 正式订单明细修改 +} \ No newline at end of file diff --git a/klp-ui/src/views/crm/js/enum.js b/klp-ui/src/views/crm/js/enum.js new file mode 100644 index 00000000..8d8a7aab --- /dev/null +++ b/klp-ui/src/views/crm/js/enum.js @@ -0,0 +1,21 @@ +// 订单状态 +export const ORDER_STATUS = { + '待生产': 0, + '生产中': 1, + '部分发货': 2, + '已发货': 3, + '已签收': 4, +} + +// 预订单状态 +export const PRE_ORDER_STATUS = { + '待审核': 0, + '已审核': 1, + '已取消': 2, +} + +// 订单类型 +export const ORDER_TYPE = { + '预订单': 0, + '正式订单': 1, +} diff --git a/klp-ui/src/views/crm/order/index.vue b/klp-ui/src/views/crm/order/index.vue new file mode 100644 index 00000000..07e77c19 --- /dev/null +++ b/klp-ui/src/views/crm/order/index.vue @@ -0,0 +1,104 @@ + + + \ No newline at end of file diff --git a/klp-ui/src/views/crm/preOrder/index.vue b/klp-ui/src/views/crm/preOrder/index.vue new file mode 100644 index 00000000..18859d38 --- /dev/null +++ b/klp-ui/src/views/crm/preOrder/index.vue @@ -0,0 +1,366 @@ + + + diff --git a/klp-ui/src/views/wms/productSalesScript/index.vue b/klp-ui/src/views/wms/productSalesScript/index.vue index 26bd5692..f592e4b6 100644 --- a/klp-ui/src/views/wms/productSalesScript/index.vue +++ b/klp-ui/src/views/wms/productSalesScript/index.vue @@ -335,7 +335,7 @@ export default { }, // 跳转详情页 goToDetail(scriptId) { - this.$router.push({ path: `/shop/rich/${scriptId}` }); + this.$router.push({ path: `/crm/rich/${scriptId}` }); }, handleGenerateScript() { this.generateScriptLoading = true;