From 90e33530589c879799f797f8e2b7877de7adc82d Mon Sep 17 00:00:00 2001 From: zhouxueli <2841188632@qq.com> Date: Fri, 18 Aug 2023 14:52:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=8C=E5=BC=80=E7=A5=A8=E9=80=9A=E7=9F=A5=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mine.js | 63 ++++ src/assets/arrow_bottom.png | Bin 0 -> 246 bytes src/assets/line.png | Bin 0 -> 237 bytes src/components/cellGroup.vue | 1 + src/router/index.js | 2 +- src/utils/appointTime.js | 59 ---- src/utils/common.js | 14 + src/utils/http.js | 2 +- src/views/index/driverAdd.vue | 149 +++++---- src/views/index/driverManage.vue | 104 ++++--- src/views/index/invoicingDetail.vue | 40 ++- src/views/index/invoicingNotify.vue | 63 +++- src/views/index/vehicleAdd.vue | 6 +- src/views/index/vehicleManage.vue | 37 ++- src/views/index/workOrderDetail.vue | 4 +- src/views/workOrder/accounting.vue | 97 ++++-- .../workOrder/workOrderReconciliation.vue | 292 +++++++++++++++++- 17 files changed, 701 insertions(+), 232 deletions(-) create mode 100644 src/assets/arrow_bottom.png create mode 100644 src/assets/line.png delete mode 100644 src/utils/appointTime.js diff --git a/src/api/mine.js b/src/api/mine.js index ddac1cbf..953f957c 100644 --- a/src/api/mine.js +++ b/src/api/mine.js @@ -60,4 +60,67 @@ export function saveDriver(data){ contentType:'application/json', data }) +} +//司机停启用操作 +export function enableAction(data){ + return request({ + url:'/supplierAppV2/dispatchApp/user/enableAction', + method:'POST', + contentType:'application/json', + data + }) +} +//工单对账列表 +export function accountRecordList(data){ + return request({ + url:'/supplierAppV2/dispatchApp/accountRecord/accountRecordList', + method:'POST', + contentType:'application/json', + data + }) +} +//工单对账详情 +export function getAccountRecordDetail(data){ + return request({ + url:'/supplierAppV2/dispatchApp/accountRecord/getAccountRecordDetail', + method:'POST', + contentType:'application/json', + data + }) +} +//工单对账计算金额（记账） +export function accountRecordCompute(data){ + return request({ + url:'/supplierAppV2/dispatchApp/accountRecord/accountRecordCompute', + method:'POST', + contentType:'application/json', + data + }) +} +//修改服务商记账信息 （重新记账） +export function updateAccountRecordInfo(data){ + return request({ + url:'/supplierAppV2/dispatchApp/accountRecord/updateAccountRecordInfo', + method:'POST', + contentType:'application/json', + data + }) +} +//开票通知列表 +export function notifyInvoiceList(data){ + return request({ + url:'/supplierAppV2/dispatchApp/accountRecord/notifyInvoiceList', + method:'POST', + contentType:'application/json', + data + }) +} +//开票通知详情 +export function notifyInvoiceDetail(data){ + return request({ + url:'/supplierAppV2/dispatchApp/accountRecord/notifyInvoiceDetail', + method:'POST', + contentType:'application/json', + data + }) } \ No newline at end of file diff --git a/src/assets/arrow_bottom.png b/src/assets/arrow_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..434720873b521bc3c1a558820415a093bd769ba4 GIT binary patch literal 246 zcmVPx#ut`KgR47xG(J>A|K@i6A|Ci__dW{>XG#W~U2yp3JkS`ZtE;CyI{d^`?Egg=5$)9i}2WB<{hB@(6QiML= z3TXYnYoH_P`sf(CmVgAPe!+X7A?f7z5eDoV-U8(}d<5!}4$t!x47dhtfMO^*15HW0 w*T*t2;4a|bPx#r%6OXR47w@(9H^hU=W4jcQz&HG6;eeg3v+`AbC^I6O z)x(_4%n@EAs=5Li!y336Ho(QO13dCKfTJM+ nDnksM=9fQ9c-QhQYO3x5<%6NLiGW*R00000NkvXXu0mjfd diff --git a/src/router/index.js b/src/router/index.js index d1b79357..ed532217 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -108,7 +108,7 @@ const routes = [ name: 'driverAdd', component:()=>import('@/views/index/driverAdd'), meta: { - name:'司机新增或修改' + title:'司机新增或修改' } } ] diff --git a/src/utils/appointTime.js b/src/utils/appointTime.js deleted file mode 100644 index be05fff3..00000000 --- a/src/utils/appointTime.js +++ /dev/null @@ -1,59 +0,0 @@ -import { formatDate, formatNumber } from '@/utils/common' -// 拼接 预约时间 picker -export function getAppointFun (time) { - let arr = [] - // 当天剩余时间段 - let obj = getCurrentDatePicker(time) - arr.push(obj) - // 后六天的可选时间段 - let tempArr = getAfterTimeList() - arr.push(...tempArr) - return arr -} - -// 拼接 当天剩余的可预约时间段（默认第一个是两小时之后可选） -const getCurrentDatePicker = time => { - let obj = {} - obj.text = formatDate(time); - let timeArr = getCurrentTimeList() - obj.children = timeArr - return obj -} - -// 当天日期的时间段 -const getCurrentTimeList = () => { - let todayDate = new Date() - let tempArr = [] - tempArr.push({ text: '尽快到' }); // 首先添加尽快到 - if( todayDate.getMinutes() <= 30 && todayDate.getMinutes() > 0 ) { - let tempVal = todayDate.getHours() + 2; - let tempHalfHours = formatNumber(tempVal) + ':30'; - tempArr.push({ text: tempHalfHours }); - } - let startFlag = (todayDate.getMinutes() == 0) ? (todayDate.getHours() + 2) : (todayDate.getHours() + 3) - tempArr = getDateTimeList(startFlag, tempArr) - return tempArr -} - -// 获取后六天的 预约时间 picker -const getAfterTimeList = () => { - let afterArr = [] - for(let i = 1; i < 7; i++ ) { - let obj = {}; - let tempTime = formatDate(new Date().getTime() + (i * 24* 60 * 60 * 1000)) - obj.text = tempTime - let timeArr = [] - obj.children = getDateTimeList(0, timeArr) - afterArr.push(obj) - } - return afterArr -} - -// 获取某个时间段后的所有可选时段 -const getDateTimeList = (startHours = 0, list) => { - for(let i = startHours; i < 24; i++ ) { - list.push({ text: formatNumber(i) + ':' + '00' }) - list.push({ text: formatNumber(i) + ':' + '30' }) - } - return list -} diff --git a/src/utils/common.js b/src/utils/common.js index 2044b732..6582438d 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -22,9 +22,23 @@ const leftCopy = (obj, source) => { } } +const timeFormat=(data) =>{ + const currentDate = new Date(data); + const year = currentDate.getFullYear(); + const month = String(currentDate.getMonth() + 1).padStart(2, '0'); + const day = String(currentDate.getDate()).padStart(2, '0'); + const hours = String(currentDate.getHours()).padStart(2, '0'); + const minutes = String(currentDate.getMinutes()).padStart(2, '0'); + const seconds = String(currentDate.getSeconds()).padStart(2, '0'); + const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; + // console.log("formattedDate",formattedDate) + return formattedDate; + +} module.exports = { formatNumber, formatDate, leftCopy, + timeFormat } diff --git a/src/utils/http.js b/src/utils/http.js index f62f489f..98730d6e 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -16,7 +16,7 @@ service.interceptors.request.use( 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.eyJzdWIiOiJzemwiLCJhdWQiOlsic3VwcGxpZXItYXBwIl0sIm5iZiI6MTY5MjE2ODQ3OCwidXNlcl9pbmZvIjp7InVzZXJJZCI6NTQ1ODUsInBob25lIjoiMTc2MzAwMzU2NTgiLCJuYW1lIjoi5bCP5a6LIiwic3VwcGxpZXJOYW1lIjoi5LiK5rW35a6J55WFQSIsInN1cHBsaWVySWQiOjExMjgsInN1cHBsaWVyVHlwZSI6MSwidXNlcm5hbWUiOiJzemwiLCJ1c2VyVHlwZSI6IkFQUCIsImF1dGhvcml0aWVzIjpbXX0sInNjb3BlIjpbImFsbCJdLCJpc3MiOiJodHRwczovL3Npbm9hc3Npc3QuY29tIiwiZXhwIjoxNjkyMjU0ODc4LCJpYXQiOjE2OTIxNjg0Nzh9.yVreEsJqwcEy6jALrhqQ9tasuBKqEE-y3fq_TXfaspE' + let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzemwiLCJhdWQiOlsic3VwcGxpZXItYXBwIl0sIm5iZiI6MTY5MjI2MzgzOSwidXNlcl9pbmZvIjp7InVzZXJJZCI6NTQ1ODUsInBob25lIjoiMTc2MzAwMzU2NTgiLCJuYW1lIjoi5bCP5a6LIiwic3VwcGxpZXJOYW1lIjoi5LiK5rW35a6J55WFQSIsInN1cHBsaWVySWQiOjExMjgsInN1cHBsaWVyVHlwZSI6MSwidXNlcm5hbWUiOiJzemwiLCJ1c2VyVHlwZSI6IkFQUCIsImF1dGhvcml0aWVzIjpbXX0sInNjb3BlIjpbImFsbCJdLCJpc3MiOiJodHRwczovL3Npbm9hc3Npc3QuY29tIiwiZXhwIjoxNjkyMzUwMjM5LCJpYXQiOjE2OTIyNjM4Mzl9.Mldu7SmfjNEdH-bItFCLVL-zo-IopHWTc8LkTXOtC58' config.headers['Authorization'] = `${token}`; return config }, diff --git a/src/views/index/driverAdd.vue b/src/views/index/driverAdd.vue index 3c3b4a69..e8709eaa 100644 --- a/src/views/index/driverAdd.vue +++ b/src/views/index/driverAdd.vue @@ -1,47 +1,33 @@ diff --git a/src/views/index/workOrderDetail.vue b/src/views/index/workOrderDetail.vue index 449469e8..f531cafe 100644 --- a/src/views/index/workOrderDetail.vue +++ b/src/views/index/workOrderDetail.vue @@ -23,8 +23,8 @@
{{ orderDetailInfo.userName }}
{{ orderDetailInfo.userPhone }}
{{ orderDetailInfo.plateNumber }}
-
- {{orderDetailInfo.model}} +
+ {{orderDetailInfo.model}} {{ orderDetailInfo.brand }}
diff --git a/src/views/workOrder/accounting.vue b/src/views/workOrder/accounting.vue index 86087970..70402e90 100644 --- a/src/views/workOrder/accounting.vue +++ b/src/views/workOrder/accounting.vue @@ -1,44 +1,55 @@