@@ -507,8 +502,9 @@ export default {
archivedTaskShow: false,
projectDialogSubscribe: null,
+
+ flowId: 0,
flowList: [],
- flowId: 0
}
},
@@ -572,23 +568,21 @@ export default {
},
panelTask() {
- const {searchText,flowId} = this;
+ const {searchText, flowId} = this;
return function (list) {
if (!this.projectParameter('completedTask')) {
list = list.filter(({complete_at}) => {
return !complete_at;
});
}
+ if (flowId > 0) {
+ list = list.filter(({flow_item_id}) => flow_item_id === flowId);
+ }
if (searchText) {
list = list.filter(({name, desc}) => {
return $A.strExists(name, searchText) || $A.strExists(desc, searchText);
});
}
- if(flowId > 0){
- list = list.filter(({flow_item_id}) => {
- return flow_item_id === flowId;
- });
- }
return list;
}
},
@@ -624,7 +618,7 @@ export default {
})).sort((a, b) => {
let at1 = $A.Date(a.complete_at),
at2 = $A.Date(b.complete_at);
- if(at1 || at2){
+ if (at1 || at2) {
return at1 - at2;
}
if (a.sort != b.sort) {
@@ -691,14 +685,14 @@ export default {
if (task.project_id != projectId || task.parent_id > 0) {
return false;
}
+ if (flowId > 0 && task.flow_item_id !== flowId) {
+ return false;
+ }
if (searchText) {
if (!$A.strExists(task.name, searchText) && !$A.strExists(task.desc, searchText)) {
return false;
}
}
- if(task.flow_item_id !== flowId && flowId > 0){
- return false;
- }
return !task.complete_at;
});
return array.sort((a, b) => {
@@ -725,14 +719,14 @@ export default {
if (task.project_id != projectId || task.parent_id > 0) {
return false;
}
+ if (flowId > 0 && task.flow_item_id !== flowId) {
+ return false;
+ }
if (searchText) {
if (!$A.strExists(task.name, searchText) && !$A.strExists(task.desc, searchText)) {
return false;
}
}
- if(task.flow_item_id !== flowId && flowId > 0){
- return false;
- }
return task.complete_at;
});
return array.sort((a, b) => {
@@ -762,10 +756,11 @@ export default {
},
projectId: {
handler(val) {
- if (val) {
+ if (val > 0) {
this.getFlowData();
}
},
+ immediate: true,
},
},
@@ -1158,21 +1153,20 @@ export default {
taskIsHidden(task) {
const {name, desc, complete_at} = task;
- const {searchText,flowId} = this;
+ const {searchText, flowId} = this;
if (!this.projectParameter('completedTask')) {
if (complete_at) {
return true;
}
}
+ if (flowId > 0 && task.flow_item_id !== flowId) {
+ return false;
+ }
if (searchText) {
if (!($A.strExists(name, searchText) || $A.strExists(desc, searchText))) {
return true;
}
}
-
- if(task.flow_item_id !== flowId && flowId > 0){
- return true;
- }
return false;
},
@@ -1200,6 +1194,22 @@ export default {
});
},
+ getFlowData() {
+ this.$store.dispatch("call", {
+ url: 'project/flow/list',
+ data: {
+ project_id: this.projectId,
+ },
+ }).then(({data}) => {
+ let flowList = data.map(({project_flow_item}) => project_flow_item);
+ if (flowList) {
+ this.flowList = flowList[0];
+ }
+ }).catch(() => {
+ this.flowList = [];
+ });
+ },
+
inviteCopy() {
if (!this.inviteData.url) {
return;
@@ -1253,14 +1263,14 @@ export default {
return false;
}
}
+ if (this.flowId > 0 && task.flow_item_id !== this.flowId) {
+ return false;
+ }
if (this.searchText) {
if (!$A.strExists(task.name, this.searchText) && !$A.strExists(task.desc, this.searchText)) {
return false;
}
}
- if(task.flow_item_id !== this.flowId && this.flowId > 0){
- return false;
- }
return task.owner;
},
@@ -1276,37 +1286,20 @@ export default {
return false;
}
}
+ if (this.flowId > 0 && task.flow_item_id !== this.flowId) {
+ return false;
+ }
if (this.searchText) {
if (!$A.strExists(task.name, this.searchText) && !$A.strExists(task.desc, this.searchText)) {
return false;
}
}
- if(task.flow_item_id !== this.flowId && this.flowId > 0){
- return false;
- }
return task.task_user && task.task_user.find(({userid, owner}) => userid == this.userId && owner == 0);
},
expiresFormat(date) {
return $A.countDownFormat(date, this.nowTime)
},
- getFlowData() {
- this.$store.dispatch("call", {
- url: 'project/flow/list',
- data: {
- project_id: this.projectId,
- is_filter: 1
- },
- }).then(({data}) => {
- let flowList = data.map(item => {
- return item.project_flow_item;
- });
- this.flowList = flowList[0];
- }).catch(({msg}) => {
- this.flowList = [];
- return false;
- });
- },
}
}
diff --git a/resources/assets/js/pages/manage/components/ReportEdit.vue b/resources/assets/js/pages/manage/components/ReportEdit.vue
index 2ff83645f..24025746b 100644
--- a/resources/assets/js/pages/manage/components/ReportEdit.vue
+++ b/resources/assets/js/pages/manage/components/ReportEdit.vue
@@ -103,16 +103,10 @@ export default {
if (this.id > 0) {
this.getDetail(val);
}else{
- this.userInputShow = false;
this.reportData.offset = 0;
this.reportData.type = "weekly";
this.reportData.receive = [];
this.getTemplate();
- setTimeout(() => {
- // 如果不做异步，直接重新赋值的话会导致组件无法重新加载
- // 组件不销毁重新渲染，会导致UserInput组件无法重新拉取所有人的列表
- this.userInputShow = true;
- }, 50)
}
},
},
diff --git a/resources/assets/js/pages/manage/components/TaskAdd.vue b/resources/assets/js/pages/manage/components/TaskAdd.vue
index c20df9e85..905b9baae 100644
--- a/resources/assets/js/pages/manage/components/TaskAdd.vue
+++ b/resources/assets/js/pages/manage/components/TaskAdd.vue
@@ -473,10 +473,6 @@ export default {
return;
}
this.loadIng++;
- // 处理栏目变更
- if ( this.addData.cascader.length > 0 ) {
- this.addData.column_id = this.addData.cascader[1];
- }
this.$store.dispatch("taskAdd", this.addData).then(({msg}) => {
this.loadIng--;
$A.messageSuccess(msg);
diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue
index f33addc3f..db7dcc8a6 100644
--- a/resources/assets/js/pages/manage/file.vue
+++ b/resources/assets/js/pages/manage/file.vue
@@ -417,7 +417,8 @@ export default {
'asp', 'properties', 'gitignore', 'log', 'bas', 'prg', 'python', 'ftl', 'aspx',
'mp3', 'wav', 'mp4', 'flv',
'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm',
- 'xmind', 'rp',
+ 'xmind',
+ 'rp',
],
uploadAccept: '',
maxSize: 204800,
diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss
index 843b7df38..332af5c52 100644
--- a/resources/assets/sass/pages/components/project-list.scss
+++ b/resources/assets/sass/pages/components/project-list.scss
@@ -136,14 +136,18 @@
box-shadow: none;
}
}
- .project-select{
+ .project-select {
display: flex;
align-items: center;
margin-right: 14px;
- opacity: 0.9;
- z-index: 1000;
- .title{
- width:50px;
+ .ivu-select-single {
+ .ivu-select-selection {
+ height: 30px;
+ .ivu-select-selected-value {
+ height: 28px;
+ line-height: 28px;
+ }
+ }
}
}
.project-switch-button {
@@ -957,16 +961,6 @@
.project-switch {
margin-left: 0;
justify-content: flex-end;
- .project-select{
- display: flex;
- align-items: center;
- margin-right: 14px;
- opacity: 0.9;
- z-index: 1000;
- .title{
- width:50px;
- }
- }
}
}
}