59 Commits

Author SHA1 Message Date
8dee7c54df 数据处理 2026-01-12 18:12:57 +08:00
89cd821276 司机管理获取列表前清空列表 2026-01-12 17:56:50 +08:00
276a0b982e 司机管理获取列表前清空列表 2026-01-12 17:45:46 +08:00
b2119b4fd7 司机管理获取列表前清空列表 2026-01-12 17:45:27 +08:00
63b6028690 司机管理获取列表前清空列表 2026-01-12 17:45:17 +08:00
22bf45eda2 VConsole添加 2026-01-12 17:33:40 +08:00
9083f4ff30 CRM_26-01-13#story#7762,潜在服务商增加财务结算信息的需求--曹智龙 2026-01-12 15:19:32 +08:00
783910ba84 CRM_26-01-13#story#7852,为推进人车梳理工作优化调度APP车辆、司机管理功能的需求 2026-01-12 11:17:01 +08:00
ccf61a73ee CRM_26-01-13#story#7852,为推进人车梳理工作优化调度APP车辆、司机管理功能的需求 2026-01-09 14:02:14 +08:00
c6b23f6bb3 CRM_26-01-13#story#7762,潜在服务商增加财务结算信息的需求,许可证回显 2026-01-09 11:42:53 +08:00
d1eb15ed15 CRM_26-01-13#story#7762,潜在服务商增加财务结算信息的需求--曹智龙 2026-01-08 15:21:37 +08:00
c5fca0a4f1 CRM_26-01-13#story#7762,潜在服务商增加财务结算信息的需求--曹智龙 2026-01-07 15:49:51 +08:00
247d087c48 CRM_26-01-13#story#7762,潜在服务商增加财务结算信息的需求--曹智龙 2026-01-07 15:11:23 +08:00
3ba634d602 CRM_26-01-13#story#7762,潜在服务商增加财务结算信息的需求--曹智龙 2026-01-07 14:53:27 +08:00
58f1f5033d VConsole去除 2026-01-04 17:41:09 +08:00
c8400442a5 微信号更改添加判断 2026-01-04 16:37:05 +08:00
6dbb1377be 确认已添加接口返回null时不做任何处理 2026-01-04 16:01:58 +08:00
847fdc48c6 确认已添加接口返回null时不做任何处理 2026-01-04 15:53:21 +08:00
234853b603 vConsole添加 2026-01-04 15:45:56 +08:00
91b3c069ad 下载app接口替换 2025-12-30 10:41:46 +08:00
0732fdcb8e 人员确认添加二次弹框 2025-12-29 19:04:58 +08:00
64b2099c8b 调度h5的连接下载 2025-12-29 17:45:44 +08:00
ac08b52038 确认信息无误提示语更改 2025-12-29 13:17:10 +08:00
ebfb553829 VConsole去除 2025-12-29 13:12:22 +08:00
77335a1850 确认信息无误添加必填项判断 2025-12-29 13:11:15 +08:00
159ce0fbde 跳转app路径更换 2025-12-28 13:01:48 +08:00
1cc79ba5f5 h5链接替换 2025-12-28 12:04:21 +08:00
c3bdcc8251 样式兼容 2025-12-26 14:12:57 +08:00
78bfd97e0c h5立即打开修改(下方文字修改) 2025-12-26 14:05:36 +08:00
ca5bb1520b h5立即打开修改 2025-12-26 13:52:41 +08:00
cf6d94d54f kpi修改 2025-12-26 13:43:19 +08:00
5845ae76da h5分享链接 2025-12-26 13:43:19 +08:00
0d2082ebaf CRM_25-12-23#story#7473,服务商系统、微信号的输入框只读 2025-12-24 10:21:31 +08:00
0208136ac4 车辆审批需求,责任险可查看 2025-12-23 10:53:47 +08:00
a2907a9fd1 车辆审批需求,责任险可查看 2025-12-23 10:37:39 +08:00
c7a1d95346 车辆审批需求,责任险可查看,保存时添加车辆状态字段 2025-12-23 10:23:52 +08:00
911bf1f5e0 车辆审批需求,车辆新增一个车辆状态为‘ 否-服务商停用’ 2025-12-23 09:21:01 +08:00
a3fd0d6f46 CRM_25-12-23#story#7473,服务商系统,添加是否是主账号判断 2025-12-22 19:51:08 +08:00
6fe09d9674 CRM_25-12-23#story#7473,服务商系统,添加是否是主账号判断 2025-12-22 19:47:44 +08:00
44552c5d35 CRM_25-12-23#story#7473,服务商系统,添加是否是主账号判断 2025-12-22 19:44:35 +08:00
75b727d8b2 车辆审批需求,去除比较提交审批接口,使用原本保存接口,新增canSubmitApproval字段,默认true 2025-12-22 17:19:54 +08:00
4eb791c9c6 CRM_25-12-23#story#7473,服务商系统、调度APP新增服务商人员确认的功能 2025-12-22 13:08:25 +08:00
44e1af7262 CRM_25-12-23#story#7473,服务商系统、调度APP新增服务商人员确认的功能 2025-12-22 13:08:10 +08:00
e0f90ca3b2 VConsole日志添加 2025-12-22 10:02:27 +08:00
7e73da59eb CRM_25-12-23#story#7473,服务商系统、调度APP新增服务商人员确认的功能 2025-12-19 14:16:12 +08:00
361f7f16f8 车辆审批提交,去除备注填写,直接走接口 2025-12-18 18:04:58 +08:00
4734f236cf 车辆审批提交,去除备注填写,直接走接口 2025-12-18 17:33:49 +08:00
89cf401882 CRM_25-12-23#story#7473,服务商系统、调度APP新增服务商人员确认 2025-12-18 14:15:04 +08:00
0fc9be28d1 CRM_25-12-23#story#7473,服务商系统、调度APP新增服务商人员确认 2025-12-17 21:53:36 +08:00
1a567dee57 CRM_25-12-09#story#7474,服务商师傅和车辆修改的审批 2025-12-17 16:19:24 +08:00
ecb87e5bc9 CRM_25-12-23#story#7473,服务商系统、调度APP新增服务商人员确认的功能 2025-12-17 16:19:02 +08:00
193e9c8006 kpi修改 2025-12-17 15:55:56 +08:00
94376c91b8 调度h5续保更新条件修改 2025-12-17 15:55:56 +08:00
23984e78ec CRM_25-12-23#story#7473,服务商系统、调度APP新增服务商人员确认的功能 2025-12-17 11:37:59 +08:00
1f2af86b96 去除VConsole 2025-12-16 13:16:06 +08:00
2c344eb2f5 车辆提交审批 2025-12-16 09:23:31 +08:00
552b56d5da CRM_25-12-23#story#7473,服务商系统、调度APP新增服务商人员确认的功能 2025-12-15 13:07:55 +08:00
f9acd76fcf 报备样式修改 2025-12-12 11:40:04 +08:00
b5f30b4c77 CRM_25-12-16#story#7744,调度APP报备调整 2025-12-11 09:54:24 +08:00
20 changed files with 1025 additions and 100 deletions

View File

@@ -70,3 +70,51 @@ export function driverRealName( data) {
contentType: 'application/json' contentType: 'application/json'
}) })
} }
//获取需要确认的人员信息列表
export function getConfirmPerson(key){
return request({
url: '/supplierAppV2/dispatchApp/wechat/getNeedConfirmPersonInfo',
method:'GET',
params: key
})
}
//微信相关 获取联系我 二维码
export function getQrCode(key){
return request({
url: '/supplierAppV2/dispatchApp/wechat/getQrCode',
method:'GET',
params: key
})
}
//获取服务商的确认状态
export function getConfirmStatus(key){
return request({
url: '/supplierAppV2/dispatchApp/wechat/getSupplier',
method:'GET',
params: key
})
}
//确认已添加微信按钮
export function confirmAddWechat(key){
return request({
url: '/supplierAppV2/dispatchApp/wechat/confirmAddWechat',
method:'GET',
params: key
})
}
//确认无误
export function confirm(key){
return request({
url: '/supplierAppV2/dispatchApp/wechat/confirm',
method:'GET',
params: key
})
}
//提交审批
export function submitConfirm( data) {
return request('/supplierAppV2/dispatchApp/wechat/submitConfirm', {
data: data,
method:'POST',
contentType: 'application/json'
})
}

