From d5de73ad2c09d57571f4ad8ea43cecfc24b4c8e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 6 May 2022 00:24:51 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BC=97=E5=8C=85=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A4=A7=E5=8E=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/xm/core/xmTask.js | 1 + src/router/routes_xm.js | 14 + src/views/xm/core/crowd/XmTaskCrowdMng.vue | 1479 ++++++++++++++++++++ 3 files changed, 1494 insertions(+) create mode 100644 src/views/xm/core/crowd/XmTaskCrowdMng.vue diff --git a/src/api/xm/core/xmTask.js b/src/api/xm/core/xmTask.js index 97418c32..61788325 100644 --- a/src/api/xm/core/xmTask.js +++ b/src/api/xm/core/xmTask.js @@ -29,6 +29,7 @@ export const editXmTask = params => { return axios.post(`${base}/xm/core/xmTask/ export const addXmTask = params => { return axios.post(`${base}/xm/core/xmTask/add`, params); }; export const getTask = params => { return axios.get(`${base}/xm/core/xmTask/getTask`, { params: params }); }; +export const getOutTask = params => { return axios.get(`${base}/xm/core/xmTask/getOutTask`, { params: params }); }; export const addTask = params => { return axios.post(`${base}/xm/core/xmTask/addTask`, params ); }; diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js index 84f3a4e0..3d23a195 100644 --- a/src/router/routes_xm.js +++ b/src/router/routes_xm.js @@ -74,6 +74,20 @@ export default { ] }, + { + path: '/xm/core', + component: Layout, + name: '众包任务', + iconCls: 'fa el-icon-menu', + meta: { + title: '众包任务', + icon: 'task' + }, + // leaf: true,//只有一个节点 + children: [ + { path: 'crowd/XmTaskCrowdMng', component: _import('xm/core/crowd/XmTaskCrowdMng'), name: 'XmTaskCrowdMng', meta: { title: '众包大厅' }}, + ] + }, { path: '/xm/core/xmProduct/XmProductInfoRoute', component: _import('xm/core/xmProduct/XmProductInfoRoute'), diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue new file mode 100644 index 00000000..8d1c8f6e --- /dev/null +++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue @@ -0,0 +1,1479 @@ + + + + + + From e727a3c99aa75d11dd6c5e4a5cf418cc5500cf6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 6 May 2022 00:29:51 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/crowd/XmTaskCrowdMng.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue index 8d1c8f6e..b0827ff6 100644 --- a/src/views/xm/core/crowd/XmTaskCrowdMng.vue +++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue @@ -1276,6 +1276,7 @@ export default { } params.taskOut="1" params.crowd="1" + params.ntype="0" return params; }, From f52c67b7b292d8f376cb97ce5e33238249eb523a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 6 May 2022 09:36:00 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/routes_xm.js | 2 +- src/views/xm/core/crowd/XmTaskCrowdMng.vue | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js index 3d23a195..e9c01999 100644 --- a/src/router/routes_xm.js +++ b/src/router/routes_xm.js @@ -85,7 +85,7 @@ export default { }, // leaf: true,//只有一个节点 children: [ - { path: 'crowd/XmTaskCrowdMng', component: _import('xm/core/crowd/XmTaskCrowdMng'), name: 'XmTaskCrowdMng', meta: { title: '众包大厅' }}, + { path: 'crowd/XmTaskCrowdMng', component: _import('xm/core/crowd/XmTaskCrowdMng'), name: 'XmTaskCrowdMng', meta: { title: '众包大厅',icon: 'task' }}, ] }, { diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue index b0827ff6..13540c8e 100644 --- a/src/views/xm/core/crowd/XmTaskCrowdMng.vue +++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue @@ -326,12 +326,9 @@ show-overflow-tooltip > Date: Fri, 6 May 2022 09:42:34 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/crowd/XmTaskCrowdMng.vue | 30 +++------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue index 13540c8e..9896112c 100644 --- a/src/views/xm/core/crowd/XmTaskCrowdMng.vue +++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue @@ -99,7 +99,7 @@ v-loading="load.list" > - + { - if(this.isTaskCenter ||(this.selProject && this.selProject.id)){ - this.getXmTasks(); - } + this.$nextTick(() => { + this.getXmTasks(); this.tableHeight = this.source == 'GZT' ? this.tableHeight : util.calcTableMaxHeight(this.$refs.table.$el); initSimpleDicts( "all", ["planType","taskType","priority","xmTaskSettleSchemel","priority","taskState" ]).then((res) => { this.dicts = res.data.data; From dd40fd9acd0c8bd13e69d9b2975c6291da21bd00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 6 May 2022 09:48:34 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/crowd/XmTaskCrowdMng.vue | 50 +++++++++++++--------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue index 9896112c..b6ba1423 100644 --- a/src/views/xm/core/crowd/XmTaskCrowdMng.vue +++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue @@ -527,7 +527,25 @@ - + + + Date: Fri, 6 May 2022 10:00:03 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/crowd/XmTaskCrowdMng.vue | 53 ++++++++++++++++------ src/views/xm/core/xmTask/XmTaskMng.vue | 4 +- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue index b6ba1423..99540b64 100644 --- a/src/views/xm/core/crowd/XmTaskCrowdMng.vue +++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue @@ -231,16 +231,9 @@
- - - - - - - - + - +
@@ -535,8 +528,7 @@ append-to-body :close-on-click-modal="false" > - + + + + - + - + From 7da0b8a585cb8636802bed29aa59fa91fc8ac9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 6 May 2022 10:07:43 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/routes_xm.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js index e9c01999..71066ae5 100644 --- a/src/router/routes_xm.js +++ b/src/router/routes_xm.js @@ -69,9 +69,6 @@ export default { { path: 'xmTask/XmTaskCenter', component: _import('xm/core/xmTask/XmTaskCenter'), name: 'xmTaskCenter', meta: { title: '任务大厅' }}, { path: 'xmTask/XmMyTaskCenter', component: _import('xm/core/xmTask/XmMyTaskCenter'), name: 'xmMyTaskCenter', meta: { title: '任务(我的)' }}, - { path: 'xmTaskExecuser/XmTaskExecuserMng', component: _import('xm/core/xmTaskExecuser/XmTaskExecuserMng'), name: 'XmTaskExecuserMng', meta: { title: '竞标管理' }}, - { path: 'xmTaskExecuser/XmTaskExecuserForMy', component: _import('xm/core/xmTaskExecuser/XmTaskExecuserForMy'), name: 'XmTaskExecuserForMy', meta: { title: '竞标(我的)' }}, - ] }, { @@ -85,7 +82,10 @@ export default { }, // leaf: true,//只有一个节点 children: [ - { path: 'crowd/XmTaskCrowdMng', component: _import('xm/core/crowd/XmTaskCrowdMng'), name: 'XmTaskCrowdMng', meta: { title: '众包大厅',icon: 'task' }}, + { path: 'crowd/XmTaskCrowdMng', component: _import('xm/core/crowd/XmTaskCrowdMng'), name: 'XmTaskCrowdMng', meta: { title: '众包大厅' }}, + { path: 'xmTaskExecuser/XmTaskExecuserMng', component: _import('xm/core/xmTaskExecuser/XmTaskExecuserMng'), name: 'XmTaskExecuserMng', meta: { title: '候选人管理' }}, + { path: 'xmTaskExecuser/XmTaskExecuserForMy', component: _import('xm/core/xmTaskExecuser/XmTaskExecuserForMy'), name: 'XmTaskExecuserForMy', meta: { title: '候选人(我的)' }}, + ] }, { From 585dba33dc7b22a6adde88f944d008e13a3d2036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 6 May 2022 11:33:22 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BC=97=E5=8C=85=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/crowd/XmTaskCrowdMng.vue | 10 +++++++++- src/views/xm/core/xmTask/XmTaskMng.vue | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue index 99540b64..07f24089 100644 --- a/src/views/xm/core/crowd/XmTaskCrowdMng.vue +++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue @@ -90,8 +90,11 @@ style="width: 150px" v-model="filters.key" placeholder="计划/任务名称" - > + > + + + 0) { params.tagIdList = this.filters.tags.map(i=>i.tagId); } + + if (this.filters.cbranchId) { + params.cbranchId = this.filters.cbranchId; + } params.taskOut="1" params.crowd="1" params.ntype="0" diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index a863bc1f..e2eb6fd4 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -1256,12 +1256,12 @@ export default { params.ntype="0" } - if(this.ptype==='1'){ + if(this.ptype==='1' && !this.isTaskCenter){ if(!params.productId){ this.$notify.warning("请先选中产品") return; } - }else if(this.ptype==='0'){ + }else if(this.ptype==='0' && !this.isTaskCenter){ if(!params.projectId){ this.$notify.warning("请先选中项目") return; From 6bf4a6030be9639a88a985139eff8eb036ac87c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 6 May 2022 11:37:37 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/crowd/XmTaskCrowdMng.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue index 07f24089..95ef0c49 100644 --- a/src/views/xm/core/crowd/XmTaskCrowdMng.vue +++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue @@ -94,7 +94,7 @@ - +