Compare commits
3 Commits
prod-26-06
...
prod-26-04
| Author | SHA1 | Date | |
|---|---|---|---|
| ea5881f844 | |||
| e366cea0a5 | |||
| e34dc1be05 |
@@ -72,12 +72,10 @@ export function vehicleTypeList(){
|
||||
})
|
||||
}
|
||||
// 服务商服务能力
|
||||
export function supplierServiceTree(data){
|
||||
console.log('ddddddd0', data)
|
||||
export function supplierServiceTree(){
|
||||
return request({
|
||||
url:'/supplierAppV2/dispatchApp/user/supplierServiceTree',
|
||||
method:'POST',
|
||||
data
|
||||
method:'POST'
|
||||
})
|
||||
}
|
||||
|
||||
@@ -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){
|
||||
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){
|
||||
return request({
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 31 KiB |
@@ -27,14 +27,6 @@ const routes = [
|
||||
title: '审核中',
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/addWechat',
|
||||
name: 'addWechat',
|
||||
component: () => import('@/views/index/addWechat'),
|
||||
meta:{
|
||||
title: '添加微信',
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/supplierInfo',
|
||||
name: 'supplierInfo',
|
||||
@@ -337,7 +329,7 @@ const routes = [
|
||||
name: 'goToApp',
|
||||
component:()=>import('@/views/goToApp/goToApp.vue'),
|
||||
meta: {
|
||||
title:'中道小板运输'
|
||||
title:'电瓶详情'
|
||||
}
|
||||
},
|
||||
...kpiRouter,
|
||||
|
||||
@@ -7,12 +7,6 @@
|
||||
<div class="font_cls">如已安装未自动跳转，请 <span @click="downLoadHandler">立即下载</span></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>
|
||||
</template>
|
||||
|
||||
@@ -20,22 +14,7 @@
|
||||
import { getNewVersion } from "@/api/order"
|
||||
export default {
|
||||
name: "goToApp",
|
||||
data() {
|
||||
return {
|
||||
showGuide: false
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.showGuide = this.isWeixin()
|
||||
},
|
||||
methods: {
|
||||
isWeixin() {
|
||||
const ua = navigator.userAgent.toLowerCase()
|
||||
return ua.indexOf('micromessenger') !== -1
|
||||
},
|
||||
closeGuide() {
|
||||
this.showGuide = false
|
||||
},
|
||||
goAppHandler() {
|
||||
window.location.href = "rvdriver://page/pagesLogin/phoneLogin?source=h5Link";
|
||||
},
|
||||
@@ -91,32 +70,4 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
.guide-mask {
|
||||
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>
|
||||
@@ -1,180 +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.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;
|
||||
let res = await getContactQrCodeResult({ configId: this.configId });
|
||||
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>
|
||||
@@ -122,7 +122,7 @@
|
||||
<span>司机状态</span>
|
||||
</div>
|
||||
<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">
|
||||
启用
|
||||
<img
|
||||
@@ -163,7 +163,6 @@ export default {
|
||||
// baseURL:'',
|
||||
// licenseOcrInfo:'',
|
||||
id:'',
|
||||
supplierId: '',
|
||||
driverName:"",
|
||||
driverPhone:"",
|
||||
identityCardNumber:"",
|
||||
@@ -185,7 +184,6 @@ export default {
|
||||
iconList: [],
|
||||
driverInfo: {},
|
||||
drivingLicenceName: '',
|
||||
potentialFlag: '',
|
||||
idCardAuthority:'',
|
||||
idCardValidStartTime:'',
|
||||
idCardValidEndTime:'',
|
||||
@@ -206,7 +204,6 @@ export default {
|
||||
let token=localStorage.getItem('token')
|
||||
this.authorization.Authorization=token;*/
|
||||
this.id = this.$route.params?.id;
|
||||
this.supplierId = this.$route.params?.supplierId || '';
|
||||
this.driverName = this.$route.params?.name;
|
||||
this.driverPhone = this.$route.params?.phone;
|
||||
this.drivingModel = this.$route.params?.drivingModel;
|
||||
@@ -223,11 +220,6 @@ export default {
|
||||
this.identityCardFront = this.$route.params?.identityCardFront;
|
||||
this.driverInfo.lssueDate = this.$route.params?.lssueDate;
|
||||
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 ) {
|
||||
this.identityCardFrontList = [{ url : this.identityCardFront }];
|
||||
}
|
||||
@@ -248,7 +240,7 @@ export default {
|
||||
const selectedValue = selectElement.value;
|
||||
this.drivingModel=selectedValue
|
||||
});
|
||||
console.log('statesDisabled', this.statesDisabled)
|
||||
|
||||
},
|
||||
methods:{
|
||||
isUse(e){
|
||||
@@ -434,7 +426,6 @@ export default {
|
||||
}
|
||||
await saveDriver({
|
||||
driverId:this.id ? this.id : '',
|
||||
supplierId: this.supplierId || undefined,
|
||||
driverName:this.driverName ,
|
||||
driverPhone:this.driverPhone,
|
||||
identityCardNumber:this.identityCardNumber,
|
||||
@@ -462,11 +453,6 @@ export default {
|
||||
},2000)
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
statesDisabled() {
|
||||
return !this.id && this.potentialFlag === '1';
|
||||
}
|
||||
},
|
||||
components:{
|
||||
TwoCommonBtn,
|
||||
CellGroup
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
<div class="navBar">
|
||||
<van-nav-bar
|
||||
title="司机管理"
|
||||
:left-arrow="!supplierId"
|
||||
left-arrow
|
||||
left-arrow-color="#FFFFFF"
|
||||
:border="false"
|
||||
:fixed="true"
|
||||
:safe-area-inset-top="true"
|
||||
@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" >
|
||||
<img src="@/assets/addImg.png" />
|
||||
<span class="addTxt">添加</span>
|
||||
@@ -62,14 +62,14 @@
|
||||
finished-text="没有更多了"
|
||||
@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="namephone">{{ item.driverName }} / {{ item.driverPhone }}
|
||||
<span style="margin-left: 10px" :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span>
|
||||
</div>
|
||||
<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>-->
|
||||
</div>
|
||||
</div>
|
||||
@@ -103,7 +103,7 @@
|
||||
<span class="halfOpci">身份证号:</span>
|
||||
<span class="allOpci">{{ item.identityCardNumber }}</span>
|
||||
</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>
|
||||
<span class="halfOpci">状 态:</span>
|
||||
<span :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span>
|
||||
@@ -113,9 +113,6 @@
|
||||
</van-pull-refresh>
|
||||
|
||||
</div>
|
||||
<div class="btn_wrap" v-if="supplierId">
|
||||
<div class="btn" @click="nextToResult">下一步</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -134,10 +131,6 @@ export default {
|
||||
total:'',
|
||||
driverList:[],
|
||||
states:'',
|
||||
supplierId: '',
|
||||
routeId: '',
|
||||
initialized: false,
|
||||
potentialFlag: '',
|
||||
supplierType:'',
|
||||
count: 0,
|
||||
isLoading: false,
|
||||
@@ -183,24 +176,10 @@ export default {
|
||||
mounted() {
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
this.supplierType = urlParams.get('supplierType');
|
||||
const rawId = this.$route.query.id || urlParams.get('id');
|
||||
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()
|
||||
},
|
||||
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) {
|
||||
const ids = String(id)
|
||||
const steps = {
|
||||
@@ -257,7 +236,6 @@ export default {
|
||||
}else{
|
||||
this.$router.push({
|
||||
name: 'driverAdd',
|
||||
params: { supplierId: this.supplierId || undefined, potentialFlag: this.potentialFlag || undefined }
|
||||
})
|
||||
}
|
||||
},
|
||||
@@ -269,7 +247,6 @@ export default {
|
||||
idCardStatusList: this.idCardStatusList,
|
||||
driverLicenseStatusList: this.driverLicenseStatusList,
|
||||
authStatusList: this.authStatusList,
|
||||
supplierId: this.supplierId || undefined,
|
||||
});
|
||||
if(res.code == 200){
|
||||
this.total=res.total
|
||||
@@ -540,22 +517,4 @@ export default {
|
||||
.flex-between{
|
||||
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>
|
||||
|
||||
@@ -85,8 +85,8 @@
|
||||
</el-tree>
|
||||
</template>
|
||||
</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.minorCount" type="digit" class="required" name="minorCount" label="抢修车数量" placeholder="请输入" :rules="countVerify" />
|
||||
<van-field :border="true" v-model="form.trailCount" name="trailCount" label="拖车数量" placeholder="请输入" />
|
||||
<van-field :border="true" v-model="form.minorCount" name="minorCount" label="抢修车数量" placeholder="请输入" />
|
||||
<van-field :border="true" class="required" label="服务区域" placeholder="请选择">
|
||||
<template #input>
|
||||
<el-cascader
|
||||
@@ -100,12 +100,12 @@
|
||||
clearable></el-cascader>
|
||||
</template>
|
||||
</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_code_bg">
|
||||
<img v-if="qrCodeUrl" :src="qrCodeUrl" alt="企业微信二维码" />
|
||||
</div>
|
||||
</div>-->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -138,7 +138,6 @@
|
||||
errorMsg: '',
|
||||
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: '邮箱格式不正确' }],
|
||||
countVerify: [{ required: true, message: '请输入数量' }, { validator: value => /^\d+$/.test(value) && Number(value) >= 0, message: '请输入大于等于0的整数' }],
|
||||
id:'', //车辆Id
|
||||
idBackPhotoList: [],
|
||||
idBackPhoto: '',
|
||||
@@ -203,14 +202,7 @@
|
||||
},
|
||||
async mounted() {
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
const lastRoute = localStorage.getItem('lastRoute');
|
||||
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();
|
||||
if(this.id) {
|
||||
await this.getInfoHandler();
|
||||
@@ -229,6 +221,7 @@
|
||||
});
|
||||
this.configId = res?.configId;
|
||||
this.qrCode = res?.qrCode
|
||||
console.log('idid', res);
|
||||
},
|
||||
async getInfoHandler() {
|
||||
let res = await getSupplierInfo({
|
||||
@@ -262,6 +255,7 @@
|
||||
}
|
||||
if(_data?.serviceAreaCode) {
|
||||
this.$set(this.form, 'serviceAreaCode', _data?.serviceAreaCode.split(',').map(item => Number(item)));
|
||||
// this.form.serviceAreaCode = _data?.serviceAreaCode.split(',').map(item => Number(item));
|
||||
}
|
||||
},
|
||||
showError(msg) {
|
||||
@@ -297,30 +291,28 @@
|
||||
this.showError('服务区域不能为空')
|
||||
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 ) {
|
||||
let _node = this.$refs.areaCascader.getCheckedNodes();
|
||||
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(','),
|
||||
};
|
||||
localStorage.setItem('supplierAddForm', JSON.stringify(payload));
|
||||
this.goPage('addWechat', { potentialFlag: 1 });
|
||||
await this.saveHandler()
|
||||
}
|
||||
},
|
||||
async QrCodeResult() { //获取添加企微结果
|
||||
let res = await getContactQrCodeResult({
|
||||
configId: this.configId
|
||||
});
|
||||
console.log('resres', res)
|
||||
this.wechatId = res?.data?.wechatId
|
||||
},
|
||||
async saveHandler() {
|
||||
@@ -343,36 +335,17 @@
|
||||
accountUrl:this.licensePhoto,
|
||||
service: this.$refs.tree.getCheckedKeys().join(',') ,
|
||||
serviceAreaCode: checkArr.join(','),
|
||||
wechatId: this.wechatId,
|
||||
});
|
||||
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) {
|
||||
this.showError(e)
|
||||
} finally {
|
||||
|
||||
@@ -19,26 +19,15 @@
|
||||
data() {
|
||||
return {
|
||||
id: '',
|
||||
potentialFlag: '',
|
||||
name: '',
|
||||
qrCodeUrl: '',
|
||||
qrCode: '',
|
||||
configId: '',
|
||||
wechatId: '',
|
||||
}
|
||||
},
|
||||
async mounted() {
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
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: {
|
||||
async searchInfo() {
|
||||
localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierInfo', query: { id: this.id, potentialFlag: this.potentialFlag } }));
|
||||
this.goPage('supplierInfo', { id: this.id, potentialFlag: this.potentialFlag })
|
||||
searchInfo() {
|
||||
this.goPage('supplierInfo', { id : this.id })
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -91,23 +80,4 @@
|
||||
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>
|
||||
|
||||
@@ -87,11 +87,11 @@
|
||||
</div>
|
||||
<div class="info_item">
|
||||
<div class="label">拖车数量：</div>
|
||||
<div class="content">{{supplierInfo.trailCount>=0 ? supplierInfo.trailCount : ''}}</div>
|
||||
<div class="content">{{supplierInfo?.trailCount || ''}}</div>
|
||||
</div>
|
||||
<div class="info_item">
|
||||
<div class="label">抢修车数量：</div>
|
||||
<div class="content">{{supplierInfo.minorCount >= 0 ? supplierInfo.minorCount : ''}}</div>
|
||||
<div class="content">{{supplierInfo?.minorCount || ''}}</div>
|
||||
</div>
|
||||
<div class="info_item">
|
||||
<div class="label">服务区域：</div>
|
||||
@@ -124,9 +124,7 @@
|
||||
</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" @click="goModifyPage">修改信息</div>
|
||||
</div>
|
||||
@@ -154,7 +152,6 @@
|
||||
supplierInfo: {},
|
||||
type: 'show',
|
||||
origin: '',
|
||||
potentialFlag: '',
|
||||
}
|
||||
},
|
||||
async mounted() {
|
||||
@@ -162,15 +159,9 @@
|
||||
this.id=this.$route.query.id || urlParams.get('id');
|
||||
this.type=this.$route.query.type || urlParams.get('type') || 'show';
|
||||
this.origin = this.$route.query.origin || ''
|
||||
this.potentialFlag = this.$route.query.potentialFlag || urlParams.get('potentialFlag') || '';
|
||||
await this.getInfoHandler();
|
||||
},
|
||||
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() {
|
||||
this.goPage('supplierAdd', { id : this.id })
|
||||
},
|
||||
|
||||
@@ -287,10 +287,10 @@
|
||||
if(!res.data.ocrInvoiceRes.data.sellerName.startsWith("国家税务总局") &&
|
||||
conList.every(a => {
|
||||
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 ) {
|
||||
|
||||
@@ -197,7 +197,7 @@
|
||||
<span>车辆状态</span>
|
||||
</div>
|
||||
<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">
|
||||
启用
|
||||
<img
|
||||
@@ -470,8 +470,7 @@ export default {
|
||||
maxDate: new Date(2099, 11, 31), // 设置最大可选日期（2099年12月31日）
|
||||
checkList: [],
|
||||
virtualVehicle: '',
|
||||
potentialFlag: new URLSearchParams(window.location.search).get('potentialFlag') || '',
|
||||
vehicleStatus: new URLSearchParams(window.location.search).get('potentialFlag') === '1' ? 2 : '',
|
||||
vehicleStatus: '',
|
||||
showDatePicker: false,
|
||||
dateVal: '',
|
||||
trailerService: '',//拖车服务
|
||||
@@ -649,9 +648,6 @@ export default {
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
},
|
||||
vehicleStatusDisabled() {
|
||||
return !this.id && this.potentialFlag === '1';
|
||||
}
|
||||
},
|
||||
watch:{
|
||||
@@ -690,9 +686,6 @@ export default {
|
||||
async mounted() {
|
||||
this.id=this.$route.params?.id
|
||||
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.getTypeList();
|
||||
if( this.id){
|
||||
@@ -955,7 +948,7 @@ export default {
|
||||
}
|
||||
},
|
||||
async getSupplierServiceTree(){
|
||||
let res = await supplierServiceTree({ supplierId: this.supplierId });
|
||||
let res = await supplierServiceTree();
|
||||
this.supplierServiceList=res.data
|
||||
this.oldSupplierServiceList=this.supplierServiceList
|
||||
},
|
||||
@@ -1219,17 +1212,12 @@ export default {
|
||||
this.insuranceChange=false
|
||||
},
|
||||
back() {
|
||||
if( this.supplierId ) {
|
||||
this.$router.back();
|
||||
} else {
|
||||
this.$router.push({
|
||||
name:'vehicleManage',
|
||||
params:{
|
||||
id: this.id
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
async submitBtn(){
|
||||
if( !this.vehicleLicenseFront ) {
|
||||
@@ -1315,7 +1303,6 @@ export default {
|
||||
// return
|
||||
await saveVehicle({
|
||||
vehicleId:this.id ? this.id : '',
|
||||
supplierId: this.supplierId || undefined,
|
||||
plateNumber:this.carNum ? this.carNum :'',
|
||||
vehicleType:this.selectedOption?.length>0 ? this.selectedOption.join(',') : '',
|
||||
// hasPolymerization:this.isJoin,
|
||||
|
||||
@@ -3,15 +3,15 @@
|
||||
<div class="navBar">
|
||||
<van-nav-bar
|
||||
title="车辆管理"
|
||||
:left-arrow="!supplierId"
|
||||
left-arrow
|
||||
left-arrow-color="#FFFFFF"
|
||||
:border="false"
|
||||
:fixed="true"
|
||||
:safe-area-inset-top="true"
|
||||
@click-left="goBack"
|
||||
>
|
||||
<template slot="right" v-if="permissonList.includes('vehicleAddBtn') || supplierId">
|
||||
<div class="rightWrap" @click="goPage('vehicleAdd', supplierId ? { supplierId, potentialFlag } : {})">
|
||||
<template slot="right" v-if="permissonList.includes('vehicleAddBtn')">
|
||||
<div class="rightWrap" @click="goPage('vehicleAdd')">
|
||||
<img src="@/assets/addImg.png" />
|
||||
<span class="addTxt">添加</span>
|
||||
</div>
|
||||
@@ -71,7 +71,6 @@
|
||||
<div class="wrap_cls">
|
||||
<van-pull-refresh v-model="isLoading" @refresh="onRefresh">
|
||||
<van-list
|
||||
v-if="initialized"
|
||||
v-model="loading"
|
||||
:finished="finished"
|
||||
finished-text="没有更多了"
|
||||
@@ -115,9 +114,6 @@
|
||||
</div>
|
||||
|
||||
<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>
|
||||
|
||||
</template>
|
||||
@@ -125,7 +121,7 @@
|
||||
<script>
|
||||
import {Dialog} from "vant";
|
||||
import { myMixins} from "@/utils/myMixins";
|
||||
import {supplierVehicleList, deleteVehicle, userOperationPermissions, enableVehicle, supplierSelectById} from "@/api/mine"
|
||||
import {supplierVehicleList, deleteVehicle, userOperationPermissions, enableVehicle} from "@/api/mine"
|
||||
export default {
|
||||
name: "vehicleManage",
|
||||
mixins:[myMixins],
|
||||
@@ -134,9 +130,6 @@ export default {
|
||||
vehicleList:[],
|
||||
show:false,
|
||||
id:'',
|
||||
supplierId: '',
|
||||
routeId: '',
|
||||
initialized: false,
|
||||
pageNum:1,
|
||||
pageSize:10,
|
||||
total:'',
|
||||
@@ -149,7 +142,6 @@ export default {
|
||||
searchVal: '',
|
||||
authStates: [],
|
||||
liabilityInsuranceAuditList: [],
|
||||
potentialFlag: '',
|
||||
inputStatusListOptions: [{
|
||||
name: '行驶证未录入',
|
||||
value: 0
|
||||
@@ -197,31 +189,10 @@ export default {
|
||||
}],
|
||||
}
|
||||
},
|
||||
async mounted() {
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
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 ) {
|
||||
mounted() {
|
||||
this.getPermissions();
|
||||
}
|
||||
},
|
||||
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) {
|
||||
Dialog.alert({
|
||||
title: '未通过原因',
|
||||
@@ -306,7 +277,6 @@ export default {
|
||||
inputStatusList: this.inputStatusList,
|
||||
authStates: this.authStates,
|
||||
liabilityInsuranceAuditList: this.liabilityInsuranceAuditList,
|
||||
supplierId: this.supplierId || undefined,
|
||||
})
|
||||
this.total=result.total
|
||||
if(this.pageNum == 1){// 第一页直接赋值
|
||||
@@ -615,23 +585,5 @@ export default {
|
||||
justify-content: flex-start;
|
||||
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>
|
||||
|
||||
@@ -507,6 +507,7 @@ export default {
|
||||
})
|
||||
},
|
||||
async compute() {
|
||||
alert(11111)
|
||||
if(this.orderInfo.contractSettleTypeString == '车主现收'){
|
||||
this.form.supplierBasePrice = 0
|
||||
this.form.supplierExtraPrice = 0
|
||||
@@ -753,7 +754,7 @@ export default {
|
||||
formData.append('state', 0);
|
||||
formData.append('postfix', this.postfix);
|
||||
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) {
|
||||
this.$toast('操作成功')
|
||||
setTimeout(() => {
|
||||
@@ -766,7 +767,7 @@ export default {
|
||||
}
|
||||
})
|
||||
}, 2000)
|
||||
}
|
||||
}*/
|
||||
this.loading = false;
|
||||
},
|
||||
async confirmAudit() {
|
||||
@@ -848,7 +849,7 @@ export default {
|
||||
formData.append('state', 0);
|
||||
formData.append('postfix', this.postfix);
|
||||
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) {
|
||||
this.$toast('操作成功')
|
||||
setTimeout(() => {
|
||||
@@ -861,7 +862,7 @@ export default {
|
||||
}
|
||||
})
|
||||
}, 2000)
|
||||
}
|
||||
}*/
|
||||
this.loading1 = false;
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user