View File

@@ -159,3 +159,12 @@ export function getConfigByCode(data){
data data
}) })
} }
//获取最新版本
export function getNewVersion(key){
return request({
url: '/driverApp/app/updateVersion',
method:'GET',
params: key
})
}

BIN
src/assets/greTip.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 868 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 915 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 MiB

BIN
src/assets/toAppBg.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 643 KiB

BIN
src/assets/yelTip.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 870 B

View File

@@ -39,5 +39,13 @@ const authenticationRouter = [
title: '银行卡信息认证', title: '银行卡信息认证',
} }
}, },
{
path: '/personList',
name: 'personList',
component: () => import('@/views/mine/personList.vue'),
meta:{
title: '人员信息',
}
},
] ]
export default authenticationRouter export default authenticationRouter

View File

@@ -324,6 +324,14 @@ const routes = [
title:'电瓶详情' title:'电瓶详情'
} }
}, },
{
path: '/goToApp',
name: 'goToApp',
component:()=>import('@/views/goToApp/goToApp.vue'),
meta: {
title:'电瓶详情'
}
},
...kpiRouter, ...kpiRouter,
...invoiceRouter, ...invoiceRouter,
...secondHandRouter, ...secondHandRouter,

View File

@@ -48,6 +48,7 @@ service.interceptors.request.use(
service.interceptors.response.use( service.interceptors.response.use(
response => { response => {
console.log('response', response.data)
const res = response.data const res = response.data
if ( res.code === 401 || res.code === 400 || res.code == 500) { if ( res.code === 401 || res.code === 400 || res.code == 500) {
Toast(res.msg || 'Error') Toast(res.msg || 'Error')

View File

@@ -94,6 +94,7 @@ export const myMixins = {
isWebFunc(){ isWebFunc(){
let res=false let res=false
var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent); var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
console.log('isMobile',isMobile)
if (!isMobile) {// 是移动端不变 if (!isMobile) {// 是移动端不变
res=true res=true
} }

View File

@@ -0,0 +1,73 @@
<template>
<div class="wrap">
<div class="content">
<div class="goToBtn" @click="goAppHandler">立即打开</div>
<div class="content_tip">
<div class="font_cls">如未安装请点击下载</div>
<div class="font_cls">如已安装未自动跳转 <span @click="downLoadHandler">立即下载</span></div>
</div>
</div>
</div>
</template>
<script>
import { getNewVersion } from "@/api/order"
export default {
name: "goToApp",
methods: {
goAppHandler() {
window.location.href = "rvdriver://page/pagesLogin/phoneLogin?source=h5Link";
},
async downLoadHandler() {
getNewVersion({
appType: 5
}).then((res) => {
window.location.href = res?.result?.path
}).catch(() => {
this.$message.error('请求版本失败,请重试');
});
}
}
}
</script>
<style lang="scss" scoped>
.wrap {
width: 100%;
height: 100vh;
background-image: url('@/assets/toAppBg.png');
background-repeat: no-repeat;
background-size: 100% 100%;
}
.content {
width: 100%;
position: fixed;
top: 74vh;
}
.goToBtn {
width: 70%;
height: 45px;
margin-left: 15%;
background: linear-gradient( 270deg, #2347C0 0%, #72A3FF 100%);
border-radius: 23px;
//font-weight: bold;
font-size: 17px;
color: #FFFFFF;
letter-spacing: 2px;
line-height: 45px;
text-align: center;
}
.content_tip {
width: 100%;
margin-top: 15px;
.font_cls {
font-size: 14px;
color: #808080;
line-height: 20px;
text-align: center;
span {
color: #007BE9;
}
}
}
</style>

View File

@@ -67,7 +67,7 @@
accept="image " accept="image "
/> />
</div> </div>
<div class="lineBot"></div> <!-- <div class="lineBot"></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" />
@@ -80,11 +80,12 @@
:preview-size="54" :preview-size="54"
accept="image " accept="image "
/> />
</div> </div>-->
<div class="lineBot"></div> <div class="lineBot"></div>
<div class="itemContent"> <div class="itemContent">
<div class="titleType"> <div class="titleType">
<span>头像</span> <img class="startImg" src="@/assets/start.png" />
<span>免冠正面照</span>
</div> </div>
<van-uploader <van-uploader
v-model="iconList" v-model="iconList"
@@ -307,7 +308,7 @@ export default {
let res = await uploadImage(formData) let res = await uploadImage(formData)
this.drivingLicenceContrary = res.data; this.drivingLicenceContrary = res.data;
}, },
async iconListHandler(file) { // 上传头像 async iconListHandler(file) { // 上传免冠正面照
const formData = new FormData(); const formData = new FormData();
formData.append("file" , file.file); formData.append("file" , file.file);
let res = await uploadImage(formData) let res = await uploadImage(formData)
@@ -399,9 +400,13 @@ export default {
this.$toast('驾驶证首页未上传') this.$toast('驾驶证首页未上传')
return return
} }
if(!this.drivingLicenceContrary) { /* if(!this.drivingLicenceContrary) {
this.$toast('驾驶证副页未上传') this.$toast('驾驶证副页未上传')
return return
}*/
if(!this.icon) {
this.$toast('免冠正面照未上传')
return
} }
let drivingLicenceName=this.drivingLicenceName.replace(/[^\u4e00-\u9fff]+/g, ''); let drivingLicenceName=this.drivingLicenceName.replace(/[^\u4e00-\u9fff]+/g, '');
let driverName=this.driverName.replace(/[^\u4e00-\u9fff]+/g, ''); let driverName=this.driverName.replace(/[^\u4e00-\u9fff]+/g, '');

View File

@@ -18,6 +18,43 @@
</template> </template>
</van-nav-bar> </van-nav-bar>
</div> </div>
<van-search
v-model="searchVal"
show-action
placeholder="请输入司机姓名、电话、身份证号"
@search="resetHandler"
>
<template #action>
<div @click="resetHandler">搜索</div>
</template>
</van-search>
<div class="filterWrap">
<el-select @change="resetHandler" multiple :collapse-tags="true" v-model="idCardStatusList" placeholder="身份证录入状态" :class="{'customSel':true , 'has-value': idCardStatusList }" clearable>
<el-option
v-for="item in idCardStatusListOptions"
:key="item.value"
:label="item.name"
:value="item.value">
</el-option>
</el-select>
<el-select @change="resetHandler" multiple :collapse-tags="true" v-model="driverLicenseStatusList" placeholder="驾驶证录入状态" :class="{'customSel':true , 'has-value': driverLicenseStatusList }" clearable>
<el-option
v-for="item in driverLicenseStatusListOptions"
:key="item.value"
:label="item.name"
:value="item.value">
</el-option>
</el-select>
<el-select @change="resetHandler" multiple :collapse-tags="true" v-model="authStatusList" placeholder="认证状态" :class="{'customSel':true , 'has-value': authStatusList }" clearable>
<el-option
v-for="item in authStatesOptions"
:key="item.value"
:label="item.name"
:value="item.value">
</el-option>
</el-select>
</div>
<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-model="loading" v-model="loading"
@@ -25,13 +62,32 @@
finished-text="没有更多了" finished-text="没有更多了"
@load="onLoad" @load="onLoad"
> >
<div class="itemWrap" v-for="(item,index) in driverList" :key="index"> <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> <div class="namephone">{{ item.driverName }} / {{ item.driverPhone }}
<div class="twoBtn"> <span style="margin-left: 10px" :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span>
<button v-if="permissonList.includes('driverModifyBtn')" class="del" @click="handleStatus(item)">{{ item.states?.label == '启用' ? '停用' : '启用' }}</button>
<button v-if="permissonList.includes('driverModifyBtn')" class="revise" @click="updateDriver(item)">修改</button>
</div> </div>
<div class="twoBtn">
<!-- 只有启用状态下才展示停用按钮-->
<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>-->
</div>
</div>
<div class="juhe flex-between">
<span class="zdJuhe">录入状态</span>
<span class="flex-right">
<span class="common_cls" v-if="item.idCardStatusStr" :class="getClass(item.idCardStatus)?.className">{{item.idCardStatusStr}}</span>
<span class="common_cls" v-if="item.driverLicenseStatusStr" :class="getClass(item.driverLicenseStatus)?.className">{{item.driverLicenseStatusStr}}</span>
</span>
<!-- <span class="flex-right" v-if="item.idCardStatusStr">
<span class="common_cls" :class="getClass(item.idCardStatus)?.className">{{item.idCardStatusStr}}</span>
</span>-->
</div>
<div class="juhe flex-between">
<span class="zdJuhe">认证状态</span>
<span class="flex-right" v-if="item.authStatusStr">
<span class="common_cls" :class="getClass(item.authStatusStr)?.className">{{item.authStatusStr}}</span>
</span>
</div> </div>
<div class="" style="display: flex"> <div class="" style="display: flex">
<div class="sex" style="margin-right: 40px"> <div class="sex" style="margin-right: 40px">
@@ -47,22 +103,24 @@
<span class="halfOpci">身份证号:</span> <span class="halfOpci">身份证号:</span>
<span class="allOpci">{{ item.identityCardNumber }}</span> <span class="allOpci">{{ item.identityCardNumber }}</span>
</div> </div>
<div> <van-icon class="arrow_position" v-if="permissonList.includes('driverModifyBtn')" name="arrow" />
<!-- <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>
</div>-->
</div> </div>
</div>
</van-list> </van-list>
</van-pull-refresh> </van-pull-refresh>
</div> </div>
</div>
</template> </template>
<script> <script>
import {myMixins} from "@/utils/myMixins" import {myMixins} from "@/utils/myMixins"
import {driverList, enableAction, userOperationPermissions} from "@/api/mine" import {driverList, enableAction, userOperationPermissions} from "@/api/mine"
import {Dialog} from "vant";
export default { export default {
name: "driverManage", name: "driverManage",
mixins:[myMixins], mixins:[myMixins],
@@ -79,6 +137,40 @@ export default {
loading: false, loading: false,
finished: false, finished: false,
permissonList:[], permissonList:[],
searchVal:'',
idCardStatusList:[],
driverLicenseStatusList:[],
authStatusList:[],
idCardStatusListOptions: [{
name: '身份证未录入',
value: 0
},{
name: '身份证核验通过',
value: 1
},{
name: '身份证核验不通过',
value: 2
}],
authStatesOptions: [{
name: '免冠正面照未录入',
value: 1
},{
name: '免冠正面照认证通过',
value: 3
},{
name: '免冠正面照认证不通过',
value: 2
}],
driverLicenseStatusListOptions: [{
name: '驾驶证未录入',
value: 0
},{
name: '驾驶证认证通过',
value: 1
},{
name: '驾驶证认证不通过',
value: 2
}],
} }
}, },
mounted() { mounted() {
@@ -88,9 +180,41 @@ export default {
// this.getDriverList() // this.getDriverList()
}, },
methods:{ methods:{
getClass(id) {
const ids = String(id)
const steps = {
0: {
className: 'default_cls'
},
1: {
className: 'success_cls'
},
2: {
className: 'danger_cls'
},
'免冠正面照未录入': {
className: 'default_cls'
},
'免冠正面照认证通过': {
className: 'success_cls'
},
'免冠正面照认证不通过': {
className: 'danger_cls'
},
}
return steps[ids] || { className: 'default_cls' }
},
async resetHandler() {
this.pageNum=1
this.finished = false;
this.total = 0;
await this.getDriverList();
},
async onLoad(){ async onLoad(){
await this.getDriverList() await this.getDriverList()
if (this.total>10){
this.pageNum++; this.pageNum++;
}
// 加载状态结束 // 加载状态结束
this.loading = false; this.loading = false;
// 数据全部加载完成 // 数据全部加载完成
@@ -118,7 +242,11 @@ export default {
async getDriverList(){ async getDriverList(){
let res = await driverList({ let res = await driverList({
pageNum:this.pageNum, pageNum:this.pageNum,
pageSize:this.pageSize pageSize:this.pageSize,
searchVal: this.searchVal,
idCardStatusList: this.idCardStatusList,
driverLicenseStatusList: this.driverLicenseStatusList,
authStatusList: this.authStatusList,
}); });
if(res.code == 200){ if(res.code == 200){
this.total=res.total this.total=res.total
@@ -130,12 +258,11 @@ export default {
this.driverList = preList.concat(arr) this.driverList = preList.concat(arr)
} }
} }
console.log('this.driverList',this.driverList)
}, },
async getPermissions(){ async getPermissions(){
let res = await userOperationPermissions(); let res = await userOperationPermissions();
this.permissonList = res.data this.permissonList = res.data
// console.log("司机管理",this.permissonList.includes('driverAddBtn'))
}, },
async handleStatus(item){ async handleStatus(item){
if(item.states.code === 0){ if(item.states.code === 0){
@@ -143,14 +270,23 @@ export default {
}else{ }else{
this.states = 0 this.states = 0
} }
Dialog.confirm({
message: '当前状态为启用,是否要改为停用?',
}).then(async () => {
await enableAction({ await enableAction({
driverId:item.driverId, driverId:item.driverId,
states:this.states states:this.states
}) })
this.pageNum = 1; this.pageNum = 1;
await this.getDriverList(); await this.getDriverList();
}).catch(() => {
});
}, },
updateDriver(item){ updateDriver(item){
if(!this.permissonList.includes('driverModifyBtn')){//有权限才能修改
return
}
// 在当前组件中进行路由跳转并传递参数对象 // 在当前组件中进行路由跳转并传递参数对象
this.$router.push({ this.$router.push({
name: 'driverAdd', // 目标路由的名称 name: 'driverAdd', // 目标路由的名称
@@ -185,7 +321,7 @@ export default {
.wrap { .wrap {
background: #F4F5F7; background: #F4F5F7;
@include sizingPadding(13px,13px); //@include sizingPadding(13px,13px);
@include wh(100%, 100%); @include wh(100%, 100%);
overflow-y: auto; overflow-y: auto;
} }
@@ -208,7 +344,7 @@ export default {
} }
.itemWrap { .itemWrap {
@include wh(100%, 104px); @include wh(100%, 140px);
@include radiusSizing(6px); @include radiusSizing(6px);
@include fontWeightSize(400, 12px); @include fontWeightSize(400, 12px);
@include flexBetween; @include flexBetween;
@@ -216,6 +352,7 @@ export default {
box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5); box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
margin-bottom: 10px; margin-bottom: 10px;
padding: 11px 13px 9px 15px; padding: 11px 13px 9px 15px;
position: relative;
.halfOpci { .halfOpci {
opacity: .5; opacity: .5;
margin-right: 5px; margin-right: 5px;
@@ -224,15 +361,15 @@ export default {
opacity: 1; opacity: 1;
} }
.statusNo { .statusNo {
color: #FF0000; color: red;
} }
.statusYes { .statusYes {
color: #09B820 color: green
} }
} }
.name-status { .name-status {
@include flexColBet; @include flexBetCen;
.namephone { .namephone {
@include fontWeightSize(bold, 14px) @include fontWeightSize(bold, 14px)
} }
@@ -256,6 +393,128 @@ export default {
margin-left: 15px; margin-left: 15px;
} }
} }
}
.filterWrap {
width: 100%;
padding-right: 13px;
padding-left: 13px;
display: flex;
overflow-x: auto; /* 允许横向滚动 */
white-space: nowrap; /* 防止子元素换行 */
padding-bottom: 10px;
-webkit-overflow-scrolling: touch; /* 在iOS上平滑滚动 */
scrollbar-width: none; /* Firefox */
padding-bottom: 10px;
/*padding: 10px;*/
margin-bottom: 10px;
background-color: #fff;
box-sizing: border-box;
&::-webkit-scrollbar {
display: none; /* Chrome/Safari */
}
.customSel {
flex: 0 0 auto; /* 防止子元素被压缩 */
width: calc(33% - 5px);
/*width: 100%;*/
height: 25px;
background: #F5F5F5;
border-radius: 4px;
font-size: 10px;
color: #323233;
margin-right: 5px;
::v-deep .el-input__inner{
padding: 0 2px;
height: 25px;
font-size: 10px;
background: #F5F5F5;
border-radius: 4px;
border: none;
}
::v-deep .el-input__icon{
line-height: 25px;
font-size: 10px;
width: 18px;
color: #2A5094;
}
::v-deep .el-input__suffix{
right: 2px;
}
}
.customInput{
/*width: 49%;*/
width: 130px;
}
.has-value ::v-deep .el-input__inner{
background: #F1F6FF ;
color: #007BE9;
font-weight: bold;
padding-left: 8px;
}
.has-value ::v-deep .el-input__icon{
color: #007BE9;
}
.priceSel{
display: flex;
justify-content: space-around;
align-items: center;
color: #C0C4CC;
.iconSpan{
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
font-size: 8px;
}
}
.has-price{
color: #007BE9 !important;
}
}
.wrap_cls {
width: 100%;
padding-left: 13px;
padding-right: 13px;
box-sizing: border-box;
}
.common_cls {
color: #fff;
padding: 4px 8px;
border-radius: 3px;
margin-right: 6px;
}
.default_cls {
background-color: #B0BEC5;
}
.danger_cls {
background-color: red;
}
.success_cls {
background-color: #4CAF50;
}
.info_cls {
background-color: #FF9800;
}
.main_cls {
background-color: #6C9BFF;
}
.arrow_position {
position: absolute;
right: 5px;
top: 50px;
font-size: 20px;
opacity: 0.6;
}
.carType,.zdJuhe{
opacity: .7;
@include fontWeightSize(400,12px);
margin-right: 8px;
}
/*.zdJuhe {
width: 80px;
text-align: right;
margin-left: -10px;
}*/
.flex-between{
line-height: 24px;
} }
</style> </style>

View File

@@ -9,7 +9,7 @@
<img class="title1" src="@/assets/supplier/title1.png" alt=""> <img class="title1" src="@/assets/supplier/title1.png" alt="">
<div class="credentials_wrap"> <div class="credentials_wrap">
<div class="credentials_item"> <div class="credentials_item">
<div class="credentials_title">1. 法人身份证正面</div> <div class="credentials_title">1.法人身份证人像页</div>
<van-uploader <van-uploader
accept="image/*" accept="image/*"
v-model="idFrontPhotoList" v-model="idFrontPhotoList"
@@ -22,7 +22,7 @@
</van-uploader> </van-uploader>
</div> </div>
<div class="credentials_item ml2"> <div class="credentials_item ml2">
<div class="credentials_title">2. 法人身份证反面</div> <div class="credentials_title">2.法人身份证国徽页</div>
<van-uploader <van-uploader
accept="image/*" accept="image/*"
v-model="idBackPhotoList" v-model="idBackPhotoList"
@@ -47,6 +47,19 @@
</div> </div>
</van-uploader> </van-uploader>
</div> </div>
<div class="credentials_item">
<div class="credentials_title">4.开户许可证/基本存款账户信息</div>
<van-uploader
accept="image/*"
v-model="licensePhotoList"
:after-read="licensePhotoHandler"
:max-size="5 * 1024 * 1024"
max-count="1">
<div class="custom-background">
<img src="@/assets/supplier/licensePhoto.png" alt="">
</div>
</van-uploader>
</div>
</div> </div>
</div> </div>
<div class="company_info"> <div class="company_info">
@@ -57,6 +70,7 @@
<van-field :border="true" readonly v-model="form.legalName" class="required" name="legalName" label="法人姓名" placeholder="请输入" :rules="[{ required: true, message: '请输入法人姓名' }]" /> <van-field :border="true" readonly v-model="form.legalName" class="required" name="legalName" label="法人姓名" placeholder="请输入" :rules="[{ required: true, message: '请输入法人姓名' }]" />
<van-field :border="true" v-model="form.linkName" class="required" name="linkName" label="联系人姓名" placeholder="请输入" :rules="[{ required: true, message: '请输入联系人姓名' }]" /> <van-field :border="true" v-model="form.linkName" class="required" name="linkName" label="联系人姓名" placeholder="请输入" :rules="[{ required: true, message: '请输入联系人姓名' }]" />
<van-field :border="true" v-model="form.linkPhone" class="required" name="linkPhone" label="联系电话" placeholder="请输入" :rules="phoneVerify" /> <van-field :border="true" v-model="form.linkPhone" class="required" name="linkPhone" label="联系电话" placeholder="请输入" :rules="phoneVerify" />
<van-field :border="true" v-model="form.linkEmail" class="required" name="linkEmail" label="邮箱" placeholder="请输入" :rules="emailVerify" />
<van-field :border="true" class="required" name="serviceType" label="服务能力"> <van-field :border="true" class="required" name="serviceType" label="服务能力">
<template #input> <template #input>
<el-tree <el-tree
@@ -121,13 +135,16 @@
return { return {
clickFlag: true, clickFlag: true,
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: '邮箱格式不正确' }],
id:'', //车辆Id id:'', //车辆Id
idBackPhotoList: [], idBackPhotoList: [],
idBackPhoto: '', idBackPhoto: '',
idFrontPhotoList: [], idFrontPhotoList: [],
idFrontPhoto: '', idFrontPhoto: '',
companyPhotoList: [], companyPhotoList: [],
licensePhotoList: [],
companyPhoto: '', companyPhoto: '',
licensePhoto:'',
form: { form: {
name: '', name: '',
legalName: '', legalName: '',
@@ -138,6 +155,23 @@
trailCount: '', trailCount: '',
minorCount: '', minorCount: '',
serviceAreaCode: [], serviceAreaCode: [],
linkEmail:'',
accountInfoDTO:{
dutyParagraph:'',
accountNumber:'',
accountName:'',
accountType:'',
invoiceType:'',
settlementType:'',
shouldRate:'',
realRate:'',
unitName:'',
bankNo:'',
billingPhone:'',
billingAddress:'',
billHead:'',
companyType:'',
}
}, },
qrCodeUrl: '', qrCodeUrl: '',
qrCode: '', qrCode: '',
@@ -195,6 +229,7 @@
this.idFrontPhoto = _data?.idCardFrontUrl; this.idFrontPhoto = _data?.idCardFrontUrl;
this.idBackPhoto = _data?.idCardBackUrl; this.idBackPhoto = _data?.idCardBackUrl;
this.companyPhoto = _data?.businessLicense; this.companyPhoto = _data?.businessLicense;
this.licensePhoto = _data?.accountUrl;
this.wechatId = _data?.wechatId this.wechatId = _data?.wechatId
if(this.idFrontPhoto) { if(this.idFrontPhoto) {
this.idFrontPhotoList = [{ url : this.idFrontPhoto }]; this.idFrontPhotoList = [{ url : this.idFrontPhoto }];
@@ -205,6 +240,9 @@
if(this.companyPhoto) { if(this.companyPhoto) {
this.companyPhotoList = [{ url : this.companyPhoto }]; this.companyPhotoList = [{ url : this.companyPhoto }];
} }
if(this.licensePhoto){
this.licensePhotoList= [{ url : this.licensePhoto }];
}
if( _data.service ) { if( _data.service ) {
this.$refs.tree.setCheckedKeys(_data.service.split(',')) this.$refs.tree.setCheckedKeys(_data.service.split(','))
} }
@@ -215,11 +253,11 @@
}, },
async applyAdd() { async applyAdd() {
if( !this.idFrontPhoto ) { if( !this.idFrontPhoto ) {
this.$toast('法人身份证正面照未上传') this.$toast('法人身份证人像页未上传')
return return
} }
if( !this.idBackPhoto ) { if( !this.idBackPhoto ) {
this.$toast('法人身份证反面照未上传') this.$toast('法人身份证国徽页未上传')
return return
} }
if( !this.companyPhoto ) { if( !this.companyPhoto ) {
@@ -230,6 +268,7 @@
this.$toast('服务区域不能为空') this.$toast('服务区域不能为空')
return return
} }
// this.wechatId='wmOTNXBwAABrvKkE_Fh8ZN8Xm2S9v2wQ'
if(!this.wechatId) { if(!this.wechatId) {
await this.QrCodeResult(); await this.QrCodeResult();
if( !this.wechatId ) { if( !this.wechatId ) {
@@ -237,7 +276,6 @@
return return
} }
} }
if( this.$refs.tree.getCheckedKeys().length > 0 ) { if( this.$refs.tree.getCheckedKeys().length > 0 ) {
await this.saveHandler() await this.saveHandler()
} else { } else {
@@ -261,22 +299,15 @@
_node.map(item => { _node.map(item => {
checkArr.push(item.data.id) checkArr.push(item.data.id)
}) })
/* let treeArr = this.$refs.tree.getCheckedKeys();
let childrenTreeArr = [];
treeArr.map(item => {
let _arr = this.supplierServiceList.filter(_item => _item.id == item) || [] // 获取对应的大类
_arr[0]?.children?.map(childItem => {
childrenTreeArr?.push(childItem?.id)
})
})
let allArr = [...treeArr, ...childrenTreeArr]*/
let res = await saveSupplier({ let res = await saveSupplier({
id: this.id, id: this.id,
...this.form, ...this.form,
accountInfoJson:JSON.stringify(this.form.accountInfoDTO),
accountInfoDTO:{},
idCardFrontUrl: this.idFrontPhoto, idCardFrontUrl: this.idFrontPhoto,
idCardBackUrl: this.idBackPhoto, idCardBackUrl: this.idBackPhoto,
businessLicense: this.companyPhoto, businessLicense: this.companyPhoto,
accountUrl:this.licensePhoto,
service: this.$refs.tree.getCheckedKeys().join(',') , service: this.$refs.tree.getCheckedKeys().join(',') ,
serviceAreaCode: checkArr.join(','), serviceAreaCode: checkArr.join(','),
wechatId: this.wechatId, wechatId: this.wechatId,
@@ -382,8 +413,26 @@
}) })
this.form.name = res?.data?.name; this.form.name = res?.data?.name;
this.form.areaName = res?.data?.address this.form.areaName = res?.data?.address
this.form.accountInfoDTO.dutyParagraph=res?.data?.regNum
this.form.accountInfoDTO.unitName = res?.data?.name
this.form.accountInfoDTO.companyType=res?.data?.type
await this.QrCodeHandler(); await this.QrCodeHandler();
}, },
async licensePhotoHandler(file){// 开户许可证
const formData = new FormData();
formData.append("file" , file.file);
let res = await uploadImage(formData);
this.licensePhoto = res.data
await this.licenseOcrHandler()
},
async licenseOcrHandler(){// 开户许可证ocr识别
let res = await ocrHandler({
ocrType: 15,
imageUrl: this.licensePhoto,
})
this.form.accountInfoDTO.accountNumber=res?.data?.accountNumber
this.form.accountInfoDTO.accountName = res?.data?.accountBank
},
}, },
computed: { computed: {
regionText() { regionText() {
@@ -413,12 +462,13 @@
padding: 0 20px; padding: 0 20px;
} }
.credentials_info { .credentials_info {
height: 170px; //height: 170px;
} }
.credentials_wrap { .credentials_wrap {
display: flex; display: flex;
width: 100%; width: 100%;
margin-top: 10px; margin-top: 10px;
flex-wrap: wrap;
.credentials_item { .credentials_item {
width: 32%; width: 32%;
text-align: center; text-align: center;

View File

@@ -28,17 +28,21 @@
<div class="common_title">证件照信息</div> <div class="common_title">证件照信息</div>
<div class="credentials_wrap"> <div class="credentials_wrap">
<div class="credentials_item"> <div class="credentials_item">
<div class="credentials_title">1. 法人身份证正面</div> <div class="credentials_title">1.法人身份证人像页</div>
<img :src="supplierInfo?.idCardFrontUrl" alt=""> <img :src="supplierInfo?.idCardFrontUrl" alt="">
</div> </div>
<div class="credentials_item ml2"> <div class="credentials_item ml2">
<div class="credentials_title">2. 法人身份证反面</div> <div class="credentials_title">2.法人身份证国徽页</div>
<img :src="supplierInfo?.idCardBackUrl" alt=""> <img :src="supplierInfo?.idCardBackUrl" alt="">
</div> </div>
<div class="credentials_item ml2"> <div class="credentials_item ml2">
<div class="credentials_title">3.营业执照</div> <div class="credentials_title">3.营业执照</div>
<img :src="supplierInfo?.businessLicense" alt=""> <img :src="supplierInfo?.businessLicense" alt="">
</div> </div>
<div class="credentials_item">
<div class="credentials_title">4.开户许可证/基本存款账户信息</div>
<img :src="supplierInfo?.accountUrl" alt="">
</div>
</div> </div>
</div> </div>
<div class="company_info"> <div class="company_info">
@@ -72,6 +76,10 @@
<div class="label">联系电话</div> <div class="label">联系电话</div>
<div class="content">{{supplierInfo?.linkPhone}}</div> <div class="content">{{supplierInfo?.linkPhone}}</div>
</div> </div>
<div class="info_item">
<div class="label">邮箱</div>
<div class="content">{{supplierInfo?.linkEmail}}</div>
</div>
<div class="info_item"> <div class="info_item">
<div class="label">服务能力</div> <div class="label">服务能力</div>
<div class="content service_color">{{supplierInfo?.serviceCategoryName}}</div> <div class="content service_color">{{supplierInfo?.serviceCategoryName}}</div>
@@ -191,7 +199,6 @@
id: this.id, id: this.id,
}); });
this.supplierInfo = res?.data; this.supplierInfo = res?.data;
console.log('res', res)
}, },
} }
} }
@@ -259,7 +266,7 @@
margin-top: 5px; margin-top: 5px;
} }
.supplier_content { .supplier_content {
padding: 0 24px; padding: 0 20px;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
} }
@@ -282,6 +289,7 @@
display: flex; display: flex;
width: 100%; width: 100%;
margin-top: 10px; margin-top: 10px;
flex-wrap: wrap;
.credentials_item { .credentials_item {
width: 32%; width: 32%;
text-align: center; text-align: center;

View File

@@ -199,7 +199,7 @@
<div class="isJoin"> <div class="isJoin">
<van-radio-group v-model="vehicleStatus" :class="{ 'disabled-tree': vehicleInfoDisabled }" :disabled="vehicleInfoDisabled" @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">
1 启用
<img <img
slot="icon" slot="icon"
slot-scope="props" slot-scope="props"
@@ -207,7 +207,7 @@
> >
</van-radio> </van-radio>
<van-radio :name="2" style="margin-right: 14px"> <van-radio :name="2" style="margin-right: 14px">
1 停用
<img <img
slot="icon" slot="icon"
slot-scope="props" slot-scope="props"
@@ -744,7 +744,8 @@ export default {
clickPreview(){ clickPreview(){
console.log(' this.insurancePicturePhoto', this.insurancePicturePhoto) console.log(' this.insurancePicturePhoto', this.insurancePicturePhoto)
if(this.insurancePicturePhoto && this.insurancePicturePhoto.indexOf('.pdf') !== -1){ if(this.insurancePicturePhoto && this.insurancePicturePhoto.indexOf('.pdf') !== -1){
window.open(this.insurancePicturePhoto.replace("http://", "https://")) let url=this.insurancePicturePhoto?.split(',')[0]
window.open(url.replace("http://", "https://"))
} }
}, },
async insurancePictureFilesHandler(file) { async insurancePictureFilesHandler(file) {
@@ -752,6 +753,7 @@ export default {
formData.append("file" , file.file); formData.append("file" , file.file);
let res = await uploadImage(formData); let res = await uploadImage(formData);
this.insurancePicturePhoto = res.data; this.insurancePicturePhoto = res.data;
console.log('insurancePictureFilesHandler',this.insurancePictureFiles)
}, },
async ocrCarFrontHandler() { // 车辆正面 orc 识别 async ocrCarFrontHandler() { // 车辆正面 orc 识别
let res = await ocrHandler({ let res = await ocrHandler({
@@ -901,8 +903,9 @@ export default {
this.insuranceCorp = result.insuranceCorp; this.insuranceCorp = result.insuranceCorp;
this.liabilityInsuranceAudit = result.liabilityInsuranceAudit this.liabilityInsuranceAudit = result.liabilityInsuranceAudit
if(this.insurancePicturePhoto) { if(this.insurancePicturePhoto) {
this.insurancePictureFiles = [{url: this.insurancePicturePhoto}] this.insurancePictureFiles = [{url: this.insurancePicturePhoto?.split(',')[0]}]
} }
console.log('this.insurancePictureFiles',this.insurancePictureFiles)
if( this.vehicleLicenseFront ) { if( this.vehicleLicenseFront ) {
this.vehicleLicenseFrontList = [{ url : this.vehicleLicenseFront }]; this.vehicleLicenseFrontList = [{ url : this.vehicleLicenseFront }];
} }

View File

@@ -21,7 +21,7 @@
<van-search <van-search
v-model="searchVal" v-model="searchVal"
show-action show-action
placeholder="车辆名称/车牌号/车架号" placeholder="请输入车辆名称车牌号车架号"
@search="resetHandler" @search="resetHandler"
> >
<template #action> <template #action>
@@ -39,6 +39,14 @@
></i> ></i>
</template> </template>
</el-input>--> </el-input>-->
<el-select @change="resetHandler" multiple :collapse-tags="true" v-model="authStates" placeholder="认证状态" :class="{'customSel':true , 'has-value': authStates }" clearable>
<el-option
v-for="item in authStatesOptions"
:key="item.value"
:label="item.name"
:value="item.value">
</el-option>
</el-select>
<el-select @change="resetHandler" multiple :collapse-tags="true" v-model="inputStatusList" placeholder="录入状态" :class="{'customSel':true , 'has-value': inputStatusList }" clearable> <el-select @change="resetHandler" multiple :collapse-tags="true" v-model="inputStatusList" placeholder="录入状态" :class="{'customSel':true , 'has-value': inputStatusList }" clearable>
<el-option <el-option
v-for="item in inputStatusListOptions" v-for="item in inputStatusListOptions"
@@ -49,14 +57,6 @@
</el-select> </el-select>
<!-- </div>--> <!-- </div>-->
<!-- <div>--> <!-- <div>-->
<el-select @change="resetHandler" multiple :collapse-tags="true" v-model="authStates" placeholder="认证状态" :class="{'customSel':true , 'has-value': authStates }" clearable>
<el-option
v-for="item in authStatesOptions"
:key="item.value"
:label="item.name"
:value="item.value">
</el-option>
</el-select>
<el-select @change="resetHandler" multiple :collapse-tags="true" v-model="liabilityInsuranceAuditList" placeholder="职业责任险" :class="{'customSel':true , 'has-value': liabilityInsuranceAuditList }" clearable> <el-select @change="resetHandler" multiple :collapse-tags="true" v-model="liabilityInsuranceAuditList" placeholder="职业责任险" :class="{'customSel':true , 'has-value': liabilityInsuranceAuditList }" clearable>
<el-option <el-option
v-for="item in insuresOptions" v-for="item in insuresOptions"
@@ -79,11 +79,12 @@
<div class="carItem" v-for="(item,index) in vehicleList" :key="index" @click.stop="updateVehicle(item)"> <div class="carItem" v-for="(item,index) in vehicleList" :key="index" @click.stop="updateVehicle(item)">
<div class="carCode"> <div class="carCode">
<div class="codeLeft">{{item.plateNumber}} / {{item.vehicleTypeString}} <div class="codeLeft">{{item.plateNumber}} / {{item.vehicleTypeString}}
<span class="ml10" @click.stop="updateStatus(item)" :class="{'insuranceSuccess': item.vehicleStatus == 1, 'insuranceDanger': item.vehicleStatus == 2 ,'insuranceGray': !item.vehicleStatus }">{{ item.vehicleStatus == 1 ? '启用' :( item.vehicleStatus == 2 ? '停用' : ( item.vehicleStatus == 12 ? '否-服务商停用' : '无状态')) }} </span> <span class="ml10" :class="{'insuranceSuccess': item.vehicleStatus == 1, 'insuranceDanger': item.vehicleStatus == 2 ,'insuranceGray': !item.vehicleStatus }">{{ item.vehicleStatus == 1 ? '启用' :( item.vehicleStatus == 2 ? '停用' : ( item.vehicleStatus == 12 ? '否-服务商停用' : '无状态')) }} </span>
</div> </div>
<div class="codeRight" v-if="item.vehicleStatus == 1" @click.stop="updateStatus(item)">停用</div>
</div> </div>
<div class="juhe flex-between"> <div class="juhe flex-between">
<span class="zdJuhe">核验认证</span>
<span class="flex-right"> <span class="flex-right">
<span class="common_cls" v-if="item.inputStatusString" :class="getClass(item.inputStatusString)?.className">{{item.inputStatusString}}</span> <span class="common_cls" v-if="item.inputStatusString" :class="getClass(item.inputStatusString)?.className">{{item.inputStatusString}}</span>
<span class="common_cls" v-if="item.authStateString" :class="getClass(item.authStateString)?.className">{{item.authStateString}}</span> <span class="common_cls" v-if="item.authStateString" :class="getClass(item.authStateString)?.className">{{item.authStateString}}</span>
@@ -95,12 +96,12 @@
<span class="common_cls" @click.stop="showTip(item.liabilityInsuranceAuditMsg)" :class="getClass(item.rescueInsurance)?.className">{{item.rescueInsurance}}</span> <span class="common_cls" @click.stop="showTip(item.liabilityInsuranceAuditMsg)" :class="getClass(item.rescueInsurance)?.className">{{item.rescueInsurance}}</span>
</span> </span>
</div> </div>
<div class="juhe flex-between"> <!-- <div class="juhe flex-between">
<span class="zdJuhe">车辆信息</span> <span class="zdJuhe">车辆信息</span>
<span class="flex-right" v-if="item.auditStatusStr"> <span class="flex-right" v-if="item.auditStatusStr">
<span class="common_cls" @click.stop="showTip(item.auditMsg)" :class="getClass(item.auditStatusStr)?.className">{{item.auditStatusStr}}</span> <span class="common_cls" @click.stop="showTip(item.auditMsg)" :class="getClass(item.auditStatusStr)?.className">{{item.auditStatusStr}}</span>
</span> </span>
</div> </div>-->
<div class="juhe flex-between"> <div class="juhe flex-between">
<span class="zdJuhe">最近登录时间</span> <span class="zdJuhe">最近登录时间</span>
<span class="flex-right">{{item.lastLoginTime}}</span> <span class="flex-right">{{item.lastLoginTime}}</span>
@@ -249,7 +250,9 @@ export default {
}, },
async onLoad(){ async onLoad(){
await this.getVehicleList() await this.getVehicleList()
if(this.total>10){
this.pageNum++; this.pageNum++;
}
// 加载状态结束 // 加载状态结束
this.loading = false; this.loading = false;
// 数据全部加载完成 // 数据全部加载完成
@@ -412,6 +415,12 @@ export default {
.codeLeft{ .codeLeft{
@include fontWeightSize(bold,14px) @include fontWeightSize(bold,14px)
} }
.codeRight{
padding: 2px 8px;
border: 1px solid #DDDDDD;
border-radius: 3px;
font-weight: bold;
}
.twoBtn{ .twoBtn{
display: flex; display: flex;
align-items: center; align-items: center;

View File

@@ -1626,13 +1626,13 @@ export default {
getTitle(type) { getTitle(type) {
switch (type) { switch (type) {
case 0: case 0:
return '接单时效';
case 1:
return '客户评价'; return '客户评价';
case 2: case 1:
return 'APP使用'; return 'APP使用';
case 3: case 2:
return '时效'; return '时效';
/* case 3:
return '时效';*/
} }
}, },
} }

View File

@@ -0,0 +1,443 @@
<template>
<div class="wrap">
<div class="navBar">
<van-nav-bar
title="人员信息"
:left-arrow="Boolean(!isWebFunc())"
left-arrow-color="#FFFFFF"
:border="false"
:fixed="true"
:safe-area-inset-top="true"
@click-left="goBack"
/>
</div>
<div :class="{'tipWrap':true,'yelBg':type==3,'greBg':type==4}">
<img v-show="[1,2].includes(type)" src="@/assets/unpass.png" />
<img v-show="[3].includes(type)" src="@/assets/yelTip.png" />
<img v-show="[4].includes(type)" src="@/assets/greTip.png" />
<span v-if="type==1">请立即核对或修改以下信息姓名/身份/电话/微信号/邮箱</span>
<span v-else-if="type==2">角色无法修改如需修改角色请联系区域经理提交审批后请到管理人员模块进行查看</span>
<span v-else-if="type==3">当前信息正在确认中如需调整请联系区域经理</span>
<span v-else-if="type==4">当前信息已确认如需调整请联系区域经理</span>
</div>
<van-loading v-show="personList.length<=0" class="loadingWrap" type="spinner" color="#1989fa" />
<div class="contentWrap" v-show="personList.length>0"
:style="{'height':([1,2].includes(type) && isMaster) ? 'calc(100% - 160px)' : 'calc(100% - 90px)'}">
<div class="itemWrap" v-for="(item,index) in personList" :key="index">
<div class="opaCol">人员{{(index+1)}}:</div>
<div class="line"></div>
<div class="item">
<div class="left" :class="{'opaCol':type!=2}"><span class="star">*</span><span>姓名</span></div>
<div class="right">
<van-field :input-align="type==2 ? 'right' : 'left'" :readonly="type!=2" v-model="item.name" placeholder="请输入" />
</div>
</div>
<div class="item">
<div class="left opaCol"><span class="star" style="opacity: 0">*</span><span>角色</span></div>
<div class="right" :class="{'opaCol':type==2}">
<van-field :input-align="type==2 ? 'right' : 'left'" readonly v-model="item.roleName" placeholder="请输入" />
</div>
</div>
<div class="item">
<div class="left" :class="{'opaCol':type!=2}"><span class="star">*</span><span>电话1</span></div>
<div class="right">
<van-field :input-align="type==2 ? 'right' : 'left'" :readonly="type!=2" v-model.number="item.phone1" placeholder="请输入" @blur="blurHandle" />
</div>
</div>
<div class="item">
<div class="left" :class="{'opaCol':type!=2}"><span class="star" style="opacity: 0">*</span><span>电话2</span></div>
<div class="right">
<van-field :input-align="type==2 ? 'right' : 'left'" :readonly="type!=2" v-model.number="item.phone2" @blur="blurHandle" placeholder="请输入" />
</div>
</div>
<div class="item">
<div class="left" :class="{'opaCol':type!=2}"><span class="star">*</span><span>微信号</span></div>
<div class="right wechatRight">
<span class="reviseBtn" v-show="type==2" @click="wechatRevise(item,index)">修改</span>
<van-field :input-align="type==2 ? 'right' : 'left'" readonly v-model="item.wechatName" />
</div>
</div>
<div class="item">
<div class="left" :class="{'opaCol':type!=2}"><span class="star" style="opacity: 0">*</span><span>邮箱</span></div>
<div class="right">
<van-field :input-align="type==2 ? 'right' : 'left'" :readonly="type!=2" v-model="item.email" placeholder="请输入" />
</div>
</div>
</div>
</div>
<div class="btnWrap" v-if="isMaster && [1,2].includes(type)">
<div v-show="type==2" class="audit common" @click="auditHandle">提交审批</div>
<div v-show="type==1" class="revise common" @click="reviseHandle">立即修改</div>
<div v-show="type==1" class="confirm common" @click="confirmHandle">确认信息无误</div>
</div>
<van-dialog v-model="dialogShow" title="请将此二维码发送至相应人员进行添加,成功添加后将更新微信号。" show-cancel-button
confirmButtonText="确认已添加" confirmButtonColor="#354E93" className="customDialog"
@confirm="wechatConfirm" @cancel="cancelHandle">
<img v-if="wechatInfo?.qrCode" :src="wechatInfo.qrCode" style="width: 83%"/>
</van-dialog>
</div>
</template>
<script>
import {myMixins} from "@/utils/myMixins"
import {getConfirmPerson,getConfirmStatus,getQrCode,confirmAddWechat,confirm,submitConfirm} from "@/api/authentication";
import { Dialog } from 'vant';
export default {
name: "personList",
mixins:[myMixins],
data(){
return{
noClick:true,
id:'',
type:'',//1确认信息 2修改 3审批中 4已确认
personList:[],
dialogShow:false,
reviseIndex:-1,
supplierId:'',
wechatInfo:'',
personInfoId:'',
personInfo:'',
isMaster:false,
}
},
async mounted() {
window.addEventListener('message', (event) => {
if (event.data === 'dialogClosed') {
// console.log('Dialog 已关闭 // 执行关闭后的逻辑');
}
});
// console.log('isWebFunc()',this.isWebFunc())
const urlParams = new URLSearchParams(window.location.search);
this.id=this.$route.query.id || urlParams.get('id');
this.supplierId=this.$route.query.supplierId || urlParams.get('supplierId');
// this.supplierId=1128
console.log('1111',this.supplierId)
await this.getPersonList()
},
methods:{
blurHandle(e){
let val= e.target.value || ''
let flag=this.validatePhone(val)
// console.log('flag',flag)
if(!flag){
this.$toast('手机号格式不正确')
}
},
validatePhone(val) {
console.log('val',val)
if(!val){
return true
}
const purePhone = val
// 情况111位且1开头 → 合法
if (/^1[0-9]{10}$/.test(purePhone)) {
return true
}
// 情况212位且首位是0、第二位是1 → 去0后合法
if (/^01[0-9]{10}$/.test(purePhone)) {
return true
}
// 其他情况 → 不合法
return false
},
async getPersonList(){
let result=await getConfirmStatus({supplierId:this.supplierId})
if(result.data?.wechatConfirmStatus==2){
this.type=3
}else if(result.data?.wechatConfirmStatus==3){
this.type=4
}else if(!result.data?.wechatConfirmStatus || result.data?.wechatConfirmStatus==1){
this.type=1
}
this.isMaster=result.data.isMaster
// this.type=2
let res=await getConfirmPerson({supplierId:this.supplierId})
if(res.data && res.data.length>0){
this.personList=res.data
}else{
this.personList=[]
}
},
async wechatConfirm(){//确认已添加微信按钮
Dialog.confirm({
message:'请确认相关人员是否已添加该二维码。',
confirmButtonText:'确认',
cancelButtonText:'取消',
confirmButtonColor:'#354E93',
}).then(async() => {
let res=await confirmAddWechat({supplierId:this.supplierId,supplierPersonInfoId:this.personInfoId})
console.log('res',this.personInfo,res.data?.name,this.personInfo.wechatName)
if((res.data?.name == this.personInfo.wechatName) || (!res.data && this.personInfo.wechatName)){
console.log('11111111')
this.$set(this.personList[this.reviseIndex],'isChange',false)
}else {
console.log('2222222')
this.$set(this.personList[this.reviseIndex],'isChange',true)
}
console.log('this.personList',this.personList)
let flagRevise=this.personList.some(item => 'isChange' in item && !item.isChange)
console.log('存在未修改',flagRevise)
if(res.data){
this.personList[this.reviseIndex].wechatId=res.data?.externalUserId
this.personList[this.reviseIndex].wechatName=res.data?.name
}
await this.cancelHandle()
}).catch(async () => {
await this.cancelHandle()
});
},
cancelHandle(){
this.dialogShow=false
this.wechatInfo=''
this.reviseIndex=-1
this.personInfoId=''
},
async wechatRevise(item,index){
console.log('item,index',item,index)
// console.log('item',item)
this.personInfoId=item.id
this.reviseIndex=index
this.personInfo=item
await this.getCode()
this.dialogShow=true
},
async getCode(){//获取二维码
let res = await getQrCode({supplierId:this.supplierId,supplierPersonInfoId:this.personInfoId})
// console.log('res--getCode',res)
this.wechatInfo=res.data || ''
},
async auditHandle(){//提交审批
let flag=this.personList.every(item => item.name && item.phone1 && item.wechatId && item.wechatName)
if(!flag){
this.$toast('必填项不可为空')
return
}
console.log('----',this.personList)
let flagRevise=this.personList.some(item => 'isChange' in item && !item.isChange)
console.log('存在未修改',flagRevise)
if(flagRevise){
this.$toast('您仍未修改微信号,请先修改再提交审批。')
return
}
let phone1Flag= this.personList.every(item => this.validatePhone(item.phone1))
let phone2Flag= this.personList.every(item => (item.phone2 && this.validatePhone(item.phone2) || !item.phone2))
console.log('phone1Flag',phone1Flag)
console.log('phone2Flag',phone2Flag)
if(!phone1Flag || !phone2Flag){
return
}
await submitConfirm({supplierId:this.supplierId,infos:this.personList})
this.$toast('操作成功')
if(this.isWebFunc()){
setTimeout(()=>{
this.closeParentDialog()
},1500)
}else{
setTimeout(()=>{
this.goBack()
},1500)
}
},
async reviseHandle(){//修改
this.type=2
},
async confirmHandle(){//确认信息无误
let flag=this.personList.every(item => item.name && item.phone1 && item.wechatId && item.wechatName)
if(!flag){
this.$toast('必填项不可为空,请点击“立即修改”将信息补充完整')
return
}
Dialog.confirm({
message:'请务必仔细确认信息是否无误。',
confirmButtonText:'确认无误',
cancelButtonText:'返回',
confirmButtonColor:'#354E93',
}).then(async() => {
// console.log('确认无误')
await confirm({supplierId:this.supplierId})
this.$toast('操作成功')
if(this.isWebFunc()){
setTimeout(()=>{
this.closeParentDialog()
},1500)
}else{
setTimeout(()=>{
this.goBack()
},1500)
}
}).catch(() => {
});
},
}
}
</script>
<style lang="scss">
.customDialog {
.van-dialog__content{
text-align: center !important;
}
.van-dialog__header {
box-sizing: border-box;
padding: 12px;
}
}
</style>
<style scoped lang="scss">
@import "@/styles/common.scss";
@import '@/styles/mixin.scss';
.wrap {
@include wh(100%, 100%);
position: relative;
background-color: #F6F6F6;
}
.navBar{
margin-bottom: 46px;
}
.tipWrap{
width: 100%;
box-sizing: border-box;
padding: 8px 8px 8px 18px;
margin-bottom: 10px;
display: flex;
background-color: #FFF6F2;
img{
width: 14px;
height: 14px;
//vertical-align: middle;
margin-right: 5px;
margin-top: 2px;
}
span{
color: #FC3C06;
}
}
.yelBg{
background-color: #FFFFED ;
span{
color: #F36708;
}
}
.greBg{
background-color: #E8FFF3;
span{
color: #19AC43;
}
}
/*.headerWrap{
width: 100%;
box-sizing: border-box;
padding: 15px 16px;
position: relative;
display: flex;
justify-content: space-between;
align-items: center;
.back{
@include wh(15px,15px);
}
span{
font-weight: bold;
font-size: 16px;
color: #203152;
}
}*/
.loadingWrap{
width: 100%;
height: calc(100% - 90px);
text-align: center;
line-height: 200px;
}
.contentWrap{
//height: calc(100% - 160px);
//height: calc(100% - 90px);//没有按钮时
overflow-y: auto;
.itemWrap{
font-size: 14px;
width: 100%;
margin-bottom: 10px;
background-color: #FFFFFF;
box-sizing: border-box;
padding:10px 15px 10px 20px;
.line{
width: 100%;
text-align: center;
border-bottom: 2px solid;
opacity: 0.16;
margin-top: 10px;
border-image: linear-gradient(270deg, rgba(217, 217, 217, 0.6), rgba(178, 178, 178, 1), rgba(178, 178, 178, 1), rgba(217, 217, 217, 0.6)) 1 1;
}
.item{
//line-height: 36px;
display: flex;
align-items: center;
.left{
width: 66px;
}
.right{
flex: 1;
}
.wechatRight{
display: flex;
align-items: center;
justify-content: space-between;
.reviseBtn{
display: inline-block;
width: 60px;
text-align: center;
border-radius: 4px;
background-color: #354D93;
color: #FFFFFF;
box-sizing: border-box;
padding: 2px 0;
}
}
}
.opaCol{
color: #323643;
opacity: .65;
}
.star{
font-weight: bold;
font-size: 13px;
color: #FF0808;
}
}
}
.btnWrap{
width: 100%;
position: fixed;
bottom: 0;
left: 0;
box-sizing: border-box;
padding: 10px 19px;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #F6F6F6;
.common{
background: #354D93;
height: 48px;
line-height: 48px;
text-align: center;
border-radius: 5px;
font-weight: 500;
font-size: 14px;
color: #FFFFFF;
cursor: pointer;
}
.audit{
width: 100%;
}
.revise{
width: 30%;
background-color: #FFFFFF;
color: #354D93;
box-sizing: border-box;
border: 1px solid #354D93;
}
.confirm{
width: 67%;
}
}
</style>