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 @@
/>
+
+
+
+
@@ -168,7 +217,7 @@
详情
@@ -176,7 +225,7 @@
link
type="primary"
@click="openForm('update', scope.row.id)"
- v-hasPermi="['erp:stock-order:update']"
+ v-hasPermi="['erp:sale-order:update']"
:disabled="scope.row.status === 20"
>
编辑
@@ -185,7 +234,7 @@
link
type="primary"
@click="handleUpdateStatus(scope.row.id, 20)"
- v-hasPermi="['erp:stock-order:update-status']"
+ v-hasPermi="['erp:sale-order:update-status']"
v-if="scope.row.status === 10"
>
审批
@@ -194,7 +243,7 @@
link
type="danger"
@click="handleUpdateStatus(scope.row.id, 10)"
- v-hasPermi="['erp:stock-order:update-status']"
+ v-hasPermi="['erp:sale-order:update-status']"
v-else
>
反审批
@@ -203,7 +252,7 @@
link
type="danger"
@click="handleDelete([scope.row.id])"
- v-hasPermi="['erp:stock-order:delete']"
+ v-hasPermi="['erp:sale-order:delete']"
>
删除
@@ -253,7 +302,8 @@ const queryParams = reactive({
orderTime: [],
status: undefined,
remark: undefined,
- creator: undefined
+ creator: undefined,
+ inStatus: undefined
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
diff --git a/src/views/erp/stock/check/index.vue b/src/views/erp/stock/check/index.vue
index c6410489..a95fc4a7 100644
--- a/src/views/erp/stock/check/index.vue
+++ b/src/views/erp/stock/check/index.vue
@@ -20,6 +20,7 @@