Compare commits

..
Author SHA1 Message Date
zlf ea5881f844 审核数据问题查找修改 2026-05-13 16:24:10 +08:00
zlf e366cea0a5 审核数据问题修复 2026-05-12 14:27:29 +08:00
zxl e34dc1be05 工单对账,记账接口恢复 2026-05-07 16:06:00 +08:00
29 changed files with 136 additions and 3217 deletions
-2
View File
@@ -17,8 +17,6 @@ pnpm-debug.log*
# Editor directories and files # Editor directories and files
.idea .idea
.vscode .vscode
.claude
.kimi-code
*.suo *.suo
*.ntvs* *.ntvs*
*.njsproj *.njsproj
+2 -2
View File
@@ -31,14 +31,14 @@
} }
</script> </script>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.AutoComplete,AMap.PlaceSearch,AMap.Geolocation,AMap.Geocoder,AMap.Marker,AMap.Driving"></script> <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.AutoComplete,AMap.PlaceSearch,AMap.Geolocation,AMap.Geocoder,AMap.Marker,AMap.Driving"></script>
<script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script> <!-- <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>-->
<script> <script>
window.selfLink = window.location.href; window.selfLink = window.location.href;
window.selfSearch = window.location.search; window.selfSearch = window.location.search;
</script> </script>
<script> <script>
// VConsole 默认会挂载到 `window.VConsole` 上 // VConsole 默认会挂载到 `window.VConsole` 上
let vConsole = new window.VConsole(); // let vConsole = new window.VConsole();
(function (doc, win) { (function (doc, win) {
// console.log("==window.location.pathname===",window.location.pathname) // console.log("==window.location.pathname===",window.location.pathname)
let docEl = doc.documentElement let docEl = doc.documentElement
-14
View File
@@ -1,14 +0,0 @@
import request from '@/utils/http'
/**
* 查询 H5 损伤照片
* @param {Object} data - { userOrderId, taskOrderId }
*/
export function getDamagePhotos(data) {
return request({
url: '/api/h5-interface/damagePhotos',
method: 'POST',
contentType: 'application/json',
data
})
}
-10
View File
@@ -1,10 +0,0 @@
import request from '@/utils/http'
export function getBeforeDispatchImage(data) {
return request({
url: '/supplierAppV2/dispatchApp/order/getBeforeDispatchImage',
method: 'POST',
contentType: 'application/json',
data
})
}
+2 -22
View File
@@ -72,12 +72,10 @@ export function vehicleTypeList(){
}) })
} }
// 服务商服务能力 // 服务商服务能力
export function supplierServiceTree(data){ export function supplierServiceTree(){
console.log('ddddddd0', data)
return request({ return request({
url:'/supplierAppV2/dispatchApp/user/supplierServiceTree', url:'/supplierAppV2/dispatchApp/user/supplierServiceTree',
method:'POST', method:'POST'
data
}) })
} }
@@ -117,15 +115,6 @@ export function getSupplierInfo(key){
}) })
} }
// 根据id查询潜在服务商
export function supplierSelectById(params){
return request({
url:'/supplier/potential/supplierSelectById',
method:'GET',
params
})
}
// 获取企微二维码 // 获取企微二维码
export function getOrCodeInfo(data){ export function getOrCodeInfo(data){
return request({ return request({
@@ -144,15 +133,6 @@ export function getContactQrCodeResult(data){
}) })
} }
// 添加企微
export function updateWechatId(data){
return request({
url:'/supplier/potential/updateWechatId',
method:'POST',
data
})
}
//司机列表 //司机列表
export function driverList(data){ export function driverList(data){
return request({ return request({
-43
View File
@@ -1,43 +0,0 @@
import request from '@/utils/http'
/**
* 查询当前服务商分时段电话列表和审批状态
* @param {Object} params
* @param {number} params.supplierId 服务商 ID
*/
export function getSupplierPhoneList(params) {
return request({
url: '/supplierAppV2/dispatchApp/supplierPhone/list',
method: 'GET',
params
})
}
/**
* 查询当前服务商电话时段变更审批状态
* @param {Object} params
* @param {number} params.supplierId 服务商 ID
*/
export function getSupplierPhoneApprovalStatus(params) {
return request({
url: '/supplierAppV2/dispatchApp/supplierPhone/approvalStatus',
method: 'GET',
params
})
}
/**
* 提交服务商电话时段变更审批
* @param {Object} data
* @param {number} data.supplierId 服务商 ID
* @param {string} [data.modifyReason] 修改原因
* @param {Array} data.phoneList 电话时段草稿列表
*/
export function submitSupplierPhoneApproval(data) {
return request({
url: '/supplierAppV2/dispatchApp/supplierPhone/submit',
method: 'POST',
contentType: 'application/json',
data
})
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 643 KiB

-646
View File
@@ -1,646 +0,0 @@
<template>
<div class="cameraGuide" v-if="visible">
<!-- ===== 拍摄引导页 ===== -->
<div class="cameraPage" v-show="step==='guide'">
<video ref="video" class="cameraVideo" autoplay playsinline muted></video>
<div class="cameraNav">
<van-icon name="arrow-left" class="backBtn" @click="handleClose" />
<span class="navTitle">{{ navTitle }}</span>
</div>
<div class="guideLayer">
<!-- 顶部主指令卡 -->
<div class="guideHero">
<div class="guideHeroIcon">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
<rect x="3" y="5" width="18" height="14" rx="2"></rect>
<path d="M3 9h18"></path>
<circle cx="8" cy="13.5" r="1.6"></circle>
<path d="M11 12.5h7M11 15h5"></path>
</svg>
</div>
<div class="guideHeroText">
<div class="guideHeroTitle">{{ heroTitle }}</div>
<div class="guideHeroSub">从卡套内拿出避免反光</div>
</div>
</div>
<!-- 取景框 -->
<div class="guideFrameOuter">
<span class="corner tl"></span>
<span class="corner tr"></span>
<span class="corner bl"></span>
<span class="corner br"></span>
<div class="guideFrameBorder"></div>
<div class="guideHole">
<!-- 主页模板标题 + 印章 -->
<div v-if="type==='front'" class="licenseTemplate ltFrontPage">
<div class="ltInner">
<div class="ltTitle">
<div class="ltTitleLine">中华人民共和国机动车行驶证</div>
</div>
<div class="ltSeal">印章</div>
</div>
</div>
<!-- 副页模板条形码 + 编号 -->
<div v-else-if="type==='back'" class="licenseTemplate ltBackPage">
<div class="ltInner">
<div class="ltBarcodeArea">
<div class="ltBarcodeStrip">
<div v-for="(bar, i) in barcodeBars" :key="i" class="ltBar" :class="bar"></div>
</div>
<div class="ltBarcodeNum">3701001234567</div>
</div>
</div>
</div>
<!-- 车辆照片模板标题 + 车辆轮廓 -->
<div v-else class="licenseTemplate ltCarPage">
<div class="ltInner">
<div class="ltTitle">
<div class="ltTitleLine">车辆照片</div>
</div>
<div class="ltCarOutline">
<svg viewBox="0 0 140 70" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
<path d="M14 46 L20 26 Q22 20 30 19 L88 16 Q96 16 102 22 L116 34 Q126 36 128 42 L128 48 Q128 52 124 52 L116 52"></path>
<path d="M14 46 L14 50 Q14 52 18 52 L30 52"></path>
<circle cx="42" cy="52" r="9"></circle>
<circle cx="102" cy="52" r="9"></circle>
<path d="M51 52 L93 52"></path>
<path d="M58 19 L60 33 L34 34"></path>
<path d="M92 18 L94 32 L114 33"></path>
</svg>
</div>
</div>
</div>
</div>
</div>
<!-- 底部取景要点 -->
<div class="guideTips">
<div class="tipItem ok">
<span class="tipIco">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
<path d="M4 8V4h4M16 4h4v4M20 16v4h-4M8 20H4v-4"></path>
</svg>
</span>
<span class="tipLabel">四角入框</span>
</div>
<div class="tipItem ok">
<span class="tipIco">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
<path d="M4 12h16M7 7h10M7 17h10"></path>
</svg>
</span>
<span class="tipLabel">平放正向</span>
</div>
<div class="tipItem warn">
<span class="tipIco">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
<circle cx="12" cy="12" r="4"></circle>
<path d="M12 2v3M12 19v3M2 12h3M19 12h3M5 5l2 2M17 17l2 2M19 5l-2 2M5 19l2-2"></path>
</svg>
</span>
<span class="tipLabel">避免反光</span>
</div>
</div>
</div>
<div class="shootBar">
<div class="shootBtn" @click="takePhoto"></div>
<div class="shootLabel">点击拍照</div>
</div>
</div>
<!-- ===== 预览确认页 ===== -->
<div class="previewPage" v-show="step==='preview'">
<div class="cameraNav">
<van-icon name="arrow-left" class="backBtn" @click="handlePreviewBack" />
<span class="navTitle">照片预览</span>
</div>
<div class="previewImgWrap">
<img class="previewImg" :src="previewDataURL" alt="预览" />
</div>
<div class="previewBtns">
<button class="previewBtn btnRetake" @click="retake">重拍</button>
<button class="previewBtn btnConfirm" @click="confirmPhoto">确认使用</button>
</div>
</div>
</div>
</template>
<script>
// 拍摄引导组件:WebRTC 取景 + 引导框 + 分页面证件模板 + 预览确认
// props: type(front/back/car), visible
// emit: confirm({blob, dataURL})、cancel、fallback(权限拒绝/相机不可用,父组件降级系统选择器)
export default {
name: 'CameraGuide',
props: {
type: {
type: String,
default: 'front'
},
visible: {
type: Boolean,
default: false
}
},
data() {
const heights = ['tall', 'short', 'medium wide', 'tall', 'short', 'medium', 'tall wide', 'short',
'medium', 'tall', 'short wide', 'medium', 'tall', 'short', 'medium wide', 'tall',
'short', 'medium', 'tall wide', 'short', 'medium', 'tall', 'short wide', 'medium',
'tall', 'short', 'medium wide', 'tall', 'short', 'medium', 'tall wide', 'short',
'medium', 'tall', 'short wide', 'medium', 'tall', 'short', 'medium wide', 'tall']
return {
step: 'guide', // guide 拍摄引导 | preview 预览确认
stream: null,
previewBlob: null,
previewDataURL: '',
barcodeBars: heights
}
},
computed: {
navTitle() {
return { front: '拍摄行驶证主页', back: '拍摄行驶证副页', car: '拍摄行驶证车辆照片' }[this.type] || '拍摄行驶证'
},
heroTitle() {
return { front: '请将主页对准取景框', back: '请将副页对准取景框', car: '请将车辆对准取景框' }[this.type] || '请将证件对准取景框'
}
},
watch: {
visible(val) {
if (val) {
this.step = 'guide'
this.previewBlob = null
this.previewDataURL = ''
this.$nextTick(() => this.startCamera())
} else {
this.stopCamera()
}
}
},
beforeDestroy() {
this.stopCamera()
},
methods: {
async startCamera() {
try {
const stream = await navigator.mediaDevices.getUserMedia({
video: { facingMode: 'environment' },
audio: false
})
// 等待期间组件已被关闭,立即释放
if (!this.visible) {
stream.getTracks().forEach(t => t.stop())
return
}
this.stream = stream
await this.$nextTick()
const video = this.$refs.video
if (video) {
video.srcObject = stream
video.play().catch(() => {})
}
} catch (e) {
// 权限拒绝或相机不可用 → 通知父组件降级为系统选择器
console.error('getUserMedia error:', e)
this.$emit('fallback')
}
},
stopCamera() {
if (this.stream) {
this.stream.getTracks().forEach(t => t.stop())
this.stream = null
}
},
takePhoto() {
const video = this.$refs.video
if (!video || !video.videoWidth) {
this.$toast('相机尚未就绪,请稍候')
return
}
const canvas = document.createElement('canvas')
canvas.width = video.videoWidth
canvas.height = video.videoHeight
canvas.getContext('2d').drawImage(video, 0, 0)
const dataURL = canvas.toDataURL('image/jpeg', 0.92)
canvas.toBlob(blob => {
if (!blob) {
this.$toast('拍摄失败,请重试')
return
}
this.previewBlob = blob
this.previewDataURL = dataURL
this.step = 'preview'
}, 'image/jpeg', 0.92)
},
retake() {
// 重拍回到引导页,相机流保持
this.step = 'guide'
},
confirmPhoto() {
this.$emit('confirm', { blob: this.previewBlob, dataURL: this.previewDataURL })
},
handleClose() {
this.$emit('cancel')
},
handlePreviewBack() {
// 预览页返回 = 放弃拍摄,关闭并释放相机流
this.$emit('cancel')
}
}
}
</script>
<style scoped lang="scss">
.cameraGuide {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 3000;
background: #F5F5F5;
}
.cameraPage {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: linear-gradient(160deg, #F7F9FC 0%, #EEF1F6 50%, #E6EAF1 100%);
overflow: hidden;
}
.cameraVideo {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
object-fit: cover;
z-index: 1;
}
.cameraNav {
position: relative;
z-index: 10;
display: flex;
align-items: center;
height: 52px;
padding-left: 14px;
padding-top: env(safe-area-inset-top);
background: #2C395F;
color: #fff;
.backBtn {
font-size: 22px;
width: 36px;
flex-shrink: 0;
}
.navTitle {
flex: 1;
text-align: left;
font-size: 18px;
font-weight: bolder;
letter-spacing: .5px;
padding-left: 4px;
}
}
.guideLayer {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 5;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding-top: 80px;
padding-bottom: 100px;
pointer-events: none;
}
.guideHero {
display: flex;
align-items: center;
gap: 12px;
background: #FFFFFF;
border: 1px solid #E9E9EA;
border-radius: 6px;
padding: 12px 15px;
margin-bottom: 24px;
max-width: 322px;
width: calc(100% - 48px);
box-sizing: border-box;
box-shadow: 0 2px 10px rgba(20, 30, 50, .08);
.guideHeroIcon {
width: 42px;
height: 42px;
flex-shrink: 0;
border-radius: 6px;
background: rgba(53, 77, 147, .10);
display: flex;
align-items: center;
justify-content: center;
color: #354D93;
svg {
width: 23px;
height: 23px;
}
}
.guideHeroTitle {
color: #222;
font-size: 16px;
font-weight: 700;
line-height: 1.3;
letter-spacing: .3px;
}
.guideHeroSub {
color: #5B606E;
font-size: 12.5px;
margin-top: 4px;
line-height: 1.4;
}
}
/* 取景框:宽约为屏宽 80%,宽高比约 1.43:1 */
.guideFrameOuter {
position: relative;
width: 80%;
max-width: 340px;
padding-top: 69.93%; /* 宽高比约 1.43:1 */
flex-shrink: 0;
filter: drop-shadow(0 4px 16px rgba(20, 30, 50, .12));
}
.corner {
position: absolute;
width: 30px;
height: 30px;
border-color: #354D93;
border-style: solid;
z-index: 10;
animation: cornerFadeIn .45s ease both;
&.tl { top: -4px; left: -4px; border-width: 4px 0 0 4px; border-radius: 4px 0 0 0; }
&.tr { top: -4px; right: -4px; border-width: 4px 4px 0 0; border-radius: 0 4px 0 0; }
&.bl { bottom: -4px; left: -4px; border-width: 0 0 4px 4px; border-radius: 0 0 0 4px; }
&.br { bottom: -4px; right: -4px; border-width: 0 4px 4px 0; border-radius: 0 0 4px 0; }
}
@keyframes cornerFadeIn {
from { opacity: 0; transform: scale(1.15); }
to { opacity: 1; transform: scale(1); }
}
.guideFrameBorder {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
border: 3px solid #C2C8D2;
border-radius: 8px;
pointer-events: none;
z-index: 9;
}
.guideHole {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
border-radius: 8px;
overflow: hidden;
}
/* 证件模板叠层(仅视觉辅助,不拦截事件) */
.licenseTemplate {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 6;
border: 1.5px solid rgba(53, 77, 147, .55);
border-radius: 4px;
overflow: hidden;
pointer-events: none;
background: rgba(53, 77, 147, .06);
}
.ltInner {
position: absolute;
top: 5px;
left: 5px;
right: 5px;
bottom: 5px;
display: flex;
flex-direction: column;
}
.ltTitle {
text-align: center;
margin-bottom: 4px;
}
.ltTitleLine {
font-size: 10px;
color: rgba(53, 77, 147, .9);
font-weight: bold;
letter-spacing: 1px;
white-space: nowrap;
}
.ltSeal {
position: absolute;
left: 10px;
bottom: 10px;
width: 34px;
height: 34px;
border: 1.5px dashed rgba(255, 85, 59, .85);
border-radius: 2px;
display: flex;
align-items: center;
justify-content: center;
font-size: 5.5px;
color: rgba(255, 85, 59, .85);
}
.ltFrontPage .ltInner {
justify-content: flex-start;
}
.ltBackPage .ltInner {
justify-content: flex-end;
}
.ltBarcodeArea {
display: flex;
flex-direction: column;
align-items: flex-end;
gap: 4px;
padding-bottom: 6px;
padding-right: 8px;
}
.ltBarcodeStrip {
display: flex;
align-items: flex-end;
height: 28px;
gap: 1px;
.ltBar {
background: rgba(53, 77, 147, .6);
width: 1.5px;
border-radius: 0.5px;
&.wide { width: 2.8px; }
&.short { height: 50%; }
&.medium { height: 70%; }
&.tall { height: 100%; }
}
}
.ltBarcodeNum {
font-size: 8px;
color: rgba(53, 77, 147, .9);
letter-spacing: 2px;
font-family: 'Courier New', monospace;
}
.ltCarPage .ltCarOutline {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
svg {
width: 60%;
opacity: .6;
color: #354D93;
}
}
.guideTips {
display: flex;
gap: 10px;
margin-top: 22px;
padding: 0 14px;
max-width: 340px;
width: 100%;
box-sizing: border-box;
}
.tipItem {
flex: 1;
display: flex;
flex-direction: column;
align-items: center;
gap: 7px;
background: #FFFFFF;
border-radius: 6px;
padding: 11px 4px 9px;
border: 1px solid #E9E9EA;
box-shadow: 0 2px 8px rgba(20, 30, 50, .06);
.tipIco {
width: 28px;
height: 28px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
svg {
width: 17px;
height: 17px;
}
}
&.ok .tipIco {
background: rgba(53, 77, 147, .10);
color: #354D93;
}
&.warn .tipIco {
background: rgba(255, 85, 59, .12);
color: #FF553B;
}
.tipLabel {
color: #5B606E;
font-size: 11.5px;
line-height: 1.3;
text-align: center;
}
}
.shootBar {
position: absolute;
bottom: 0;
left: 0;
right: 0;
z-index: 10;
display: flex;
flex-direction: column;
align-items: center;
padding-top: 12px;
padding-bottom: calc(32px + env(safe-area-inset-bottom));
background: #FFFFFF;
border-top: 1px solid #E9E9EA;
}
.shootBtn {
width: 72px;
height: 72px;
border-radius: 50%;
border: 4px solid #354D93;
background: #FFFFFF;
position: relative;
box-shadow: 0 0 0 2px rgba(53, 77, 147, .22), 0 6px 16px rgba(20, 30, 50, .18);
&:active {
transform: scale(.92);
}
&::after {
content: '';
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 58px;
height: 58px;
border-radius: 50%;
background: #354D93;
}
}
.shootLabel {
color: #5B606E;
font-size: 12px;
margin-top: 10px;
letter-spacing: 1px;
}
/* ===== 预览确认页 ===== */
.previewPage {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: #F5F5F5;
display: flex;
flex-direction: column;
z-index: 20;
}
.previewImgWrap {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
padding: 20px;
overflow: hidden;
}
.previewImg {
max-width: 100%;
max-height: 100%;
border-radius: 8px;
object-fit: contain;
}
.previewBtns {
display: flex;
gap: 16px;
padding: 0 20px 32px;
padding-bottom: calc(32px + env(safe-area-inset-bottom));
}
.previewBtn {
flex: 1;
height: 48px;
border-radius: 24px;
border: none;
font-size: 16px;
font-weight: 600;
&:active {
opacity: .8;
}
}
.btnRetake {
background: #FFFFFF;
color: #354D93;
border: 1px solid #354D93;
}
.btnConfirm {
background: #354D93;
color: #fff;
}
</style>
-136
View File
@@ -1,136 +0,0 @@
<template>
<div class="step-bar">
<div
v-for="(step, index) in steps"
:key="index"
class="step-item"
:class="getStepClass(index)"
>
<div class="step-circle" @click="onStepClick(index)">
<span v-if="getStatus(index) === 'finish'" class="step-check"></span>
<span v-else>{{ index + 1 }}</span>
</div>
<div class="step-label">{{ step }}</div>
<div v-if="index < steps.length - 1" class="step-line" :class="{'step-line-done': getStatus(index) === 'finish'}"></div>
</div>
</div>
</template>
<script>
export default {
name: 'StepBar',
props: {
current: {
type: Number,
default: 1
},
steps: {
type: Array,
default: () => ['基本信息', '添加企微', '车辆信息', '驾驶员信息']
}
},
methods: {
getStatus(index) {
const stepNum = index + 1;
if (stepNum < this.current) return 'finish';
if (stepNum === this.current) return 'process';
return 'wait';
},
getStepClass(index) {
return `step-${this.getStatus(index)}`;
},
onStepClick(index) {
const stepNum = index + 1;
if (this.getStatus(index) === 'finish') {
this.$emit('step-click', stepNum);
}
}
}
}
</script>
<style scoped lang="scss">
.step-bar {
display: flex;
align-items: flex-start;
justify-content: center;
padding: 14px 10px 10px;
background: #fff;
position: relative;
}
.step-item {
display: flex;
flex-direction: column;
align-items: center;
flex: 1;
position: relative;
}
.step-circle {
width: 26px;
height: 26px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
font-size: 13px;
font-weight: bold;
z-index: 1;
position: relative;
}
.step-finish .step-circle {
background: #0E76F4;
color: #fff;
cursor: pointer;
}
.step-process .step-circle {
background: #0E76F4;
color: #fff;
box-shadow: 0 0 0 3px rgba(14, 118, 244, 0.2);
}
.step-wait .step-circle {
background: #e0e0e0;
color: #999;
}
.step-label {
font-size: 11px;
margin-top: 5px;
text-align: center;
white-space: nowrap;
}
.step-finish .step-label {
color: #0E76F4;
}
.step-process .step-label {
color: #0E76F4;
font-weight: bold;
}
.step-wait .step-label {
color: #999;
}
.step-line {
position: absolute;
top: 13px;
left: calc(50% + 13px);
right: calc(-50% + 13px);
height: 2px;
background: #e0e0e0;
}
.step-line-done {
background: #0E76F4;
}
.step-check {
font-size: 14px;
}
</style>
+1 -41
View File
@@ -27,14 +27,6 @@ const routes = [
title: '审核中', title: '审核中',
} }
}, },
{
path: '/addWechat',
name: 'addWechat',
component: () => import('@/views/index/addWechat'),
meta:{
title: '添加微信',
}
},
{ {
path: '/supplierInfo', path: '/supplierInfo',
name: 'supplierInfo', name: 'supplierInfo',
@@ -43,22 +35,6 @@ const routes = [
title: '信息查看', title: '信息查看',
} }
}, },
{
path: '/supplierTimePhone',
name: 'supplierTimePhone',
component: () => import('@/views/index/supplierTimePhone'),
meta:{
title: '供应商时段电话',
}
},
{
path: '/supplierTimePhoneEdit',
name: 'supplierTimePhoneEdit',
component: () => import('@/views/index/supplierTimePhoneEdit'),
meta:{
title: '编辑时段电话',
}
},
{ {
path: '/toDoList', path: '/toDoList',
name: 'toDoList', name: 'toDoList',
@@ -180,22 +156,6 @@ const routes = [
title: '查看发票' title: '查看发票'
} }
}, },
{
path: '/damagePhotos',
name: 'damagePhotoList',
component: () => import('@/views/damagePhoto/damagePhotoList.vue'),
meta: {
title: '损伤照片'
}
},
{
path: '/environmentPhotos',
name: 'environmentPhotoList',
component: () => import('@/views/environmentPhoto/environmentPhotoList.vue'),
meta: {
title: '环境照片'
}
},
{ {
path: "/vehicleManage", path: "/vehicleManage",
name: 'vehicleManage', name: 'vehicleManage',
@@ -369,7 +329,7 @@ const routes = [
name: 'goToApp', name: 'goToApp',
component:()=>import('@/views/goToApp/goToApp.vue'), component:()=>import('@/views/goToApp/goToApp.vue'),
meta: { meta: {
title:'小板运输司机端' title:'电瓶详情'
} }
}, },
...kpiRouter, ...kpiRouter,
-51
View File
@@ -1,51 +0,0 @@
/**
* 校验电话号码
* 支持:大陆手机号、大陆固话、400电话、港澳手机号
* @param {string} phone
* @returns {boolean}
*/
export function isValidPhone(phone) {
if (!phone) return false
// 大陆手机号
const mainlandMobile = /^1[3-9]\d{9}$/
// 大陆固话:区号(可选) + 7~8位号码
const mainlandLandline = /^(0\d{2,3}-?)\d{7,8}$/
// 400电话
const phone400 = /^400-?\d{3}-?\d{4}$/
// 港澳手机号(8位,首位5/6/8/9)
const hkMacaoMobile = /^[5689]\d{7}$/
// 港澳固话
const hkMacaoLandline = /^(\d{4}-?)?\d{4}$/
return (
mainlandMobile.test(phone) ||
mainlandLandline.test(phone) ||
phone400.test(phone) ||
hkMacaoMobile.test(phone) ||
hkMacaoLandline.test(phone)
)
}
/**
* 校验时段格式 HH:mm 及起止关系
* @param {string} startTime
* @param {string} endTime
* @returns {{valid: boolean, message?: string}}
*/
export function validateTimeRange(startTime, endTime) {
const timeRegex = /^([0-1]\d|2[0-3]):([0-5]\d)$/
if (!startTime || !endTime) {
return { valid: false, message: '请填写完整的起止时段' }
}
if (!timeRegex.test(startTime) || !timeRegex.test(endTime)) {
return { valid: false, message: '时段格式不正确,应为 00:00 ~ 23:59' }
}
const [startH, startM] = startTime.split(':').map(Number)
const [endH, endM] = endTime.split(':').map(Number)
const start = startH * 60 + startM
const end = endH * 60 + endM
if (start > end) {
return { valid: false, message: '开始时间不得晚于结束时间' }
}
return { valid: true }
}
-312
View File
@@ -1,312 +0,0 @@
<template>
<div class="wrap damage-photo-wrap">
<div class="navBar">
<van-nav-bar
title="损伤照片"
left-arrow
left-arrow-color="#FFFFFF"
:border="false"
:fixed="true"
:safe-area-inset-top="true"
@click-left="h5GoBack"
/>
</div>
<div class="content-wrap" v-if="loaded">
<!-- 案件信息 -->
<div class="info-card">
<div class="info-item">
<span class="info-label">案件号</span>
<span class="info-value">{{ info.caseNo || '-' }}</span>
</div>
<div class="info-item">
<span class="info-label">车辆标识</span>
<span class="info-value">{{ info.vehicleIdentity || '-' }}</span>
</div>
<div class="info-item">
<span class="info-label">起止路线</span>
<span class="info-value">{{ info.route || '-' }}</span>
</div>
</div>
<!-- 照片列表 -->
<div class="photo-list" v-if="photoList.length">
<div class="photo-card" v-for="(item, index) in photoList" :key="index">
<div class="photo-title">
<span>{{ item.title || '-' }}</span>
<span
v-if="item.replaced || (item.historyList && item.historyList.length)"
class="replaced-tag"
@click="showHistory(item)"
>被替换</span>
</div>
<div class="photo-image" @click="previewCurrent(item.currentUrl)">
<van-image
:src="item.currentUrl"
fit="cover"
width="100%"
height="160"
:error-icon="defaultImg"
error-icon-size="48"
/>
</div>
</div>
</div>
<!-- 空态 -->
<div class="empty-state" v-else>
<van-empty description="暂无损伤照片" />
</div>
</div>
<!-- 历史照片弹框 -->
<van-popup
v-model="historyShow"
position="bottom"
round
closeable
:style="{ height: '70%' }"
@closed="currentHistory = []"
>
<div class="history-popup">
<div class="history-title">历史照片</div>
<div class="history-list" v-if="currentHistory.length">
<div
class="history-item"
v-for="(item, index) in currentHistory"
:key="index"
@click="previewHistory(item.url)"
>
<van-image
:src="item.url"
fit="cover"
width="100%"
height="120"
:error-icon="defaultImg"
error-icon-size="48"
/>
<div class="history-time" v-if="item.replaceTime">替换时间{{ item.replaceTime }}</div>
</div>
</div>
<div class="history-empty" v-else>
<van-empty description="暂无历史照片" />
</div>
</div>
</van-popup>
</div>
</template>
<script>
import { getDamagePhotos } from '@/api/damagePhoto'
import { myMixins } from '@/utils/myMixins'
import { ImagePreview, Toast } from 'vant'
export default {
name: 'damagePhotoList',
mixins: [myMixins],
data() {
return {
loaded: false,
info: {
caseNo: '',
vehicleIdentity: '',
route: ''
},
photoList: [],
historyShow: false,
currentHistory: [],
defaultImg: require('@/assets/empty.png')
}
},
async mounted() {
await this.fetchDamagePhotos()
},
methods: {
async fetchDamagePhotos() {
const userOrderId = this.$route.query.userOrderId
const taskOrderId = this.$route.query.taskOrderId
if (!userOrderId || !taskOrderId) {
Toast('缺少必要参数')
this.loaded = true
return
}
Toast.loading({
message: '加载中...',
forbidClick: true,
duration: 0
})
try {
const res = await getDamagePhotos({
userOrderId: Number(userOrderId),
taskOrderId: Number(taskOrderId)
})
this.info = {
caseNo: res.data?.caseNo || '',
vehicleIdentity: res.data?.vehicleIdentity || '',
route: res.data?.route || ''
}
this.photoList = Array.isArray(res.data?.photos) ? res.data.photos : []
} finally {
Toast.clear()
this.loaded = true
}
},
previewCurrent(url) {
if (!url) return
ImagePreview({
images: [url],
startPosition: 0,
closeable: true
})
},
showHistory(item) {
this.currentHistory = Array.isArray(item.historyList) ? item.historyList : []
this.historyShow = true
},
previewHistory(url) {
if (!url) return
ImagePreview({
images: [url],
startPosition: 0,
closeable: true
})
}
}
}
</script>
<style scoped lang="scss">
@import "@/styles/mixin.scss";
@import "@/styles/common.scss";
.wrap {
@include wh(100%, 100%);
background-color: #F4F5F7;
overflow-y: auto;
}
.navBar {
height: 46px;
::v-deep .van-nav-bar--fixed {
z-index: 9999 !important;
}
}
.content-wrap {
padding: 10px 15px 20px;
}
.info-card {
background: #fff;
border-radius: 8px;
padding: 15px;
margin-bottom: 10px;
.info-item {
display: flex;
line-height: 24px;
font-size: 13px;
&:not(:last-child) {
margin-bottom: 8px;
}
.info-label {
color: rgba(0, 0, 0, 0.5);
width: 70px;
flex-shrink: 0;
}
.info-value {
color: #323643;
flex: 1;
word-break: break-all;
}
}
}
.photo-list {
.photo-card {
background: #fff;
border-radius: 8px;
padding: 12px 12px 15px;
margin-bottom: 10px;
.photo-title {
display: flex;
justify-content: space-between;
align-items: center;
font-size: 14px;
font-weight: bold;
color: #323643;
margin-bottom: 10px;
.replaced-tag {
font-size: 12px;
font-weight: normal;
color: #fff;
background-color: #ee0a24;
padding: 2px 8px;
border-radius: 4px;
}
}
.photo-image {
width: 100%;
border-radius: 4px;
overflow: hidden;
}
}
}
.empty-state {
margin-top: 30px;
}
.history-popup {
height: 100%;
display: flex;
flex-direction: column;
.history-title {
font-size: 16px;
font-weight: bold;
color: #323643;
text-align: center;
padding: 15px 0;
border-bottom: 1px solid #E9E9EA;
}
.history-list {
flex: 1;
overflow-y: auto;
padding: 15px;
.history-item {
margin-bottom: 15px;
border-radius: 4px;
overflow: hidden;
.history-time {
font-size: 12px;
color: rgba(0, 0, 0, 0.5);
margin-top: 6px;
}
}
}
.history-empty {
flex: 1;
}
}
</style>
<style>
/* 确保图片预览及其遮罩层级高于底部弹框 */
.van-image-preview {
z-index: 10000000003 !important;
}
.van-overlay.van-image-preview__overlay {
z-index: 10000000002 !important;
}
</style>
@@ -1,118 +0,0 @@
<template>
<div class="wrap environment-photo-wrap">
<div v-if="loaded && photoList.length === 0" class="empty-tip">暂无环境照片</div>
<div v-for="(item, index) in photoList" :key="index" class="photo-item">
<div class="media-wrap">
<video
v-if="item.tag && item.tag.includes('video')"
:src="item.imageUrl"
controls
playsinline
class="media"
/>
<img
v-else-if="item.tag && item.tag.includes('img')"
:src="item.imageUrl"
class="media"
@click="previewImage(index)"
/>
</div>
<p v-if="item.title" class="photo-name">{{ item.title }}</p>
</div>
</div>
</template>
<script>
import { Toast, ImagePreview } from 'vant'
import { getBeforeDispatchImage } from '@/api/environmentPhoto'
export default {
name: 'EnvironmentPhotoList',
data() {
return {
photoList: [],
loaded: false
}
},
async mounted() {
await this.fetchPhotos()
},
methods: {
async fetchPhotos() {
const userOrderId = this.$route.query.userOrderId
if (!userOrderId) {
Toast('缺少必要参数')
this.loaded = true
return
}
Toast.loading({
message: '加载中...',
forbidClick: true,
duration: 0
})
try {
const res = await getBeforeDispatchImage({ userOrderId: Number(userOrderId) })
this.photoList = Array.isArray(res.data) ? res.data : []
} finally {
Toast.clear()
this.loaded = true
}
},
previewImage(index) {
const urls = this.photoList
.filter(item => item.tag && item.tag.includes('img'))
.map(item => item.imageUrl)
ImagePreview({ images: urls, startPosition: index })
}
}
}
</script>
<style scoped>.wrap {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #F4F5F7;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
}
.environment-photo-wrap {
padding: 12px;
}
.empty-tip {
text-align: center;
color: #999;
margin-top: 60px;
font-size: 14px;
}
.photo-item {
background: #fff;
border-radius: 6px;
margin-bottom: 12px;
overflow: hidden;
}
.media-wrap {
position: relative;
width: 100%;
padding-top: 56.25%;
}
.photo-item img,
.photo-item video {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: block;
object-fit: cover;
}
.photo-name {
font-size: 13px;
color: #333;
padding: 8px 10px;
margin: 0;
}
</style>
+4 -67
View File
@@ -3,57 +3,22 @@
<div class="content"> <div class="content">
<div class="goToBtn" @click="goAppHandler">立即打开</div> <div class="goToBtn" @click="goAppHandler">立即打开</div>
<div class="content_tip"> <div class="content_tip">
<div class="font_cls">如未安装请点击 <span @click="downLoadHandler">立即下载</span></div> <div class="font_cls">如未安装请点击下载</div>
<div class="font_cls">如已安装未自动跳转 <span @click="downLoadHandler">立即下载</span></div>
</div> </div>
</div> </div>
<!-- 微信内置浏览器引导 -->
<div v-if="showGuide" class="guide-mask" @click.self="closeGuide">
<img class="guide-img" src="@/assets/sucai.png" alt="引导在浏览器打开" />
<div class="guide-btn" @click="closeGuide">我知道了</div>
</div>
</div> </div>
</template> </template>
<script> <script>
import { getNewVersion, getLog } from "@/api/order" import { getNewVersion } from "@/api/order"
export default { export default {
name: "goToApp", name: "goToApp",
data() {
return {
showGuide: false
}
},
mounted() {
getLog({
source: 'App下载页',
event: '页面浏览',
page: '/h5/supplier/dispatch/goToApp'
})
this.showGuide = this.isWeixin()
},
methods: { methods: {
isWeixin() {
const ua = navigator.userAgent.toLowerCase()
return ua.indexOf('micromessenger') !== -1
},
closeGuide() {
this.showGuide = false
},
goAppHandler() { goAppHandler() {
getLog({
source: 'App下载页',
event: '直接打开',
page: '/h5/supplier/dispatch/goToApp'
})
window.location.href = "rvdriver://page/pagesLogin/phoneLogin?source=h5Link"; window.location.href = "rvdriver://page/pagesLogin/phoneLogin?source=h5Link";
}, },
async downLoadHandler() { async downLoadHandler() {
getLog({
source: 'App下载页',
event: '立即下载',
page: '/h5/supplier/dispatch/goToApp'
});
getNewVersion({ getNewVersion({
appType: 5 appType: 5
}).then((res) => { }).then((res) => {
@@ -105,32 +70,4 @@ export default {
} }
} }
} }
.guide-mask { </style>
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 999;
display: flex;
flex-direction: column;
align-items: center;
background: rgba(0, 0, 0, 0.85);
}
.guide-img {
width: 90%;
margin-top: 0;
object-fit: contain;
}
.guide-btn {
width: 140px;
height: 40px;
margin-top: 40px;
border: 1px solid #FFFFFF;
border-radius: 20px;
font-size: 15px;
color: #FFFFFF;
line-height: 40px;
text-align: center;
}
</style>
-183
View File
@@ -1,183 +0,0 @@
<template>
<div class="wrap">
<div class="top-wrap"></div>
<div class="center-info">
<div class="wei_code_wrap">
<div class="wei_title">请先添加企业微信保证申请流程正常进行</div>
<div class="wei_code_bg">
<img v-if="qrCodeUrl" :src="qrCodeUrl" alt="企业微信二维码" />
</div>
</div>
</div>
<div class="btn_wrap">
<div class="btn" @click="nextStep">下一步</div>
</div>
</div>
</template>
<script>
import QRCode from 'qrcode'
import {getOrCodeInfo, getContactQrCodeResult, saveSupplier} from "@/api/mine"
import {myMixins} from "@/utils/myMixins"
import {Toast, Dialog} from "vant";
export default {
name: "addWechat",
mixins: [myMixins],
data() {
return {
name: '',
potentialFlag: '',
formPayload: null,
qrCodeUrl: '',
qrCode: '',
configId: '',
wechatId: '',
clickFlag: true,
}
},
async mounted() {
const urlParams = new URLSearchParams(window.location.search);
this.potentialFlag = this.$route.query.potentialFlag || urlParams.get('potentialFlag') || '';
const cached = localStorage.getItem('supplierAddForm');
if (cached) {
this.formPayload = JSON.parse(cached);
this.wechatId = this.formPayload.wechatId;
this.name = this.formPayload.name;
}
if (this.name) {
await this.QrCodeHandler();
}
},
methods: {
async QrCodeHandler() {
await this.QrCodeInfo();
await this.getQrCode();
},
async QrCodeInfo() {
let res = await getOrCodeInfo({ name: this.name });
this.configId = res?.configId;
this.qrCode = res?.qrCode;
},
async getQrCode() {
try {
this.qrCodeUrl = await QRCode.toDataURL(this.qrCode, {
width: 150,
margin: 2,
color: { dark: '#000000', light: '#FFFFFF' },
});
} catch (error) {
console.error('生成二维码失败:', error);
}
},
async nextStep() {
if (!this.clickFlag) return;
if(!this.wechatId) {
let res = await getContactQrCodeResult({ configId: this.configId, name: this.name });
this.wechatId = res?.data?.wechatId;
}
if (!this.wechatId) {
Toast('请先添加企微再继续');
return;
}
try {
this.clickFlag = false;
const res = await saveSupplier({
...this.formPayload,
wechatId: this.wechatId,
});
if (res?.noToast) {
if (res?.code != 0) {
Dialog.alert({ title: '提示', message: '该服务商已存在,查看信息' }).then(() => {
localStorage.removeItem('supplierAddForm');
const target = { name: 'supplierInfo', query: { id: res?.code, potentialFlag: this.potentialFlag } };
localStorage.setItem('lastRoute', JSON.stringify(target));
this.goPage('supplierInfo', { id: res?.code, potentialFlag: this.potentialFlag });
});
} else {
Toast('该服务商已存在');
}
} else {
localStorage.removeItem('supplierAddForm');
const supplierId = res?.data;
const potentialFlag = this.potentialFlag;
const target = { name: 'supplierAddResult', query: { id: supplierId, potentialFlag } };
localStorage.setItem('lastRoute', JSON.stringify(target));
Dialog.confirm({
title: '提示',
message: '添加车辆和驾驶员会加快审核进度,是否去添加?',
confirmButtonText: '去添加',
cancelButtonText: '取消',
}).then(() => {
localStorage.setItem('lastRoute', JSON.stringify({ name: 'vehicleManage', query: { id: supplierId, potentialFlag } }));
this.goPage('vehicleManage', { id: supplierId, potentialFlag });
}).catch(() => {
localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierAddResult', query: { id: supplierId, potentialFlag } }));
this.goPage('supplierAddResult', { id: supplierId, potentialFlag });
});
}
} catch (e) {
Toast(e?.message || '提交失败');
} finally {
setTimeout(() => { this.clickFlag = true; }, 1000);
}
}
}
}
</script>
<style scoped lang="scss">
@import "@/styles/mixin.scss";
@import "@/styles/common.scss";
.wrap {
@include wh(100%, 100%);
box-sizing: border-box;
padding-bottom: 100px;
overflow-y: auto;
background: linear-gradient(180deg, #FBFDFE 0%, #F6FBFF 73%, #F0F7FF 100%);
backdrop-filter: blur(5.602678571428572px);
}
.top-wrap {
width: 100%;
height: 175px;
background: linear-gradient(180deg, #DAECFF 0%, rgba(233, 243, 255, 0) 100%);
}
.center-info {
text-align: center;
}
.wei_code_wrap {
margin-top: 10px;
.wei_title {
font-size: 15px;
color: #FF553B;
text-align: center;
}
.wei_code_bg {
width: 163px;
height: 173px;
background-image: url("~@/assets/supplier/weiCodeBg.png");
background-size: 100% 100%;
margin: 8px auto;
display: flex;
align-items: center;
justify-content: center;
}
}
.btn_wrap {
width: 100%;
padding: 15px 0;
position: fixed;
bottom: 10px;
z-index: 10000 !important;
.btn {
width: calc(100% - 80px);
margin-left: 40px;
height: 46px;
background: #0E76F4;
border-radius: 5px;
font-size: 15px;
color: #FFFFFF;
text-align: center;
line-height: 46px;
}
}
</style>
+2 -16
View File
@@ -122,7 +122,7 @@
<span>司机状态</span> <span>司机状态</span>
</div> </div>
<div class="isJoin"> <div class="isJoin">
<van-radio-group v-model="states" @change="isUse" :disabled="statesDisabled" :class="{ 'disabled-tree': statesDisabled }" class="joinWrap"> <van-radio-group v-model="states" @change="isUse" class="joinWrap">
<van-radio :name="1" style="margin-right: 26px" class="item"> <van-radio :name="1" style="margin-right: 26px" class="item">
启用 启用
<img <img
@@ -163,7 +163,6 @@ export default {
// baseURL:'', // baseURL:'',
// licenseOcrInfo:'', // licenseOcrInfo:'',
id:'', id:'',
supplierId: '',
driverName:"", driverName:"",
driverPhone:"", driverPhone:"",
identityCardNumber:"", identityCardNumber:"",
@@ -185,7 +184,6 @@ export default {
iconList: [], iconList: [],
driverInfo: {}, driverInfo: {},
drivingLicenceName: '', drivingLicenceName: '',
potentialFlag: '',
idCardAuthority:'', idCardAuthority:'',
idCardValidStartTime:'', idCardValidStartTime:'',
idCardValidEndTime:'', idCardValidEndTime:'',
@@ -206,7 +204,6 @@ export default {
let token=localStorage.getItem('token') let token=localStorage.getItem('token')
this.authorization.Authorization=token;*/ this.authorization.Authorization=token;*/
this.id = this.$route.params?.id; this.id = this.$route.params?.id;
this.supplierId = this.$route.params?.supplierId || '';
this.driverName = this.$route.params?.name; this.driverName = this.$route.params?.name;
this.driverPhone = this.$route.params?.phone; this.driverPhone = this.$route.params?.phone;
this.drivingModel = this.$route.params?.drivingModel; this.drivingModel = this.$route.params?.drivingModel;
@@ -223,11 +220,6 @@ export default {
this.identityCardFront = this.$route.params?.identityCardFront; this.identityCardFront = this.$route.params?.identityCardFront;
this.driverInfo.lssueDate = this.$route.params?.lssueDate; this.driverInfo.lssueDate = this.$route.params?.lssueDate;
this.drivingLicenceName = this.$route.params?.drivingLicenceName; this.drivingLicenceName = this.$route.params?.drivingLicenceName;
this.potentialFlag = this.$route.params?.potentialFlag || '';
console.log('this.potentialFlagthis.potentialFlag', this.potentialFlag)
if(!this.id && this.potentialFlag === '1') {
this.states = 0;
}
if( this.identityCardFront ) { if( this.identityCardFront ) {
this.identityCardFrontList = [{ url : this.identityCardFront }]; this.identityCardFrontList = [{ url : this.identityCardFront }];
} }
@@ -248,7 +240,7 @@ export default {
const selectedValue = selectElement.value; const selectedValue = selectElement.value;
this.drivingModel=selectedValue this.drivingModel=selectedValue
}); });
console.log('statesDisabled', this.statesDisabled)
}, },
methods:{ methods:{
isUse(e){ isUse(e){
@@ -434,7 +426,6 @@ export default {
} }
await saveDriver({ await saveDriver({
driverId:this.id ? this.id : '', driverId:this.id ? this.id : '',
supplierId: this.supplierId || undefined,
driverName:this.driverName , driverName:this.driverName ,
driverPhone:this.driverPhone, driverPhone:this.driverPhone,
identityCardNumber:this.identityCardNumber, identityCardNumber:this.identityCardNumber,
@@ -462,11 +453,6 @@ export default {
},2000) },2000)
}, },
}, },
computed: {
statesDisabled() {
return !this.id && this.potentialFlag === '1';
}
},
components:{ components:{
TwoCommonBtn, TwoCommonBtn,
CellGroup CellGroup
+7 -48
View File
@@ -3,14 +3,14 @@
<div class="navBar"> <div class="navBar">
<van-nav-bar <van-nav-bar
title="司机管理" title="司机管理"
:left-arrow="!supplierId" left-arrow
left-arrow-color="#FFFFFF" left-arrow-color="#FFFFFF"
:border="false" :border="false"
:fixed="true" :fixed="true"
:safe-area-inset-top="true" :safe-area-inset-top="true"
@click-left="goBack" @click-left="goBack"
> >
<template slot="right" v-if="permissonList.includes('driverAddBtn') || supplierId"> <template slot="right" v-if="permissonList.includes('driverAddBtn')">
<div class="rightWrap" @click="addDriver" > <div class="rightWrap" @click="addDriver" >
<img src="@/assets/addImg.png" /> <img src="@/assets/addImg.png" />
<span class="addTxt">添加</span> <span class="addTxt">添加</span>
@@ -62,14 +62,14 @@
finished-text="没有更多了" finished-text="没有更多了"
@load="onLoad" @load="onLoad"
> >
<div class="itemWrap" v-for="(item,index) in driverList" :key="index" @click.stop="!isMiniProgram(item) && updateDriver(item)"> <div class="itemWrap" v-for="(item,index) in driverList" :key="index" @click.stop="updateDriver(item)">
<div class="name-status"> <div class="name-status">
<div class="namephone">{{ item.driverName }} / {{ item.driverPhone }} <div class="namephone">{{ item.driverName }} / {{ item.driverPhone }}
<span style="margin-left: 10px" :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span> <span style="margin-left: 10px" :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span>
</div> </div>
<div class="twoBtn"> <div class="twoBtn">
<!-- 只有启用状态下才展示停用按钮小程序来源司机不显示--> <!-- 只有启用状态下才展示停用按钮-->
<button v-if="!isMiniProgram(item) && permissonList.includes('driverModifyBtn') && item.states?.code==1" class="del" @click.stop="handleStatus(item)">停用</button> <button v-if="permissonList.includes('driverModifyBtn') && item.states?.code==1" class="del" @click.stop="handleStatus(item)">停用</button>
<!-- <button v-if="permissonList.includes('driverModifyBtn')" class="revise" @click="updateDriver(item)">修改</button>--> <!-- <button v-if="permissonList.includes('driverModifyBtn')" class="revise" @click="updateDriver(item)">修改</button>-->
</div> </div>
</div> </div>
@@ -103,7 +103,7 @@
<span class="halfOpci">身份证号:</span> <span class="halfOpci">身份证号:</span>
<span class="allOpci">{{ item.identityCardNumber }}</span> <span class="allOpci">{{ item.identityCardNumber }}</span>
</div> </div>
<van-icon class="arrow_position" v-if="!isMiniProgram(item) && permissonList.includes('driverModifyBtn')" name="arrow" /> <van-icon class="arrow_position" v-if="permissonList.includes('driverModifyBtn')" name="arrow" />
<!-- <div> <!-- <div>
<span class="halfOpci">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</span> <span class="halfOpci">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</span>
<span :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span> <span :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span>
@@ -113,9 +113,6 @@
</van-pull-refresh> </van-pull-refresh>
</div> </div>
<div class="btn_wrap" v-if="supplierId">
<div class="btn" @click="nextToResult">下一步</div>
</div>
</div> </div>
</template> </template>
@@ -134,10 +131,6 @@ export default {
total:'', total:'',
driverList:[], driverList:[],
states:'', states:'',
supplierId: '',
routeId: '',
initialized: false,
potentialFlag: '',
supplierType:'', supplierType:'',
count: 0, count: 0,
isLoading: false, isLoading: false,
@@ -183,24 +176,10 @@ export default {
mounted() { mounted() {
const urlParams = new URLSearchParams(window.location.search); const urlParams = new URLSearchParams(window.location.search);
this.supplierType = urlParams.get('supplierType'); this.supplierType = urlParams.get('supplierType');
const rawId = this.$route.query.id || urlParams.get('id'); this.getPermissions();
this.supplierId = rawId ? Number(rawId) : '';
const potentialId = this.$route.query.potentialId || urlParams.get('potentialId');
this.routeId = potentialId;
this.potentialFlag = this.$route.query.potentialFlag || urlParams.get('potentialFlag') || '';
if(!rawId) {
this.getPermissions();
}
// this.getDriverList() // this.getDriverList()
}, },
methods:{ methods:{
nextToResult() {
localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierAddResult', query: { id: this.routeId, potentialFlag: this.potentialFlag } }));
this.goPage('supplierAddResult', { id: this.routeId, potentialFlag: this.potentialFlag });
},
isMiniProgram(item) {
return item.registerFrom === '小程序' || (item.jobNumber && item.jobNumber.includes('小程序'))
},
getClass(id) { getClass(id) {
const ids = String(id) const ids = String(id)
const steps = { const steps = {
@@ -257,7 +236,6 @@ export default {
}else{ }else{
this.$router.push({ this.$router.push({
name: 'driverAdd', name: 'driverAdd',
params: { supplierId: this.supplierId || undefined, potentialFlag: this.potentialFlag || undefined }
}) })
} }
}, },
@@ -269,7 +247,6 @@ export default {
idCardStatusList: this.idCardStatusList, idCardStatusList: this.idCardStatusList,
driverLicenseStatusList: this.driverLicenseStatusList, driverLicenseStatusList: this.driverLicenseStatusList,
authStatusList: this.authStatusList, authStatusList: this.authStatusList,
supplierId: this.supplierId || undefined,
}); });
if(res.code == 200){ if(res.code == 200){
this.total=res.total this.total=res.total
@@ -540,22 +517,4 @@ export default {
.flex-between{ .flex-between{
line-height: 24px; line-height: 24px;
} }
.btn_wrap {
width: 100%;
padding: 15px 0;
position: fixed;
bottom: 10px;
z-index: 10000;
.btn {
width: calc(100% - 80px);
margin-left: 40px;
height: 46px;
background: #0E76F4;
border-radius: 5px;
font-size: 15px;
color: #FFFFFF;
text-align: center;
line-height: 46px;
}
}
</style> </style>
+31 -59
View File
@@ -85,8 +85,8 @@
</el-tree> </el-tree>
</template> </template>
</van-field> </van-field>
<van-field :border="true" v-model="form.trailCount" type="digit" class="required" name="trailCount" label="拖车数量" placeholder="请输入" :rules="countVerify" /> <van-field :border="true" v-model="form.trailCount" name="trailCount" label="拖车数量" placeholder="请输入" />
<van-field :border="true" v-model="form.minorCount" type="digit" class="required" name="minorCount" label="抢修车数量" placeholder="请输入" :rules="countVerify" /> <van-field :border="true" v-model="form.minorCount" name="minorCount" label="抢修车数量" placeholder="请输入" />
<van-field :border="true" class="required" label="服务区域" placeholder="请选择"> <van-field :border="true" class="required" label="服务区域" placeholder="请选择">
<template #input> <template #input>
<el-cascader <el-cascader
@@ -100,12 +100,12 @@
clearable></el-cascader> clearable></el-cascader>
</template> </template>
</van-field> </van-field>
<!-- <div class="wei_code_wrap" v-if="form.name && !id"> <div class="wei_code_wrap" v-if="form.name && !id">
<div class="wei_title">请先添加企业微信保证申请流程正常进行</div> <div class="wei_title">请先添加企业微信保证申请流程正常进行</div>
<div class="wei_code_bg"> <div class="wei_code_bg">
<img v-if="qrCodeUrl" :src="qrCodeUrl" alt="企业微信二维码" /> <img v-if="qrCodeUrl" :src="qrCodeUrl" alt="企业微信二维码" />
</div> </div>
</div>--> </div>
</div> </div>
</div> </div>
</div> </div>
@@ -138,7 +138,6 @@
errorMsg: '', errorMsg: '',
phoneVerify: [{ required: true, message: '请输入联系电话' }, { validator: value => { return /^1[3456789]\d{9}$/.test(value) }, message: '联系电话格式不正确' }], phoneVerify: [{ required: true, message: '请输入联系电话' }, { validator: value => { return /^1[3456789]\d{9}$/.test(value) }, message: '联系电话格式不正确' }],
emailVerify: [{ required: true, message: '请输入邮箱' }, { validator: value => { return /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/.test(value) }, message: '邮箱格式不正确' }], emailVerify: [{ required: true, message: '请输入邮箱' }, { validator: value => { return /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/.test(value) }, message: '邮箱格式不正确' }],
countVerify: [{ required: true, message: '请输入数量' }, { validator: value => /^\d+$/.test(value) && Number(value) >= 0, message: '请输入大于等于0的整数' }],
id:'', //车辆Id id:'', //车辆Id
idBackPhotoList: [], idBackPhotoList: [],
idBackPhoto: '', idBackPhoto: '',
@@ -203,14 +202,7 @@
}, },
async mounted() { async mounted() {
const urlParams = new URLSearchParams(window.location.search); const urlParams = new URLSearchParams(window.location.search);
const lastRoute = localStorage.getItem('lastRoute');
this.id = this.$route.query.id || urlParams.get('id'); this.id = this.$route.query.id || urlParams.get('id');
if (lastRoute && !this.id) {
const { name, query } = JSON.parse(lastRoute);
this.$router.replace({ name, query });
return;
}
await this.getAreaTree(); await this.getAreaTree();
if(this.id) { if(this.id) {
await this.getInfoHandler(); await this.getInfoHandler();
@@ -229,6 +221,7 @@
}); });
this.configId = res?.configId; this.configId = res?.configId;
this.qrCode = res?.qrCode this.qrCode = res?.qrCode
console.log('idid', res);
}, },
async getInfoHandler() { async getInfoHandler() {
let res = await getSupplierInfo({ let res = await getSupplierInfo({
@@ -262,6 +255,7 @@
} }
if(_data?.serviceAreaCode) { if(_data?.serviceAreaCode) {
this.$set(this.form, 'serviceAreaCode', _data?.serviceAreaCode.split(',').map(item => Number(item))); this.$set(this.form, 'serviceAreaCode', _data?.serviceAreaCode.split(',').map(item => Number(item)));
// this.form.serviceAreaCode = _data?.serviceAreaCode.split(',').map(item => Number(item));
} }
}, },
showError(msg) { showError(msg) {
@@ -297,31 +291,28 @@
this.showError('服务区域不能为空') this.showError('服务区域不能为空')
return return
} }
if( !this.qrCode && !this.id) {
await this.QrCodeHandler();
this.showError('请先添加下方企微再申请')
return
}
// this.wechatId='wmOTNXBwAABrvKkE_Fh8ZN8Xm2S9v2wQ'
if(!this.wechatId) {
await this.QrCodeResult();
if( !this.wechatId ) {
this.showError('请先添加企微再申请')
return
}
}
if( this.$refs.tree.getCheckedKeys().length > 0 ) { if( this.$refs.tree.getCheckedKeys().length > 0 ) {
let _node = this.$refs.areaCascader.getCheckedNodes(); await this.saveHandler()
let checkArr = [];
_node.map(item => { checkArr.push(item.data.id) });
const payload = {
id: this.id,
...this.form,
accountInfoJson: JSON.stringify(this.form.accountInfoDTO),
accountInfoDTO: {},
idCardFrontUrl: this.idFrontPhoto,
idCardBackUrl: this.idBackPhoto,
businessLicense: this.companyPhoto,
accountUrl: this.licensePhoto,
service: this.$refs.tree.getCheckedKeys().join(','),
serviceAreaCode: checkArr.join(','),
wechatId: this.wechatId,
};
localStorage.setItem('supplierAddForm', JSON.stringify(payload));
this.goPage('addWechat', { potentialFlag: 1 });
} }
}, },
async QrCodeResult() { //获取添加企微结果 async QrCodeResult() { //获取添加企微结果
let res = await getContactQrCodeResult({ let res = await getContactQrCodeResult({
configId: this.configId configId: this.configId
}); });
console.log('resres', res)
this.wechatId = res?.data?.wechatId this.wechatId = res?.data?.wechatId
}, },
async saveHandler() { async saveHandler() {
@@ -344,36 +335,17 @@
accountUrl:this.licensePhoto, accountUrl:this.licensePhoto,
service: this.$refs.tree.getCheckedKeys().join(',') , service: this.$refs.tree.getCheckedKeys().join(',') ,
serviceAreaCode: checkArr.join(','), serviceAreaCode: checkArr.join(','),
wechatId: this.wechatId,
});
Dialog.alert({
title: '提示',
message: "操作成功"
}).then(async () => {
this.goPage('supplierAddResult', { id : res?.data })
setTimeout(() => {
this.clickFlag = true
}, 1000)
}); });
console.log('rererere', res)
if( res?.noToast ) { // 服务商已存在
this.showError('当前服务商已存在')
if( res?.code != 0 ) {
Dialog.alert({
title: '提示',
message: "该服务商已存在,查看信息"
}).then(async () => {
const target = { name: 'supplierAddResult', query: { id: res?.code } };
localStorage.setItem('lastRoute', JSON.stringify(target));
this.goPage('supplierAddResult', { id : res?.code })
setTimeout(() => {
this.clickFlag = true
}, 1000)
});
}
} else {
Dialog.alert({
title: '提示',
message: "操作成功"
}).then(async () => {
const target = { name: 'supplierAddResult', query: { id: res?.data } };
localStorage.setItem('lastRoute', JSON.stringify(target));
this.goPage('supplierAddResult', { id : res?.data })
setTimeout(() => {
this.clickFlag = true
}, 1000)
});
}
} catch (e) { } catch (e) {
this.showError(e) this.showError(e)
} finally { } finally {
+2 -32
View File
@@ -19,26 +19,15 @@
data() { data() {
return { return {
id: '', id: '',
potentialFlag: '',
name: '',
qrCodeUrl: '',
qrCode: '',
configId: '',
wechatId: '',
} }
}, },
async mounted() { async mounted() {
const urlParams = new URLSearchParams(window.location.search); const urlParams = new URLSearchParams(window.location.search);
this.id = this.$route.query.id || urlParams.get('id'); this.id = this.$route.query.id || urlParams.get('id');
this.potentialFlag = this.$route.query.potentialFlag || urlParams.get('potentialFlag') || '';
if (this.id) {
localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierAddResult', query: { id: this.id, potentialFlag: this.potentialFlag } }));
}
}, },
methods: { methods: {
async searchInfo() { searchInfo() {
localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierInfo', query: { id: this.id, potentialFlag: this.potentialFlag } })); this.goPage('supplierInfo', { id : this.id })
this.goPage('supplierInfo', { id: this.id, potentialFlag: this.potentialFlag })
} }
} }
} }
@@ -91,23 +80,4 @@
line-height: 46px; line-height: 46px;
} }
} }
.wei_code_wrap {
margin-top: 10px;
.wei_title {
font-size: 15px;
color: #FF553B;
text-align: center;
}
.wei_code_bg {
width: 163px;
height: 173px;
background-image: url("~@/assets/supplier/weiCodeBg.png");
background-size: 100% 100%;
margin: 8px auto;
display: flex;
align-items: center;
justify-content: center;
}
}
</style> </style>
+3 -12
View File
@@ -87,11 +87,11 @@
</div> </div>
<div class="info_item"> <div class="info_item">
<div class="label">拖车数量</div> <div class="label">拖车数量</div>
<div class="content">{{supplierInfo.trailCount>=0 ? supplierInfo.trailCount : ''}}</div> <div class="content">{{supplierInfo?.trailCount || ''}}</div>
</div> </div>
<div class="info_item"> <div class="info_item">
<div class="label">抢修车数量</div> <div class="label">抢修车数量</div>
<div class="content">{{supplierInfo.minorCount >= 0 ? supplierInfo.minorCount : ''}}</div> <div class="content">{{supplierInfo?.minorCount || ''}}</div>
</div> </div>
<div class="info_item"> <div class="info_item">
<div class="label">服务区域</div> <div class="label">服务区域</div>
@@ -124,9 +124,7 @@
</div> </div>
</div> </div>
<!-- <div class="btn_wrap" style="margin-bottom: 5px">
<div class="btn" @click="goAddVehicle">完善信息</div>
</div>-->
<div class="btn_wrap" v-if="type == 'show' && supplierInfo?.state == 99 && origin != 'web'"> <div class="btn_wrap" v-if="type == 'show' && supplierInfo?.state == 99 && origin != 'web'">
<div class="btn" @click="goModifyPage">修改信息</div> <div class="btn" @click="goModifyPage">修改信息</div>
</div> </div>
@@ -154,7 +152,6 @@
supplierInfo: {}, supplierInfo: {},
type: 'show', type: 'show',
origin: '', origin: '',
potentialFlag: '',
} }
}, },
async mounted() { async mounted() {
@@ -162,15 +159,9 @@
this.id=this.$route.query.id || urlParams.get('id'); this.id=this.$route.query.id || urlParams.get('id');
this.type=this.$route.query.type || urlParams.get('type') || 'show'; this.type=this.$route.query.type || urlParams.get('type') || 'show';
this.origin = this.$route.query.origin || '' this.origin = this.$route.query.origin || ''
this.potentialFlag = this.$route.query.potentialFlag || urlParams.get('potentialFlag') || '';
await this.getInfoHandler(); await this.getInfoHandler();
}, },
methods: { methods: {
goAddVehicle() {
const supplierId = this.id
localStorage.setItem('lastRoute', JSON.stringify({ name: 'vehicleManage', query: { id: supplierId, potentialFlag: this.potentialFlag } }));
this.goPage('vehicleManage', { id: supplierId, potentialFlag: this.potentialFlag });
},
goModifyPage() { goModifyPage() {
this.goPage('supplierAdd', { id : this.id }) this.goPage('supplierAdd', { id : this.id })
}, },
-417
View File
@@ -1,417 +0,0 @@
<template>
<div class="wrap">
<van-nav-bar
title="供应商时段电话"
left-arrow
@click-left="onNavBack"
fixed
placeholder
class="nav-bar"
/>
<div class="content">
<!-- 审批状态提示条 -->
<div v-if="inApproval" class="status-tip status-tip--pending">{{approvalStateName }}</div>
<div v-else-if="rejected" class="status-tip status-tip--danger">
<div class="status-tip__title">审批被驳回</div>
<div v-if="approvalRemark" class="status-tip__desc">{{ approvalRemark }}</div>
</div>
<!-- 空态 -->
<div v-if="!phoneList.length" class="empty-wrap">
<div class="empty-text">暂无分时段电话点击新增时段电话</div>
</div>
<!-- 时段卡片列表 -->
<div v-else class="card-list">
<div v-for="(item, index) in phoneList" :key="index" class="time-card" @click="goEdit(index)">
<div class="card-head">
<span class="period">{{ item.startTime }} {{ item.endTime }}</span>
<div class="ops" @click.stop v-if="!inApproval">
<span class="op-edit" @click="goEdit(index)">编辑</span>
<span class="op-del" @click="deleteItem(index)">删除</span>
</div>
</div>
<div class="divider"></div>
<div class="phone-rows">
<div v-for="phone in visiblePhones(item)" :key="phone.index" class="phone-row">
<span class="phone-icon"></span>
<span class="phone-num">{{ phone.num }}</span>
<span v-if="phone.desc" class="tag">{{ phone.desc }}</span>
<span v-if="phone.wx" class="tag tag-wx">:{{ phone.wx }}</span>
</div>
</div>
</div>
</div>
</div>
<!-- 底部操作栏 -->
<div class="footer">
<button v-if="!inApproval" class="btn btn-add" @click="goAdd"> 新增时段</button>
<button
class="btn btn-submit"
:disabled="inApproval || !phoneList.length"
@click="onSubmitClick"
>
{{ inApproval ? '审核中' : '提交审批' }}
</button>
</div>
</div>
</template>
<script>
import { getSupplierPhoneList, submitSupplierPhoneApproval } from '@/api/supplierPhone'
import { myMixins } from '@/utils/myMixins'
import { Dialog, Toast } from 'vant'
const DRAFT_KEY_PREFIX = 'supplierTimePhoneDraft_'
function getSupplierIdFromToken() {
const token = localStorage.getItem('token')
if (!token) return null
try {
const payload = JSON.parse(atob(token.split('.')[1]))
return payload.supplierId || null
} catch (e) {
return null
}
}
function getDraftKey(supplierId) {
return `${DRAFT_KEY_PREFIX}${supplierId}`
}
export default {
name: 'supplierTimePhone',
mixins: [myMixins],
data() {
return {
supplierId: null,
supplierName: '',
approvalId: null,
approvalState: null,
approvalStateName: '',
inApproval: false,
rejected: false,
approvalRemark: '',
phoneList: []
}
},
mounted() {
const urlParams = new URLSearchParams(window.location.search);
this.supplierId = urlParams.get('supplierId') || this.$route.query.supplierId || getSupplierIdFromToken()
if (!this.supplierId) {
Toast('未获取到服务商信息')
return
}
this.loadData()
},
methods: {
async loadData() {
Toast.loading({ message: '加载中...', forbidClick: true, duration: 0 })
try {
const result = await getSupplierPhoneList({ supplierId: this.supplierId })
const res=result?.data || ''
this.supplierName = res?.supplierName || ''
this.approvalId = res?.approvalId || null
this.approvalState = res?.approvalState || null
this.approvalStateName = res?.approvalStateName || ''
this.inApproval = !!res?.inApproval
this.rejected = !!res?.rejected
this.approvalRemark = res?.approvalRemark || ''
const cached = this.getCachedDraft()
if (cached && Array.isArray(cached.phoneList)) {
this.phoneList = cached.phoneList
} else {
this.phoneList = res?.phoneList || []
this.saveDraft()
}
} catch (e) {
console.error(e)
} finally {
Toast.clear()
}
},
visiblePhones(item) {
const list = []
for (let i = 1; i <= 3; i++) {
const num = item['phone' + i]
if (num) {
list.push({
index: i,
num,
desc: item['phone' + i + 'Desc'],
wx: item['phone' + i + 'WechatId']
})
}
}
return list
},
getCachedDraft() {
try {
const raw = localStorage.getItem(getDraftKey(this.supplierId))
return raw ? JSON.parse(raw) : null
} catch (e) {
return null
}
},
saveDraft() {
const draft = {
approvalId: this.approvalId,
approvalState: this.approvalState,
phoneList: this.phoneList
}
localStorage.setItem(getDraftKey(this.supplierId), JSON.stringify(draft))
},
onNavBack() {
localStorage.removeItem(getDraftKey(this.supplierId))
this.goBack()
},
goAdd() {
this.saveDraft()
this.goPage('supplierTimePhoneEdit', { supplierId: this.supplierId, index: -1 })
},
goEdit(index) {
this.saveDraft()
this.goPage('supplierTimePhoneEdit', { supplierId: this.supplierId, index })
},
deleteItem(index) {
Dialog.confirm({
title: '提示',
message: '确定删除该时段电话?'
}).then(() => {
this.phoneList.splice(index, 1)
this.saveDraft()
}).catch(() => {})
},
// 将 HH:mm 转换为分钟数,兼容中英文冒号
timeToMinutes(timeStr) {
if (!timeStr) return null
const normalized = String(timeStr).trim().replace(//g, ':')
const [h, m] = normalized.split(':').map(Number)
if (isNaN(h) || isNaN(m)) return null
return h * 60 + m
},
// 校验时间段:重叠、00:00 开始、23:59 结束、遗漏(允许 1 分钟误差)
validateTimePeriods(list) {
const periods = list.map(item => ({
start: this.timeToMinutes(item.startTime),
end: this.timeToMinutes(item.endTime)
}))
if (periods.some(p => p.start === null || p.end === null)) {
return '存在格式不正确的时间段'
}
periods.sort((a, b) => a.start - b.start)
if (periods[0].start !== 0) {
return '时间段未从 00:00 开始!'
}
if (periods[periods.length - 1].end !== 23 * 60 + 59) {
return '时间段未到 23:59 结束!'
}
for (let i = 1; i < periods.length; i++) {
if (periods[i].start < periods[i - 1].end) {
return '时间段重叠'
}
if (periods[i].start - periods[i - 1].end > 1) {
return '时间段有遗漏'
}
}
return null
},
async onSubmitClick() {
if (this.inApproval) return
if (!this.phoneList.length) {
Toast('请先添加至少一个时段电话')
return
}
if (!this.phoneList.every(item => item.phone1)) {
Toast('每条时段电话1均必填')
return
}
const timeError = this.validateTimePeriods(this.phoneList)
if (timeError) {
Toast(timeError)
return
}
Toast.loading({ message: '提交中...', forbidClick: true, duration: 0 })
try {
await submitSupplierPhoneApproval({
supplierId: this.supplierId,
modifyReason: '',
phoneList: this.phoneList
})
Toast.success('提交成功')
localStorage.removeItem(getDraftKey(this.supplierId))
this.loadData()
} catch (e) {
Toast(e?.message || '提交失败,请重试')
} finally {
Toast.clear()
}
}
}
}
</script>
<style scoped lang="scss">
@import "@/styles/mixin.scss";
@import "@/styles/common.scss";
.wrap {
@include wh(100%, 100%);
box-sizing: border-box;
background: #f4f5f7;
display: flex;
flex-direction: column;
}
::v-deep .nav-bar {
.van-nav-bar {
background: #2b6cff;
}
.van-nav-bar__title,
.van-nav-bar__arrow {
color: #fff;
}
}
.content {
flex: 1;
overflow-y: auto;
padding: 12px;
}
.status-tip {
border-radius: 10px;
padding: 10px 12px;
font-size: 13px;
line-height: 1.5;
margin-bottom: 12px;
&--pending {
background: #eef3ff;
color: #2b6cff;
}
&--danger {
background: #fff2f0;
color: #ff4d4f;
}
&__title {
font-weight: 600;
}
&__desc {
margin-top: 4px;
font-size: 12px;
}
}
.empty-wrap {
text-align: center;
padding: 60px 0;
.empty-text {
font-size: 13px;
color: #999;
}
}
.card-list {
.time-card {
background: #fff;
border-radius: 14px;
padding: 12px 14px;
margin-bottom: 12px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
}
.card-head {
display: flex;
align-items: center;
justify-content: space-between;
}
.period {
font-size: 15px;
font-weight: 700;
color: #1a1a1a;
background: #eef3ff;
padding: 4px 10px;
border-radius: 8px;
}
.ops {
font-size: 13px;
color: #2b6cff;
span {
margin-left: 14px;
cursor: pointer;
}
.op-del {
color: #ff4d4f;
}
}
.divider {
height: 1px;
background: #f0f0f0;
margin: 10px 0;
}
.phone-row {
display: flex;
align-items: center;
gap: 8px;
padding: 5px 0;
font-size: 13.5px;
}
.phone-icon {
color: #2b6cff;
font-size: 14px;
}
.phone-num {
font-weight: 600;
color: #1a1a1a;
letter-spacing: 0.3px;
}
.tag {
font-size: 11px;
padding: 2px 7px;
border-radius: 6px;
background: #f2f3f5;
color: #666;
}
.tag-wx {
background: #e8f8ee;
color: #1a8a4a;
}
}
.footer {
padding: 10px 12px;
background: #fff;
border-top: 1px solid #eee;
flex-shrink: 0;
display: flex;
gap: 10px;
.btn {
flex: 1;
height: 46px;
border-radius: 12px;
border: none;
font-size: 15px;
font-weight: 600;
display: flex;
align-items: center;
justify-content: center;
}
.btn-add {
flex: 0 0 44%;
background: #fff;
color: #2b6cff;
border: 1.5px solid #2b6cff;
}
.btn-submit {
background: #2b6cff;
color: #fff;
&:disabled {
background: #b9c8ee;
cursor: not-allowed;
}
}
}
</style>
-393
View File
@@ -1,393 +0,0 @@
<template>
<div class="wrap">
<van-nav-bar
:title="isEdit ? '编辑时段电话' : '新增时段电话'"
left-arrow
@click-left="h5GoBack"
fixed
placeholder
class="nav-bar"
/>
<div class="content">
<div class="field">
<label class="field-label">时段开始 结束格式 00:00 ~ 23:59</label>
<div class="period-row">
<input
type="text"
readonly
:value="form.startTime"
placeholder="开始时间"
@click="openTimePicker('startTime')"
/>
<span class="sep"></span>
<input
type="text"
readonly
:value="form.endTime"
placeholder="结束时间"
@click="openTimePicker('endTime')"
/>
</div>
<div v-if="periodErr" class="err-msg">{{ periodErr }}</div>
</div>
<div class="phone-block" v-for="n in 3" :key="n">
<div class="phone-block__head">
<span>电话 {{ n }}{{ n === 1 ? '(必填)' : '(选填)' }}</span>
</div>
<input
type="text"
v-model="form['phone' + n]"
:placeholder="'电话号码'"
/>
<div class="sub-grid">
<input
type="text"
v-model="form['phone' + n + 'Desc']"
placeholder="备注/负责人"
/>
<input
type="text"
v-model="form['phone' + n + 'WechatId']"
placeholder="微信号"
/>
</div>
<div v-if="phoneErr[n - 1]" class="err-msg">{{ phoneErr[n - 1] }}</div>
</div>
</div>
<div class="footer">
<button class="btn btn-save" @click="save">保存</button>
</div>
<van-popup v-model="showTimePicker" round position="bottom">
<van-datetime-picker
v-if="showTimePicker"
v-model="pickerValue"
type="time"
:formatter="timeFormatter"
@confirm="onTimeConfirm"
@cancel="showTimePicker = false"
/>
</van-popup>
</div>
</template>
<script>
import { myMixins } from '@/utils/myMixins'
import { isValidPhone, validateTimeRange } from '@/utils/validate'
import { Toast } from 'vant'
const DRAFT_KEY_PREFIX = 'supplierTimePhoneDraft_'
function getSupplierIdFromToken() {
const token = localStorage.getItem('token')
if (!token) return null
try {
const payload = JSON.parse(atob(token.split('.')[1]))
return payload.supplierId || null
} catch (e) {
return null
}
}
function getDraftKey(supplierId) {
return `${DRAFT_KEY_PREFIX}${supplierId}`
}
function emptyRecord() {
return {
startTime: '',
endTime: '',
phone1: '',
phone1Desc: '',
phone1WechatId: '',
phone2: '',
phone2Desc: '',
phone2WechatId: '',
phone3: '',
phone3Desc: '',
phone3WechatId: ''
}
}
export default {
name: 'supplierTimePhoneEdit',
mixins: [myMixins],
data() {
return {
supplierId: null,
index: -1,
form: emptyRecord(),
periodErr: '',
phoneErr: ['', '', ''],
showTimePicker: false,
pickerField: 'startTime',
pickerValue: ''
}
},
computed: {
isEdit() {
return this.index >= 0
}
},
mounted() {
this.supplierId = this.$route.query.supplierId || getSupplierIdFromToken()
this.index = Number(this.$route.query.index)
if (Number.isNaN(this.index)) {
this.index = -1
}
if (this.isEdit) {
this.loadRecord()
}
},
methods: {
validate() {
this.periodErr = ''
this.phoneErr = ['', '', '']
let valid = true
const timeRes = validateTimeRange(this.form.startTime, this.form.endTime)
if (!timeRes.valid) {
this.periodErr = timeRes.message
valid = false
}
if (!this.form.phone1) {
this.phoneErr[0] = '电话 1 为必填项'
valid = false
} else if (!isValidPhone(this.form.phone1)) {
this.phoneErr[0] = '电话 1 格式不正确'
valid = false
} else if (!this.form.phone1Desc) {
this.phoneErr[0] = '电话 1 备注为必填项'
valid = false
}
if (this.form.phone2) {
if (!isValidPhone(this.form.phone2)) {
this.phoneErr[1] = '电话 2 格式不正确'
valid = false
} else if (!this.form.phone2Desc) {
this.phoneErr[1] = '电话 2 备注为必填项'
valid = false
}
}
if (this.form.phone3) {
if (!isValidPhone(this.form.phone3)) {
this.phoneErr[2] = '电话 3 格式不正确'
valid = false
} else if (!this.form.phone3Desc) {
this.phoneErr[2] = '电话 3 备注为必填项'
valid = false
}
}
return valid
},
loadRecord() {
const key = getDraftKey(this.supplierId)
const raw = localStorage.getItem(key)
if (!raw) {
Toast('未找到时段数据')
this.h5GoBack()
return
}
try {
const draft = JSON.parse(raw)
const list = draft.phoneList || []
if (this.index >= 0 && this.index < list.length) {
this.form = { ...list[this.index] }
} else {
Toast('时段数据不存在')
this.h5GoBack()
}
} catch (e) {
console.error(e)
Toast('数据读取失败')
this.h5GoBack()
}
},
save() {
if (!this.validate()) return
try {
const key = getDraftKey(this.supplierId)
const draft = JSON.parse(localStorage.getItem(key) || '{}')
const list = draft.phoneList || []
const record = {
startTime: this.form.startTime,
endTime: this.form.endTime,
phone1: this.form.phone1,
phone1Desc: this.form.phone1Desc,
phone1WechatId: this.form.phone1WechatId,
phone2: this.form.phone2,
phone2Desc: this.form.phone2Desc,
phone2WechatId: this.form.phone2WechatId,
phone3: this.form.phone3,
phone3Desc: this.form.phone3Desc,
phone3WechatId: this.form.phone3WechatId
}
if (this.isEdit) {
list[this.index] = record
} else {
list.push(record)
}
draft.phoneList = list
localStorage.setItem(key, JSON.stringify(draft))
Toast('已保存')
this.h5GoBack()
} catch (e) {
Toast('保存失败')
console.error(e)
}
},
openTimePicker(field) {
this.pickerField = field
this.pickerValue = this.form[field] || '00:00'
this.showTimePicker = true
},
onTimeConfirm(value) {
this.form[this.pickerField] = value
this.showTimePicker = false
},
timeFormatter(type, value) {
return value.toString().padStart(2, '0')
}
}
}
</script>
<style scoped lang="scss">
@import "@/styles/mixin.scss";
@import "@/styles/common.scss";
.wrap {
@include wh(100%, 100%);
box-sizing: border-box;
background: #f4f5f7;
display: flex;
flex-direction: column;
}
::v-deep .nav-bar {
.van-nav-bar {
background: #2b6cff;
}
.van-nav-bar__title,
.van-nav-bar__arrow {
color: #fff;
}
}
.content {
flex: 1;
overflow-y: auto;
padding: 14px;
}
.field {
margin-bottom: 16px;
}
.field-label {
display: block;
font-size: 13px;
color: #333;
font-weight: 600;
margin-bottom: 7px;
}
.period-row {
display: flex;
align-items: center;
gap: 10px;
input {
flex: 1;
}
.sep {
color: #999;
}
}
input[type='text'] {
width: 100%;
height: 42px;
border: 1px solid #dfe1e6;
border-radius: 10px;
padding: 0 12px;
font-size: 14px;
color: #1a1a1a;
background: #fafbfc;
outline: none;
box-sizing: border-box;
&:focus {
border-color: #2b6cff;
background: #fff;
}
&[readonly] {
cursor: pointer;
}
}
.phone-block {
border: 1px solid #eef0f3;
border-radius: 12px;
padding: 12px;
margin-bottom: 12px;
background: #fcfcfd;
&__head {
display: flex;
justify-content: space-between;
font-size: 13px;
color: #2b6cff;
font-weight: 600;
margin-bottom: 8px;
}
.sub-grid {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 10px;
margin-top: 8px;
}
}
.err-msg {
color: #ff4d4f;
font-size: 12px;
margin-top: 6px;
}
.footer {
padding: 10px 12px;
background: #fff;
border-top: 1px solid #eee;
flex-shrink: 0;
display: flex;
flex-direction: row;
gap: 10px;
.btn {
flex: 1;
height: 46px;
border-radius: 12px;
border: none;
font-size: 15px;
font-weight: 600;
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
}
.btn-save {
background: #2b6cff;
color: #fff;
}
.btn-cancel {
background: #f2f3f5;
color: #666;
}
.btn-del {
background: #fff;
color: #ff4d4f;
border: 1.5px solid #ffccc7;
}
}
</style>
+2 -2
View File
@@ -287,10 +287,10 @@
if(!res.data.ocrInvoiceRes.data.sellerName.startsWith("国家税务总局") && if(!res.data.ocrInvoiceRes.data.sellerName.startsWith("国家税务总局") &&
conList.every(a => { conList.every(a => {
let items = a.itemName.split("*") let items = a.itemName.split("*")
return (!items[1].includes("生产生活服务") && !items[1].includes("交通运输服务")) || (!items[2].includes("拖车") && !items[2].includes("救援") && !items[2].includes("施救") && !items[2].includes("清障") && !items[2].includes("道路救援")) return (!items[1].includes("现代服务") && !items[1].includes("运输服务")) || (!items[2].includes("拖车") && !items[2].includes("救援") && !items[2].includes("施救") && !items[2].includes("清障") && !items[2].includes("道路救援"))
}) })
){ ){
errorStr = errorStr + "分类必须包含:生产生活服务/交通运输服务,服务名称必须包含:拖车/救援/施救/清障/道路救援 ;例如《*现代服务*拖车费》"; errorStr = errorStr + "分类必须包含:现代服务/运输服务,服务名称必须包含:拖车/救援/施救/清障/道路救援 ;例如《*现代服务*拖车费》";
} }
if( !flag ) { if( !flag ) {
+60 -415
View File
@@ -17,54 +17,45 @@
<img class="startImg" src="@/assets/start.png" /> <img class="startImg" src="@/assets/start.png" />
<span>行驶证首页</span> <span>行驶证首页</span>
</div> </div>
<div class="uploadSlotWrap"> <van-uploader
<van-uploader v-model="vehicleLicenseFrontList"
ref="licenseFrontUploader" :after-read="vehicleLicenseFrontHandler"
v-model="vehicleLicenseFrontList" @oversize="onOversize"
:after-read="vehicleLicenseFrontHandler" :max-size="5 * 1024 * 1024"
@delete="vehicleLicenseFrontDelete" max-count="1"
max-count="1" :preview-size="54"
:preview-size="54" accept="image "
accept="image/*" />
/>
<div class="slotClickMask" @click="onLicenseSlotClick('front')"></div>
</div>
</div> </div>
<div class="itemContent"> <div class="itemContent">
<div class="titleType"> <div class="titleType">
<img class="startImg" src="@/assets/start.png" /> <img class="startImg" src="@/assets/start.png" />
<span>行驶证副页</span> <span>行驶证副页</span>
</div> </div>
<div class="uploadSlotWrap"> <van-uploader
<van-uploader v-model="vehicleLicenseBackList"
ref="licenseBackUploader" :after-read="vehicleLicenseBackHandler"
v-model="vehicleLicenseBackList" @oversize="onOversize"
:after-read="vehicleLicenseBackHandler" :max-size="5 * 1024 * 1024"
@delete="vehicleLicenseBackDelete" max-count="1"
max-count="1" :preview-size="54"
:preview-size="54" accept="image "
accept="image/*" />
/>
<div class="slotClickMask" @click="onLicenseSlotClick('back')"></div>
</div>
</div> </div>
<div class="itemContent"> <div class="itemContent">
<div class="titleType"> <div class="titleType">
<img class="startImg" src="@/assets/start.png" /> <img class="startImg" src="@/assets/start.png" />
<span>行驶证车辆照片页</span> <span>行驶证车辆照片页</span>
</div> </div>
<div class="uploadSlotWrap"> <van-uploader
<van-uploader v-model="vehicleLicenseCarPhotoList"
ref="licenseCarUploader" :after-read="vehicleLicenseCarHandler"
v-model="vehicleLicenseCarPhotoList" @oversize="onOversize"
:after-read="vehicleLicenseCarHandler" :max-size="5 * 1024 * 1024"
@delete="vehicleLicenseCarPhotoDelete" max-count="1"
max-count="1" :preview-size="54"
:preview-size="54" accept="image "
accept="image/*" />
/>
<div class="slotClickMask" @click="onLicenseSlotClick('car')"></div>
</div>
</div> </div>
<div class="itemContent"> <div class="itemContent">
<div class="titleType"> <div class="titleType">
@@ -74,10 +65,11 @@
<van-uploader <van-uploader
v-model="vehicleFrontPhotoList" v-model="vehicleFrontPhotoList"
:after-read="vehicleFrontPhotoHandler" :after-read="vehicleFrontPhotoHandler"
@delete="vehicleFrontPhotoDelete" @oversize="onOversize"
:max-size="5 * 1024 * 1024"
max-count="1" max-count="1"
:preview-size="54" :preview-size="54"
accept="image/*" accept="image "
/> />
</div> </div>
@@ -112,7 +104,6 @@
value-key="name" value-key="name"
class="elSelect" class="elSelect"
collapse-tags="collapse-tags" collapse-tags="collapse-tags"
:popper-append-to-body="false"
placeholder="请选择" style="width: 55%" placeholder="请选择" style="width: 55%"
> >
<el-option <el-option
@@ -206,7 +197,7 @@
<span>车辆状态</span> <span>车辆状态</span>
</div> </div>
<div class="isJoin"> <div class="isJoin">
<van-radio-group v-model="vehicleStatus" :class="{ 'disabled-tree': vehicleInfoDisabled || vehicleStatusDisabled }" :disabled="vehicleInfoDisabled || vehicleStatusDisabled" @change="isVehicleChange" class="joinWrap"> <van-radio-group v-model="vehicleStatus" :class="{ 'disabled-tree': vehicleInfoDisabled }" :disabled="vehicleInfoDisabled" @change="isVehicleChange" class="joinWrap">
<van-radio :name="1" style="margin-right: 14px"> <van-radio :name="1" style="margin-right: 14px">
启用 启用
<img <img
@@ -454,14 +445,6 @@
</div> </div>
</van-popup> </van-popup>
<camera-guide
:visible="cameraGuideVisible"
:type="cameraGuideType"
@confirm="onCameraConfirm"
@cancel="onCameraCancel"
@fallback="onCameraFallback"
/>
</div> </div>
</template> </template>
@@ -474,7 +457,6 @@ import {vehicleTypeList,saveVehicle,getInfoById,supplierServiceTree, uploadImage
userOperationPermissions,saveSupplierApproval} from "@/api/mine" userOperationPermissions,saveSupplierApproval} from "@/api/mine"
import TwoCommonBtn from "@/components/twoBtnCommon.vue" import TwoCommonBtn from "@/components/twoBtnCommon.vue"
import CellGroup from "@/components/cellGroup.vue"; import CellGroup from "@/components/cellGroup.vue";
import CameraGuide from "@/components/CameraGuide.vue";
export default { export default {
name: "vehicleAdd", name: "vehicleAdd",
mixins:[myMixins], mixins:[myMixins],
@@ -488,8 +470,7 @@ export default {
maxDate: new Date(2099, 11, 31), // 设置最大可选日期(2099年12月31日) maxDate: new Date(2099, 11, 31), // 设置最大可选日期(2099年12月31日)
checkList: [], checkList: [],
virtualVehicle: '', virtualVehicle: '',
potentialFlag: new URLSearchParams(window.location.search).get('potentialFlag') || '', vehicleStatus: '',
vehicleStatus: new URLSearchParams(window.location.search).get('potentialFlag') === '1' ? 2 : '',
showDatePicker: false, showDatePicker: false,
dateVal: '', dateVal: '',
trailerService: '',//拖车服务 trailerService: '',//拖车服务
@@ -510,8 +491,6 @@ export default {
oldSupplierServiceList:[], oldSupplierServiceList:[],
show:false, show:false,
imageUrl: require('@/assets/arr_right.png'), imageUrl: require('@/assets/arr_right.png'),
cameraGuideVisible: false, // 拍摄引导弹层显示
cameraGuideType: 'front', // 当前拍摄槽位 front/back/car
vehicleLicenseFrontList: [], vehicleLicenseFrontList: [],
vehicleLicenseBackList: [], vehicleLicenseBackList: [],
vehicleLicenseCarPhotoList: [], vehicleLicenseCarPhotoList: [],
@@ -669,9 +648,6 @@ export default {
} else { } else {
return false return false
} }
},
vehicleStatusDisabled() {
return !this.id && this.potentialFlag === '1';
} }
}, },
watch:{ watch:{
@@ -710,9 +686,6 @@ export default {
async mounted() { async mounted() {
this.id=this.$route.params?.id this.id=this.$route.params?.id
this.approvalForm.supplierId=this.$route.params?.supplierId this.approvalForm.supplierId=this.$route.params?.supplierId
const urlParams = new URLSearchParams(window.location.search);
const rawId = this.$route.query.supplierId || urlParams.get('supplierId');
this.supplierId = rawId ? Number(rawId) : '';
await this.getSupplierServiceTree(); await this.getSupplierServiceTree();
await this.getTypeList(); await this.getTypeList();
if( this.id){ if( this.id){
@@ -818,288 +791,33 @@ export default {
onOversize() { onOversize() {
this.$toast(`文件大小不能超过5M`) this.$toast(`文件大小不能超过5M`)
}, },
// 将 base64 dataURL 转为 Blob,用于 APP WebView 只返回 content 的场景
dataURLToBlob(dataURL) {
const arr = dataURL.split(',');
const mime = arr[0].match(/:(.*?);/)[1];
const bstr = atob(arr[1]);
let n = bstr.length;
const u8arr = new Uint8Array(n);
while (n--) {
u8arr[n] = bstr.charCodeAt(n);
}
return new Blob([u8arr], { type: mime });
},
blobToDataURL(blob) {
return new Promise((resolve, reject) => {
const reader = new FileReader();
reader.onload = (e) => resolve(e.target.result);
reader.onerror = () => reject(new Error('读取压缩图片失败'));
reader.readAsDataURL(blob);
});
},
compressImage(file, maxSize = 5 * 1024 * 1024) {
return new Promise((resolve, reject) => {
const reader = new FileReader();
reader.onload = (e) => {
const img = new Image();
img.onload = () => {
const canvas = document.createElement('canvas');
const ctx = canvas.getContext('2d');
const originWidth = img.width;
const originHeight = img.height;
const tryQuality = (quality = 0.9) => {
canvas.width = originWidth;
canvas.height = originHeight;
ctx.clearRect(0, 0, originWidth, originHeight);
ctx.drawImage(img, 0, 0, originWidth, originHeight);
canvas.toBlob((blob) => {
if (!blob) return reject(new Error('压缩失败'));
if (blob.size <= maxSize || quality <= 0.1) {
if (blob.size <= maxSize) {
resolve(blob);
} else {
tryResolution();
}
return;
}
tryQuality(quality - 0.1);
}, 'image/jpeg', quality);
};
const tryResolution = (scale = 0.9, quality = 0.8) => {
const width = Math.floor(originWidth * scale);
const height = Math.floor(originHeight * scale);
canvas.width = width;
canvas.height = height;
ctx.clearRect(0, 0, width, height);
ctx.drawImage(img, 0, 0, width, height);
canvas.toBlob((blob) => {
if (!blob) return reject(new Error('压缩失败'));
if (blob.size <= maxSize || scale <= 0.1) {
if (blob.size <= maxSize) {
resolve(blob);
} else {
reject(new Error('超过5M'));
}
return;
}
tryResolution(scale - 0.1, quality);
}, 'image/jpeg', quality);
};
tryQuality();
};
img.onerror = () => reject(new Error('图片加载失败'));
img.src = e.target.result;
};
reader.onerror = () => reject(new Error('文件读取失败'));
reader.readAsDataURL(file);
});
},
async compressFileItem(fileItem, maxSize = 5 * 1024 * 1024) {
let rawFile = fileItem?.file;
const rawContent = fileItem?.content;
// 打印可序列化的基础信息,VConsole 中对象会显示为空,但 name/size/type 能看到
console.log('rawFile info:', {
name: rawFile?.name,
size: rawFile?.size,
type: rawFile?.type,
constructor: rawFile?.constructor?.name
});
console.log('rawContent prefix:', typeof rawContent === 'string' ? rawContent.slice(0, 60) : rawContent);
// 部分 APP WebView 返回的文件对象异常或为空,但 content 是 base64,此时用 content 兜底
if ((!rawFile || !(rawFile instanceof File) || rawFile.size === 0) &&
typeof rawContent === 'string' && rawContent.startsWith('data:')) {
try {
const blob = this.dataURLToBlob(rawContent);
const ext = blob.type === 'image/png' ? 'png' : 'jpg';
rawFile = new File([blob], `upload_${Date.now()}.${ext}`, { type: blob.type || 'image/jpeg' });
console.log('fallback file from content, size:', rawFile.size);
} catch (e) {
console.error('content to file error:', e);
throw new Error('文件解析失败,请重新上传');
}
}
if (!rawFile) {
throw new Error('未获取到文件,请重新上传');
}
if (rawFile.size <= maxSize) return rawFile;
const blob = await this.compressImage(rawFile, maxSize);
if (blob.size > maxSize) {
throw new Error('超过5M');
}
const fileName = (rawFile.name || 'image').replace(/\.[^.]+$/, '') + '.jpg';
const compressedFile = new File([blob], fileName, { type: 'image/jpeg' });
fileItem.file = compressedFile;
fileItem.size = compressedFile.size;
fileItem.content = await this.blobToDataURL(blob);
const mb1 = (compressedFile.size / 1024 / 1024).toFixed(2);
console.log(`压缩后为:${mb1}M`)
return compressedFile;
},
isCameraSupported() { // 是否支持 getUserMedia(不支持则降级系统选择器)
return !!(navigator.mediaDevices && navigator.mediaDevices.getUserMedia)
},
onLicenseSlotClick(type) { // 行驶证三槽位点击拦截:支持相机进引导页,不支持降级原系统选择器
if (this.isCameraSupported()) {
this.cameraGuideType = type
this.cameraGuideVisible = true
} else {
this.triggerNativeUpload(type)
}
},
triggerNativeUpload(type) { // 主动触发对应 uploader 的原生文件选择
const refMap = { front: 'licenseFrontUploader', back: 'licenseBackUploader', car: 'licenseCarUploader' }
this.$nextTick(() => {
const uploader = this.$refs[refMap[type]]
const input = uploader && uploader.$el && uploader.$el.querySelector('.van-uploader__input')
if (input) input.click()
})
},
onCameraConfirm({ blob, dataURL }) { // 拍摄确认:构造 {file, content} 走现有压缩→上传→OCR 链路
this.cameraGuideVisible = false
const type = this.cameraGuideType
const file = new File([blob], `vehicle_license_${type}_${Date.now()}.jpg`, { type: 'image/jpeg' })
const fileItem = { file, content: dataURL }
const handlerMap = {
front: 'vehicleLicenseFrontHandler',
back: 'vehicleLicenseBackHandler',
car: 'vehicleLicenseCarHandler'
}
const listMap = {
front: 'vehicleLicenseFrontList',
back: 'vehicleLicenseBackList',
car: 'vehicleLicenseCarPhotoList'
}
// 写回 uploader 的 v-model 列表,使槽位缩略图回显
this[listMap[type]] = [fileItem]
this[handlerMap[type]](fileItem)
},
onCameraCancel() { // 返回放弃
this.cameraGuideVisible = false
},
onCameraFallback() { // 权限拒绝/相机不可用:弹框询问,重试或降级系统选择器
this.cameraGuideVisible = false
Dialog.confirm({
title: '提示',
message: '相机权限未开启,无法使用拍摄引导。是否重新尝试开启相机?',
confirmButtonText: '重新尝试',
cancelButtonText: '从相册选择',
confirmButtonColor: '#354D93',
}).then(() => {
// 重新打开拍摄引导(等弹层关闭状态先刷新,确保 visible 变化被组件感知)
this.$nextTick(() => {
this.cameraGuideVisible = true
})
}).catch(() => {
// 降级为系统选择器
this.triggerNativeUpload(this.cameraGuideType)
})
},
async vehicleLicenseFrontHandler(file) { // 上传 行驶证首页 async vehicleLicenseFrontHandler(file) { // 上传 行驶证首页
console.log('file',file) const formData = new FormData();
try { formData.append("file" , file.file);
const uploadFile = await this.compressFileItem(file); let res = await uploadImage(formData)
console.log('uploadFile',uploadFile) this.vehicleLicenseFront = res.data;
if (uploadFile.size > 5 * 1024 * 1024) { await this.vehicleOcrHandler();
this.onOversize();
return;
}
const formData = new FormData();
formData.append("file" , uploadFile);
let res = await uploadImage(formData)
this.vehicleLicenseFront = res.data;
await this.vehicleOcrHandler();
} catch (e) {
console.error('upload compress error:', e);
if (e && e.message === '超过5M') {
this.onOversize();
} else {
this.$toast(e && e.message ? e.message : '上传失败,请重试');
}
}
}, },
async vehicleLicenseBackHandler(file) { // 上传 行驶证副页 async vehicleLicenseBackHandler(file) { // 上传 行驶证副页
try { this.vehicleLicenseBackOcrFlag = true;
this.vehicleLicenseBackOcrFlag = true; const formData = new FormData();
const uploadFile = await this.compressFileItem(file); formData.append("file" , file.file);
if (uploadFile.size > 5 * 1024 * 1024) { let res = await uploadImage(formData);
this.onOversize(); this.vehicleLicenseBack = res.data;
return; await this.vehicleBackOcrHandler();
}
const formData = new FormData();
formData.append("file" , uploadFile);
let res = await uploadImage(formData);
this.vehicleLicenseBack = res.data;
await this.vehicleBackOcrHandler();
} catch (e) {
console.error('upload compress error:', e);
if (e && e.message === '超过5M') {
this.onOversize();
} else {
this.$toast(e && e.message ? e.message : '上传失败,请重试');
}
}
}, },
async vehicleLicenseCarHandler(file) { // 上传 行驶证车辆照片 async vehicleLicenseCarHandler(file) { // 上传 行驶证车辆照片
try { const formData = new FormData();
const uploadFile = await this.compressFileItem(file); formData.append("file" , file.file);
if (uploadFile.size > 5 * 1024 * 1024) { let res = await uploadImage(formData);
this.onOversize(); this.vehicleLicenseCarPhoto = res.data;
return;
}
const formData = new FormData();
formData.append("file" , uploadFile);
let res = await uploadImage(formData);
this.vehicleLicenseCarPhoto = res.data;
} catch (e) {
console.error('upload compress error:', e);
if (e && e.message === '超过5M') {
this.onOversize();
} else {
this.$toast(e && e.message ? e.message : '上传失败,请重试');
}
}
}, },
async vehicleFrontPhotoHandler(file) { // 上传 车头照 async vehicleFrontPhotoHandler(file) { // 上传 车头照
try { const formData = new FormData();
const uploadFile = await this.compressFileItem(file); formData.append("file" , file.file);
if (uploadFile.size > 5 * 1024 * 1024) { let res = await uploadImage(formData);
this.onOversize(); this.vehicleFrontPhoto = res.data;
return; await this.ocrCarFrontHandler()
}
const formData = new FormData();
formData.append("file" , uploadFile);
let res = await uploadImage(formData);
this.vehicleFrontPhoto = res.data;
await this.ocrCarFrontHandler()
} catch (e) {
console.error('upload compress error:', e);
if (e && e.message === '超过5M') {
this.onOversize();
} else {
this.$toast(e && e.message ? e.message : '上传失败,请重试');
}
}
},
vehicleLicenseFrontDelete() { // 删除 行驶证首页
this.vehicleLicenseFront = '';
},
vehicleLicenseBackDelete() { // 删除 行驶证副页
this.vehicleLicenseBack = '';
this.vehicleLicenseBackOcrFlag = false;
},
vehicleLicenseCarPhotoDelete() { // 删除 行驶证车辆照片
this.vehicleLicenseCarPhoto = '';
},
vehicleFrontPhotoDelete() { // 删除 车头照
this.vehicleFrontPhoto = '';
}, },
clickPreview(){ clickPreview(){
console.log(' this.insurancePicturePhoto', this.insurancePicturePhoto) console.log(' this.insurancePicturePhoto', this.insurancePicturePhoto)
@@ -1150,7 +868,7 @@ export default {
this.vehicleLicenseInfo.address = frontInfo?.address; this.vehicleLicenseInfo.address = frontInfo?.address;
this.vehicleLicenseInfo.useNature = frontInfo?.useCharacter; this.vehicleLicenseInfo.useNature = frontInfo?.useCharacter;
this.vehicleLicenseInfo.model = frontInfo?.model; this.vehicleLicenseInfo.model = frontInfo?.model;
this.vehicleLicenseInfo.vinCode = String(frontInfo?.vin || '').toUpperCase().replace(/O/g, '0'); this.vehicleLicenseInfo.vinCode = frontInfo?.vin;
this.vehicleLicenseInfo.engineNumber = frontInfo?.engineNo; this.vehicleLicenseInfo.engineNumber = frontInfo?.engineNo;
this.vehicleLicenseInfo.registrationDate = frontInfo?.registerDate; this.vehicleLicenseInfo.registrationDate = frontInfo?.registerDate;
this.vehicleLicenseInfo.issueDate = frontInfo?.issueDate; this.vehicleLicenseInfo.issueDate = frontInfo?.issueDate;
@@ -1230,7 +948,7 @@ export default {
} }
}, },
async getSupplierServiceTree(){ async getSupplierServiceTree(){
let res = await supplierServiceTree({ supplierId: this.supplierId }); let res = await supplierServiceTree();
this.supplierServiceList=res.data this.supplierServiceList=res.data
this.oldSupplierServiceList=this.supplierServiceList this.oldSupplierServiceList=this.supplierServiceList
}, },
@@ -1494,65 +1212,14 @@ export default {
this.insuranceChange=false this.insuranceChange=false
}, },
back() { back() {
this.$router.back(); this.$router.push({
/*if( this.supplierId ) { name:'vehicleManage',
this.$router.back(); params:{
} else { id: this.id
this.$router.push({
name:'vehicleManage',
params:{
id: this.id
}
})
}*/
},
validatePlateNumber(value) {
if (!value) {
return { valid: false, message: '请输入车牌号' }
}
const provinceList = ['京','津','冀','晋','蒙','辽','吉','黑','沪','苏','浙','皖','闽','赣','鲁','豫','鄂','湘','粤','桂','琼','渝','川','贵','云','藏','陕','甘','青','宁','新']
const firstChar = value.charAt(0)
if (!provinceList.includes(firstChar)) {
return { valid: false, message: '车牌号首位必须是省级简称(京/沪/津/渝/冀/晋/辽/吉/黑/苏/浙/皖/闽/赣/鲁/豫/鄂/湘/粤/琼/川/贵/云/陕/甘/青/蒙/桂/藏/宁/新)' }
}
if (!/^[\u4e00-\u9fa5][A-Z0-9]+$/.test(value)) {
return { valid: false, message: '车牌号只能包含汉字、字母和数字' }
}
if (![7, 8].includes(value.length)) {
return { valid: false, message: `车牌号必须为 7 位或 8 位(当前 ${value.length} 位)` }
}
return { valid: true, message: '' }
},
validateVinNo(value) {
const normalizedValue = String(value || '').toUpperCase()
if (!normalizedValue) {
return { valid: false, message: '车架号识别错误,请重新拍照上传。' }
}
if (!/^[A-NP-Z0-9]{17}$/.test(normalizedValue)) {
if (normalizedValue.includes('O')) {
return { valid: false, message: '车架号识别错误,请重新拍照上传。' }
} }
if (!/^[A-NP-Z0-9]+$/.test(normalizedValue)) { })
return { valid: false, message: '车架号识别错误,请重新拍照上传。' }
}
return { valid: false, message: `车架号识别错误,请重新拍照上传。` }
}
return { valid: true, message: '' }
}, },
async submitBtn(){ async submitBtn(){
const plateResult = this.validatePlateNumber(this.carNum)
if (!plateResult.valid) {
Dialog.alert({ message: plateResult.message })
return
}
const vinCode = String(this.vehicleLicenseInfo.vinCode || '')
const vinResult = this.validateVinNo(vinCode)
if (!vinResult.valid) {
Dialog.alert({ message: vinResult.message })
return
}
this.vehicleLicenseInfo.vinCode = vinCode
if( !this.vehicleLicenseFront ) { if( !this.vehicleLicenseFront ) {
this.$toast('行驶证主页照片不能为空') this.$toast('行驶证主页照片不能为空')
return return
@@ -1636,7 +1303,6 @@ export default {
// return // return
await saveVehicle({ await saveVehicle({
vehicleId:this.id ? this.id : '', vehicleId:this.id ? this.id : '',
supplierId: this.supplierId || undefined,
plateNumber:this.carNum ? this.carNum :'', plateNumber:this.carNum ? this.carNum :'',
vehicleType:this.selectedOption?.length>0 ? this.selectedOption.join(',') : '', vehicleType:this.selectedOption?.length>0 ? this.selectedOption.join(',') : '',
// hasPolymerization:this.isJoin, // hasPolymerization:this.isJoin,
@@ -1673,8 +1339,7 @@ export default {
}, },
components:{ components:{
CellGroup, CellGroup,
TwoCommonBtn, TwoCommonBtn
CameraGuide
} }
} }
</script> </script>
@@ -1688,23 +1353,6 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
@import "@/styles/mixin.scss"; @import "@/styles/mixin.scss";
@import "@/styles/common.scss"; @import "@/styles/common.scss";
/* 行驶证三槽位透明点击拦截层 */
.uploadSlotWrap{
position: relative;
display: inline-block;
.slotClickMask{
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 10;
}
/* 已上传图片的删除按钮置于拦截层之上,保证可删除重传 */
::v-deep .van-uploader__preview-delete{
z-index: 11;
}
}
.mySelect{ .mySelect{
@include fontWeightSize(bold,13px); @include fontWeightSize(bold,13px);
color: #323643; color: #323643;
@@ -1717,9 +1365,6 @@ export default {
} }
.navBar{ .navBar{
margin-bottom: 46px; margin-bottom: 46px;
::v-deep .van-nav-bar--fixed {
z-index: 9999 !important;
}
} }
.wrap{ .wrap{
@include wh(100%,100%); @include wh(100%,100%);
+6 -54
View File
@@ -3,15 +3,15 @@
<div class="navBar"> <div class="navBar">
<van-nav-bar <van-nav-bar
title="车辆管理" title="车辆管理"
:left-arrow="!supplierId" left-arrow
left-arrow-color="#FFFFFF" left-arrow-color="#FFFFFF"
:border="false" :border="false"
:fixed="true" :fixed="true"
:safe-area-inset-top="true" :safe-area-inset-top="true"
@click-left="goBack" @click-left="goBack"
> >
<template slot="right" v-if="permissonList.includes('vehicleAddBtn') || supplierId"> <template slot="right" v-if="permissonList.includes('vehicleAddBtn')">
<div class="rightWrap" @click="goPage('vehicleAdd', supplierId ? { supplierId, potentialFlag } : {})"> <div class="rightWrap" @click="goPage('vehicleAdd')">
<img src="@/assets/addImg.png" /> <img src="@/assets/addImg.png" />
<span class="addTxt">添加</span> <span class="addTxt">添加</span>
</div> </div>
@@ -71,7 +71,6 @@
<div class="wrap_cls"> <div class="wrap_cls">
<van-pull-refresh v-model="isLoading" @refresh="onRefresh"> <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
<van-list <van-list
v-if="initialized"
v-model="loading" v-model="loading"
:finished="finished" :finished="finished"
finished-text="没有更多了" finished-text="没有更多了"
@@ -115,9 +114,6 @@
</div> </div>
<van-dialog v-model="show" title="确定删除吗" show-cancel-button @confirm="handleConfirm"></van-dialog> <van-dialog v-model="show" title="确定删除吗" show-cancel-button @confirm="handleConfirm"></van-dialog>
<div class="btn_wrap" v-if="supplierId">
<div class="btn" @click="nextToDriver">下一步</div>
</div>
</div> </div>
</template> </template>
@@ -125,7 +121,7 @@
<script> <script>
import {Dialog} from "vant"; import {Dialog} from "vant";
import { myMixins} from "@/utils/myMixins"; import { myMixins} from "@/utils/myMixins";
import {supplierVehicleList, deleteVehicle, userOperationPermissions, enableVehicle, supplierSelectById} from "@/api/mine" import {supplierVehicleList, deleteVehicle, userOperationPermissions, enableVehicle} from "@/api/mine"
export default { export default {
name: "vehicleManage", name: "vehicleManage",
mixins:[myMixins], mixins:[myMixins],
@@ -134,9 +130,6 @@ export default {
vehicleList:[], vehicleList:[],
show:false, show:false,
id:'', id:'',
supplierId: '',
routeId: '',
initialized: false,
pageNum:1, pageNum:1,
pageSize:10, pageSize:10,
total:'', total:'',
@@ -149,7 +142,6 @@ export default {
searchVal: '', searchVal: '',
authStates: [], authStates: [],
liabilityInsuranceAuditList: [], liabilityInsuranceAuditList: [],
potentialFlag: '',
inputStatusListOptions: [{ inputStatusListOptions: [{
name: '行驶证未录入', name: '行驶证未录入',
value: 0 value: 0
@@ -197,31 +189,10 @@ export default {
}], }],
} }
}, },
async mounted() { mounted() {
const urlParams = new URLSearchParams(window.location.search); this.getPermissions();
const rawId = this.$route.query.id || urlParams.get('id');
this.potentialFlag = this.$route.query.potentialFlag || urlParams.get('potentialFlag') || '';
if (rawId) {
this.routeId = rawId;
await this.getSupplierById(Number(rawId));
} else {
this.initialized = true;
}
let _token = localStorage.getItem('token')
if( _token ) {
this.getPermissions();
}
}, },
methods:{ methods:{
nextToDriver() {
localStorage.setItem('lastRoute', JSON.stringify({ name: 'driverManage', query: { id: this.supplierId, potentialId: this.routeId, potentialFlag: this.potentialFlag } }));
this.goPage('driverManage', { id: this.supplierId, potentialId: this.routeId, potentialFlag: this.potentialFlag });
},
async getSupplierById(id) {
let res = await supplierSelectById({ id });
this.supplierId = res?.data?.supplierId || '';
this.initialized = true;
},
showTip(msg) { showTip(msg) {
Dialog.alert({ Dialog.alert({
title: '未通过原因', title: '未通过原因',
@@ -306,7 +277,6 @@ export default {
inputStatusList: this.inputStatusList, inputStatusList: this.inputStatusList,
authStates: this.authStates, authStates: this.authStates,
liabilityInsuranceAuditList: this.liabilityInsuranceAuditList, liabilityInsuranceAuditList: this.liabilityInsuranceAuditList,
supplierId: this.supplierId || undefined,
}) })
this.total=result.total this.total=result.total
if(this.pageNum == 1){// 第一页直接赋值 if(this.pageNum == 1){// 第一页直接赋值
@@ -615,23 +585,5 @@ export default {
justify-content: flex-start; justify-content: flex-start;
margin-left: 10px; margin-left: 10px;
} }
.btn_wrap {
width: 100%;
padding: 15px 0;
position: fixed;
bottom: 10px;
z-index: 10000;
.btn {
width: calc(100% - 80px);
margin-left: 40px;
height: 46px;
background: #0E76F4;
border-radius: 5px;
font-size: 15px;
color: #FFFFFF;
text-align: center;
line-height: 46px;
}
}
</style> </style>
-72
View File
@@ -96,32 +96,8 @@
<div class="item" v-if="queryType == 9 || queryType ==11 || queryType ==12 || queryType ==5"> <div class="item" v-if="queryType == 9 || queryType ==11 || queryType ==12 || queryType ==5">
<span class="leftTitle fontColor">工单照片:</span><span class="rightContent"> <span class="leftTitle fontColor">工单照片:</span><span class="rightContent">
<span class="driverPoiBtn" @click="checkPhoto">查看照片</span> <span class="driverPoiBtn" @click="checkPhoto">查看照片</span>
<span class="driverPoiBtn" v-if="orderDetailInfo.beforeDispatchImages && orderDetailInfo.beforeDispatchImages.length > 0" @click="environmentPhoto">环境照片</span>
</span> </span>
</div> </div>
<div v-if="orderDetailInfo.firstAggregateFailInfo" class="aggregate-fail-card">
<div class="aggregate-fail-card__title"> 首次聚合未接单</div>
<div class="aggregate-fail-card__row">
<span class="aggregate-fail-card__label">师傅姓名</span>
<span class="aggregate-fail-card__value">{{ orderDetailInfo.firstAggregateFailInfo.driverName || '—' }}</span>
</div>
<div class="aggregate-fail-card__row">
<span class="aggregate-fail-card__label">师傅手机号</span>
<span class="aggregate-fail-card__value">{{ orderDetailInfo.firstAggregateFailInfo.driverPhone || '—' }}</span>
</div>
<div class="aggregate-fail-card__row">
<span class="aggregate-fail-card__label">车辆</span>
<span class="aggregate-fail-card__value">{{ aggregateFailVehicle }}</span>
</div>
<div class="aggregate-fail-card__row">
<span class="aggregate-fail-card__label">失败原因</span>
<span class="aggregate-fail-card__value aggregate-fail-card__value--warning">{{ orderDetailInfo.firstAggregateFailInfo.failReason || '—' }}</span>
</div>
<div class="aggregate-fail-card__row">
<span class="aggregate-fail-card__label">聚合时间</span>
<span class="aggregate-fail-card__value">{{ orderDetailInfo.firstAggregateFailInfo.dispatchTime || '—' }}</span>
</div>
</div>
</div> </div>
</div> </div>
<div class="serviceInfo common" v-if="orderDetailInfo.batteryNo"> <div class="serviceInfo common" v-if="orderDetailInfo.batteryNo">
@@ -177,16 +153,6 @@ export default {
carTypeList: [] carTypeList: []
} }
}, },
computed:{
aggregateFailVehicle(){
const info = this.orderDetailInfo.firstAggregateFailInfo
if(!info) return '—'
const plate = info.licensePlate || ''
const type = info.vehicleTypeName || ''
if(plate && type) return `${plate}${type}`
return plate || type || '—'
}
},
async mounted() { async mounted() {
// 获取当前 URL // 获取当前 URL
const urlParams = new URLSearchParams(window.location.search); const urlParams = new URLSearchParams(window.location.search);
@@ -269,12 +235,6 @@ export default {
window.android.sendMessage("orderPhoto,"+this.userOrderId+","+this.orderCode+","+this.taskOrderId+","+isAllowImage); window.android.sendMessage("orderPhoto,"+this.userOrderId+","+this.orderCode+","+this.taskOrderId+","+isAllowImage);
} }
}, },
environmentPhoto() {
this.$router.push({
path: '/environmentPhotos',
query: { userOrderId: this.userOrderId }
})
},
initMap() { initMap() {
this.map = new AMap.Map('container',{ this.map = new AMap.Map('container',{
zoom:14,//级别(缩放比例 3-20 ) zoom:14,//级别(缩放比例 3-20 )
@@ -451,38 +411,6 @@ export default {
} }
} }
} }
.aggregate-fail-card{
margin-top: 12px;
padding: 12px;
background: #FFF7F0;
border: 1px solid #FFBB96;
border-radius: 6px;
&__title{
@include fontWeightSize(bold,13px);
color: #FA541C;
margin-bottom: 8px;
}
&__row{
display: flex;
align-items: baseline;
line-height: 22px;
}
&__label{
width: 78px;
flex-shrink: 0;
@include fontWeightSize(400,12px);
color: #000000;
opacity: .65;
}
&__value{
flex: 1;
@include fontWeightSize(bold,12px);
color: #000000;
&--warning{
color: #FA541C;
}
}
}
.title{ .title{
@include fontWeightSize(bold,14px); @include fontWeightSize(bold,14px);
@include colorOpa(#323643,0.6); @include colorOpa(#323643,0.6);
+2 -45
View File
@@ -35,17 +35,9 @@
<div class="item"> <div class="item">
<div class="left opaCol"><span class="star" style="opacity: 0">*</span><span>角色</span></div> <div class="left opaCol"><span class="star" style="opacity: 0">*</span><span>角色</span></div>
<div class="right" :class="{'opaCol':type==2}"> <div class="right" :class="{'opaCol':type==2}">
<van-field :input-align="type==2 ? 'right' : 'left'" readonly v-model="item.roleDisplay" placeholder="请输入" /> <van-field :input-align="type==2 ? 'right' : 'left'" readonly v-model="item.roleName" placeholder="请输入" />
</div> </div>
</div> </div>
<template v-if="item.hasRelationRole">
<div class="item" v-for="(row, rIndex) in item.relationRows" :key="'relation-' + rIndex">
<div class="left relationLeft" :class="{'opaCol':type!=2}"><span class="star" :style="{opacity: type==2 ? 1 : 0}">*</span><span>{{ item.relationRows.length > 1 ? row.base : '关系' }}</span></div>
<div class="right">
<van-field :input-align="type==2 ? 'right' : 'left'" :readonly="type!=2" v-model="row.relation" placeholder="请输入关系" />
</div>
</div>
</template>
<div class="item"> <div class="item">
<div class="left" :class="{'opaCol':type!=2}"><span class="star">*</span><span>电话1</span></div> <div class="left" :class="{'opaCol':type!=2}"><span class="star">*</span><span>电话1</span></div>
<div class="right"> <div class="right">
@@ -91,8 +83,6 @@
import {myMixins} from "@/utils/myMixins" import {myMixins} from "@/utils/myMixins"
import {getConfirmPerson,getConfirmStatus,getQrCode,confirmAddWechat,confirm,submitConfirm} from "@/api/authentication"; import {getConfirmPerson,getConfirmStatus,getQrCode,confirmAddWechat,confirm,submitConfirm} from "@/api/authentication";
import { Dialog } from 'vant'; import { Dialog } from 'vant';
// 带关系角色(存储格式:角色名-关系)
const RELATION_ROLES = ['其他', '法人关系人', '实控人关系人', '合伙人']
export default { export default {
name: "personList", name: "personList",
mixins:[myMixins], mixins:[myMixins],
@@ -173,26 +163,11 @@ export default {
// this.type=2 // this.type=2
let res=await getConfirmPerson({supplierId:this.supplierId}) let res=await getConfirmPerson({supplierId:this.supplierId})
if(res.data && res.data.length>0){ if(res.data && res.data.length>0){
this.personList=res.data.map(item => this.buildRoleDisplay(item)) this.personList=res.data
}else{ }else{
this.personList=[] this.personList=[]
} }
}, },
// 拆分带关系角色:roleName 按逗号拆项,识别 `角色名-关系`,按第一个 '-' 拆出基础角色与关系
buildRoleDisplay(item){
const parts = (item.roleName || '').split(',').filter(Boolean).map(raw => {
const dashIndex = raw.indexOf('-')
if (dashIndex > -1 && RELATION_ROLES.includes(raw.substring(0, dashIndex))) {
return { raw, base: raw.substring(0, dashIndex), relation: raw.substring(dashIndex + 1) }
}
return { raw, base: raw, relation: null }
})
item.roleParts = parts
item.roleDisplay = parts.map(p => p.relation != null ? p.base : p.raw).join(',')
item.relationRows = parts.filter(p => p.relation != null)
item.hasRelationRole = item.relationRows.length > 0
return item
},
async wechatConfirm(){//确认已添加微信按钮 async wechatConfirm(){//确认已添加微信按钮
Dialog.confirm({ Dialog.confirm({
message:'请确认相关人员是否已添加该二维码。', message:'请确认相关人员是否已添加该二维码。',
@@ -263,18 +238,6 @@ export default {
this.$toast('电话号码格式不正确') this.$toast('电话号码格式不正确')
return return
} }
// 带关系角色:关系必填校验,并将 roleDisplay + relation 重新拼接为 `角色名-关系` 写回 roleName
for (const item of this.personList) {
if (item.hasRelationRole) {
for (const row of item.relationRows) {
if (!row.relation || !String(row.relation).trim()) {
this.$toast(`请填写${row.base}关系`)
return
}
}
item.roleName = item.roleParts.map(p => p.relation != null ? `${p.base}-${String(p.relation).trim()}` : p.raw).join(',')
}
}
await submitConfirm({supplierId:this.supplierId,infos:this.personList}) await submitConfirm({supplierId:this.supplierId,infos:this.personList})
this.$toast('操作成功') this.$toast('操作成功')
if(this.isWebFunc()){ if(this.isWebFunc()){
@@ -444,12 +407,6 @@ export default {
color: #323643; color: #323643;
opacity: .65; opacity: .65;
} }
.item .left.relationLeft{
width: auto;
min-width: 66px;
white-space: nowrap;
padding-right: 4px;
}
.star{ .star{
font-weight: bold; font-weight: bold;
font-size: 13px; font-size: 13px;
+12 -5
View File
@@ -498,9 +498,16 @@ export default {
console.log("ii", i) console.log("ii", i)
}, },
goback() { goback() {
this.$router.back() this.$router.push({
name: "workOrderReconciliation",
params: {
activeIndex: this.index,
queryTime: this.queryTime,
}
})
}, },
async compute() { async compute() {
alert(11111)
if(this.orderInfo.contractSettleTypeString == '车主现收'){ if(this.orderInfo.contractSettleTypeString == '车主现收'){
this.form.supplierBasePrice = 0 this.form.supplierBasePrice = 0
this.form.supplierExtraPrice = 0 this.form.supplierExtraPrice = 0
@@ -747,7 +754,7 @@ export default {
formData.append('state', 0); formData.append('state', 0);
formData.append('postfix', this.postfix); formData.append('postfix', this.postfix);
formData.append('supplierBridgeAmount', parseInt(this.form.supplierBridgeAmountAb || 0) + parseInt(this.form.supplierBridgeAmountBc || 0) + parseInt(this.form.supplierBridgeAmountCa || 0)); formData.append('supplierBridgeAmount', parseInt(this.form.supplierBridgeAmountAb || 0) + parseInt(this.form.supplierBridgeAmountBc || 0) + parseInt(this.form.supplierBridgeAmountCa || 0));
let res = await updateAccountRecordInfo(formData); /*let res = await updateAccountRecordInfo(formData);
if (res.code === 200) { if (res.code === 200) {
this.$toast('操作成功') this.$toast('操作成功')
setTimeout(() => { setTimeout(() => {
@@ -760,7 +767,7 @@ export default {
} }
}) })
}, 2000) }, 2000)
} }*/
this.loading = false; this.loading = false;
}, },
async confirmAudit() { async confirmAudit() {
@@ -842,7 +849,7 @@ export default {
formData.append('state', 0); formData.append('state', 0);
formData.append('postfix', this.postfix); formData.append('postfix', this.postfix);
formData.append('supplierBridgeAmount', parseInt(this.form.supplierBridgeAmountAb || 0) + parseInt(this.form.supplierBridgeAmountBc || 0) + parseInt(this.form.supplierBridgeAmountCa || 0)); formData.append('supplierBridgeAmount', parseInt(this.form.supplierBridgeAmountAb || 0) + parseInt(this.form.supplierBridgeAmountBc || 0) + parseInt(this.form.supplierBridgeAmountCa || 0));
let res = await updateAccountRecordInfo(formData); /*let res = await updateAccountRecordInfo(formData);
if (res.code === 200) { if (res.code === 200) {
this.$toast('操作成功') this.$toast('操作成功')
setTimeout(() => { setTimeout(() => {
@@ -855,7 +862,7 @@ export default {
} }
}) })
}, 2000) }, 2000)
} }*/
this.loading1 = false; this.loading1 = false;
}, },