+
-
+
@@ -580,7 +596,6 @@
-
-
@@ -648,7 +663,7 @@
visibleProjectMemberMenu = false"
>
-
+ -->
@@ -667,7 +682,7 @@
@@ -685,7 +700,7 @@
显示较早的 {{taskLogTotal - taskLogList.length}} 条动态
-
@@ -695,11 +710,14 @@
v-html="log.content">
-
+
-
+
{{log.member.name}}
+
提交
+
通过
+
驳回
{{log.create_time}}
@@ -723,7 +741,7 @@
@@ -1091,6 +1114,7 @@
},
created() {
this.init();
+ console.log(this.userInfo);
},
mounted() {
this.$nextTick(()=>{
@@ -1102,13 +1126,13 @@
})()
};
document.onkeydown = (event) => {
- console.log(event);
+ // console.log(event);
var e = event || window.event || arguments.callee.caller.arguments[0];
if (13 == e.keyCode && e.ctrlKey) {
//处理的部分
- this.createComment();
+ this.createComment(1);
}
- if ('@' == e.key && this.commenting) {
+ if (('@' == e.key || (e.code=='Digit2'&&e.key=='Process'&&e.shiftKey)) && this.commenting) {
this.showMentions = true;
}else{
this.showMentions = false;
@@ -1526,14 +1550,18 @@
this.initContent(this.task.description)
},
initContent(value) {
- if (value) {
- this.$refs.vueWangeditor.setHtml(value)
- } else {
- this.$refs.vueWangeditor.setHtml('')
+ try {
+ if (value) {
+ this.$refs.vueWangeditor.setHtml(value)
+ } else {
+ this.$refs.vueWangeditor.setHtml('')
+ }
+ this.$nextTick(() => {
+ this.checkShowMoreDesc(false, true);
+ });
+ } catch (error) {
+
}
- this.$nextTick(() => {
- this.checkShowMoreDesc(false, true);
- });
},
doContent() {
let content = this.$refs.vueWangeditor.getHtml();
@@ -1550,7 +1578,7 @@
this.getTaskLog();
});
},
- createComment() {
+ createComment(type=0) {
let comment = this.comment.trim();
if (!comment) {
return false;
@@ -1566,7 +1594,7 @@
}
});
}
- createComment(this.code, this.comment, JSON.stringify(this.mentionsList)).then(() => {
+ createComment(this.code, this.comment, JSON.stringify(this.mentionsList), type).then(() => {
this.comment = '';
this.mentionsList = [];
this.getTaskLog();
@@ -2159,7 +2187,7 @@
.content-right {
//width: 37%;
- width: 410px;
+ width: 510px;
.header {
padding: 15px 20px 20px 20px;
@@ -2199,7 +2227,7 @@
}
.log-comment {
- max-width: 405px;
+ max-width: 100%;
align-items: end;
margin-bottom: 15px;
}
@@ -2236,7 +2264,56 @@
flex: 1 1;
}
}
- }
+
+ .log-pass{
+ border: 1px solid green;
+ background-color: rgba(green, 0.05);
+ border-radius: 10px;
+ color: #fff !important;
+ padding: 10px;
+ }
+
+ .log-reject{
+ border: 1px solid #ff4d4f;
+ background-color: rgba(#ff4d4f, 0.1);
+ border-radius: 10px;
+ color: #fff !important;
+ padding: 10px;
+ }
+
+ .log-add{
+ border: 1px solid #1890ff;
+ background-color: rgba(#1890ff, 0.1);
+ border-radius: 10px;
+ color: #fff !important;
+ padding: 10px;
+ }
+
+ .log-pass-tips{
+ margin-left: 10px;
+ color: #fff;
+ font-size: 12px;
+ padding: 0px 6px;
+ border-radius: 2px;
+ background-color: green;
+ }
+ .log-reject-tips{
+ margin-left: 10px;
+ color: #fff;
+ font-size: 12px;
+ padding: 0px 6px;
+ border-radius: 2px;
+ background-color: #ff4d4f;
+ }
+ .log-add-tips{
+ margin-left: 10px;
+ color: #fff;
+ font-size: 12px;
+ padding: 0px 6px;
+ border-radius: 2px;
+ background-color: #1890ff;
+ }
+ }
}
.footer {
diff --git a/src/components/project/taskSearch.vue b/src/components/project/taskSearch.vue
index 3d62cab..6ebc764 100644
--- a/src/components/project/taskSearch.vue
+++ b/src/components/project/taskSearch.vue
@@ -9,7 +9,7 @@
:form="form"
@submit.prevent="handleSubmit">
-
-
+ -->
{
+ if (binding.value) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ });
+ el.querySelectorAll('*').forEach((child) => {
+ child.addEventListener('click', (event) => {
+ event.preventDefault();
+ event.stopPropagation();
+ });
+ });
+ }
+ },
+ update(el, binding) {
+ binding.value = !!binding.value;
+ console.log('binding', binding);
+ if(binding.value){
+ el.addEventListener('click', (event) => {
+ if (binding.value) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ });
+ el.querySelectorAll('*').forEach((child) => {
+ child.addEventListener('click', (event) => {
+ event.preventDefault();
+ event.stopPropagation();
+ });
+ });
+ }
+ },
+ });
+
Vue.config.productionTip = false;
Vue.use(Antd);
Vue.component('WrapperContent', WrapperContent);
diff --git a/src/views/project/space/task.vue b/src/views/project/space/task.vue
index 0ab9edb..16b1b69 100644
--- a/src/views/project/space/task.vue
+++ b/src/views/project/space/task.vue
@@ -1,935 +1,1259 @@
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- 子任务尚未全部完成，无法完成父任务
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 子任务尚未全部完成，无法完成父任务
+
+
+
+
+
-
-
-
-
{{ task.name }}
-
-
- {{task.executor.name}}
-
- ![]()
-
-
-
-
-
{{task.statusText}}
-
-
- {{ showTaskTime(task.begin_time,task.end_time)}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{task.childCount[1]}}/{{task.childCount[0]}}
-
-
-
- {{tag.tag.name}}
-
-
{{ task.task_execute_name }}
-
-
- {{task.like}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ task.name }}
-
-
- {{task.executor.name}}
-
- ![]()
-
-
-
-
-
-
-
- 有 {{stage.canNotReadCount}} 个任务被隐藏（因为设置了仅参与者可见）
-
-
-
-
-
+
+
\ No newline at end of file
+.task-table {
+ .ant-table-body {
+ margin: 0 10px 0 15px;
+ }
+ .wrapper-content {
+ position: inherit !important;
+ }
+}
+
- Pear Project
+ 工单系统