diff --git a/subpkg/property/chosseCompany.vue b/subpkg/property/chosseCompany.vue
index 1641602..cffd870 100644
--- a/subpkg/property/chosseCompany.vue
+++ b/subpkg/property/chosseCompany.vue
@@ -2,12 +2,12 @@
- {{dataList.create_time.slice(0,10)}} 提出申请
+ {{dataList.create_time}} 提出申请
- {{dataList.create_time.slice(0,10)}} 提出解除申请
+ {{dataList.create_time}} 提出解除申请
@@ -80,9 +80,9 @@
- 《租赁合同》
+ 《解除合同》
- {{'2023-03-03'}}
+ {{dataList.create_time}}
@@ -94,15 +94,13 @@
- {{dataList.status}}
-
+
@@ -117,7 +115,8 @@
- {{ dataList.type!=2? "《租赁合同》":"解除合同" }}
+ {{typeFn( dataList.type) }}
+
{{'2023-03-03'}}
@@ -130,18 +129,17 @@
-
-
+
-
@@ -170,7 +168,8 @@
export default {
data() {
return {
- times: 5,
+ flag1: true,
+ times: 0,
dataList: {},
overruleValue: "",
showPop: false,
@@ -181,32 +180,62 @@
}
},
onLoad(options) {
- // console.log(this.$route.query)
- // console.log(6565)
+ console.log(options)
getAgencyDetailApi({
id: options.id
}).then(res => {
// 13043214321
this.dataList = res.data.vehicleContract
this.carList = res.data.vehicleRentCars
- this.dataList.cars_info = JSON.parse(this.dataList.cars_info).license
+ this.dataList.cars_info ? this.dataList.cars_info = JSON.parse(this.dataList.cars_info).license :
+ ""
if (this.dataList.status == 3) {
uni.navigateBack()
}
+ console.log(this.dataList.cars_info)
+ if (this.carList.length >= 0 || this.dataList.cars_info) {
+ this.flag1 = false
+ }
+ // console.log(this.dataList)
})
+ // console.log(this.dataList.cars_info)
+
+
},
methods: {
sendAgainFn() {
+ let that = this
sendMsgApi({
- id: this.dataList.id
+ id: this.dataList.id,
+ }).then(res => {
+ Toast("发送成功")
+ that.times = 10
+ that.timer()
+ // that.num = 10
})
},
sendFn() {
+ let that = this
sendcontractApi({
id: this.dataList.id
+ }).then(res => {
+ Toast("操作成功")
+ that.times = 10
+ that.timer()
+ that.dataList.status = 2
})
},
-
+ typeFn(status) {
+ if (status == 0) {
+ return "租赁合同"
+ }
+ if (status == 1) {
+ return "自有车两"
+ }
+ if (status == 2) {
+ "解除合同"
+ }
+ },
confirm() {
// console.log(this.overruleValue)
overruleApi({
@@ -225,23 +254,16 @@
let timers = setInterval(() => {
that.times--
if (that.times <= 0) {
- this.flag = true
clearInterval(timers)
}
}, 1000)
},
navToContract(contract_no) {
- download_file({
- applyNo: contract_no
- }).then(res => {
- if (res.code != 1) {
- Toast(res.msg || '合同未签订')
- }
- uni.navigateTo({
- url: `/subpkg/pdfView/pdfView?url=${res.data.url}`
- })
+ uni.navigateTo({
+ url: `/subpkg/pdfView/pdfView?url=${contract_no}`
})
+
},
contractFn() {
console.log(this.checked)
@@ -253,14 +275,14 @@
})
this.navTo('/subpkg/property/success')
},
- sendcontractFn() {
- this.lg ? this.sendAgainFn() : this.sendFn()
- Toast("操作成功")
- this.flag = false
- this.times = 10
- this.timer()
- this.lg = true
- },
+ // sendcontractFn() {
+
+ // // this.sendFn()
+ // Toast("操作成功")
+ // this.times = 10
+ // this.timer()
+
+ // },
navTo(url) {
uni.navigateTo({
url
diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue
index 5be847d..b1783cc 100644
--- a/subpkg/property/index.vue
+++ b/subpkg/property/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -7,7 +7,7 @@
-
+
你还没有所属车辆哦,请向镇公司申请用车或使用自有车辆并绑定系统
@@ -30,9 +30,15 @@
-
+
+
+
+ 你已提交解除申请,等待签约
+ ...
+
+
-
+
您已上传自用车辆,系统正在审核中,请耐心等待
...
@@ -40,14 +46,10 @@
-
+
你已提交用车申请，后台正在加快处理中，请耐心等待哦
...
-
- 你已提交解除申请
- ...
-
@@ -201,7 +203,6 @@
-
@@ -242,6 +243,7 @@
dataList: [],
newCarNum: "",
newcarTit: "",
+ flag: false
@@ -255,17 +257,9 @@
if (type == 18) {
// getvehicleDetailApi().then(res => {})
villageCompanyApi().then(res => {
- if (!res.data?.id) {
-
- this.showLoading = false
- this.step = 999
- return
- }
-
this.showLoading = false
this.datas = res.data
this.step = res.data.status
-
switch (this.step) {
case 3:
uni.redirectTo({
@@ -284,7 +278,6 @@
else {
getvehicleListApi().then(res => {
this.datas = res.data
-
res.data.apply.length >= 2 ? this.applicationList = res.data.apply : this.applicationList = res
.data.apply.slice(0, 2)
// this.applicationList = res.data.apply
@@ -308,6 +301,9 @@
// // this.applicationList=res
// })
+ setTimeout(() => {
+ this.flag = true
+ })
},
@@ -317,7 +313,7 @@
applycarFn() {
upVehicleApi().then(res => {
Toast(res.msg)
- this.step = 2
+ this.step = -1
})
},
// 自有车辆
@@ -325,7 +321,6 @@
upVehicleApi({
license: this.carLicense
}).then(res => {
- // this.show = false
this.step = 2
})
// upVehicleApi({
diff --git a/subpkg/property/vehicle_a.vue b/subpkg/property/vehicle_a.vue
index ad29794..e68ed27 100644
--- a/subpkg/property/vehicle_a.vue
+++ b/subpkg/property/vehicle_a.vue
@@ -52,15 +52,15 @@
-
+
-
+
《租赁合同》
- {{ datas.contract.create_time}}
+ {{ datas.create_time}}
-
+
查看
@@ -102,12 +102,14 @@
import {
Toast
} from "../../libs/uniApi";
+ import Cache from '@/utils/cache';
export default {
components: {
mybtn
},
data() {
return {
+ company_type: 0,
showMap: true,
pdfUrl: "",
showPDF: false,
@@ -120,6 +122,7 @@
queryData: "请选择时间",
mapClass: 'custom-map',
scale: 17,
+ showCont: false,
markers: [{
id: 2,
latitude: 28.8733,
@@ -130,6 +133,7 @@
}
},
onLoad(options) {
+ this.company_type = (JSON.parse(Cache.get("USER_INFO")).company.company_type)
// console.log(this.$route.query.id)
// if (this.$route.query.type) {
// villageCompanyApi().then(res => {
@@ -146,11 +150,15 @@
})
this.minDateFn()
+ if (this.datas.contract) {
+ this.showCont = true
+ }
// console.log(date - 7)
},
methods: {
showContractFn(url) {
+ console.log(url)
uni.navigateTo({
url: `/subpkg/pdfView/pdfView?url=${url}`
})