end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
陈裕财 3 years ago
parent
db7eca399d
commit
62fc26e197
11 changed files with 35 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/router/routes_xm.js
  2. 8
      src/views/xm/core/crowd/XmTaskCrowdMng.vue
  3. 4
      src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
  4. 2
      src/views/xm/core/xmMenu/XmEpicFeatures.vue
  5. 4
      src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
  6. 4
      src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
  7. 48
      src/views/xm/core/xmTask/XmPhase.vue
  8. 6
      src/views/xm/core/xmTaskExecuser/XmTaskExecuserForMy.vue
  9. 2
      src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
  10. 16
      src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
  11. 16
      src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue

2
src/router/routes_xm.js
View File

@ -679,7 +679,7 @@ export default {
}, },
//leaf: true,//只有一个节点 //leaf: true,//只有一个节点
children: [ children: [
{ path: 'project/cost', component: _import('xm/core/xmProject/XmProjectCost'), name: 'XmProjectCost', meta: { title: '应付款',roles:["user"]}},
{ path: 'branch/cost', component: _import('xm/core/xmProject/XmProjectCost'), name: 'XmProjectCost', meta: { title: '应付款',roles:["user"]}},
{ path: 'task/sbill', component: _import('xm/core/xmTaskSbill/XmTaskSbillMng'), name: 'XmTaskSbilllMng', meta: { title: '任务结算单',roles:["user"]}}, { path: 'task/sbill', component: _import('xm/core/xmTaskSbill/XmTaskSbillMng'), name: 'XmTaskSbilllMng', meta: { title: '任务结算单',roles:["user"]}},
{ path: 'workload/day/me', component: _import('xm/core/xmWorkload/WorkloadSetDayListMy'), name: 'WorkloadSetDayListMy', meta: { title: '工时日报(我)',roles:["user"]}}, { path: 'workload/day/me', component: _import('xm/core/xmWorkload/WorkloadSetDayListMy'), name: 'WorkloadSetDayListMy', meta: { title: '工时日报(我)',roles:["user"]}},

8
src/views/xm/core/crowd/XmTaskCrowdMng.vue
View File

@ -71,7 +71,7 @@
@close="skillTagClear(skill)" @close="skillTagClear(skill)"
>{{ skill.skillName }}</el-tag >{{ skill.skillName }}</el-tag
> >
<el-button
<el-button
style="margin-top: 10px;" style="margin-top: 10px;"
v-if="!filters.tags || filters.tags.length == 0" v-if="!filters.tags || filters.tags.length == 0"
@click.native="$refs.tagDialog.open()" @click.native="$refs.tagDialog.open()"
@ -87,14 +87,14 @@
}})个</el-tag }})个</el-tag
> >
<el-input <el-input
style="width: 150px"
style="width: 10em"
v-model="filters.key" v-model="filters.key"
placeholder="计划/任务名称" placeholder="计划/任务名称"
> >
</el-input> </el-input>
<el-input v-model="filters.projectId" style="width: 150px;" placeholder="项目编号" clearable></el-input>
<el-input v-model="filters.cbranchId" style="width: 150px;" placeholder="项目归属公司编号" clearable></el-input>
<el-input v-model="filters.projectId" style="width: 10em;" placeholder="项目编号" clearable></el-input>
<el-input class="hidden-md-and-down" v-model="filters.cbranchId" style="width: 10em;" placeholder="项目公司编号" clearable></el-input>
<el-button <el-button
@click="searchXmTasks" @click="searchXmTasks"
type="primary" type="primary"

4
src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
View File

