From 1a119820dd0037186f2024f701bc3fd951279f21 Mon Sep 17 00:00:00 2001 From: zhouxueli <2841188632@qq.com> Date: Wed, 16 Aug 2023 17:29:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mine.js | 22 ++- src/assets/addImg.png | Bin 0 -> 215 bytes src/assets/empty.png | Bin 0 -> 11749 bytes src/components/cellGroup.vue | 4 +- src/components/commonBtn.vue | 2 +- src/components/twoBtnCommon.vue | 2 +- src/router/index.js | 12 +- src/styles/common.scss | 10 +- src/utils/http.js | 5 +- src/utils/myMixins.js | 6 + src/views/index/driverAdd.vue | 4 +- src/views/index/driverManage.vue | 45 +++++- src/views/index/invoicingDetail.vue | 6 +- src/views/index/invoicingNotify.vue | 19 ++- src/views/index/reporting.vue | 2 +- src/views/index/supplySettlement.vue | 6 +- src/views/index/toDoList.vue | 25 +++- src/views/index/vehicleAdd.vue | 130 +++++++++++++----- src/views/index/vehicleManage.vue | 128 +++++++++++++++-- src/views/index/workOrderDetail.vue | 9 +- src/views/{index => workOrder}/accounting.vue | 4 +- .../{index => workOrder}/reAccounting.vue | 8 +- .../workOrder/workOrderReconciliation.vue | 32 +++++ 23 files changed, 389 insertions(+), 92 deletions(-) create mode 100644 src/assets/addImg.png create mode 100644 src/assets/empty.png rename src/views/{index => workOrder}/accounting.vue (98%) rename src/views/{index => workOrder}/reAccounting.vue (97%) create mode 100644 src/views/workOrder/workOrderReconciliation.vue diff --git a/src/api/mine.js b/src/api/mine.js index 7bb59d68..ddac1cbf 100644 --- a/src/api/mine.js +++ b/src/api/mine.js @@ -5,11 +5,11 @@ export function supplierVehicleList(data){ return request({ url:'/supplierAppV2/dispatchApp/user/supplierVehicleList', method:'POST', - contentTye:'application/json', + contentType:'application/json', data }) } -//添加或修改车辆信息 +//编辑车辆信息 export function saveVehicle(data){ return request({ url:'/supplierAppV2/dispatchApp/user/saveVehicle', @@ -42,4 +42,22 @@ export function vehicleTypeList(){ url:'/supplierAppV2/dispatchApp/user/vehicleTypeList', method:'POST' }) +} + //司机列表 +export function driverList(data){ + return request({ + url:'/supplierAppV2/dispatchApp/user/driverList', + method:'POST', + contentType:'application/json', + data + }) +} +//编辑司机信息 +export function saveDriver(data){ + return request({ + url:'/supplierAppV2/dispatchApp/user/saveDriver', + method:'POST', + contentType:'application/json', + data + }) } \ No newline at end of file diff --git a/src/assets/addImg.png b/src/assets/addImg.png new file mode 100644 index 0000000000000000000000000000000000000000..6f6fb041fcbf02f4472149d33172fbaf2abf01d7 GIT binary patch literal 215 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 Hu0mjf?1MHx literal 0 HcmV?d00001 diff --git a/src/components/cellGroup.vue b/src/components/cellGroup.vue index f7936447..be6c3898 100644 --- a/src/components/cellGroup.vue +++ b/src/components/cellGroup.vue @@ -55,12 +55,12 @@ export default { @include widHeiMar(6px,6px,3px); } ::v-deep .van-field__label{ - @include fontWeightSize(500,14px); + @include fontWeightSize(bold,14px); color: #323643; margin-left: 10px; } ::v-deep .van-field__control{ color: #323643; - @include fontWeightSize(500,13px); + @include fontWeightSize(bold,13px); } \ No newline at end of file diff --git a/src/components/commonBtn.vue b/src/components/commonBtn.vue index b093f3bb..c3f1c2bc 100644 --- a/src/components/commonBtn.vue +++ b/src/components/commonBtn.vue @@ -29,7 +29,7 @@ border-radius: 5px; text-align: center; @include bgFontColor(#FFFFFF,#354D93); - @include fontWeightSize(500,15px); + @include fontWeightSize(bold,15px); @include whLin(88%,48px); } diff --git a/src/components/twoBtnCommon.vue b/src/components/twoBtnCommon.vue index 0bd70670..856578d7 100644 --- a/src/components/twoBtnCommon.vue +++ b/src/components/twoBtnCommon.vue @@ -38,7 +38,7 @@ export default { @include whLin(152px,39px); border-radius: 5px; color: #FFFFFF; - @include fontWeightSize(500,14px) + @include fontWeightSize(bold,14px) } .cancel{ background: #9EA7C0; diff --git a/src/router/index.js b/src/router/index.js index 6dd31325..d1b79357 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -39,10 +39,18 @@ const routes = [ title: '补结算单' } }, + { + path: "/workOrderReconciliation", + name: "workOrderReconciliation", + component:()=>import('@/views/workOrder/workOrderReconciliation.vue'), + meta: { + title: '工单对账' + } + }, { path: "/accounting", name: 'accountingView', - component: () => import('@/views/index/accounting'), + component: () => import('@/views/workOrder/accounting.vue'), meta: { title: '记账' } @@ -50,7 +58,7 @@ const routes = [ { path: "/reAccounting", name: 'reAccountingView', - component: () => import('@/views/index/reAccounting'), + component: () => import('@/views/workOrder/reAccounting.vue'), meta: { title: '重新记账' } diff --git a/src/styles/common.scss b/src/styles/common.scss index b50537de..2629b2d6 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -29,24 +29,24 @@ select{ overflow-y: auto; } ::v-deep .van-nav-bar__content{ - background-color: #354683 ; + background-color: #2C395F ; } ::v-deep .van-nav-bar__title{ color: #fff; opacity: .7; - font-weight: 500; - font-size: 15px; + font-weight: bolder; + font-size: 18px; } ::v-deep .van-nav-bar .van-icon{ color: #fff; opacity: .7; - font-size: 15px; + font-size: 18px; width: 6px; height: 13px; } ::v-deep .van-radio__label{ margin-left: 0; - font-weight: 400; + font-weight: normal; font-size: 14px; //@include fontWeightSize(400,14px); color: #000000; diff --git a/src/utils/http.js b/src/utils/http.js index 3a5344fd..f62f489f 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -14,8 +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'); + // const urlParams = new URLSearchParams(window.location.search); + // const token = urlParams.get('token'); + let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzemwiLCJhdWQiOlsic3VwcGxpZXItYXBwIl0sIm5iZiI6MTY5MjE2ODQ3OCwidXNlcl9pbmZvIjp7InVzZXJJZCI6NTQ1ODUsInBob25lIjoiMTc2MzAwMzU2NTgiLCJuYW1lIjoi5bCP5a6LIiwic3VwcGxpZXJOYW1lIjoi5LiK5rW35a6J55WFQSIsInN1cHBsaWVySWQiOjExMjgsInN1cHBsaWVyVHlwZSI6MSwidXNlcm5hbWUiOiJzemwiLCJ1c2VyVHlwZSI6IkFQUCIsImF1dGhvcml0aWVzIjpbXX0sInNjb3BlIjpbImFsbCJdLCJpc3MiOiJodHRwczovL3Npbm9hc3Npc3QuY29tIiwiZXhwIjoxNjkyMjU0ODc4LCJpYXQiOjE2OTIxNjg0Nzh9.yVreEsJqwcEy6jALrhqQ9tasuBKqEE-y3fq_TXfaspE' config.headers['Authorization'] = `${token}`; return config }, diff --git a/src/utils/myMixins.js b/src/utils/myMixins.js index 42a77bf4..a1b7ef5b 100644 --- a/src/utils/myMixins.js +++ b/src/utils/myMixins.js @@ -22,6 +22,12 @@ export const myMixins = { document.execCommand('copy'); window.getSelection().removeAllRanges(); // 清除选择内容的高亮状态 this.$toast('复制成功') + }, + goBack(){//h5返回APP + window.android.sendMessage("goBack"); + }, + h5GoBack(){ + this.$router.back(); } } } diff --git a/src/views/index/driverAdd.vue b/src/views/index/driverAdd.vue index 82b5523d..3c3b4a69 100644 --- a/src/views/index/driverAdd.vue +++ b/src/views/index/driverAdd.vue @@ -141,7 +141,7 @@ export default { box-sizing: border-box; padding-right: 25px; .titleType{ - @include fontWeightSize(500,14px); + @include fontWeightSize(bold,14px); color: #323643; } .isJoin{ @@ -160,7 +160,7 @@ export default { input{ border: none; text-align: right; - @include fontWeightSize(500,13px); + @include fontWeightSize(bold,13px); opacity: .5; } diff --git a/src/views/index/driverManage.vue b/src/views/index/driverManage.vue index fe2a19b5..c4eff3b1 100644 --- a/src/views/index/driverManage.vue +++ b/src/views/index/driverManage.vue @@ -1,5 +1,23 @@ + + \ No newline at end of file