diff --git a/src/api/mine.js b/src/api/mine.js
index 3d8da605..6bba5823 100644
--- a/src/api/mine.js
+++ b/src/api/mine.js
@@ -72,10 +72,12 @@ export function vehicleTypeList(){
})
}
// 服务商服务能力
-export function supplierServiceTree(){
+export function supplierServiceTree(data){
+ console.log('ddddddd0', data)
return request({
url:'/supplierAppV2/dispatchApp/user/supplierServiceTree',
- method:'POST'
+ method:'POST',
+ data
})
}
@@ -115,6 +117,15 @@ export function getSupplierInfo(key){
})
}
+// 根据id查询潜在服务商
+export function supplierSelectById(params){
+ return request({
+ url:'/supplier/potential/supplierSelectById',
+ method:'GET',
+ params
+ })
+}
+
// 获取企微二维码
export function getOrCodeInfo(data){
return request({
diff --git a/src/router/index.js b/src/router/index.js
index 32da1cca..a257400f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -27,6 +27,14 @@ const routes = [
title: '审核中',
}
},
+ {
+ path: '/addWechat',
+ name: 'addWechat',
+ component: () => import('@/views/index/addWechat'),
+ meta:{
+ title: '添加微信',
+ }
+ },
{
path: '/supplierInfo',
name: 'supplierInfo',
diff --git a/src/views/index/addWechat.vue b/src/views/index/addWechat.vue
new file mode 100644
index 00000000..9188bf89
--- /dev/null
+++ b/src/views/index/addWechat.vue
@@ -0,0 +1,172 @@
+
+
+
+
+
+
请先添加企业微信,保证申请流程正常进行。
+
+
![企业微信二维码]()
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/index/driverAdd.vue b/src/views/index/driverAdd.vue
index 43006754..0d7172c5 100644
--- a/src/views/index/driverAdd.vue
+++ b/src/views/index/driverAdd.vue
@@ -163,6 +163,7 @@ export default {
// baseURL:'',
// licenseOcrInfo:'',
id:'',
+ supplierId: '',
driverName:"",
driverPhone:"",
identityCardNumber:"",
@@ -204,6 +205,7 @@ 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;
@@ -426,6 +428,7 @@ export default {
}
await saveDriver({
driverId:this.id ? this.id : '',
+ supplierId: this.supplierId || undefined,
driverName:this.driverName ,
driverPhone:this.driverPhone,
identityCardNumber:this.identityCardNumber,
diff --git a/src/views/index/driverManage.vue b/src/views/index/driverManage.vue
index c1088b8d..f7e83bcf 100644
--- a/src/views/index/driverManage.vue
+++ b/src/views/index/driverManage.vue
@@ -3,14 +3,14 @@
-
+
添加
@@ -113,6 +113,9 @@
+
@@ -131,6 +134,9 @@ export default {
total:'',
driverList:[],
states:'',
+ supplierId: '',
+ routeId: '',
+ initialized: false,
supplierType:'',
count: 0,
isLoading: false,
@@ -176,7 +182,13 @@ export default {
mounted() {
const urlParams = new URLSearchParams(window.location.search);
this.supplierType = urlParams.get('supplierType');
- this.getPermissions();
+ 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;
+ if(!rawId) {
+ this.getPermissions();
+ }
// this.getDriverList()
},
methods:{
@@ -239,6 +251,7 @@ export default {
}else{
this.$router.push({
name: 'driverAdd',
+ params: this.supplierId ? { supplierId: this.supplierId } : {}
})
}
},
@@ -250,6 +263,7 @@ export default {
idCardStatusList: this.idCardStatusList,
driverLicenseStatusList: this.driverLicenseStatusList,
authStatusList: this.authStatusList,
+ supplierId: this.supplierId || undefined,
});
if(res.code == 200){
this.total=res.total
@@ -520,4 +534,22 @@ 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;
+ }
+}
diff --git a/src/views/index/supplierAdd.vue b/src/views/index/supplierAdd.vue
index 51871fef..39c69048 100644
--- a/src/views/index/supplierAdd.vue
+++ b/src/views/index/supplierAdd.vue
@@ -298,7 +298,23 @@
return
}
if( this.$refs.tree.getCheckedKeys().length > 0 ) {
- await this.saveHandler()
+ 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', {});
}
},
async QrCodeResult() { //获取添加企微结果
diff --git a/src/views/index/vehicleAdd.vue b/src/views/index/vehicleAdd.vue
index ffa9225b..cd0c2fe2 100644
--- a/src/views/index/vehicleAdd.vue
+++ b/src/views/index/vehicleAdd.vue
@@ -686,6 +686,9 @@ 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){
@@ -948,7 +951,7 @@ export default {
}
},
async getSupplierServiceTree(){
- let res = await supplierServiceTree();
+ let res = await supplierServiceTree({ supplierId: this.supplierId });
this.supplierServiceList=res.data
this.oldSupplierServiceList=this.supplierServiceList
},
@@ -1303,6 +1306,7 @@ 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,
diff --git a/src/views/index/vehicleManage.vue b/src/views/index/vehicleManage.vue
index 35ff1e50..2f61d787 100644
--- a/src/views/index/vehicleManage.vue
+++ b/src/views/index/vehicleManage.vue
@@ -3,15 +3,15 @@
-
-
+
+
添加
@@ -71,6 +71,7 @@
@@ -121,7 +125,7 @@