@ -4,7 +4,7 @@
<el-col :xl="4" :lg="4" :md="5" :sm="5" :xs="5" class="padding"> <el-col :xl="4" :lg="4" :md="5" :sm="5" :xs="5" class="padding">
<div class="border"> <div class="border">
<el-row > <el-row >
<xm-iteration-select ref="xmIterationSelect" :auto-select="true" :link-project-id="projectInfo?projectInfo.id:null" :product-id="xmProduct?xmProduct.id:null" @row-click="onIterationRowClick" @clear="onIterationClearSelect">
<xm-iteration-select ref="xmIterationSelect" :auto-select="false" :link-project-id="projectInfo?projectInfo.id:null" :product-id="xmProduct?xmProduct.id:null" @row-click="onIterationRowClick" @clear="onIterationClearSelect">
<template v-slot:title="{iteration}"> <template v-slot:title="{iteration}">
<h4 href="#"><div style="max-width:15vw;" class="res-text hidden-md-and-down"><i style="font-size:16px;" class="el-icon-sort"></i> {{iteration&&iteration.id?iteration.iterationName:'请选择一个迭代'}}</div></h4> <h4 href="#"><div style="max-width:15vw;" class="res-text hidden-md-and-down"><i style="font-size:16px;" class="el-icon-sort"></i> {{iteration&&iteration.id?iteration.iterationName:'请选择一个迭代'}}</div></h4>
<h4 href="#"><div style="max-width:19vw;" class="res-text hidden-lg-and-up"><i style="font-size:16px;" class="el-icon-sort"></i> {{iteration&&iteration.id?iteration.iterationName:'请选择一个迭代'}}</div></h4> <h4 href="#"><div style="max-width:19vw;" class="res-text hidden-lg-and-up"><i style="font-size:16px;" class="el-icon-sort"></i> {{iteration&&iteration.id?iteration.iterationName:'请选择一个迭代'}}</div></h4>
@ -236,7 +236,7 @@
</div> </div>
</el-col> </el-col>
<el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19"> <el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19">
<el-tabs :value="showPanel" @tab-click="tabClick">
<el-tabs :value="showPanel" @tab-click="tabClick" v-if="xmIteration && xmIteration.id">
<el-tab-pane label="迭代概览" name="iterationOverview" > <el-tab-pane label="迭代概览" name="iterationOverview" >
<xm-iteration-overview v-if="xmIteration && showPanel=='iterationOverview'" :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-iteration-overview> <xm-iteration-overview v-if="xmIteration && showPanel=='iterationOverview'" :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-iteration-overview>

2
src/views/xm/core/xmMenu/XmEpicFeatures.vue
View File

@ -124,7 +124,7 @@
<i class="el-icon-document"></i> <i class="el-icon-document"></i>
</div> </div>
<span class="hidden-md-and-down">{{scope.row.seqNo}}</span> <span class="hidden-md-and-down">{{scope.row.seqNo}}</span>
<span>{{scope.row.menuName}} </span>
<span style="font-size:14px;">{{scope.row.menuName}} </span>
<el-popover class="hidden-bar" v-if="!disabledMng" @click.stop <el-popover class="hidden-bar" v-if="!disabledMng" @click.stop
placement="top" placement="top"
width="100" width="100"

4
src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
View File

@ -6,7 +6,7 @@
<el-row> <el-row>
<xm-product-select <xm-product-select
ref="xmProductSelect" ref="xmProductSelect"
:auto-select="true"
:auto-select="false"
:link-project-id="projectInfo ? projectInfo.id : null" :link-project-id="projectInfo ? projectInfo.id : null"
:iterationId="xmIteration ? xmIteration.id : null" :iterationId="xmIteration ? xmIteration.id : null"
@row-click="onProductRowClick" @row-click="onProductRowClick"
@ -134,7 +134,7 @@
</div> </div>
</el-col> </el-col>
<el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19" class="padding-left padding-right"> <el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19" class="padding-left padding-right">
<el-tabs :value="showPanel" @tab-click="tabClick">
<el-tabs :value="showPanel" @tab-click="tabClick" v-if="xmProduct && xmProduct.id">
<el-tab-pane <el-tab-pane
label="产品概览" label="产品概览"
name="productOverview" name="productOverview"

4
src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
View File

@ -6,7 +6,7 @@
<el-row v-if=" (xmProduct&&xmProduct.id) || (xmIteration && xmIteration.id)"> <el-row v-if=" (xmProduct&&xmProduct.id) || (xmIteration && xmIteration.id)">
<xm-project-select <xm-project-select
ref="xmProjectSelect" ref="xmProjectSelect"
:auto-select="true"
:auto-select="false "
:link-iteration-id="xmIteration ? xmIteration.id : null" :link-iteration-id="xmIteration ? xmIteration.id : null"
:link-product-id="xmProduct ? xmProduct.id : null" :link-product-id="xmProduct ? xmProduct.id : null"
@row-click="onProjectRowClick" @row-click="onProjectRowClick"
@ -144,7 +144,7 @@
</div> </div>
</el-col> </el-col>
<el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19" class="padding-left padding-right"> <el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19" class="padding-left padding-right">
<el-tabs :value="showPanel" @tab-click="tabClick">
<el-tabs :value="showPanel" @tab-click="tabClick" v-if="selProject && selProject.id">
<el-tab-pane <el-tab-pane
label="项目概览" label="项目概览"
name="projectOverview" name="projectOverview"

