diff --git a/api/BusinessApproval.js b/api/BusinessApproval.js
new file mode 100644
index 0000000..3aebbeb
--- /dev/null
+++ b/api/BusinessApproval.js
@@ -0,0 +1,472 @@
+import request from '@/utils/request'
+
+
+// 获取当前商业用户票扣列表
+// 相当于补差/bussiness/salemain/piAoKouLiSt
+export function salemainpiAoKouList(data) {
+ return request({
+ url: '/bussiness/salemain/piAoKouLiSt',
+ method: 'post',
+ data: data,
+ isEncrypt: false
+ })
+}
+
+
+// 点击新增的时候先调用检查质保协议
+export function salemaincheckQa(data) {
+ return request({
+ url: '/bussiness/salemain/checkQa',
+ method: 'post',
+ data: data,
+ isEncrypt: false
+ })
+}
+
+// 查询订单列表--商业用户
+export function listsalemain(data,query) {
+ return request({
+ url: '/bussiness/salemain/list',
+ method: 'post',
+ data: data,
+ params: query,
+ isEncrypt: false
+ })
+}
+// 查询订单列表内部用户
+export function listsalemainNB(data,query) {
+ return request({
+ url: '/bussiness/salemain/sysOrderList',
+ method: 'post',
+ data: data,
+ params: query,
+ isEncrypt: false
+ })
+}
+
+// 查询详细
+export function salemainDetail(salemainId) {
+ return request({
+ url: '/bussiness/salemain/info?id=' + salemainId,
+ method: 'get',
+ isEncrypt: false
+ })
+}
+
+// 新增
+export function addsalemain(data) {
+ return request({
+ url: '/bussiness/salemain/add',
+ method: 'post',
+ data: data,
+ isEncrypt: false
+ })
+}
+
+// 修改
+export function updatesalemain(data) {
+ return request({
+ url: '/bussiness/salemain/edit',
+ method: 'post',
+ data: data,
+ isEncrypt: false
+ })
+}
+
+// 删除
+export function delsalemain(id) {
+ return request({
+ url: '/bussiness/salemain/remove?ids=' +id,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 查询商务审批列表
+export function mangerList(data,query) {
+ return request({
+ url: '/bussiness/salemain/mangerList',
+ method: 'post',
+ data: data,
+ params: query,
+ isEncrypt: false
+ })
+}
+
+// 查询商务审批列表-张梦洁
+export function specialMangerList(data,query) {
+ return request({
+ url: '/bussiness/salemain/specialMangerList',
+ method: 'post',
+ data: data,
+ params: query,
+ isEncrypt: false
+ })
+}
+
+// 查询商务审批-商务经理额度
+export function getManagerCreditLine(query) {
+ return request({
+ url: '/bussiness/salemain/getManagerCreditLine',
+ method: 'post',
+ params: query,
+ isEncrypt: false
+ })
+}
+// 查询商务审批-商务经理额度
+export function getAreaCreditLine(query) {
+ return request({
+ url: '/bussiness/salemain/getAreaCreditLine',
+ method: 'post',
+ params: query,
+ isEncrypt: false
+ })
+}
+
+// 商务经理审批时获取详情,下面的商品列表
+export function businessManagerReviewGoodsList(salemainId) {
+ return request({
+ url: '/bussiness/businessgoods/businessManagerReviewGoodsList?saleId=' + salemainId,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 审批时获取详情-分开获取数据。分上面订单数据和下面商品数据。此接口为上面的订单数据
+export function salemainDetailSWJL(query) {
+ return request({
+ url: '/bussiness/salemain/detail?id=' + query.salemainId + '&isThisMonth=' + query.isThisMonth,
+ method: 'get',
+ isEncrypt: false
+ })
+}
+
+// 商务审批-审核
+export function managerConfirm(data) {
+ return request({
+ url: '/bussiness/salemain/managerConfirm?saleIds=' + data.saleIds + '&actionType=' + data.actionType,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+
+
+
+// 商务审批-回退
+export function managerRefuse(data) {
+ return request({
+ url: '/bussiness/salemain/managerRefuse?saleIds=' + data.saleIds + '&actionType=' + data.actionType,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+
+// 查询财务审批列表
+export function financeList(data,query) {
+ return request({
+ url: '/bussiness/salemain/financeList',
+ method: 'post',
+ data: data,
+ params: query,
+ isEncrypt: false
+ })
+}
+
+
+// 财务审批-审核
+export function financeConfirm(data) {
+ return request({
+ url: '/bussiness/salemain/financeConfirm?saleIds=' + data.saleIds,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 财务审批-回退
+export function financeConfirmRefuse(data) {
+ return request({
+ url: '/bussiness/salemain/financeConfirmRefuse?saleIds=' + data.saleIds,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 订单审核-列表
+export function orderList(data,query) {
+ return request({
+ url: '/bussiness/salemain/orderList',
+ method: 'post',
+ data: data,
+ params: query,
+ isEncrypt: false
+ })
+}
+
+// 订单审核-推送至OA-----state表示是否强制推送至OA,1是强制,0是不强制。
+export function orderReviewSendOa(data) {
+ return request({
+ url: '/bussiness/salemain/orderReviewSendOa?saleIds=' + data.saleIds + '&companyId=' + data.companyId + '&state=0',
+ method: 'post',
+ isEncrypt: false
+ })
+}
+// 订单审核-强制推送至OA
+export function orderReviewSendOaQZ(data) {
+ return request({
+ url: '/bussiness/salemain/orderReviewSendOa?saleIds=' + data.saleIds + '&companyId=' + data.companyId + '&state=1'+ '&psw=' + data.psw,
+ method: 'post',
+ isEncrypt: false,
+
+ })
+}
+
+// 订单审核-强制推送至分配
+export function orderReviewForceOaToFenPei(data) {
+ return request({
+ // url: '/bussiness/salemain/orderReviewForceOa',
+ // 上面这个接口是参数用body里面传递的
+ url: '/bussiness/salemain/orderReviewForceOa?id=' + data.saleIds + '&psw=' + data.psw,
+ method: 'post',
+ // data:data,
+ // isEncrypt: true
+ })
+}
+
+// 订单审核-审核
+export function orderReview(saleIds) {
+ return request({
+ url: '/bussiness/salemain/orderReview?ids=' + saleIds,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 订单审核-回退
+export function orderReviewBack(saleIds) {
+ return request({
+ url: '/bussiness/salemain/orderReviewBack?id=' + saleIds ,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 账期审核
+export function periodAudit(data) {
+ return request({
+ url: '/bussiness/salemain/periodAudit?ids=' + data,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 额度审核
+export function creditReview(data) {
+ return request({
+ url: '/bussiness/salemain/creditReview?ids=' + data,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 更换仓库列表
+export function changeWarehouseList(data) {
+ return request({
+ url: '/bussiness/salemain/changeWarehouseList?id=' + data ,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 更换仓库
+export function changeWarehouse(data) {
+ return request({
+ url: '/bussiness/salemain/changeWarehouse?ids=' + data.ids + '&wareHouseId=' + data.wareHouseId,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+
+// 销售订单操作日志
+export function salemainlogList(data,query) {
+ return request({
+ url: '/bussiness/salemainlog/list',
+ method: 'post',
+ data:data,
+ params: query,
+ isEncrypt: false
+ })
+}
+
+// 查询订单分配列表
+export function disOrderListsalemain(data,query) {
+ return request({
+ url: '/bussiness/salemain/disOrderList',
+ method: 'post',
+ data: data,
+ params: query,
+ isEncrypt: false
+ })
+}
+
+// 订单分配-推送牛力(待推送分配状态推送至牛力状态)
+export function SendNiuLi(id) {
+ return request({
+ url: '/bussiness/salemain/SendNiuLi?id=' + id,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 订单分配-数量查询
+export function disOrderGetDataNiuLi(data,query) {
+ return request({
+ url: '/bussiness/salemain/disOrderGetDataNiuLi',
+ method: 'post',
+ data: data,
+ params: query,
+ isEncrypt: false
+ })
+}
+
+// 查询订单分配详细--上面部分
+export function disOrderDetail(salemainId) {
+ return request({
+ url: '/bussiness/salemain/disOrderDetail?id=' + salemainId,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 查询订单分配列表--下面部分
+export function disOrderDisDetailList(salemainId) {
+ return request({
+ url: '/bussiness/salemain/disOrderDisDetailList?saleId=' + salemainId,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 查询订单分配库存列表--双击后的列表
+export function disOrderStockList(data) {
+ return request({
+ url: '/bussiness/salemain/disOrderStockList?saleId=' + data.saleId + '&goodsId=' + data.goodsId + '&warehouseId=' + data.warehouseId,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+//订单分配--添加
+export function disOrderSave(data) {
+ return request({
+ url: '/bussiness/salemain/disOrderSave',
+ method: 'post',
+ data: data,
+ isEncrypt: false
+ })
+}
+//订单分配--提交
+export function disOrderSubmit(data) {
+ return request({
+ url: '/bussiness/salemain/disOrderSubmit',
+ method: 'post',
+ data: data,
+ isEncrypt: false
+ })
+}
+
+//订单分配--回退
+export function disOrderReturn(data) {
+ return request({
+ url: '/bussiness/salemain/disOrderReturn',
+ method: 'post',
+ data: data,
+ isEncrypt: false
+ })
+}
+
+
+// 发货管理-工厂列表
+export function factoryList(data,query) {
+ return request({
+ url: '/bussiness/salemain/factoryList',
+ method: 'post',
+ data: data,
+ params: query,
+ isEncrypt: false
+ })
+}
+
+// 发货管理-三方列表
+export function thirdList(data,query) {
+ return request({
+ url: '/bussiness/salemain/thirdList',
+ method: 'post',
+ data: data,
+ params: query,
+ isEncrypt: false
+ })
+}
+
+// 发货管理-数量查询
+export function factoryGroupList(saleIds) {
+ return request({
+ url: '/bussiness/salemain/factoryGroupList?saleIds=' + saleIds,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 发货管理-获取页面详情-上面部分
+export function DeliverDetail(saleId) {
+ return request({
+ url: '/bussiness/salemain/DeliverDetail?saleId=' + saleId,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+
+// 发货管理-获取页面列表-下面
+export function DeliverDetailList(saleId) {
+ return request({
+ url: '/bussiness/salemain/DeliverDetailList?saleId=' + saleId,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 发货管理-回退
+export function DeliverBack(saleId) {
+ return request({
+ url: '/bussiness/salemain/DeliverBack?saleId=' + saleId,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+// 发货管理-确认发货
+export function DeliverSubmit(data) {
+ return request({
+ url: '/bussiness/salemain/DeliverSubmit?saleId=' + data.saleid + '&ckexecdate=' + data.ckexecdate,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+
+// 发货管理-实际发货清单
+export function getSaleDisDetail(saleid) {
+ return request({
+ url: '/bussiness/salemain/getSaleDisDetail?saleId=' + saleid,
+ method: 'post',
+ isEncrypt: false
+ })
+}
+// 发货管理-发票单
+export function getInvoiceList(saleid) {
+ return request({
+ url: '/bussiness/salemain/getInvoiceList?saleId=' + saleid,
+ method: 'post',
+ isEncrypt: false
+ })
+}
diff --git a/package.json b/package.json
index 9f87a78..bd20422 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
{
"dependencies": {
- "pinia-plugin-persistedstate": "^4.5.0"
+ "pinia-plugin-persistedstate": "^4.5.0",
+ "radash": "^12.1.1"
}
}
diff --git a/pages/work/BusinessApproval/ListItem.vue b/pages/work/BusinessApproval/ListItem.vue
new file mode 100644
index 0000000..f8050f7
--- /dev/null
+++ b/pages/work/BusinessApproval/ListItem.vue
@@ -0,0 +1,58 @@
+
+
+
+
+ 状态:
+ {{ item.stateText }}
+
+
+ 制单日期:
+ {{ formatDate(item.adddate) }}
+
+
+ 订单金额:
+ {{ item.contractmoney.toFixed(2) }}
+
+
+ 区域:
+ {{ item.areaName }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/work/BusinessApproval/index.vue b/pages/work/BusinessApproval/index.vue
index 171d256..190422d 100644
--- a/pages/work/BusinessApproval/index.vue
+++ b/pages/work/BusinessApproval/index.vue
@@ -1,73 +1,113 @@
-
-
+
+
-
+
-
+
-
-
-
- 暂无匹配的合同数据
-
+
+
-
-
-
- 生产单位: {{ contract.companyName }}
-
-
- 合同编号: {{ contract.contractcode }}
-
-
-
-
- 制单日期: {{ formatDate(contract.adddate) }}
-
-
- 订单金额: {{ contract.contractmoney.toFixed(2) }}
-
-
-
-
- 状态: {{ contract.stateText }}
-
-
- 区域: {{ contract.areaName }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+