From b26b91d4c83ad23c051fbb28801e1d75013b7218 Mon Sep 17 00:00:00 2001 From: Fsd0511 <422865775@qq.com> Date: Thu, 21 Aug 2025 11:14:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 27 +- pages/work/BusinessApproval/OrderDetail.vue | 472 +++++++++++++++++ .../work/{yonghu => BusinessApproval}/data.js | 0 .../{yonghu => BusinessApproval}/detail.vue | 0 pages/work/BusinessApproval/detailData.js | 69 +++ .../{yonghu => BusinessApproval}/index.vue | 2 +- .../OrderDetail.vue | 105 ++-- pages/work/FinancialApproval/data.js | 49 ++ pages/work/FinancialApproval/detail.vue | 34 ++ pages/work/FinancialApproval/detailData.js | 69 +++ pages/work/FinancialApproval/index.vue | 186 +++++++ pages/work/OrderApproval/OrderDetail.vue | 488 ++++++++++++++++++ pages/work/OrderApproval/data.js | 49 ++ pages/work/OrderApproval/detail.vue | 34 ++ pages/work/OrderApproval/detailData.js | 69 +++ pages/work/OrderApproval/index.vue | 206 ++++++++ pages/work/index.vue | 32 +- 17 files changed, 1844 insertions(+), 47 deletions(-) create mode 100644 pages/work/BusinessApproval/OrderDetail.vue rename pages/work/{yonghu => BusinessApproval}/data.js (100%) rename pages/work/{yonghu => BusinessApproval}/detail.vue (100%) create mode 100644 pages/work/BusinessApproval/detailData.js rename pages/work/{yonghu => BusinessApproval}/index.vue (98%) rename pages/work/{yonghu => FinancialApproval}/OrderDetail.vue (75%) create mode 100644 pages/work/FinancialApproval/data.js create mode 100644 pages/work/FinancialApproval/detail.vue create mode 100644 pages/work/FinancialApproval/detailData.js create mode 100644 pages/work/FinancialApproval/index.vue create mode 100644 pages/work/OrderApproval/OrderDetail.vue create mode 100644 pages/work/OrderApproval/data.js create mode 100644 pages/work/OrderApproval/detail.vue create mode 100644 pages/work/OrderApproval/detailData.js create mode 100644 pages/work/OrderApproval/index.vue diff --git a/pages.json b/pages.json index df82816..5467be5 100644 --- a/pages.json +++ b/pages.json @@ -21,10 +21,20 @@ "navigationBarTitleText": "工作台" } }, { - "path": "pages/work/yonghu/index", + "path": "pages/work/BusinessApproval/index", "style": { "navigationBarTitleText": "商务审批" } + }, { + "path": "pages/work/FinancialApproval/index", + "style": { + "navigationBarTitleText": "财务审批" + } + }, { + "path": "pages/work/OrderApproval/index", + "style": { + "navigationBarTitleText": "订单审批" + } },{ "path": "pages/mine/index", "style": { @@ -76,11 +86,22 @@ "navigationBarTitleText": "浏览文本" } },{ - "path": "pages/work/yonghu/OrderDetail", + "path": "pages/work/BusinessApproval/OrderDetail", "style": { - "navigationBarTitleText": "订单详情" + "navigationBarTitleText": "商务订单详情" + } + },{ + "path": "pages/work/FinancialApproval/OrderDetail", + "style": { + "navigationBarTitleText": "财务订单详情" + } + },{ + "path": "pages/work/OrderApproval/OrderDetail", + "style": { + "navigationBarTitleText": "订单审批详情" } }], + "tabBar": { "color": "#000000", "selectedColor": "#000000", diff --git a/pages/work/BusinessApproval/OrderDetail.vue b/pages/work/BusinessApproval/OrderDetail.vue new file mode 100644 index 0000000..e7b5036 --- /dev/null +++ b/pages/work/BusinessApproval/OrderDetail.vue @@ -0,0 +1,472 @@ + + + + + \ No newline at end of file diff --git a/pages/work/yonghu/data.js b/pages/work/BusinessApproval/data.js similarity index 100% rename from pages/work/yonghu/data.js rename to pages/work/BusinessApproval/data.js diff --git a/pages/work/yonghu/detail.vue b/pages/work/BusinessApproval/detail.vue similarity index 100% rename from pages/work/yonghu/detail.vue rename to pages/work/BusinessApproval/detail.vue diff --git a/pages/work/BusinessApproval/detailData.js b/pages/work/BusinessApproval/detailData.js new file mode 100644 index 0000000..8653bc1 --- /dev/null +++ b/pages/work/BusinessApproval/detailData.js @@ -0,0 +1,69 @@ +// 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" + } + ] + } diff --git a/pages/work/yonghu/index.vue b/pages/work/BusinessApproval/index.vue similarity index 98% rename from pages/work/yonghu/index.vue rename to pages/work/BusinessApproval/index.vue index 923931b..37c2f59 100644 --- a/pages/work/yonghu/index.vue +++ b/pages/work/BusinessApproval/index.vue @@ -124,7 +124,7 @@ function gotoDetail(contract) { console.log("查看合同详情:", contract) // proxy.$tab.navigateTo('/pages/work/yonghu/detail') // proxy.$tab.navigateTo(`/pages/work/yonghu/detail?saleid=${contract.saleid}`) - proxy.$tab.navigateTo('/pages/work/yonghu/OrderDetail') + proxy.$tab.navigateTo('/pages/work/BusinessApproval/OrderDetail') } diff --git a/pages/work/yonghu/OrderDetail.vue b/pages/work/FinancialApproval/OrderDetail.vue similarity index 75% rename from pages/work/yonghu/OrderDetail.vue rename to pages/work/FinancialApproval/OrderDetail.vue index a117447..bcaf354 100644 --- a/pages/work/yonghu/OrderDetail.vue +++ b/pages/work/FinancialApproval/OrderDetail.vue @@ -6,57 +6,71 @@ - 商业公司: 重庆制药 + 商业公司: {{contract.user_name}} - 制单日期:{{ compensationAmount }} + 制单日期:{{ contract.adddate}} - 合同编号:{{ compensationAmount }} + 合同编号:{{ contract.contractcode }} - 订单金额:{{ compensationAmount }} + 订单金额:{{ contract.contractmoney }} - 补差金额:{{ compensationAmount }} + 补差金额:{{ contract.user_name }} - 本月商务额度:{{ compensationAmount }} + 支付方式:{{ contract.ispaynow }} - 本月商务可用:{{ compensationAmount }} + 联系方式:{{ contract.ispaynow }} - 本月大区额度:{{ compensationAmount }} + *执行月份: + + + - 本月大区可用:{{ compensationAmount }} + 折后订单金额:{{ contract.piaokous }} + + + + + 本月商务额度:{{ contract.contractmoney }} + + + 本月商务可用:{{ contract.contractmoney }} + + + + + 本月大区额度:{{ contract.contractmoney }} + + + 本月大区可用:{{ contract.contractmoney }} - *执行月份: - - - - - - 折后订单金额:{{ compensationAmount }} - + 收货地址:{{ contract.place }} + + @@ -79,18 +93,18 @@ > {{ index + 1 }} - {{ goods.name }} + {{ goods.goodsname }} - 件装数:{{ goods.packCount }} + 件装数:{{ goods.packingnum }} - 供应参考价:{{ goods.referencePrice }} + 供应参考价:{{ goods.invoiceprice }} @@ -98,11 +112,11 @@ - 前三月平均数:{{ goods.average }} + 前三月平均数:{{ goods.mon3 }} - 采购数量:{{ goods.quantity }} + 采购数量:{{ goods.goodsnum }} @@ -110,11 +124,11 @@ - 小计:{{ goods.subtotal }} + 小计:{{ goods.allmoney }} - 使用票扣:{{ goods.ticketDeduction }} + 使用票扣:{{ goods.piaokou }} @@ -122,7 +136,7 @@ - 税率:{{ goods.taxRate }} + 税率:{{ goods.taxrate }} @@ -141,20 +155,23 @@ diff --git a/pages/work/FinancialApproval/data.js b/pages/work/FinancialApproval/data.js new file mode 100644 index 0000000..2464c2a --- /dev/null +++ b/pages/work/FinancialApproval/data.js @@ -0,0 +1,49 @@ +// 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/FinancialApproval/detail.vue b/pages/work/FinancialApproval/detail.vue new file mode 100644 index 0000000..9783562 --- /dev/null +++ b/pages/work/FinancialApproval/detail.vue @@ -0,0 +1,34 @@ + + + + + \ No newline at end of file diff --git a/pages/work/FinancialApproval/detailData.js b/pages/work/FinancialApproval/detailData.js new file mode 100644 index 0000000..8653bc1 --- /dev/null +++ b/pages/work/FinancialApproval/detailData.js @@ -0,0 +1,69 @@ +// 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" + } + ] + } diff --git a/pages/work/FinancialApproval/index.vue b/pages/work/FinancialApproval/index.vue new file mode 100644 index 0000000..c05713e --- /dev/null +++ b/pages/work/FinancialApproval/index.vue @@ -0,0 +1,186 @@ + + + + + \ No newline at end of file diff --git a/pages/work/OrderApproval/OrderDetail.vue b/pages/work/OrderApproval/OrderDetail.vue new file mode 100644 index 0000000..bcaf354 --- /dev/null +++ b/pages/work/OrderApproval/OrderDetail.vue @@ -0,0 +1,488 @@ + + + + + \ No newline at end of file diff --git a/pages/work/OrderApproval/data.js b/pages/work/OrderApproval/data.js new file mode 100644 index 0000000..2464c2a --- /dev/null +++ b/pages/work/OrderApproval/data.js @@ -0,0 +1,49 @@ +// 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 new file mode 100644 index 0000000..9783562 --- /dev/null +++ b/pages/work/OrderApproval/detail.vue @@ -0,0 +1,34 @@ + + + + + \ No newline at end of file diff --git a/pages/work/OrderApproval/detailData.js b/pages/work/OrderApproval/detailData.js new file mode 100644 index 0000000..8653bc1 --- /dev/null +++ b/pages/work/OrderApproval/detailData.js @@ -0,0 +1,69 @@ +// 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" + } + ] + } diff --git a/pages/work/OrderApproval/index.vue b/pages/work/OrderApproval/index.vue new file mode 100644 index 0000000..44427f4 --- /dev/null +++ b/pages/work/OrderApproval/index.vue @@ -0,0 +1,206 @@ + + + + + \ No newline at end of file diff --git a/pages/work/index.vue b/pages/work/index.vue index eb94c39..5480bdc 100644 --- a/pages/work/index.vue +++ b/pages/work/index.vue @@ -15,12 +15,24 @@ - + 商务审批 + + + + 财务审批 + + + + + + 订单审核 + + @@ -94,9 +106,23 @@ // proxy.$modal.showToast('模块建设中~') } - function gotoshangwu(e) { - proxy.$tab.navigateTo('/pages/work/yonghu/index') + + const gotoBusiness = () =>{ + uni.navigateTo({ + url:'/pages/work/BusinessApproval/index' + }) } + const gotoFinalcial = () =>{ + uni.navigateTo({ + url:'/pages/work/FinancialApproval/index' + }) + } + const gotoOrder = () =>{ + uni.navigateTo({ + url:'/pages/work/OrderApproval/index' + }) + } +