diff --git a/src/api/erp/sale/order/index.ts b/src/api/erp/sale/order/index.ts index b0847aec..215b5dbd 100644 --- a/src/api/erp/sale/order/index.ts +++ b/src/api/erp/sale/order/index.ts @@ -2,14 +2,16 @@ import request from '@/config/axios' // ERP 销售订单 VO export interface SaleOrderVO { - id: number // 迪卡侬工单编号 + id: number // 订单工单编号 no: string // 销售订单号 customerId: number // 客户编号 - orderTime: Date // 迪卡侬工单时间 + orderTime: Date // 订单工单时间 totalCount: number // 合计数量 totalPrice: number // 合计金额,单位:元 status: number // 状态 remark: string // 备注 + inCount: number // 销售入库数量 + returnCount: number // 销售退货数量 } // ERP 销售订单 API diff --git a/src/views/erp/sale/order/index.vue b/src/views/erp/sale/order/index.vue index 32f5e1d2..a716bc81 100644 --- a/src/views/erp/sale/order/index.vue +++ b/src/views/erp/sale/order/index.vue @@ -20,6 +20,7 @@ + + + + + + + + + + + + + + 搜索 重置 @@ -99,7 +124,7 @@ type="primary" plain @click="openForm('create')" - v-hasPermi="['erp:stock-order:create']" + v-hasPermi="['erp:sale-order:create']" > 新增 @@ -108,7 +133,7 @@ plain @click="handleExport" :loading="exportLoading" - v-hasPermi="['erp:stock-order:export']" + v-hasPermi="['erp:sale-order:export']" > 导出 @@ -116,7 +141,7 @@ type="danger" plain @click="handleDelete(selectionList.map((item) => item.id))" - v-hasPermi="['erp:stock-order:delete']" + v-hasPermi="['erp:sale-order:delete']" :disabled="selectionList.length === 0" > 删除 @@ -147,17 +172,41 @@ /> + + + +