13 Commits

Author SHA1 Message Date
997f20ee06 查询工单记账图片和修改服务商记账信息 接口添加参数
(cherry picked from commit e768f9c8f8)
2024-09-25 09:48:14 +08:00
d04304ea7d task#14504,换电瓶费用,加号改为减号
(cherry picked from commit 73ec8c267b)
2024-09-25 09:48:14 +08:00
9cd3a70f43 task#14504,记账界面,输入框只能输入整数 2024-08-21 15:27:31 +08:00
431ba13eea task#14504,记账界面,输入框只能输入整数 2024-08-21 15:24:18 +08:00
672ed153da task#14504,结算单页面,辅助轮个数最多可以填四个 2024-08-20 14:49:33 +08:00
65c33e54f5 task#14504,记账模块字段添加 2024-08-19 17:24:41 +08:00
dedb0f53e9 task#14504,kpi的pc端适配js代码影响了后台挂载的H5页面,只给window.location.pathname=='/h5/supplier/dispatch/kpiIndex'加适配 2024-08-07 13:58:50 +08:00
8bed0868f8 task#14504,记账-》查看详情加车衣,电瓶费用展示 2024-07-31 16:57:30 +08:00
70cea4d888 task#14504,记账-》车衣,电瓶费用展示详情界面 2024-07-31 14:48:37 +08:00
6d1df4a720 task#14504,记账-》添加车衣,电瓶,责任险费用有就扣除;新增结算比例,按地库费用结算 2024-07-31 13:56:46 +08:00
a7cf0a837e task#14504,删除首页默认服务商id 2024-07-30 15:29:56 +08:00
ec995b7548 task#14504,月总,客户评价率缺少百分号,移动端时效切换折线图数据bugfix,table双loading优化,请求慢时,日期渲染无效日期格式优化 2024-07-30 14:48:15 +08:00
372bbc44c0 task#14504,清除按钮位置调整,司机搜索使用name 2024-07-25 17:12:31 +08:00
7 changed files with 767 additions and 607 deletions

113
package-lock.json generated
View File

