页面修改

This commit is contained in:
THK3121 2023-08-30 11:28:35 +08:00
parent 5073bdd82e
commit aaedc78dac
4 changed files with 182 additions and 170 deletions

View File

@ -1,19 +1,24 @@
import oahttp from "@/utils/logistics.js";
import oahttp from "@/utils/oahttp.js";;
/**
* 车辆列表
*/
export const getvehicleList = (data) => oahttp.get('/courierLstData', data)
// https://worker-task.lihaink.cn/api/vehicle/addCar
export const getvehicleListApi = (data) => oahttp.get('/vehicle/vehicleIndex', data)
// 车辆详情
export const getvehicleDetail = (data) => oahttp.get('/courierLstData', data)
export const getvehicleDetailApi = (data) => oahttp.get('/courierLstData', data)
// 车辆上传
export const upVehicleApi = (data) => oahttp.post('/vehicle/addCar', data)
// 申请用车
export const applycarApi = (data) => oahttp.post('/vehicle/addCar', data)
// 显示轨迹
export const locusApi = (data) => oahttp.get('/courierLstData', data)
// 签约列表
export const getAgencyList = (data) => oahttp.get('/courierLstData', data)
export const getAgencyListApi = (data) => oahttp.get('/courierLstData', data)
// 签约公司详情
export const getAgencyDetail = (data) => oahttp.get('/courierLstData', data)
export const getAgencyDetailApi = (data) => oahttp.get('/courierLstData', data)
// 车辆租赁
export const leaseApi = (data) => oahttp.get('/courierLstData', data)
export const leaseApi = (data) => oahttp.post('/vehicle/setContractByTownCompany', data)
// 生成合同
export const contractApi = (data) => oahttp.get('/courierLstData', data)
// 申请驳回

View File

@ -256,7 +256,9 @@
this.showToask();
// this.initOaHomeDada();
this.getOrderList();
//#ifdef APP-PLUS
this.noticeFn()
// #endif
},
computed: {

View File

@ -92,15 +92,21 @@
export default {
data() {
return {
dataList: [],
overruleValue: "",
showPop: false,
checked: [],
carList: [1, 2]
}
},
onLaunch() {
getAgencyDetail().then(res => {
this.dataList = res
})
},
methods: {
confirm() {
console.log(this.overruleValue)
// console.log(this.overruleValue)
overruleApi().then(res => {
Toast("操作成功")
this.showPop = false

View File

@ -1,5 +1,36 @@
<template>
<view>
<view class="">
<!-- 没有测含量 -->
<view class="noCar" v-if='dataList.length==0'>
<!-- 申请 -->
<view class="" v-if="step==1">
<view class="">
你还没有所属车辆哦,请向镇公司申请用车或使用自有车辆并绑定系统
</view>
<view class="" style="margin: 20rpx 0;">
<u-button @tap="applycarFn" type="primary" style="background-color: #0122C7;border: none;"
class="btn">
申请用车</u-button>
</view>
<view class="">
<u-button @tap="show=true" type="primary" style="background-color: #0122C7;border: none;"
class="btn">
上传自有车辆</u-button>
</view>
<u-modal :show="show" @close="show=false" @confirm="upCarFn" :closeOnClickOverlay="true" title="车辆上传">
<view class="slot-content">
<u--input placeholder="请输入您的车牌号" v-model="carLicense"></u--input>
</view>
</u-modal>
</view>
<!-- 等待 -->
<view class="" v-if='step==2'>
<view class="">
您已上传自用车辆,系统正在审核中,请耐心等待
</view>
</view>
</view>
<view v-else>
<!-- <view class="serch">
<u-search placeholder="输入车牌号进行搜索" :show-action="true" bg-color="white" v-model="keywords" @search="serchFn"
@custom="serchFn"></u-search>
@ -111,70 +142,15 @@
你已发起租赁{{newCarNum}}两新车的申请,后台正在为您加急处理中,请稍后~~
</view> -->
</view>
<!--
<view v-else>
<view class="personnel_list" @click="toDetail('/subpkg/property/vehicle_a')">
<view class="cards">
<view class="cards_head">
<text>车牌号</text>
</view>
<view class="cards_content">
<view class="right">
<view class="li">
<text>行驶总里程: </text>
<text> { item.name }</text>
</view>
<view class="li">
<text>本公司签约时间: </text>
<text>{ item.phone }</text>
</view>
<view class="li">
<text>承租公司: </text>
<text> 所属片区 </text>
</view>
<view class="li">
<text>负责人: </text>
<text> 所属片区 </text>
</view>
<view class="li">
<text>联系方式: </text>
<text> 所属片区 </text>
</view>
<view class="li">
<text>所属区域: </text>
<text> 所属片区 </text>
</view>
<view class="li">
<text>承租时间: </text>
<text> 所属片区 </text>
</view>
</view>
</view>
</view>
</view>
</view> -->
<u-modal :show="showPop" @close="showPop=false" @confirm="confirm" :closeOnClickOverlay="true"
:title="newcarTit">
:title="`请输入您需要租赁的车辆数量(上限为${dataList[0]})`">
<view class="slot-content">
<u--input placeholder="请输入内容" type="number" v-model="newCarNum"></u--input>
</view>
</u-modal>
<!-- <u-modal @close="show=false" @cancel="show=false" @confirm="relieveFn" :show="show" :showCancelButton="true"
:showConfirmButton='true' :content='content'></u-modal> -->
<view class="" v-if='!curNow && dataList.length>0'>
<!-- <view class="add" @click="showPop=true">
<u-icon name="plus-circle" color="#0122C7" size="60"></u-icon>
签约新车
</view> -->
<!-- <mybtn position="position" text="签约" @click="signFn">
<u-icon name="edit-pen-fill" color="white" size="20"></u-icon>
</mybtn> -->
</view>
</view>
@ -184,9 +160,10 @@
<script>
import {
getvehicleList,
getAgencyList,
leaseApi
getvehicleListApi,
getAgencyListApi,
leaseApi,
upVehicleApi
} from "@/api/property.js"
// import mybtn from "@/components/mybtn/mybtn.vue"
import {
@ -200,10 +177,13 @@
name: "vehicle",
data() {
return {
step: 1,
applicationList: [1, 1],
// isNewCheck: true,
show: false,
carLicense: "",
showPop: false,
dataList: [1, 2, 3],
dataList: [],
tabLists: [{
name: '未出租',
}, {
@ -218,10 +198,11 @@
};
},
onLoad() {
getvehicleList().then(res => {
getvehicleListApi().then(res => {
console.log(res)
// this.getvehicleList = res
})
getAgencyList().then(res => {
getAgencyListApi().then(res => {
// this.applicationList=res
})
@ -230,18 +211,31 @@
methods: {
applycarFn() {
this.step = 2
},
upCarFn() {
upVehicleApi({
license: this.carLicense
}).then(res => {
this.show = false
})
console.log(this.carLicense)
},
signFn() {
this.toDetail("/subpkg/property/chosseCompany")
},
// serchFn() {
// console.log(this.keywords)
// },
confirm() {
if (!this.newCarNum) return
// leaseApi().then(res=>{})
leaseApi({
num: Number(this.newCarNum)
}).then(res => {
this.newCarNum = ""
Toast(res.msg)
})
this.showPop = false
Toast("操作成功")
// this.isNewCheck = true
@ -266,6 +260,11 @@
margin: 28rpx 28rpx 0 28rpx;
}
.noCar {
// background-color: red;
padding: 50rpx;
}
.info {
display: flex;
justify-content: space-around;