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-02 13:18:15 +08:00
parent caa99433f1
commit 36084196a5
3 changed files with 87 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
subpkg/property/chosseCompany.vue
View File

@ -2,12 +2,12 @@
<view class=""> <view class="">
<view class="date" v-if="dataList.type !=2"> <view class="date" v-if="dataList.type !=2">
<!-- 2022年12月12日提出申请 --> <!-- 2022年12月12日提出申请 -->
{{dataList.create_time.slice(0,10)}} 提出申请 {{dataList.create_time}} 提出申请
</view> </view>
<view class="date" v-else> <view class="date" v-else>
<!-- 2022年12月12日提出申请 --> <!-- 2022年12月12日提出申请 -->
{{dataList.create_time.slice(0,10)}} 提出解除申请 {{dataList.create_time}} 提出解除申请
</view> </view>
<!-- 公司信息 --> <!-- 公司信息 -->
@ -80,9 +80,9 @@
<u--image :showLoading="true" src="../../static/img/contract/pdf.png" width="80px" <u--image :showLoading="true" src="../../static/img/contract/pdf.png" width="80px"
height="80px"></u--image> height="80px"></u--image>
<view class="text"> <view class="text">
<view class="name">《租赁合同》</view> <view class="name">《解除合同》</view>
<view> <view>
<text>{{'2023-03-03'}}</text> <text>{{dataList.create_time}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -94,15 +94,13 @@
</view> </view>
</view> </view>
{{dataList.status}}
<!-- 按钮 --> <!-- 按钮 -->
<view class="btns"> <view class="btns">
<!-- 生成合同 --> <!-- 生成合同 -->
<view class="" v-if="dataList.status==-1"> <view class="" v-if="dataList.status==-1">
<u-button :disabled="false" type="primary" @click="showPop=true" <u-button :disabled="false" type="primary" @click="showPop=true"
style="margin-bottom: 20rpx;width: 100%;" color="#FF7C32" text="申请驳回"></u-button> style="margin-bottom: 20rpx;width: 100%;" color="#FF7C32" text="申请驳回"></u-button>
<u-button :disabled="carList.length<=0 &&!dataList.cars_info.length" type="primary" text="生成合同" <u-button :disabled="flag1" type="primary" text="生成合同" @tap="contractFn" color="#0122C7"></u-button>
@tap="contractFn" color="#0122C7"></u-button>
</view> </view>
<!-- 审核中 --> <!-- 审核中 -->
<view class="" v-if="dataList.status==0"> <view class="" v-if="dataList.status==0">
@ -117,7 +115,8 @@
<u--image :showLoading="true" src="../../static/img/contract/pdf.png" width="80px" <u--image :showLoading="true" src="../../static/img/contract/pdf.png" width="80px"
height="80px"></u--image> height="80px"></u--image>
<view class="text"> <view class="text">
<view class="name">{{ dataList.type!=2? "《租赁合同》":"解除合同" }} </view> <view class="name">{{typeFn( dataList.type) }}
</view>
<view> <view>
<text>{{'2023-03-03'}}</text> <text>{{'2023-03-03'}}</text>
</view> </view>
@ -130,18 +129,17 @@
</view> </view>
</view> </view>
</view> </view>
<u-button v-if="flag" :disabled="false" type="primary" text="发送合同" @tap="sendcontractFn" <u-button v-if="dataList.status==1" :disabled="false" type="primary" text="发送合同" @tap="sendFn"
color="#0122C7"></u-button> color="#0122C7"></u-button>
<!-- <u-button v-if="flag" :disabled="false" type="primary" text="发送合同" @tap="sendMsgFn" <!-- <u-button v-if="flag" :disabled="false" type="primary" text="发送合同" @tap="sendMsgFn"
color="#0122C7"></u-button> --> color="#0122C7"></u-button> -->
<u-button v-else :disabled="false" type="primary" :text="`重新发送${times}s`" @tap="sendMsgFn" <u-button v-else :disabled="times" type="primary" :text="`重新发送${times?times+'s':''}`" @tap="sendAgainFn"
color="grey"></u-button> color="#0122C7"></u-button>
</view> </view>
</view> </view>
<!--uview 组件 --> <!--uview 组件 -->
<view class=""> <view class="">
<u-modal :show="showPop" @close="showPop=false" @confirm="confirm" :closeOnClickOverlay="true" <u-modal :show="showPop" @close="showPop=false" @confirm="confirm" :closeOnClickOverlay="true"
title="请输入驳回理由"> title="请输入驳回理由">
@ -170,7 +168,8 @@
export default { export default {
data() { data() {
return { return {
times: 5, flag1: true,
times: 0,
dataList: {}, dataList: {},
overruleValue: "", overruleValue: "",
showPop: false, showPop: false,
@ -181,32 +180,62 @@
} }
}, },
onLoad(options) { onLoad(options) {
// console.log(this.$route.query) console.log(options)
// console.log(6565)
getAgencyDetailApi({ getAgencyDetailApi({
id: options.id id: options.id
}).then(res => { }).then(res => {
// 13043214321 // 13043214321
this.dataList = res.data.vehicleContract this.dataList = res.data.vehicleContract
this.carList = res.data.vehicleRentCars 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) { if (this.dataList.status == 3) {
uni.navigateBack() 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: { methods: {
sendAgainFn() { sendAgainFn() {
let that = this
sendMsgApi({ sendMsgApi({
id: this.dataList.id id: this.dataList.id,
}).then(res => {
Toast("发送成功")
that.times = 10
that.timer()
// that.num = 10
}) })
}, },
sendFn() { sendFn() {
let that = this
sendcontractApi({ sendcontractApi({
id: this.dataList.id 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() { confirm() {
// console.log(this.overruleValue) // console.log(this.overruleValue)
overruleApi({ overruleApi({
@ -225,23 +254,16 @@
let timers = setInterval(() => { let timers = setInterval(() => {
that.times-- that.times--
if (that.times <= 0) { if (that.times <= 0) {
this.flag = true
clearInterval(timers) clearInterval(timers)
} }
}, 1000) }, 1000)
}, },
navToContract(contract_no) { navToContract(contract_no) {
download_file({
applyNo: contract_no
}).then(res => {
if (res.code != 1) {
Toast(res.msg || '合同未签订')
}
uni.navigateTo({ uni.navigateTo({
url: `/subpkg/pdfView/pdfView?url=${res.data.url}` url: `/subpkg/pdfView/pdfView?url=${contract_no}`
})
}) })
}, },
contractFn() { contractFn() {
console.log(this.checked) console.log(this.checked)
@ -253,14 +275,14 @@
}) })
this.navTo('/subpkg/property/success') this.navTo('/subpkg/property/success')
}, },
sendcontractFn() { // sendcontractFn() {
this.lg ? this.sendAgainFn() : this.sendFn()
Toast("操作成功") // // this.sendFn()
this.flag = false // Toast("操作成功")
this.times = 10 // this.times = 10
this.timer() // this.timer()
this.lg = true
}, // },
navTo(url) { navTo(url) {
uni.navigateTo({ uni.navigateTo({
url url

37
subpkg/property/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class=""> <view v-if="flag">
<view v-if='showLoading'> <view v-if='showLoading'>
<u-loading-page :loading="showLoading"></u-loading-page> <u-loading-page :loading="showLoading"></u-loading-page>
</view> </view>
@ -7,7 +7,7 @@
<!-- 小组公司 --> <!-- 小组公司 -->
<view class="noCar" v-if='company_type==18'> <view class="noCar" v-if='company_type==18'>
<!-- 申请 --> <!-- 申请 -->
<view class="" v-if="step==999"> <view class="" v-if="step==-2">
<view class=""> <view class="">
你还没有所属车辆哦,请向镇公司申请用车或使用自有车辆并绑定系统 你还没有所属车辆哦,请向镇公司申请用车或使用自有车辆并绑定系统
</view> </view>
@ -30,9 +30,15 @@
</view> </view>
<!-- 等待 --> <!-- 等待 -->
<view class="" v-if='[-1,0,1,2].includes(step)'> <view class="" v-if='[-3,-1,0,1,2].includes(step)'>
<view class="loading" v-if='step==-3'>
<span>你已提交解除申请,等待签约</span>
<span class="dots">...</span>
</view>
<!-- 上传自有车辆 --> <!-- 上传自有车辆 -->
<view v-if="0"> <view v-if="datas.type==1">
<view class="loading"> <view class="loading">
<span>您已上传自用车辆,系统正在审核中,请耐心等待</span> <span>您已上传自用车辆,系统正在审核中,请耐心等待</span>
<span class="dots">...</span> <span class="dots">...</span>
@ -40,14 +46,10 @@
</view> </view>
<!-- 申请用车 --> <!-- 申请用车 -->
<view v-else> <view v-else>
<view class="loading" v-if="datas.type !=2"> <view class="loading" v-if="datas.type ==0">
<span>你已提交用车申请，后台正在加快处理中，请耐心等待哦</span> <span>你已提交用车申请，后台正在加快处理中，请耐心等待哦</span>
<span class="dots">...</span> <span class="dots">...</span>
</view> </view>
<view class="loading" v-else>
<span>你已提交解除申请</span>
<span class="dots">...</span>
</view>
</view> </view>
</view> </view>
<!-- 审核结束 --> <!-- 审核结束 -->
@ -201,7 +203,6 @@
</u-modal> </u-modal>
</view> </view>
</view> </view>
<mytn text='合同列表' v-if="datas.rent_num" @click="navgo('/subpkg/property/contractList')"></mytn> <mytn text='合同列表' v-if="datas.rent_num" @click="navgo('/subpkg/property/contractList')"></mytn>
</view> </view>
</template> </template>
@ -242,6 +243,7 @@
dataList: [], dataList: [],
newCarNum: "", newCarNum: "",
newcarTit: "", newcarTit: "",
flag: false
@ -255,17 +257,9 @@
if (type == 18) { if (type == 18) {
// getvehicleDetailApi().then(res => {}) // getvehicleDetailApi().then(res => {})
villageCompanyApi().then(res => { villageCompanyApi().then(res => {
if (!res.data?.id) {
this.showLoading = false
this.step = 999
return
}
this.showLoading = false this.showLoading = false
this.datas = res.data this.datas = res.data
this.step = res.data.status this.step = res.data.status
switch (this.step) { switch (this.step) {
case 3: case 3:
uni.redirectTo({ uni.redirectTo({
@ -284,7 +278,6 @@
else { else {
getvehicleListApi().then(res => { getvehicleListApi().then(res => {
this.datas = res.data this.datas = res.data
res.data.apply.length >= 2 ? this.applicationList = res.data.apply : this.applicationList = res res.data.apply.length >= 2 ? this.applicationList = res.data.apply : this.applicationList = res
.data.apply.slice(0, 2) .data.apply.slice(0, 2)
// this.applicationList = res.data.apply // this.applicationList = res.data.apply
@ -308,6 +301,9 @@
// // this.applicationList=res // // this.applicationList=res
// }) // })
setTimeout(() => {
this.flag = true
})
}, },
@ -317,7 +313,7 @@
applycarFn() { applycarFn() {
upVehicleApi().then(res => { upVehicleApi().then(res => {
Toast(res.msg) Toast(res.msg)
this.step = 2 this.step = -1
}) })
}, },
// 自有车辆 // 自有车辆
@ -325,7 +321,6 @@
upVehicleApi({ upVehicleApi({
license: this.carLicense license: this.carLicense
}).then(res => { }).then(res => {
// this.show = false
this.step = 2 this.step = 2
}) })
// upVehicleApi({ // upVehicleApi({

16
subpkg/property/vehicle_a.vue
View File

@ -52,15 +52,15 @@
</view> </view>
</view> </view>
</view> </view>
<u-button v-if="datas.type" type="primary" class='poline_btn' color="#FF7C32" <u-button v-if="datas.type==1&&company_type==16" type="primary" class='poline_btn'
@tap="cancelContractFn" text="解除合同"></u-button> color="#FF7C32" @tap="cancelContractFn" text="解除合同"></u-button>
</view> </view>
</view> </view>
</view> </view>
<!-- 合同 --> <!-- 合同 -->
<!-- {{datas.contract}} --> <!-- {{datas.contract}} -->
<view class="card"> <view class="card" v-if="showCont">
<view class="contract"> <view class="contract">
<view class="left"> <view class="left">
<u--image :showLoading="true" src="../../static/img/contract/pdf.png" width="80px" <u--image :showLoading="true" src="../../static/img/contract/pdf.png" width="80px"
@ -68,7 +68,7 @@
<view class="text"> <view class="text">
<view class="name">《租赁合同》</view> <view class="name">《租赁合同》</view>
<view> <view>
<text>{{ datas.contract.create_time}}</text> <text>{{ datas.create_time}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -102,12 +102,14 @@
import { import {
Toast Toast
} from "../../libs/uniApi"; } from "../../libs/uniApi";
import Cache from '@/utils/cache';
export default { export default {
components: { components: {
mybtn mybtn
}, },
data() { data() {
return { return {
company_type: 0,
showMap: true, showMap: true,
pdfUrl: "", pdfUrl: "",
showPDF: false, showPDF: false,
@ -120,6 +122,7 @@
queryData: "请选择时间", queryData: "请选择时间",
mapClass: 'custom-map', mapClass: 'custom-map',
scale: 17, scale: 17,
showCont: false,
markers: [{ markers: [{
id: 2, id: 2,
latitude: 28.8733, latitude: 28.8733,
@ -130,6 +133,7 @@
} }
}, },
onLoad(options) { onLoad(options) {
this.company_type = (JSON.parse(Cache.get("USER_INFO")).company.company_type)
// console.log(this.$route.query.id) // console.log(this.$route.query.id)
// if (this.$route.query.type) { // if (this.$route.query.type) {
// villageCompanyApi().then(res => { // villageCompanyApi().then(res => {
@ -146,11 +150,15 @@
}) })
this.minDateFn() this.minDateFn()
if (this.datas.contract) {
this.showCont = true
}
// console.log(date - 7) // console.log(date - 7)
}, },
methods: { methods: {
showContractFn(url) { showContractFn(url) {
console.log(url)
uni.navigateTo({ uni.navigateTo({
url: `/subpkg/pdfView/pdfView?url=${url}` url: `/subpkg/pdfView/pdfView?url=${url}`
}) })