Merge commit 'cbbd50a2e320ca0427474fb2921f2b93a5ad2c14' into pro

This commit is contained in:
kuaifan 2024-03-19 03:15:46 +09:00
commit 93578f93f4

View File

@ -401,7 +401,6 @@ export default {
this.init()
},
methods: {
init() {
this.tabsClick()
this.getProcdefList()
@ -447,10 +446,9 @@ export default {
if (!val && this.__tabsClick && time > 0) {
return;
}
this.__tabsClick = setTimeout(() => { this.__tabsClick =null; },time)
if(time == 0){
this.loadIng = true;
}
this.__tabsClick = setTimeout(() => {
this.__tabsClick = null;
}, time)
this.tabsValue = val || this.tabsValue
if (val) {
this.approvalType = this.searchState = "all"
@ -458,6 +456,7 @@ export default {
}
//
this.detailsShow = false;
this.loadIng = true;
//
if (this.tabsValue == 'unread') {
if (val === false) {
@ -487,15 +486,22 @@ export default {
}
this.getInitiatedList();
}
},
//
clickList(item) {
this.unreadList.map(h => { h._active = false; })
this.doneList.map(h => { h._active = false; })
this.notifyList.map(h => { h._active = false; })
this.initiatedList.map(h => { h._active = false; })
this.unreadList.map(h => {
h._active = false;
})
this.doneList.map(h => {
h._active = false;
})
this.notifyList.map(h => {
h._active = false;
})
this.initiatedList.map(h => {
h._active = false;
})
//
if (window.innerWidth < 426) {
this.goForward({name: 'manage-approve-details', query: {id: item.id}});
@ -652,7 +658,9 @@ export default {
let listKey = key + 'List'
this[key + 'Total'] = data.total;
type != 'scroll' ? (this[listKey] = data.rows) : data.rows.map(h => {
if (this[listKey].map(item => { return item.id }).indexOf(h.id) == -1) {
if (this[listKey].map(item => {
return item.id
}).indexOf(h.id) == -1) {
this[listKey].push(h)
}
});
@ -698,7 +706,9 @@ export default {
this.addShow = false;
this.$refs.initiateRef.resetFields();
this.tabsValue = 'initiated';
this.initiatedList.map(h=>{ h._active = false; })
this.initiatedList.map(h => {
h._active = false;
})
this.$nextTick(() => {
this.tabsClick(false, 0);
})
@ -718,18 +728,21 @@ export default {
.page-approve .approve-details {
border-radius: 8px;
}
.page-approve .ivu-tabs-nav {
display: flex;
width: 350px;
@media (max-width: 1010px) {
width: 100%;
}
.ivu-tabs-tab {
font-size: 15px;
flex: 1;
text-align: center;
}
}
.page-approve-initiate .ivu-modal-body {
padding: 16px 22px 2px !important;
}