From 44707e7b98fa88835cd9131875ef0308d79987d6 Mon Sep 17 00:00:00 2001
From: lonewolfyx <877085893@qq.com>
Date: Mon, 9 Feb 2026 16:29:04 +0800
Subject: [PATCH] =?UTF-8?q?refactor(OrderApproval):=20=E9=87=8D=E6=9E=84?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/Salemain.js | 42 ++
pages/work/OrderApproval/OrderDetail.vue | 588 +++++++----------------
pages/work/OrderApproval/data.js | 49 --
pages/work/OrderApproval/detail.vue | 34 --
pages/work/OrderApproval/detailData.js | 69 ---
5 files changed, 205 insertions(+), 577 deletions(-)
delete mode 100644 pages/work/OrderApproval/data.js
delete mode 100644 pages/work/OrderApproval/detail.vue
delete mode 100644 pages/work/OrderApproval/detailData.js
diff --git a/api/Salemain.js b/api/Salemain.js
index cad3a73..45965b8 100644
--- a/api/Salemain.js
+++ b/api/Salemain.js
@@ -40,4 +40,46 @@ export const financeConfirm = (saleIds) => {
saleIds: saleIds
}
})
+}
+
+// 查询订单分配列表--下面部分
+export const disOrderDisDetailList = (salemainId) => {
+ return request({
+ method: 'post',
+ url: '/bussiness/salemain/disOrderDisDetailList',
+ params: {
+ saleId: salemainId
+ }
+ })
+}
+
+
+// 订单审核-强制推送至OA
+export const orderReviewSendOaQZ = (data) => {
+ return request({
+ url: '/bussiness/salemain/orderReviewSendOa',
+ method: 'post',
+ params: data
+ })
+}
+
+// 订单审核-强制推送至分配
+export const orderReviewForceOaToFenPei = (data) => {
+ return request({
+ method: 'post',
+ url: '/bussiness/salemain/orderReviewForceOa',
+ params: params,
+ })
+}
+
+
+// 订单审核-回退
+export const orderReviewBack = (saleIds) => {
+ return request({
+ method: 'post',
+ url: '/bussiness/salemain/orderReviewBack',
+ params: {
+ id: saleIds
+ }
+ })
}
\ No newline at end of file
diff --git a/pages/work/OrderApproval/OrderDetail.vue b/pages/work/OrderApproval/OrderDetail.vue
index ac8d8ea..937e83a 100644
--- a/pages/work/OrderApproval/OrderDetail.vue
+++ b/pages/work/OrderApproval/OrderDetail.vue
@@ -1,449 +1,187 @@
-
-
+
+
-
-
-
-
- 商业公司: {{contract.user_name}}
-
-
-
-
-
- 制单日期:{{ contract.adddate}}
-
-
- 合同编号:{{ contract.contractcode }}
-
-
-
-
- 订单金额:{{ contract.contractmoney }}
-
-
- 补差金额:{{ contract.user_name }}
-
-
+
+
+
+ 制单日期:
+ {{ formatDate(queryParams.adddate, 'yyyy-MM-dd') }}
+
+
+ 发货仓库:
+ {{ queryParams.warehouseName }}
+
+
+ 订单金额:
+ {{ formatPrice(queryParams.contractmoney) }}
+
+
+ 补差金额:
+ {{ formatPrice(queryParams.disCount) }}
+
+
+
-
-
- 支付方式:{{ contract.ispaynow }}
-
-
- 联系方式:{{ contract.ispaynow }}
-
-
-
-
- 发货仓库:{{ contract.place }}
-
-
-
-
-
-
-
+
-
-
- 商品信息
-
-
- 暂无商品数据
-
-
-
-
-
-
-
-
-
-
- 件装数:{{ goods.packingnum }}
-
-
-
- 单价:{{ goods.invoiceprice }}
-
-
-
+
+
+ 件装数:
+ {{ item.packingnum }}
+
+
+ 单价:
+ {{ item.invoiceprice }}
+
+
+ 可分配数:
+ {{ item.candisnum }}
+
+
+ 前三月平均:
+ {{ item.mon3 }}
+
+
+ 采购数量:
+ {{ item.goodsnum }}
+
+
+ 要求补差:
+ {{ item.piaokoutotal }}
+
+
+
-
-
-
- 前三月平均数:{{ goods.mon3 }}
-
-
-
- 采购数量:{{ goods.goodsnum }}
-
-
-
+
+
-
-
-
- 可分配数:{{ goods.allmoney }}
-
-
-
- 要求补差:{{ goods.piaokou }}
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/work/OrderApproval/data.js b/pages/work/OrderApproval/data.js
deleted file mode 100644
index 2464c2a..0000000
--- a/pages/work/OrderApproval/data.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// staticData.js
-export const contractData = {
- "total": 2,
- "rows": [
- {
- "saleid": 999822,
- "adddate": "2025-08-20 09:05:26",
- "contractcode": "Z-CQ-000120",
- "contractmoney": 5767.4700,
- "usernames": "重庆医药集团医贸药品有限公司",
- "businessManagerName": "商务经理名字-西区",
- "transport": "汽运",
- "areaName": "重庆",
- "warehouseName": "临安GSP库",
- "companyName": "浙江大冢制药有限公司",
- "stateText": "待商务审批",
- "bigAreaName": "西区"
- },
- {
- "saleid": 999833,
- "adddate": "2025-08-20 09:05:26",
- "contractcode": "Z-CQ-000120",
- "contractmoney": 5767.4700,
- "usernames": "重庆医药集团医贸药品有限公司",
- "businessManagerName": "商务经理名字-西区",
- "transport": "汽运",
- "areaName": "重庆",
- "warehouseName": "临安GSP库",
- "companyName": "浙江大冢制药有限公司",
- "stateText": "待商务审批",
- "bigAreaName": "西区"
- },
- {
- "saleid": 166314,
- "adddate": "2025-07-08 15:09:20",
- "contractcode": "G-SC-40861",
- "contractmoney": 109296.0000,
- "usernames": "国药集团西南医药有限公司",
- "transport": "汽运",
- "areaName": "四川",
- "warehouseName": "广东三方(上药)",
- "companyName": "广东大冢制药有限公司",
- "stateText": "待商务审批",
- "bigAreaName": "西区"
- }
- ],
- "code": 200,
- "msg": "查询成功"
-};
\ No newline at end of file
diff --git a/pages/work/OrderApproval/detail.vue b/pages/work/OrderApproval/detail.vue
deleted file mode 100644
index 9783562..0000000
--- a/pages/work/OrderApproval/detail.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- 详情{{saleid}}
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/work/OrderApproval/detailData.js b/pages/work/OrderApproval/detailData.js
deleted file mode 100644
index 8653bc1..0000000
--- a/pages/work/OrderApproval/detailData.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// staticData.js
-export const contractData = {
- "total": 2,
- "data": [
- {
- "saleid": 999822,
- "user_name": "重庆医药集团医贸药品有限公司",
- "phonenumber": "",
- "budgetmoney_area": 0.0000,
- "ispaynow": "非现款",
- "contractcode": "Z-CQ-000120",
- "piaokous": 5767.4700,
- "budgetmoney1": 0.0000,
- "CAN": 0.0000,
- "ContractMoney1": 0.00,
- "contractmoney": 5767.4700,
- "ContractMoney_area": 0.00,
- "CAN_area": 0.0000,
- "place": "重庆市沙坪坝区土主镇明珠山一支路4号",
- "piaokou": 0.0000,
- "dept_id": 1,
- "shortName": "重庆医贸",
- "adddate": "2025-08-20"
- },
-
- ],
- "code": 200,
- "msg": "查询成功"
-};
-export const goodsData =
- {
- "msg": "操作成功",
- "code": 200,
- "data": [
- {
- "taxrate": 1.00,
- "mon3": 0.0000,
- "packingnum": 200,
- "invoiceprice": 46.8900,
- "goodsname": "盐酸丙卡特罗片(美普清)10",
- "piaokou": 0.0000,
- "goodsnum": 123,
- "allmoney": 5767.4700,
- "shortname": "MPT10"
- },
- {
- "taxrate": 1.00,
- "mon3": 0.0000,
- "packingnum": 200,
- "invoiceprice": 46.8900,
- "goodsname": "诺氟沙星(美普清)10",
- "piaokou": 0.0000,
- "goodsnum": 123,
- "allmoney": 5767.4700,
- "shortname": "MPT10"
- },
- {
- "taxrate": 1.00,
- "mon3": 0.0000,
- "packingnum": 200,
- "invoiceprice": 46.8900,
- "goodsname": "盐酸宁干片(美普清)10",
- "piaokou": 0.0000,
- "goodsnum": 123,
- "allmoney": 5767.4700,
- "shortname": "MPT10"
- }
- ]
- }