LK/income_payments_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消息查看问题，进度条ie兼容问题，bug修改

Browse Source
This commit is contained in:
zhaoxiao
2021-10-21 16:21:27 +08:00
parent 77a0bec433
commit a9a617ad9e
9 changed files with 70 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/ProgressBar.vue
+14 -6
View File
@@ -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 {
src/components/company/CompanySelect.vue
+1 -1
View File
@@ -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>
src/components/layouts/UserLayout.vue
+2 -2
View File
@@ -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;
src/components/tools/DynamicNotice.vue
+31 -27
View File
@@ -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>
src/views/packManagement/PackCompanyList.vue
+1 -1
View File
@@ -31,7 +31,7 @@
<!-- 操作按钮区域-->
<div class="table-operator">
<a-button type="primary" icon="plus" @click="handleAdd" v-has="'packCompany:add'">新增</a-button>
<a-button type="primary" icon="export" @click="handleExportXls('打包企业列表')" v-has="'packCompany:export'">导出</a-button>
<a-button type="primary" icon="export" @click="handleExportXls('打包管理')" v-has="'packCompany:export'">导出</a-button>
<a-button type="danger" icon="delete" @click="batchDel" v-has="'packCompany:batchDel'">批量删除</a-button>
</div>
<!-- 操作按钮区域-end-->
src/views/system/DepartList.vue
+10 -2
View File
@@ -24,7 +24,8 @@
<a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">取消选择</a>
</div>
</a-alert>
<a-input-search @search="onSearch" allowClear style="width:100%;margin-top: 10px" placeholder="请输入部门名称" :maxLength="50"/>
<a-input-search @search="onSearch" allowClear style="width:100%;margin-top: 10px" placeholder="请输入部门名称"
:maxLength="50"/>
<!-- 树-->
<a-col :md="10" :sm="24">
<template>
@@ -504,7 +505,7 @@ export default {
this.form.resetFields()
this.selectedKeys = []
//取消选择 清除选中部门id
this.$refs.DeptUserInfo.cancelSelect()
// this.$refs.DeptUserInfo.cancelSelect()
// 暂时注释(部门权限组件)没用 2021-08-24
// this.$refs.departAuth.departId = ''
},
@@ -736,4 +737,11 @@ export default {
background: #fff;
border-radius: 0 0 2px 2px;
}
//解决组织机构名称很长的时候文字无法隐藏的问题
/deep/ .ant-tree li .ant-tree-node-content-wrapper {
max-width: 235%;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
src/views/system/modules/UserRoleModal.vue
+6 -5
View File
@@ -81,11 +81,12 @@
}
},
methods: {
onTreeNodeSelect(id){
if(id && id.length>0){
this.selectedKeys = id
}
this.$refs.datarule.show(this.selectedKeys[0],this.roleId)
onTreeNodeSelect(){
// id
// if(id && id.length>0){
// this.selectedKeys = id
// }
// this.$refs.datarule.show(this.selectedKeys[0],this.roleId)
},
onCheck (o) {
if(this.checkStrictly){
src/views/user/Login.vue
+4 -3
View File
@@ -326,7 +326,7 @@ export default {
z-index: 99;
width: 50%;
box-sizing: border-box;
height: 60%;
height: 80%;
position: absolute;
right: 0;
top: 50%;
@@ -336,11 +336,12 @@ export default {
height: 100%;
overflow: hidden;
display: flex;
justify-content: space-between;
justify-content: center;
flex-direction: column;
.title{
display: flex;
justify-content: center;
margin-bottom: 10px;
img{
width: 395px;
height: 124px;
@@ -366,7 +367,7 @@ export default {
}
}
/deep/.ant-row{
margin-bottom: 0 !important;
margin-bottom: 4px!important;
}
/deep/.ant-input-affix-wrapper .ant-input{
border-radius: 30px;
src/views/user/alteration/Alteration.vue
+1 -1
View File
@@ -315,7 +315,7 @@ export default {
}
.alteration-content {
margin: auto;
//margin: auto;
width: 1000px;
display: flex;
justify-content: center;