weipengfei
/
work_admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

This commit is contained in:
weipengfei 2024-01-13 16:20:01 +08:00
parent b761c4fdc7
commit e8b3954b8d
10 changed files with 1988 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/project/taskAdd.vue
View File

@ -383,7 +383,7 @@
</div>
</div>
</a-spin>
<invite-project-member v-model="showInviteMember" :project-code="projectCodeCurrent"
<invite-project-member v-model="showInviteMember" :project-code="projectCode"
v-if="showInviteMember"></invite-project-member>
@ -625,6 +625,7 @@
this.getDepartment();
// console.log('router', this.$route);
this.projectCode = this.$route.params.code;
console.log(this.projectCode);
this.projectName = this.$route.query.name;
this.$nextTick(()=>{
this.changeModalHeight();

12
src/components/project/taskDetail.vue
View File

@ -741,7 +741,7 @@
</vue-scroll>
</div>
<div class="footer" id="footer">
<a-popover v-if="(userInfo.code==task.create_by&&task.status==4)||(userInfo.code == task.assign_to&&task.status==2)" trigger="click" placement="top" :visible="showMentions" arrowPointAtCenter :getPopupContainer="getPopup">
<a-popover v-if="!readonly && (userInfo.code==task.create_by&&task.status==4)||(userInfo.code == task.assign_to&&task.status==2)" trigger="click" placement="top" :visible="showMentions" arrowPointAtCenter :getPopupContainer="getPopup">
<template slot="content">
<div class="mentions-content" style="width: 200px;">
<div class="mentions-wrapper" v-for="member in taskMemberList" :key="member.id" @click="selectMentionMember(member)">
@ -753,11 +753,11 @@
<a-textarea @focus="commenting = true" @blur="commenting = false" ref="commentText" v-model="comment" :rows="1" placeholder="@提及任务成员，Ctrl+Enter发送"
style="margin-right: 15px;"/>
</a-popover>
<template v-if="userInfo.code == task.create_by&&task.status==4">
<template v-if="!readonly && userInfo.code == task.create_by&&task.status==4">
<a-button class="middle-btn" type="danger" @click="createComment(2)">驳回</a-button>
<a-button class="middle-btn" type="primary" style="margin-left: 15px;" @click="createComment(1)">通过</a-button>
</template>
<template v-if="userInfo.code == task.assign_to&&task.status==2">
<template v-if="!readonly && userInfo.code == task.assign_to&&task.status==2">
<a-button class="middle-btn" type="primary" @click="createComment(3)">提交</a-button>
</template>
</div>
@ -940,6 +940,12 @@
default() {
return '1360'
}
},
readonly:{
type: [Boolean],
default() {
return false
}
}
},
data() {

16
src/router/home.js
View File

@ -25,6 +25,22 @@ export default [
},
]
},
{
//抄送任务看板
name: 'copy',
path: '/project/space/copy/:code',
component: resolve => require(['@/views/project/space/copy'], resolve),
meta: {model: 122, info: {show_slider: false, is_inner: true}},
children: [
{
//任务详情
name: 'taskdetailcopy',
path: 'detail/:taskCode',
component: resolve => require(['@/views/project/space/taskdetail'], resolve),
meta: {model: 'Project', info: {show_slider: false}},
},
]
},
{
//邀请链接
name: 'inviteFromLink',

1861
src/views/project/space/copy.vue Normal file
View File

File diff suppressed because it is too large Load Diff

8
src/views/project/space/events.vue
View File

@ -25,14 +25,20 @@
<section class="nav-body">
<ul class="nav-wrapper nav nav-underscore pull-left">
<li><a class="app" data-app="tasks"
@click="$router.push('/project/space/task/' + code)">任务</a></li>
@click="$router.push('/project/space/task/' + code)">任务</a>
</li>
<li><a class="app" data-app="works"
@click="$router.push('/project/space/files/' + code)">
文件</a>
</li>
<li><a class="app" data-app="build"
@click="$router.push('/project/space/overview/' + code)">
概览</a>
</li>
<li><a class="app" data-app="build"
@click="$router.push('/project/space/copy/' + code)">
抄送</a>
</li>
<!-- <li class=""><a class="app" data-app="build"
@click="$router.push('/project/space/features/' + code)">
版本</a>

5
src/views/project/space/features.vue
View File

@ -29,10 +29,15 @@
<li class=""><a class="app" data-app="works"
@click="$router.push('/project/space/files/' + code)">
文件</a>
</li>
<li><a class="app" data-app="build"
@click="$router.push('/project/space/overview/' + code)">
概览</a>
</li>
<li><a class="app" data-app="build"
@click="$router.push('/project/space/copy/' + code)">
抄送</a>
</li>
<!-- <li class="actives"><a class="app" data-app="build"
@click="$router.push('/project/space/features/' + code)">
版本</a>

5
src/views/project/space/files.vue
View File

@ -29,10 +29,15 @@
<li class="actives"><a class="app" data-app="works"
@click="$router.push('/project/space/files/' + code)">
文件</a>
</li>
<li><a class="app" data-app="build"
@click="$router.push('/project/space/overview/' + code)">
概览</a>
</li>
<li><a class="app" data-app="build"
@click="$router.push('/project/space/copy/' + code)">
抄送</a>
</li>
<!-- <li class=""><a class="app" data-app="build"
@click="$router.push('/project/space/features/' + code)">
版本</a>

5
src/views/project/space/overview.vue
View File

@ -29,10 +29,15 @@
<li class=""><a class="app" data-app="works"
@click="$router.push('/project/space/files/' + code)">
文件</a>
</li>
<li class="actives"><a class="app" data-app="build"
@click="$router.push('/project/space/overview/' + code)">
概览</a>
</li>
<li><a class="app" data-app="build"
@click="$router.push('/project/space/copy/' + code)">
抄送</a>
</li>
<!-- <li class=""><a class="app" data-app="build"
@click="$router.push('/project/space/features/' + code)">
版本</a>

4
src/views/project/space/task.vue
View File

@ -62,6 +62,10 @@
概览</a
>
</li>
<li><a class="app" data-app="build"
@click="$router.push('/project/space/copy/' + code)">
抄送</a>
</li>
<!-- <li class="">
<a
class="app"

74
src/views/project/space/taskdetailcopy.vue Normal file
View File

@ -0,0 +1,74 @@
<template>
<a-modal
class="task-detail-modal"
width="min-content"
:closable="false"
visible
title=""
:footer="null"
@cancel="detailClose"
>
<task-detail :taskCode="code" @close="detailClose" readonly></task-detail>
</a-modal>
</template>
<script>
import taskDetail from '../../../components/project/taskDetail'
export default {
name: "task-detail-modal",
components: {
taskDetail
},
data() {
return {
loading: false,
code: this.$route.params.taskCode,
projectCode: this.$route.params.code,
}
},
created() {
this.init();
},
methods: {
init() {
this.loading = true;
},
detailClose() {
const stageIndex = this.$route.query.from;
let url = '';
if (stageIndex) {
url = `?from=${stageIndex}`;
}
this.$router.push(`/project/space/task/${this.projectCode}${url}`);
},
}
}
</script>
<style lang="less">
.task-detail-modal {
/*display: flex;*/
/*justify-content: center;*/
/*flex: 1;*/
/*min-height: 1px;*/
/*min-width: 1px;*/
width: 1200px;
&.ant-modal {
padding-bottom: 0;
}
.ant-modal-content {
/*width: 1200px;*/
/*overflow: hidden;*/
.ant-modal-body {
padding: 0;
}
}
}
</style>