48
src/views/xm/core/xmTask/XmPhase.vue
View File

@ -116,7 +116,7 @@
> 更换上级</el-button> > 更换上级</el-button>
</el-row> </el-row>
<el-row class="padding-top"> <el-row class="padding-top">
<el-table class="task-table" :row-style="{height:'46px'}"
<el-table
element-loading-text="努力加载中" element-loading-spinner="el-icon-loading" element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"
:data="tasksTreeData" :data="tasksTreeData"
@sort-change="sortChange" @sort-change="sortChange"
@ -145,7 +145,6 @@
<el-table-column <el-table-column
prop="name" prop="name"
class-name="title"
label="计划名称" label="计划名称"
> >
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
@ -167,7 +166,7 @@
<span class="hidden-md-and-down"> <span class="hidden-md-and-down">
{{ scope.row.sortLevel }}&nbsp; {{ scope.row.sortLevel }}&nbsp;
</span> </span>
<span> {{ scope.row.name }}
<span style="font-size:14px;"> {{ scope.row.name }}
</span> </span>
<el-popover class="hidden-bar" @click.stop <el-popover class="hidden-bar" @click.stop
placement="top-start" placement="top-start"
@ -1128,45 +1127,6 @@ export default {
}, },
}; };
</script> </script>
<style scoped>
.align-right {
float: right;
}
</style>
<style lang="scss" scoped>
.extra {
border-bottom: 1px solid #dedede;
padding: 8px;
}
.field-label {
display: inline-block;
width: 60px;
font-size: 12px;
font-weight: bold;
}
.task-header {
border-top: 1px solid #dedede;
}
.title {
font-size: 18px;
font-weight: bold;
line-height: 36px;
}
.compact {
font-size: 12px;
color: #8c92a4;
}
.compact > span {
color: #00b2f3;
}
.remarks {
margin-top: 10px;
font-size: 16px;
overflow-x: auto;
overflow-y: hidden;
}
.tool-bar.left{
margin-right: 9em;
}
<style lang="scss" scoped>
</style> </style>

6
src/views/xm/core/xmTaskExecuser/XmTaskExecuserForMy.vue
View File

@ -1,8 +1,6 @@
<template> <template>
<section>
<el-row class="xm-task">
<xm-task-execuser-mng :is-my="1"></xm-task-execuser-mng>
</el-row>
<section>
<xm-task-execuser-mng :is-my="1"></xm-task-execuser-mng>
</section> </section>
</template> </template>

2
src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
View File

@ -7,7 +7,7 @@
<el-button type="primary" @click="showAdd">邀请他人加入</el-button> <el-button type="primary" @click="showAdd">邀请他人加入</el-button>
<!-- <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> --> <!-- <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> -->
</el-row> </el-row>
<el-row>
<el-row class="padding-top">
<!--列表 XmTaskExecuser xm_task_execuser--> <!--列表 XmTaskExecuser xm_task_execuser-->
<el-table ref="table" :height="tableHeight" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> <el-table ref="table" :height="tableHeight" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column type="expand"> <el-table-column type="expand">

16
src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
View File

