diff --git a/api/property.js b/api/property.js
index c3621f1..0d6cfbb 100644
--- a/api/property.js
+++ b/api/property.js
@@ -38,6 +38,8 @@ export const sendMsgApi = (data) => oahttp.post('/vehicle/sendSmsAgain', data)
export const cancelContractApi = (data) => oahttp.post('/vehicle/cancelContract', data)
// 镇街公司合同列表
export const ContractListApi = (data) => oahttp.get('/vehicle/townCompanyContractList', data)
+// 图片上传
+export const upLoadImage = (data) => oahttp.post('/upload/image', data)
// 资产详情
// export const getpropertyDetil = (data) => oahttp.get('/lstDetail', data)
diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue
index 8188f72..b721f90 100644
--- a/subpkg/newPersonnel/newPersonnel.vue
+++ b/subpkg/newPersonnel/newPersonnel.vue
@@ -43,7 +43,8 @@
-
+
@@ -286,7 +287,8 @@
-->
-
+
@@ -300,7 +302,9 @@
} from "@/api/oaUser.js"
import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器
import districtSelectorTow from "@/components/districtSelector/districtSelectorTow.vue" //地区选择器
-import { Toast } from "../../libs/uniApi"
+ import {
+ Toast
+ } from "../../libs/uniApi"
export default {
components: {
districtSelector,
@@ -399,11 +403,11 @@ import { Toast } from "../../libs/uniApi"
},
onShow() {},
methods: {
- c_idcard(e){
- this.$nextTick(()=>{
- this.formData.id_card = e.replace(/[^0-9X]/g, '')
- })
- },
+ c_idcard(e) {
+ this.$nextTick(() => {
+ this.formData.id_card = e.replace(/[^0-9X]/g, '')
+ })
+ },
// 上传头像
async afterReadAvatar(event) {
upLoadImage({
@@ -428,10 +432,11 @@ import { Toast } from "../../libs/uniApi"
},
// 创建账号
addAcountNum() {
- if(!this.formData.avatar)return Toast('头像未上传');
+ if (!this.formData.avatar) return Toast('头像未上传');
let flag = this.$refs.districtSelectorRef.validate();
- if(!this.formData.qualification.id_card||!this.formData.qualification.id_card_b)return Toast('身份证未上传');
- if(!this.formData.qualification.bank_account||!this.formData.qualification.bank_account_b)return Toast('银行卡未上传');
+ if (!this.formData.qualification.id_card || !this.formData.qualification.id_card_b) return Toast('身份证未上传');
+ if (!this.formData.qualification.bank_account || !this.formData.qualification.bank_account_b) return Toast(
+ '银行卡未上传');
this.$refs.uForm.validate().then(async (e) => {
if (e && flag) {
uni.showLoading()
@@ -530,6 +535,9 @@ import { Toast } from "../../libs/uniApi"
color: transparent;
}
}
+
+
+
}
.title {
diff --git a/subpkg/property/chosseCompany.vue b/subpkg/property/chosseCompany.vue
index c5335ae..e0afba8 100644
--- a/subpkg/property/chosseCompany.vue
+++ b/subpkg/property/chosseCompany.vue
@@ -47,13 +47,29 @@
自有车辆
- 车牌号：{{dataList.cars_info}}
-
- 自有车辆
-
-
-
+
+
+
+
+ 车牌号：1111111
+
+
+
+
+
+
+
+
+
+
+
@@ -185,14 +201,13 @@
// 13043214321
this.dataList = res.data.vehicleContract
this.carList = res.data.vehicleRentCars
- this.checked = [this.carList[0].car_id] || ''
- this.dataList.cars_info ? this.dataList.cars_info = JSON.parse(this.dataList.cars_info).license :
- ""
- if (this.dataList.status == 3) {
- uni.navigateBack()
- }
+ this.checked = [this.carList[0]?.car_id] || ''
+ this.dataList.cars_info = JSON.parse(this.dataList.cars_info) || ""
+ // if (this.dataList.status == 3) {
+ // uni.navigateBack()
+ // }
+ console.log(this.dataList.cars_info.pic)
if (this.carList.length > 0 || this.dataList.cars_info) {
- console.log(this.dataList.cars_info)
this.flag1 = false
}
// console.log(this.dataList)
diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue
index 9ffd495..2377baf 100644
--- a/subpkg/property/index.vue
+++ b/subpkg/property/index.vue
@@ -19,12 +19,49 @@
+
+
-
+
+
+ 车牌号
+
+
+ 车牌号不能为空
+
+
+
+
+ 车辆图片
+
+
+
+
+
+
+
+
+ 上传头像
+
+
+
+
+
+
+
+
+
+ 请上传车辆图片
+
+
+
+
@@ -43,8 +80,8 @@
-
-
+
+
你已提交用车申请，后台正在加快处理中，请耐心等待哦
...
@@ -74,15 +111,46 @@
-
+
-
-
- 车牌号不能为空
+
+
+ 车牌号
+
+
+ 车牌号不能为空
+
+
+
+
+ 车辆图片
+
+
+
+
+
+
+
+
+ 上传头像
+
+
+
+
+
+
+
+
+
+ 请上传车辆图片
+
+
@@ -235,8 +303,12 @@
upVehicleApi,
getAgencyDetailApi,
getvehicleDetailApi,
- villageCompanyApi
+ villageCompanyApi,
+
} from "@/api/property.js"
+ import {
+ upLoadImage
+ } from "@/api/file.js"
import Cache from '@/utils/cache';
// import mybtn from "@/components/mybtn/mybtn.vue"
import {
@@ -261,6 +333,7 @@
applicationList: [1],
show: false,
carLicense: "",
+ imgUrl: "",
showPop: false,
datas: {},
dataList: [],
@@ -333,26 +406,32 @@
methods: {
+ async afterReadAvatar(event) {
+ upLoadImage({
+ filePath: event.file.url,
+
+ }).then(res => {
+ this.imgUrl = res.data.uri
+ // this.formData.avatar = res.data.uri
+ })
+ },
confirmFn() {
uni.reLaunch({
url: '/subpkg/property/index' // 替换为需要刷新的页面路径
});
},
- test() {
- this.aaa = 1;
- this.showpopp = true;
- // uni.reLaunch({
- // url: '/subpkg/property/index' // 替换为需要刷新的页面路径
- // });
- },
+
// 申请车辆
applycarFn() {
- Toast("操作成功")
- this.step = -1
- return
- upVehicleApi().then(res => {
+ upVehicleApi({
+ type: 0
+ }).then(res => {
Toast("操作成功")
- this.step = -1
+ setTimeout(() => {
+ uni.redirectTo({
+ url: '/subpkg/property/index'
+ })
+ }, 1000)
})
},
// 自有车辆
@@ -362,10 +441,16 @@
return
}
upVehicleApi({
- license: this.carLicense
+ license: this.carLicense,
+ pic: this.imgUrl,
+ type: 1
}).then(res => {
- this.step = 2
Toast("上传成功")
+ setTimeout(() => {
+ uni.redirectTo({
+ url: '/subpkg/property/index'
+ })
+ }, 2000)
})
this.show = false
@@ -427,6 +512,28 @@
}
}
+ .uplode {
+ width: 243.57rpx;
+ height: 173.48rpx;
+ box-sizing: border-box;
+ padding-top: 30rpx;
+ border-radius: 15rpx;
+ border: 1px solid $theme-oa-color;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: space-around;
+ color: $theme-oa-color;
+ position: relative;
+ margin-left: 20rpx;
+
+ .up {
+ position: absolute;
+ color: transparent;
+ }
+ }
+
+
.noCar {
padding: 100rpx;
margin-top: 10vh;
diff --git a/subpkg/property/vehicle_a.vue b/subpkg/property/vehicle_a.vue
index 38f4e09..7404593 100644
--- a/subpkg/property/vehicle_a.vue
+++ b/subpkg/property/vehicle_a.vue
@@ -57,7 +57,9 @@
-
+
+
+