diff --git a/package-lock.json b/package-lock.json index bb0e232c..d39fcf6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2030,49 +2030,6 @@ "webpack-merge": "^5.7.3", "webpack-virtual-modules": "^0.4.2", "whatwg-fetch": "^3.6.2" - }, - "dependencies": { - "@vue/vue-loader-v15": { - "version": "npm:vue-loader@15.10.1", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz", - "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==", - "dev": true, - "requires": { - "@vue/component-compiler-utils": "^3.1.0", - "hash-sum": "^1.0.2", - "loader-utils": "^1.1.0", - "vue-hot-reload-api": "^2.3.0", - "vue-style-loader": "^4.1.0" - }, - "dependencies": { - "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", - "dev": true - } - } - }, - "json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", - "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - } - } } }, "@vue/cli-shared-utils": { @@ -2237,6 +2194,47 @@ } } }, + "@vue/vue-loader-v15": { + "version": "npm:vue-loader@15.10.1", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz", + "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==", + "dev": true, + "requires": { + "@vue/component-compiler-utils": "^3.1.0", + "hash-sum": "^1.0.2", + "loader-utils": "^1.1.0", + "vue-hot-reload-api": "^2.3.0", + "vue-style-loader": "^4.1.0" + }, + "dependencies": { + "hash-sum": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", + "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", + "dev": true + }, + "json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + } + } + }, "@vue/web-component-wrapper": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz", diff --git a/src/api/mine.js b/src/api/mine.js new file mode 100644 index 00000000..7bb59d68 --- /dev/null +++ b/src/api/mine.js @@ -0,0 +1,45 @@ +import request from '@/utils/http' + +//车辆列表 +export function supplierVehicleList(data){ + return request({ + url:'/supplierAppV2/dispatchApp/user/supplierVehicleList', + method:'POST', + contentTye:'application/json', + data + }) +} +//添加或修改车辆信息 +export function saveVehicle(data){ + return request({ + url:'/supplierAppV2/dispatchApp/user/saveVehicle', + method:'POST', + contentType:'application/json', + data + }) +} +// 获取车辆信息（用于修改时回显的值,只需传vehicleId） +export function getInfoById(data){ + return request({ + url:'/supplierAppV2/dispatchApp/user/getInfoById', + method:'POST', + contentType:'application/json', + data + }) +} +//删除车辆信息(只需传vehicleId) +export function deleteVehicle(data){ + return request({ + url:'/supplierAppV2/dispatchApp/user/deleteVehicle', + method:'POST', + contentType:'application/json', + data + }) +} +//车辆类型列表 +export function vehicleTypeList(){ + return request({ + url:'/supplierAppV2/dispatchApp/user/vehicleTypeList', + method:'POST' + }) +} \ No newline at end of file diff --git a/src/api/order.js b/src/api/order.js index e5141ae4..b9e02493 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -34,3 +34,12 @@ export function orderReporting(data){ data }) } +// 修改结算信息 +export function updateOrderSettlement(data){ + return request({ + url:'/supplierAppV2/dispatchApp/order/updateOrderSettlement', + method:'POST', + contentType:'application/json', + data + }) +} diff --git a/src/router/index.js b/src/router/index.js index f37491f8..6dd31325 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -72,9 +72,9 @@ const routes = [ } }, { - path: "/carManage", - name: 'carManage', - component: () => import('@/views/index/carManage'), + path: "/vehicleManage", + name: 'vehicleManage', + component: () => import('@/views/index/vehicleManage.vue'), meta: { title: '车辆管理' } diff --git a/src/utils/http.js b/src/utils/http.js index 9e30b394..3a5344fd 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -1,6 +1,5 @@ import axios from "axios"; import qs from 'qs' -import { Toast } from 'vant' // console.log('process.env.VUE_APP_BASE_API', process.env.VUE_APP_BASE_API) @@ -12,43 +11,39 @@ const service = axios.create({ timeout: 10000 }) 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' - // 在发送请求之前做一些操作，如添加token到请求头 - const token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzemwiLCJhdWQiOlsic3VwcGxpZXItYXBwIl0sIm5iZiI6MTY5MTU1NzIzNSwidXNlcl9pbmZvIjp7InVzZXJJZCI6NTQ1ODUsInBob25lIjoiMTc2MzAwMzU2NTgiLCJuYW1lIjoi5bCP5a6LIiwic3VwcGxpZXJOYW1lIjoi5LiK5rW35a6J55WFQSIsInN1cHBsaWVySWQiOjExMjgsInVzZXJuYW1lIjoic3psIiwidXNlclR5cGUiOiJBUFAiLCJhdXRob3JpdGllcyI6W119LCJzY29wZSI6WyJhbGwiXSwiaXNzIjoiaHR0cHM6Ly9zaW5vYXNzaXN0LmNvbSIsImV4cCI6MTY5MTY0MzYzNSwiaWF0IjoxNjkxNTU3MjM1fQ.S1AignpcnCxSrm3M8rzhCLYlgyqD2Hv-SPMqPLgqlt4' + 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'); config.headers['Authorization'] = `${token}`; - /* if (getToken()) { - config.headers['token'] = getToken() - }*/ - return config - }, - error => { - console.log(error) - return Promise.reject(error) - } + return config + }, + error => { + console.log(error) + return Promise.reject(error) + } ) service.interceptors.response.use( - response => { - const res = response.data - // console.log('rere', res) - return res - // if (res.code && (res.code != '00' && res.code != '105' )) { - // Toast(res.msg || 'Error') - // return Promise.reject(new Error(res.msg || 'Error')) - // } else { - // if( res.code === 0 ) { - // return res.result - // } else { - // return res.data - // } - // } - }, - error => { - console.log('err' + error) - Toast(error.message) - return Promise.reject(error) - } + response => { + const res = response.data + // console.log('rere', res) + return res //请求响应数据 + // if (res.code && (res.code != '00' && res.code != '105' )) { + // Toast(res.msg || 'Error') + // return Promise.reject(new Error(res.msg || 'Error')) + // } else { + // if( res.code === 0 ) { + // return res.result + // } else { + // return res.data + // } + // } + }, + error => { + console.log('err' + error) + return Promise.reject(error) + } ) export default service diff --git a/src/views/index/reporting.vue b/src/views/index/reporting.vue index 15d21e55..7c86d790 100644 --- a/src/views/index/reporting.vue +++ b/src/views/index/reporting.vue @@ -3,7 +3,7 @@
报备事项:
- + 特殊情况绕路 - + 事发地变更 - + 目的地变更 - + 其他报备 - - - - - - - - - - - - - - - - - -
+
diff --git a/src/views/index/workOrderDetail.vue b/src/views/index/workOrderDetail.vue index 37c54414..da1e035b 100644 --- a/src/views/index/workOrderDetail.vue +++ b/src/views/index/workOrderDetail.vue @@ -1,80 +1,107 @@ @@ -118,6 +145,7 @@ export default { .item{ display: flex; align-items: center; + line-height: 27px; } .infoContent{ .leftTitle{ @@ -135,6 +163,7 @@ export default { opacity: 0.55; color: #121212; line-height: 14px; + flex: 1; } .orderStatus{ color: #E69B0B; @@ -142,7 +171,7 @@ export default { } } .title{ - @include fontWeightSize(500,14px); + @include fontWeightSize(500,14px); color: #323643; line-height: 20px; opacity: .6;