@ -1,21 +1,21 @@
<template> <template>
<section class="padding"> <section class="padding">
<el-row> <el-row>
<el-input v-model="filters.key" style="width: 20%;" placeholder="任务名称、用户姓名模糊查询" clearable></el-input>
<el-input v-model="filters.taskId" style="width:150px;" placeholder="任务编号查询" clearable></el-input>
<el-input v-model="filters.projectId" style="width: 150px;" placeholder="项目编号" clearable></el-input>
<el-input v-model="filters.execUserBranchId" style="width: 150px;" placeholder="用户公司编号" clearable></el-input>
<el-input v-model="filters.branchId" style="width: 150px;" placeholder="项目公司编号" clearable></el-input>
<el-select v-model="filters.status" placeholder="候选状态" clearable>
<el-input v-model="filters.key" style="width: 10em;" placeholder="任务名称" clearable></el-input>
<el-input v-model="filters.taskId" style="width:10em;;" placeholder="任务编号" clearable></el-input>
<el-input v-model="filters.projectId" style="width: 10em;;" placeholder="项目编号" clearable></el-input>
<el-input v-model="filters.execUserBranchId" style="width: 10em;;" placeholder="用户公司编号" clearable></el-input>
<el-input v-model="filters.branchId" style="width: 10em;;" placeholder="项目公司编号" clearable></el-input>
<el-select v-model="filters.status" style="width:6em;" placeholder="候选状态" clearable>
<el-option v-for="(item,index) in dicts.projectTaskExecuserStatus" :value="item.id" :label="item.name" :key="index"></el-option> <el-option v-for="(item,index) in dicts.projectTaskExecuserStatus" :value="item.id" :label="item.name" :key="index"></el-option>
</el-select> </el-select>
<el-select v-model="filters.taskState" placeholder="任务状态" clearable>
<el-select v-model="filters.taskState" style="width:6em;" placeholder="任务状态" clearable>
<el-option v-for="(item,index) in dicts.taskState" :value="item.id" :label="item.name" :key="index"></el-option> <el-option v-for="(item,index) in dicts.taskState" :value="item.id" :label="item.name" :key="index"></el-option>
</el-select> </el-select>
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTaskExecusers">查询</el-button> <el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTaskExecusers">查询</el-button>
<!-- <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> --> <!-- <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> -->
</el-row> </el-row>
<el-row class="page-main ">
<el-row class="padding-top">
<!--列表 XmTaskExecuser xm_task_execuser--> <!--列表 XmTaskExecuser xm_task_execuser-->
<el-table ref="table" :height="tableHeight" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> <el-table ref="table" :height="tableHeight" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column label="序号" type="index" width="60" fixed="left"> <el-table-column label="序号" type="index" width="60" fixed="left">

16
src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue
View File

@ -1,17 +1,17 @@
<template> <template>
<section class="padding"> <section class="padding">
<el-row> <el-row>
<el-input v-model="filters.key" style="width: 20%;" placeholder="任务名称、用户姓名模糊查询" clearable></el-input>
<el-input v-model="filters.taskId" style="width:150px;" placeholder="任务编号查询" clearable></el-input>
<el-input v-model="filters.key" style="width: 10em;" placeholder="任务名称" clearable></el-input>
<el-input v-model="filters.taskId" style="width:10em;" placeholder="任务编号" clearable></el-input>
<span v-if="!selProject || !selProject.id"> <span v-if="!selProject || !selProject.id">
<el-input v-model="filters.projectId" style="width: 150px;" placeholder="项目编号" clearable></el-input>
<el-input v-model="filters.branchId" style="width: 150px;" placeholder="项目公司编号" clearable></el-input>
<el-input v-model="filters.projectId" style="width: 10em;" placeholder="项目编号" clearable></el-input>
<el-input v-model="filters.branchId" style="width: 10em;" placeholder="项目公司编号" clearable></el-input>
</span> </span>
<el-input v-model="filters.execUserBranchId" style="width: 150px;" placeholder="用户公司编号" clearable></el-input>
<el-select v-model="filters.status" placeholder="候选状态" clearable>
<el-input v-model="filters.execUserBranchId" style="width: 10em;" placeholder="用户公司编号" clearable></el-input>
<el-select v-model="filters.status" style="width:6em;" placeholder="候选状态" clearable>
<el-option v-for="(item,index) in dicts.projectTaskExecuserStatus" :value="item.id" :label="item.name" :key="index"></el-option> <el-option v-for="(item,index) in dicts.projectTaskExecuserStatus" :value="item.id" :label="item.name" :key="index"></el-option>
</el-select> </el-select>
<el-select v-model="filters.taskState" placeholder="任务状态" clearable>
<el-select v-model="filters.taskState" style="width:6em;" placeholder="任务状态" clearable>
<el-option v-for="(item,index) in dicts.taskState" :value="item.id" :label="item.name" :key="index"></el-option> <el-option v-for="(item,index) in dicts.taskState" :value="item.id" :label="item.name" :key="index"></el-option>
</el-select> </el-select>
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTaskExecusers">查询</el-button> <el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTaskExecusers">查询</el-button>
@ -20,7 +20,7 @@
</span> </span>
<!-- <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> --> <!-- <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> -->
</el-row> </el-row>
<el-row class="page-main ">
<el-row class="padding-top">
<!--列表 XmTaskExecuser xm_task_execuser--> <!--列表 XmTaskExecuser xm_task_execuser-->
<el-table ref="table" :height="tableHeight" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> <el-table ref="table" :height="tableHeight" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">

Write Preview
Loading…
Cancel
Save