diff --git a/src/router/index.js b/src/router/index.js index ed532217..a7f98479 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -56,12 +56,13 @@ const routes = [ } }, { - path: "/reAccounting", - name: 'reAccountingView', - component: () => import('@/views/workOrder/reAccounting.vue'), - meta: { - title: '重新记账' - } + path: "/aduitCompleteDetail", + name: 'aduitCompleteDetail', + component: () => import('@/views/workOrder/aduitCompleteDetail.vue'), + meta: { + title: '审核完成-详情' + } + }, { path: "/invoicingNotify", diff --git a/src/utils/http.js b/src/utils/http.js index 98730d6e..127dce1c 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -14,9 +14,9 @@ service.interceptors.request.use( config => { config.data = config.contentType ? config.data : qs.stringify(config.data) config.headers['Content-Type'] = config.contentType || 'application/x-www-form-urlencoded' - // const urlParams = new URLSearchParams(window.location.search); - // const token = urlParams.get('token'); - let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzemwiLCJhdWQiOlsic3VwcGxpZXItYXBwIl0sIm5iZiI6MTY5MjI2MzgzOSwidXNlcl9pbmZvIjp7InVzZXJJZCI6NTQ1ODUsInBob25lIjoiMTc2MzAwMzU2NTgiLCJuYW1lIjoi5bCP5a6LIiwic3VwcGxpZXJOYW1lIjoi5LiK5rW35a6J55WFQSIsInN1cHBsaWVySWQiOjExMjgsInN1cHBsaWVyVHlwZSI6MSwidXNlcm5hbWUiOiJzemwiLCJ1c2VyVHlwZSI6IkFQUCIsImF1dGhvcml0aWVzIjpbXX0sInNjb3BlIjpbImFsbCJdLCJpc3MiOiJodHRwczovL3Npbm9hc3Npc3QuY29tIiwiZXhwIjoxNjkyMzUwMjM5LCJpYXQiOjE2OTIyNjM4Mzl9.Mldu7SmfjNEdH-bItFCLVL-zo-IopHWTc8LkTXOtC58' + const urlParams = new URLSearchParams(window.location.search); + const token = urlParams.get('token'); + // let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzemwiLCJhdWQiOlsic3VwcGxpZXItYXBwIl0sIm5iZiI6MTY5MjY2OTAyNiwidXNlcl9pbmZvIjp7InVzZXJJZCI6NTQ1ODUsInBob25lIjoiMTc2MzAwMzU2NTgiLCJuYW1lIjoi5bCP5a6LIiwic3VwcGxpZXJOYW1lIjoi5LiK5rW35a6J55WFQSIsInN1cHBsaWVySWQiOjExMjgsInN1cHBsaWVyVHlwZSI6MSwidXNlcm5hbWUiOiJzemwiLCJ1c2VyVHlwZSI6IkFQUCIsImF1dGhvcml0aWVzIjpbXX0sInNjb3BlIjpbImFsbCJdLCJpc3MiOiJodHRwczovL3Npbm9hc3Npc3QuY29tIiwiZXhwIjoxNjkyNzU1NDI2LCJpYXQiOjE2OTI2NjkwMjZ9.TA3LuH23aPRwghC4USWpBXQcv7t_wAAt8znuRa75qws' config.headers['Authorization'] = `${token}`; return config }, diff --git a/src/utils/myMixins.js b/src/utils/myMixins.js index a1b7ef5b..b477a466 100644 --- a/src/utils/myMixins.js +++ b/src/utils/myMixins.js @@ -24,10 +24,18 @@ export const myMixins = { this.$toast('复制成功') }, goBack(){//h5返回APP - window.android.sendMessage("goBack"); + let data = {"action":"goBack","params":""} + var u = navigator.userAgent; + var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); + // var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端 + if(isiOS){ + window.webkit.messageHandlers.nativeObject.postMessage(data); + }else { + window.android.sendMessage("goBack"); + } }, h5GoBack(){ this.$router.back(); - } + }, } } diff --git a/src/views/index/driverManage.vue b/src/views/index/driverManage.vue index 21fbb502..a7d87c13 100644 --- a/src/views/index/driverManage.vue +++ b/src/views/index/driverManage.vue @@ -108,7 +108,8 @@ export default { states:item.states.code } }); - } + }, + } } diff --git a/src/views/index/supplySettlement.vue b/src/views/index/supplySettlement.vue index 2e46b95d..c6777c82 100644 --- a/src/views/index/supplySettlement.vue +++ b/src/views/index/supplySettlement.vue @@ -119,6 +119,7 @@ export default { width: 100%; height: 100%; background-color: #F4F5F7; + overflow-y: auto; } .common { @include wh(100%, 161px); diff --git a/src/views/workOrder/accounting.vue b/src/views/workOrder/accounting.vue index 70402e90..cbf8d828 100644 --- a/src/views/workOrder/accounting.vue +++ b/src/views/workOrder/accounting.vue @@ -2,7 +2,7 @@
-
+
供应商数据:
-
拖车里程:
-
路桥费:
-
小轮费:
-
收取客户金额:
-
费用总计:
+
+
到达事发地距离:
+
公里
+
+
+
拖车里程:
+
公里
+
+
+
返程里程:
+
公里
+
+
+
ab路桥费:
+
元
+
+
+
bc路桥费:
+
元
+
+
+
ca路桥费:
+
元
+
+
+
等候费:
+
元
+
+
+
小轮费:
+
元
+
+
+
困境费:
+
元
+
+
+
地库费:
+
元
+
+
+
收取客户金额:
+
元
+
+
+
基本费用:
+
元
+
+
+
额外费用总计:
+
元
+
+
+
费用总计:
+
元
+
+
+
+
计算
+
备注说明:
-
-
公里
-
元
-
元
-
元
-
计算
-
- - + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
审核数据供应商数据
到达事发地距离:{{orderInfo.settleMileageAb + '公里'}}
拖车里程:{{orderInfo.settleMileageBc + '公里'}}
返程里程:{{orderInfo.settleMileageCa + '公里'}}
ab路桥费:{{orderInfo.bridgeAmountAb +'元'}}
bc路桥费:{{orderInfo.bridgeAmountBc +'元'}}
ca路桥费:{{orderInfo.bridgeAmountCa +'元'}}
小轮费:{{orderInfo.bridgeAmount +'元'}}
困境费:{{orderInfo.dilemmaAmount +'元'}}
等候费:{{orderInfo.waitAmount +'元'}}
地库费:{{orderInfo.basementFee +'元'}}
基本费用:{{orderInfo.basePrice +'元'}}
额外费用总计:{{orderInfo.extraPrice +'元'}}
收取客户:{{orderInfo.customerAmount +'元'}}
费用总计:{{orderInfo.settleAmount +'元'}} + + +
+
审核失败原因
+
{{orderInfo.financeRefuseAuditRemark}}
+
+ +
+ 		+
本次补充说明:
+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/views/workOrder/reAccounting.vue b/src/views/workOrder/reAccounting.vue deleted file mode 100644 index 5d337ef7..00000000 --- a/src/views/workOrder/reAccounting.vue +++ /dev/null @@ -1,250 +0,0 @@ - - - - - diff --git a/src/views/workOrder/workOrderReconciliation.vue b/src/views/workOrder/workOrderReconciliation.vue index bc414627..ea4acf13 100644 --- a/src/views/workOrder/workOrderReconciliation.vue +++ b/src/views/workOrder/workOrderReconciliation.vue @@ -56,9 +56,10 @@ {{ item.accountStatus?.label }}
- - - + + + +
@@ -122,12 +123,11 @@ export default { } }, handleAccounting(item){ - console.log("iiii",item) this.$router.push({ name: 'accountingView', // 目标路由的名称 params: { id: item.id, // 参数对象的属性 - postfix:item.postfix + postfix:item.postfix, } }); },