@ -1713,9 +1713,9 @@
}
},
"@vant/icons": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.8.0.tgz",
"integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg=="
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/@vant/icons/-/icons-3.0.2.tgz",
"integrity": "sha512-4OlRVMd0uiDtD9hgSISZW8hB95vU0fFtc41tQchRIyiXkR0tS+DydZOLb8/bQkithrNWhW7Uud38MbKjlJ9lJw=="
},
"@vant/popperjs": {
"version": "1.3.0",
@ -2030,6 +2030,49 @@
"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.11.1",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
"integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
"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": {
@ -2194,47 +2237,6 @@
}
}
},
"@vue/vue-loader-v15": {
"version": "npm:vue-loader@15.11.1",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
"integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
"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",
@ -3542,10 +3544,16 @@
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
"integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
},
"dayjs": {
"version": "1.11.13",
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
"integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
},
"de-indent": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
"integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg=="
"integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
"dev": true
},
"debug": {
"version": "4.3.4",
@ -4880,7 +4888,8 @@
"he": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
"dev": true
},
"highlight.js": {
"version": "10.7.3",
@ -5508,7 +5517,8 @@
"lodash": {
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"dev": true
},
"lodash.debounce": {
"version": "4.0.8",
@ -8025,12 +8035,12 @@
}
},
"vant": {
"version": "2.12.54",
"resolved": "https://registry.npmjs.org/vant/-/vant-2.12.54.tgz",
"integrity": "sha512-t7DCiLxNosDrg0Jm5EY9p0A5cAMo5OadmizbYtPEc0ru+OJKEa3kcfxtKIK5on7ZPqoOkyYJt8e6BQ1VDMPsrg==",
"version": "2.13.2",
"resolved": "https://registry.npmjs.org/vant/-/vant-2.13.2.tgz",
"integrity": "sha512-anZbbLqXCq+rUJk10D67mn+V/1/i9tfOTdoR+64B0e+0BzV3KFgpHBF76noLa+yX9i/L+8DeL560WMk0GEN38g==",
"requires": {
"@babel/runtime": "7.x",
"@vant/icons": "^1.7.1",
"@vant/icons": "^3.0.2",
"@vant/popperjs": "^1.1.0",
"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
"vue-lazyload": "1.2.3"
@ -8245,6 +8255,7 @@
"version": "2.7.14",
"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz",
"integrity": "sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==",
"dev": true,
"requires": {
"de-indent": "^1.0.2",
"he": "^1.2.0"

View File

@ -18,7 +18,7 @@
"qs": "^6.11.2",
"sass": "^1.65.1",
"sass-loader": "^13.3.2",
"vant": "^2.12.54",
"vant": "^2.13.2",
"vue": "^2.6.14",
"vue-router": "^3.0.7",
"vuex": "^3.6.2",

View File

@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0">-->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover,user-scalable=no">
<meta name="format-detection" content="telephone=yes"/>
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
@ -34,11 +35,11 @@
// VConsole 默认会挂载到 `window.VConsole` 上
// let vConsole = new window.VConsole();
(function (doc, win) {
console.log("==window.location.pathname===",window.location.pathname)
let docEl = doc.documentElement
let resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize'
recalc = function () {
var clientWidth = docEl.clientWidth;
// console.log("clientWidth",clientWidth)
if (!clientWidth) return;
if (clientWidth < 400) {
clientWidth = 400;
@ -48,13 +49,20 @@
if (!doc.addEventListener) return;
var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
if (isMobile) {// 是移动端不变
// console.log("是移动端不变")
}else{
win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false);
if(window.location.pathname=='/h5/supplier/dispatch/kpiIndex'){
// console.log("执行了执行了")
win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false);
}
/*else{
console.log("走着了这种饿 ")
}*/
}
// console.log("isMobile",isMobile)
})(document, window);
</script>
</body>
</html>

View File

@ -132,7 +132,7 @@ export function deleteImage(data){
})
}
//新增记账图片 form-data
export function insertRecordPicture(data){
/*export function insertRecordPicture(data){
return request({
url:'/supplierAppV2/dispatchApp/accountRecord/insertRecordPicture',
method:'POST',
@ -142,7 +142,7 @@ export function insertRecordPicture(data){
// 'Content-Type': 'multipart/form-data',
// },
})
}
}*/
//开票通知列表
export function notifyInvoiceList(data){

View File

@ -42,7 +42,7 @@
<div class="metersWrap">
<div class="item" >
<div class="leftKiloMeters">小轮个数</div>
<div class="rightInput"><input type="number" v-model="form.tyreNumber"/></div>
<div class="rightInput"><input type="number" v-model="form.tyreNumber" @input="handleInput"/></div>
</div>
<div class="item">
<div class="leftKiloMeters">等候费</div>
@ -82,7 +82,7 @@ export default {
bridgeAmountAb:'',
bridgeAmountBc:'',
bridgeAmountCa:'',
tyreNumber:'',
tyreNumber:0,
waitAmount:'',
dilemmaFee:'',
customerAmount:'',
@ -98,6 +98,15 @@ export default {
await this.getDetail()
},
methods:{
handleInput(event) {
const newValue = parseInt(event.target.value, 10);
if (!isNaN(newValue) && newValue >= 0 && newValue <= 4) {
this.form.tyreNumber = newValue;
} else {
this.$toast('请输入0到4之间的数字')
this.form.tyreNumber = null; // 或者上一个有效值
}
},
submit() {
this.updatSettlement()
},

File diff suppressed because it is too large Load Diff

View File

@ -11,7 +11,7 @@
@click-left="goback"
/>
</div>
<div class="baseInfo common">
<div class="baseInfo common" style="height: 344px">
<div class="title">基本信息:</div>
<div class="line"></div>
<div class="item">
@ -47,9 +47,16 @@
</div>
<div class="item">
<span class="titleLeft">扣除责任险费</span>
<span class="content">{{orderInfo.policyAmount}} {{orderInfo.cutInsuranceAmount}}</span>
<span class="content">{{orderInfo.policyAmount}}</span>
</div>
<div class="item">
<span class="titleLeft">车衣费用</span>
<span class="content">{{orderInfo.carClothingToolAmount}}</span>
</div>
<div class="item">
<span class="titleLeft">换电瓶费用</span>
<span class="content">{{orderInfo.replaceBatteryAmount}}</span>
</div>
</div>
<div class="baseInfo common">
<div class="title">审核数据:</div>