mkm/OfficeApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

页面修改

Browse Source
This commit is contained in:
THK3121 2023-09-06 11:36:48 +08:00
parent 6061450d62
commit a8661351ae
5 changed files with 101 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/mybtn/mybtn.vue
View File

@ -1,11 +1,10 @@
<template> <template>
<view> <view>
<button @click.stop="click" <button @click.stop="click" class="button"
class="button"
:class="{'my_btn_new_btn': position, 'my_btn_no_positon': !position, 'my_btn_disabled': my_btn_disabled}"> :class="{'my_btn_new_btn': position, 'my_btn_no_positon': !position, 'my_btn_disabled': my_btn_disabled}">
<slot></slot> <slot></slot>
{{text}} {{text}}
</button> </button>
</view> </view>
</template> </template>
@ -39,11 +38,12 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.button{ .button {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.my_btn_new_btn { .my_btn_new_btn {
position: fixed; position: fixed;
bottom: 0; bottom: 0;

34
subpkg/property/agencyList.vue
View File

@ -5,15 +5,19 @@
<view class=""> <view class="">
<view style="display: flex;justify-content: space-between;"> <view style="display: flex;justify-content: space-between;">
<view class=""> <view class="">
签约申请 签约申请列表
</view> </view>
</view>
<view class="li">
<view class="date">
{{item.create_time.slice(0, 10)}}
</view>
<view class=""> <view class="">
更多 {{item.company_b_name}}提出租赁车辆一辆
</view> </view>
</view> </view>
<view class="" style="margin-top: 20rpx;">
{{item.company_b_name}}提出租赁车辆一辆
</view>
</view> </view>
</view> </view>
</view> </view>
@ -44,10 +48,28 @@
} }
</script> </script>
<style> <style lang="scss" scoped>
.box { .box {
padding: 20rpx; padding: 20rpx;
.li {
margin-top: 20rpx;
background-color: white;
padding: 10rpx;
border-radius: 20rpx;
display: flex;
}
.date {
background-color: #FF7C32;
color: white;
padding: 0 10rpx;
width: 200rpx;
height: 50rpx;
margin-right: 10rpx;
border-radius: 15rpx // width: 170rpx;
}
.li { .li {
padding: 10rpx; padding: 10rpx;
background-color: white; background-color: white;

4
subpkg/property/chosseCompany.vue
View File

@ -42,7 +42,7 @@
</view> </view>
<!-- 车辆列表 --> <!-- 车辆列表 -->
<view class="car_info" v-if="dataList.cars_info"> <view class="car_info" v-if="dataList.type==1">
<view class="car_type"> <view class="car_type">
<text>自有车辆</text> <text>自有车辆</text>
</view> </view>
@ -56,7 +56,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="car_info" v-if="carList.length"> <view class="car_info" v-if="dataList.type==0">
<view class="car_type"> <view class="car_type">
<text v-if="true">租赁车辆</text> <text v-if="true">租赁车辆</text>
<text v-else>自有车辆</text> <text v-else>自有车辆</text>

86
subpkg/property/index.vue
View File

@ -8,23 +8,28 @@
<view class="noCar" v-if='company_type==18'> <view class="noCar" v-if='company_type==18'>
<!-- 申请 --> <!-- 申请 -->
<view class="" v-if="step==-2"> <view class="" v-if="step==-2">
<view class=""> <!-- <view class="">
你还没有所属车辆哦,请向镇公司申请用车或使用自有车辆并绑定系统 你还没有所属车辆哦,请向镇公司申请用车或使用自有车辆并绑定系统
</view> </view> -->
<view class="" style="margin: 20rpx 0;"> <u-empty text="你还没有所属车辆哦,请向镇公司申请用车或使用自有车辆并绑定系统~" icon="../../static/img/empty/data.png">
<u-button @tap="applycarFn" type="primary" style="background-color: #0122C7;border: none;" </u-empty>
<view>
<mytn text='申请用车' class="upCar" :position="false" @click="applycarFn"></mytn>
<!-- <u-button @tap="applycarFn" type="primary" style="background-color: #0122C7;border: none;"
class="btn"> class="btn">
申请用车</u-button> 申请用车</u-button> -->
</view> </view>
<view class=""> <view class="">
<u-button @tap="show=true" type="primary" style="background-color: #0122C7;border: none;" <!-- <u-button @tap="show=true" type="primary" style="background-color: #0122C7;border: none;"
class="btn"> class="btn">
上传自有车辆</u-button> 上传自有车辆</u-button> -->
<mytn text='上传自有车辆' @click="show=true"></mytn>
</view> </view>
<u-modal :show="show" @close="show=false" :showCancelButton="true" @confirm="upCarFn" <u-modal :show="show" @close="show=false" :showCancelButton="true" @confirm="upCarFn"
:closeOnClickOverlay="true" @cancel="show=false" title="车辆上传"> :closeOnClickOverlay="true" @cancel="show=false" title="车辆上传">
<view class="slot-content"> <view class="slot-content">
<u--input placeholder="请输入您的车牌号" v-model="carLicense"></u--input> <u--input placeholder="请输入车牌号" v-model="carLicense"></u--input>
</view> </view>
</u-modal> </u-modal>
</view> </view>
@ -54,30 +59,35 @@
</view> </view>
<!-- 审核结束 --> <!-- 审核结束 -->
<view class="" v-if="step==4"> <view class="" v-if="step==4">
<view class=""> <view style="margin-top: 15vh;">
你的申请于{{datas.update_time}}被驳回 <view class="">
</view> 你的申请于{{datas.update_time}}被驳回
<view class=""> </view>
驳回理由: {{datas.reject_message}} <view class="">
</view> 驳回理由: {{datas.reject_message}}
<view class=""> </view>
请修改相应内容重新提交哦 <view class="">
请修改相应内容重新提交哦
</view>
</view> </view>
<view class=""> <view class="">
<view class="" style="margin: 20rpx 0;"> <view class="" style="margin: 20rpx 0;">
<u-button @tap="applycarFn" type="primary" style="background-color: #0122C7;border: none;"
class="btn"> <mytn text='上传自有车辆' @click="show=true"></mytn>
申请用车</u-button>
</view> </view>
<view class=""> <view class="">
<u-button @tap="show=true" type="primary" style="background-color: #0122C7;border: none;"
class="btn">
上传自有车辆</u-button> <mytn text='申请用车' :position="false" class="upCar" @click="applycarFn"></mytn>
</view> </view>
<u-modal :show="show" @close="show=false" @confirm="upCarFn" :closeOnClickOverlay="true" <u-modal :show="show" @close="show=false" @confirm="upCarFn" :closeOnClickOverlay="true"
title="车辆上传"> title="车辆上传">
<view class="slot-content"> <view class="slot-content">
<u--input placeholder="请输入您的车牌号" v-model="carLicense"></u--input> <u--input placeholder="请输入您的车牌号" v-model="carLicense"></u--input>
<view style="color: red;font-size: 20rpx;" v-if="noInfo">
车牌号不能为空
</view>
</view> </view>
</u-modal> </u-modal>
</view> </view>
@ -239,6 +249,7 @@
name: "vehicle", name: "vehicle",
data() { data() {
return { return {
noInfo: false,
aaa: 0, aaa: 0,
showLoading: true, showLoading: true,
company_type: "", company_type: "",
@ -340,18 +351,19 @@
}, },
// 自有车辆 // 自有车辆
upCarFn() { upCarFn() {
if (!this.carLicense) {
this.noInfo = true
return
}
upVehicleApi({ upVehicleApi({
license: this.carLicense license: this.carLicense
}).then(res => { }).then(res => {
this.step = 2 this.step = 2
Toast("上传成功")
}) })
// upVehicleApi({
// license: this.carLicense
// }).then(res => {
// this.show = false
// })
this.show = false this.show = false
this.noInfo = false
}, },
signFn() { signFn() {
@ -408,9 +420,9 @@
.noCar { .noCar {
padding: 100rpx; padding: 100rpx;
margin-top: 30vh; margin-top: 10vh;
word-wrap: break-word; // word-wrap: break-word;
overflow-wrap: break-word; // overflow-wrap: break-word;
// position: absolute; // position: absolute;
// width: 80vw; // width: 80vw;
// height: auto; // height: auto;
@ -422,6 +434,20 @@
} }
.upCar {
position: fixed;
bottom: 110rpx;
left: 0;
// z-index: 9999999;
z-index: 1;
width: 100%;
border-radius: 0;
color: #fff;
height: 90rpx;
line-height: 90rpx;
background-color: $theme-oa-color;
}
.info { .info {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;

10
subpkg/property/vehicle_a.vue
View File

@ -147,16 +147,16 @@
// car_id: this.$route.query.id // car_id: this.$route.query.id
car_id: options.id car_id: options.id
}).then(res => { }).then(res => {
this.datas = res.data this.datas = res.data
this.markers[0].latitude = res.data.position?.lat this.markers[0].latitude = res.data.position?.lat
this.markers[0].longitude = res.data.position?.lon this.markers[0].longitude = res.data.position?.lon
if (this.datas.contract) {
this.showCont = true
}
}) })
this.minDateFn() this.minDateFn()
if (this.datas.contract) { // console.log(this.datas)
this.showCont = true
}
// console.log(date - 7) // console.log(date - 7)
}, },