消息查看问题,进度条ie兼容问题,bug修改
This commit is contained in:
@@ -1,24 +1,28 @@
|
||||
<!--进度组件-->
|
||||
<template>
|
||||
<div>
|
||||
<!-- 三项非全0-->
|
||||
<div class="progress" v-if="(data.allPayment + data.partPayment + data.notPayment) !== 0">
|
||||
<!-- 将全部付款和部分付款放入一个div中-->
|
||||
<div class="full-and-partial"
|
||||
:style="{width: (data.allPayment + data.partPayment)/(data.allPayment + data.partPayment + data.notPayment) * 100 + '%'}">
|
||||
<!-- 全部付款-->
|
||||
<div :style="{width: data.allPayment/(data.allPayment + data.partPayment) * 100 + '%'}"
|
||||
class="progress-item pay-in-full">
|
||||
class="progress-item pay-in-full" v-if="data.allPayment !== 0">
|
||||
{{ data.allPayment }}
|
||||
</div>
|
||||
<!-- 部分付款-->
|
||||
<div :style="{width: data.partPayment/(data.allPayment + data.partPayment) * 100 + '%'}"
|
||||
class="progress-item partial-payment">
|
||||
class="progress-item partial-payment" v-if="data.partPayment !== 0">
|
||||
{{ data.partPayment }}
|
||||
</div>
|
||||
</div>
|
||||
<div :style="{width: data.notPayment/(data.allPayment + data.partPayment + data.notPayment) * 100 + '%'}"
|
||||
class="progress-item non-payment">
|
||||
class="progress-item non-payment" v-if="data.notPayment !== 0">
|
||||
{{ data.notPayment }}
|
||||
</div>
|
||||
</div>
|
||||
<!-- 三项均为0-->
|
||||
<div class="progress progress-null" v-else>0</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -60,8 +64,12 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
.no-display {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.full-and-partial {
|
||||
background: linear-gradient(0deg,#0075a9 0%, #008dcc 100%);
|
||||
background: linear-gradient(0deg, #0075a9 0%, #008dcc 100%);
|
||||
display: flex;
|
||||
border-radius: 10px;
|
||||
box-sizing: border-box;
|
||||
@@ -77,11 +85,11 @@ export default {
|
||||
}
|
||||
|
||||
.pay-in-full {
|
||||
background: linear-gradient(0deg,#069f99 0%, #07b1aa 100%);
|
||||
background: linear-gradient(0deg, #069f99 0%, #07b1aa 100%);
|
||||
}
|
||||
|
||||
.partial-payment {
|
||||
background: linear-gradient(0deg,#0075a9 0%, #008dcc 100%);
|
||||
background: linear-gradient(0deg, #0075a9 0%, #008dcc 100%);
|
||||
}
|
||||
|
||||
.non-payment {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<div class="company-select">
|
||||
<a-row>
|
||||
<a-col :span="20">
|
||||
<a-input @click="chooseBusiness" :value="value[valueKey]" v-bind="$attrs" :readOnly="true"></a-input>
|
||||
<a-input @click="chooseBusiness" :value="value[valueKey]" v-bind="$attrs" :readOnly="true" unselectable="on"></a-input>
|
||||
</a-col>
|
||||
<a-col :span="4" class="form-btn" v-if="canAdd">
|
||||
<a-button v-bind="$attrs" icon="plus" @click="addCompany"></a-button>
|
||||
|
||||
@@ -61,8 +61,8 @@
|
||||
overflow: auto;
|
||||
.container {
|
||||
width: 100%;
|
||||
min-width: 1366px;
|
||||
min-height: 768px;
|
||||
min-width: 1300px;
|
||||
min-height: 600px;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
|
||||
@@ -7,35 +7,39 @@
|
||||
</component>
|
||||
</template>
|
||||
<script>
|
||||
export default {
|
||||
name: 'DynamicNotice',
|
||||
data () {
|
||||
return {
|
||||
compName: this.path
|
||||
export default {
|
||||
name: 'DynamicNotice',
|
||||
data() {
|
||||
return {
|
||||
compName: this.path
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
comp: function () {
|
||||
if (!this.path) {
|
||||
return null
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
comp: function () {
|
||||
if(!this.path){
|
||||
return null
|
||||
// this.path中的@comp字符串会拼接组件路径为@/components@comp导致控制台报错
|
||||
let path = this.path.replace('@comp', '')
|
||||
// @views/incomePayments重复导致找不到组件
|
||||
path = path.replace('@views/incomePayments', '')
|
||||
// 这么写 是因未用数据库的路径拿不到 组件 实例
|
||||
if (path && path.includes('AuditModal')) {
|
||||
return resolve => require([`@views/incomePayments${ path }.vue`], resolve)
|
||||
} else {
|
||||
return resolve => require([`@/components${ path }.vue`], resolve)
|
||||
}
|
||||
}
|
||||
},
|
||||
props: ['path', 'formData'],
|
||||
methods: {
|
||||
detail() {
|
||||
setTimeout(() => {
|
||||
if (this.path) {
|
||||
this.$refs.compModel.open(this.formData)
|
||||
}
|
||||
// 这么写 是因未用数据库的路径拿不到 组件 实例
|
||||
if(this.path && this.path.includes('AuditModal')){
|
||||
return resolve => require([`@views/incomePayments${this.path}.vue`], resolve)
|
||||
}else {
|
||||
return resolve => require([`@/components${this.path}.vue`], resolve)
|
||||
}
|
||||
}
|
||||
},
|
||||
props: ['path','formData'],
|
||||
methods: {
|
||||
detail () {
|
||||
setTimeout(() => {
|
||||
if(this.path){
|
||||
this.$refs.compModel.open(this.formData)
|
||||
}
|
||||
}, 200)
|
||||
},
|
||||
}, 200)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
Reference in New Issue
Block a user