kuaifan 5 tahun lalu
induk
melakukan
21dada8906

+ 1 - 1
resources/assets/js/main/components/WHeader.vue

@@ -262,7 +262,7 @@
                     .right-info-num {
                         position: absolute;
                         top: 2px;
-                        left: 12px;
+                        left: 22px;
                         height: auto;
                         line-height: normal;
                         color: #ffffff;

+ 3 - 0
resources/assets/js/main/components/project/gantt/GSTC.vue

@@ -31,6 +31,9 @@
             .gantt-schedule-timeline-calendar-title {
                 flex: 1;
                 padding-right: 6px;
+                &.complete-title {
+                    text-decoration: line-through;
+                }
             }
             .gantt-schedule-timeline-calendar-goto {
                 font-family: Ionicons;

+ 11 - 17
resources/assets/js/main/components/project/task/detail/detail.vue

@@ -429,17 +429,6 @@
                             return;
                         }
                         ajaxData.content = eve.username;
-                        ajaxCallback = (res) => {
-                            if (res === 1) {
-                                this.$Modal.info({
-                                    title: this.$L('温馨提示'),
-                                    content: this.$L('任务负责人已改变,点击确定关闭窗口。'),
-                                    onOk: () => {
-                                        this.visible = false;
-                                    }
-                                });
-                            }
-                        };
                         break;
 
                     case 'inittime':
@@ -527,6 +516,7 @@
                                         this.visible = false;
                                     }
                                 });
+                                return false;
                             }
                         };
                         break;
@@ -550,6 +540,7 @@
                 }
                 //
                 this.$set(this.loadData, ajaxData.act, true);
+                let runTime = Math.round(new Date().getTime());
                 $A.apiAjax({
                     url: 'project/task/edit',
                     data: ajaxData,
@@ -561,20 +552,23 @@
                         alert(this.$L('网络繁忙,请稍后再试!'));
                     },
                     success: (res) => {
+                        runTime = Math.round(new Date().getTime()) - runTime;
                         if (res.ret === 1) {
                             this.detail = res.data;
                             this.bakData = $A.cloneData(this.detail);
-                            if (ajaxCallback(1) !== false) {
-                                this.logType == '日志' && this.$refs.log.getLists(true, true);
-                                this.$Message.success(res.msg);
-                            }
                             $A.triggerTaskInfoListener(ajaxData.act, res.data);
                             $A.triggerTaskInfoChange(ajaxData.taskid);
+                            setTimeout(() =>  {
+                                if (ajaxCallback(1) !== false) {
+                                    this.logType == '日志' && this.$refs.log.getLists(true, true);
+                                    this.$Message.success(res.msg);
+                                }
+                            }, Math.max(0, 350 - runTime));
                         } else {
-                            ajaxCallback(0);
                             setTimeout(() =>  {
+                                ajaxCallback(0);
                                 this.$Modal.error({title: this.$L('温馨提示'), content: res.msg});
-                            }, 350);
+                            }, Math.max(0, 350 - runTime));
                         }
                     }
                 });

+ 1 - 0
resources/assets/js/main/pages/project/panel.vue

@@ -247,6 +247,7 @@
                                     border-left-color: #84A83B;
                                 }
                                 &.complete {
+                                    border-left-color: #c1c1c1;
                                     .task-title {
                                         color: #666666;
                                         text-decoration: line-through;