Browse Source

优化

master
陈裕财 3 years ago
parent
commit
a3f0af0aad
  1. 40
      src/views/xm/rpt/project/projectWorkItemDayList.vue
  2. 56
      src/views/xm/rpt/project/projectWorkloadSetDayList.vue
  3. 56
      src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
  4. 93
      src/views/xm/rpt/project/taskAgeDist.vue
  5. 99
      src/views/xm/rpt/project/taskAttDist.vue
  6. 41
      src/views/xm/rpt/project/taskDayAccumulate.vue
  7. 41
      src/views/xm/rpt/project/taskDayTrend.vue
  8. 98
      src/views/xm/rpt/project/taskSort.vue

40
src/views/xm/rpt/project/projectWorkItemDayList.vue

@ -8,20 +8,32 @@
<div class="echart-box" :id="this.id"></div> <div class="echart-box" :id="this.id"></div>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="border">
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
<el-form-item label="日期区间">
<br>
<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="listXmProjectStateHis">查询</el-button>
</el-form-item>
</el-form>
<el-col :span="6" v-if="showParams">
<el-popover trigger="manual" v-model="filterVisible" style="float:right;" width="500">
<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button>
<el-row>
<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
</el-row>
<el-row>
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
<el-form-item label="日期区间">
<br>
<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
</el-form-item>
<el-form-item>
<el-button type="primary" style="float:right;" icon="el-icon-search" @click="listXmProjectStateHis">查询</el-button>
</el-form-item>
</el-form>
</el-row>
</el-popover>
</el-col> </el-col>
</el-row> </el-row>
</section> </section>

56
src/views/xm/rpt/project/projectWorkloadSetDayList.vue

@ -8,28 +8,40 @@
<div class="echart-box" :id="this.id"></div> <div class="echart-box" :id="this.id"></div>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="border">
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
<el-form-item label="人员编号">
<mdp-select-user-xm label="选择人员" :clearable="true" v-model="filters" userid-key="userid" username-key="username" :project-id="filters.project?filters.project.id:null"></mdp-select-user-xm>
</el-form-item>
<el-form-item label="任务编号">
<el-input v-model="params.taskId"></el-input>
</el-form-item>
<el-form-item label="日期区间">
<br>
<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="listProjectWorkloadSetDay">查询</el-button>
</el-form-item>
</el-form>
<el-col :span="6" v-if="showParams">
<el-popover trigger="manual" v-model="filterVisible" style="float:right;" width="500">
<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button>
<el-row>
<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
</el-row>
<el-row>
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
<el-form-item label="人员编号">
<mdp-select-user-xm label="选择人员" :clearable="true" v-model="filters" userid-key="userid" username-key="username" :project-id="filters.project?filters.project.id:null"></mdp-select-user-xm>
</el-form-item>
<el-form-item label="任务编号">
<el-input v-model="params.taskId"></el-input>
</el-form-item>
<el-form-item label="日期区间">
<br>
<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
</el-form-item>
<el-form-item>
<el-button type="primary" style="float:right;" icon="el-icon-search" @click="listProjectWorkloadSetDay">查询</el-button>
</el-form-item>
</el-form>
</el-row>
</el-popover>
</el-col> </el-col>
</el-row> </el-row>
</section> </section>

56
src/views/xm/rpt/project/projectWorkloadSetMonthList.vue

@ -8,28 +8,40 @@
<div class="echart-box" :id="this.id"></div> <div class="echart-box" :id="this.id"></div>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="border">
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
<el-form-item label="人员编号">
<mdp-select-user-xm label="选择人员" :clearable="true" v-model="filters" userid-key="userid" username-key="username" :project-id="filters.project?filters.project.id:null"></mdp-select-user-xm>
</el-form-item>
<el-form-item label="任务编号">
<el-input v-model="params.taskId"></el-input>
</el-form-item>
<el-form-item label="日期区间">
<br>
<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="listProjectWorkloadSetMonth">查询</el-button>
</el-form-item>
</el-form>
<el-col :span="6" v-if="showParams">
<el-popover trigger="manual" v-model="filterVisible" style="float:right;" width="500">
<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button>
<el-row>
<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
</el-row>
<el-row>
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
<el-form-item label="人员编号">
<mdp-select-user-xm label="选择人员" :clearable="true" v-model="filters" userid-key="userid" username-key="username" :project-id="filters.project?filters.project.id:null"></mdp-select-user-xm>
</el-form-item>
<el-form-item label="任务编号">
<el-input v-model="params.taskId"></el-input>
</el-form-item>
<el-form-item label="日期区间">
<br>
<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
</el-form-item>
<el-form-item>
<el-button type="primary" style="float:right;" icon="el-icon-search" @click="listProjectWorkloadSetMonth">查询</el-button>
</el-form-item>
</el-form>
</el-row>
</el-popover>
</el-col> </el-col>
</el-row> </el-row>
</section> </section>

93
src/views/xm/rpt/project/taskAgeDist.vue

@ -8,41 +8,64 @@
<div class="progress"></div> <div class="progress"></div>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="border">
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
<el-form-item label="任务状态" prop="taskState">
<el-select style="width:100px;" size="small" v-model="params.taskState" @change="onXmTaskSomeFieldsChange('taskState',$event)" clearable>
<el-option v-for="i in this.dicts.taskState" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="taskType" >
<el-select style="width:100px;" size="small" v-model="params.taskType" @change="onXmTaskSomeFieldsChange('taskType',$event)" clearable>
<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务来源" prop="planType">
<el-select style="width:100px;" size="small" v-model="params.planType" @change="onXmTaskSomeFieldsChange('planType',$event)" clearable>
<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务层次" prop="settleSchemel" >
<el-select style="width:100px;" size="small" v-model="params.settleSchemel" @change="onXmTaskSomeFieldsChange('settleSchemel',$event)" clearable>
<el-option v-for="i in this.dicts.xmTaskSettleSchemel" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="优先级别" prop="priority" >
<el-select style="width:100px;" size="small" v-model="params.priority" @change="onXmTaskSomeFieldsChange('priority',$event)" clearable>
<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchXmTaskAgeDist">查询</el-button>
</el-form-item>
</el-form>
<el-col :span="6" v-if="showParams">
<el-popover trigger="manual" v-model="filterVisible" style="float:right;" width="500">
<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button>
<el-row>
<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
</el-row>
<el-row>
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-row>
<el-col :span="15">
<el-form-item label="分组属性">
<el-select style="width:100px;" size="small" v-model="params.groupBy" @change="onXmTaskSomeFieldsChange('groupBy',$event)" clearable>
<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="任务状态" prop="taskState">
<el-select style="width:100px;" size="small" v-model="params.taskState" @change="onXmTaskSomeFieldsChange('taskState',$event)" clearable>
<el-option v-for="i in this.dicts.taskState" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="taskType" >
<el-select style="width:100px;" size="small" v-model="params.taskType" @change="onXmTaskSomeFieldsChange('taskType',$event)" clearable>
<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务来源" prop="planType">
<el-select style="width:100px;" size="small" v-model="params.planType" @change="onXmTaskSomeFieldsChange('planType',$event)" clearable>
<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务层次" prop="settleSchemel" >
<el-select style="width:100px;" size="small" v-model="params.settleSchemel" @change="onXmTaskSomeFieldsChange('settleSchemel',$event)" clearable>
<el-option v-for="i in this.dicts.xmTaskSettleSchemel" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="优先级别" prop="priority" >
<el-select style="width:100px;" size="small" v-model="params.priority" @change="onXmTaskSomeFieldsChange('priority',$event)" clearable>
<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button type="primary" style="float:right;" icon="el-icon-search" @click="searchXmTaskAgeDist">查询</el-button>
</el-form-item>
</el-form>
</el-row>
</el-popover>
</el-col> </el-col>
</el-row> </el-row>
</section> </section>

99
src/views/xm/rpt/project/taskAttDist.vue

@ -8,47 +8,64 @@
<div class="progress"></div> <div class="progress"></div>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="border">
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-form-item label="分组属性">
<el-select style="width:100px;" size="small" v-model="params.groupBy" @change="onXmTaskSomeFieldsChange('groupBy',$event)" clearable>
<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="归属项目">
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
<el-form-item label="任务状态" prop="taskState">
<el-select style="width:100px;" size="small" v-model="params.taskState" @change="onXmTaskSomeFieldsChange('taskState',$event)" clearable>
<el-option v-for="i in this.dicts.taskState" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="taskType" >
<el-select style="width:100px;" size="small" v-model="params.taskType" @change="onXmTaskSomeFieldsChange('taskType',$event)" clearable>
<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="计划类型" prop="planType">
<el-select style="width:100px;" size="small" v-model="params.planType" @change="onXmTaskSomeFieldsChange('planType',$event)" clearable>
<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="结算方案" prop="settleSchemel" >
<el-select style="width:100px;" size="small" v-model="params.settleSchemel" @change="onXmTaskSomeFieldsChange('settleSchemel',$event)" clearable>
<el-option v-for="i in this.dicts.xmTaskSettleSchemel" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="优先级别" prop="priority">
<el-select style="width:100px;" size="small" v-model="params.priority" @change="onXmTaskSomeFieldsChange('priority',$event)" clearable>
<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchXmTaskAttDist">查询</el-button>
</el-form-item>
</el-form>
<el-col :span="6" v-if="showParams">
<el-popover trigger="manual" v-model="filterVisible" style="float:right;" width="500">
<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button>
<el-row>
<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
</el-row>
<el-row>
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-row>
<el-col :span="15">
<el-form-item label="分组属性">
<el-select style="width:100px;" size="small" v-model="params.groupBy" @change="onXmTaskSomeFieldsChange('groupBy',$event)" clearable>
<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="任务状态" prop="taskState">
<el-select style="width:100px;" size="small" v-model="params.taskState" @change="onXmTaskSomeFieldsChange('taskState',$event)" clearable>
<el-option v-for="i in this.dicts.taskState" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="taskType" >
<el-select style="width:100px;" size="small" v-model="params.taskType" @change="onXmTaskSomeFieldsChange('taskType',$event)" clearable>
<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务来源" prop="planType">
<el-select style="width:100px;" size="small" v-model="params.planType" @change="onXmTaskSomeFieldsChange('planType',$event)" clearable>
<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务层次" prop="settleSchemel" >
<el-select style="width:100px;" size="small" v-model="params.settleSchemel" @change="onXmTaskSomeFieldsChange('settleSchemel',$event)" clearable>
<el-option v-for="i in this.dicts.xmTaskSettleSchemel" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="优先级别" prop="priority" >
<el-select style="width:100px;" size="small" v-model="params.priority" @change="onXmTaskSomeFieldsChange('priority',$event)" clearable>
<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button type="primary" style="float:right;" icon="el-icon-search" @click="searchXmTaskAttDist">查询</el-button>
</el-form-item>
</el-form>
</el-row>
</el-popover>
</el-col> </el-col>
</el-row> </el-row>
</section> </section>

41
src/views/xm/rpt/project/taskDayAccumulate.vue

@ -7,20 +7,33 @@
<div class="echart-box" :id="this.id"></div> <div class="echart-box" :id="this.id"></div>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="border">
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
<el-form-item label="日期区间">
<br>
<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="listXmProjectStateHis">查询</el-button>
</el-form-item>
</el-form>
<el-col :span="6" v-if="showParams">
<el-popover trigger="manual" v-model="filterVisible" style="float:right;" width="500">
<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button>
<el-row>
<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
</el-row>
<el-row>
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
<el-form-item label="日期区间">
<br>
<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
</el-form-item>
<el-form-item>
<el-button type="primary" style="float:right;" icon="el-icon-search" @click="listXmProjectStateHis">查询</el-button>
</el-form-item>
</el-form>
</el-row>
</el-popover>
</el-col> </el-col>
</el-row> </el-row>
</section> </section>

41
src/views/xm/rpt/project/taskDayTrend.vue

@ -9,20 +9,33 @@
<div class="progress"></div> <div class="progress"></div>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="border">
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
<el-form-item label="日期区间">
<br>
<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="listXmProjectStateHis">查询</el-button>
</el-form-item>
</el-form>
<el-col :span="6" v-if="showParams">
<el-popover trigger="manual" v-model="filterVisible" style="float:right;" width="500">
<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button>
<el-row>
<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
</el-row>
<el-row>
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
<el-form-item label="日期区间">
<br>
<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
</el-form-item>
<el-form-item>
<el-button type="primary" style="float:right;" icon="el-icon-search" @click="listXmProjectStateHis">查询</el-button>
</el-form-item>
</el-form>
</el-row>
</el-popover>
</el-col> </el-col>
</el-row> </el-row>
</section> </section>

98
src/views/xm/rpt/project/taskSort.vue

@ -8,46 +8,64 @@
<div class="progress"></div> <div class="progress"></div>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="border">
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-form-item label="分组属性">
<el-select style="width:100px;" size="small" v-model="params.groupBy" @change="onXmTaskSomeFieldsChange('groupBy',$event)" clearable>
<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
<el-form-item label="任务状态" prop="taskState">
<el-select style="width:100px;" size="small" v-model="params.taskState" @change="onXmTaskSomeFieldsChange('taskState',$event)" clearable>
<el-option v-for="i in this.dicts.taskState" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="taskType" >
<el-select style="width:100px;" size="small" v-model="params.taskType" @change="onXmTaskSomeFieldsChange('taskType',$event)" clearable>
<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务来源" prop="planType">
<el-select style="width:100px;" size="small" v-model="params.planType" @change="onXmTaskSomeFieldsChange('planType',$event)" clearable>
<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务层次" prop="settleSchemel" >
<el-select style="width:100px;" size="small" v-model="params.settleSchemel" @change="onXmTaskSomeFieldsChange('settleSchemel',$event)" clearable>
<el-option v-for="i in this.dicts.xmTaskSettleSchemel" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="优先级别" prop="priority" >
<el-select style="width:100px;" size="small" v-model="params.priority" @change="onXmTaskSomeFieldsChange('priority',$event)" clearable>
<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchXmTaskSort">查询</el-button>
</el-form-item>
</el-form>
<el-col :span="6" v-if="showParams">
<el-popover trigger="manual" v-model="filterVisible" style="float:right;" width="500">
<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button>
<el-row>
<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
</el-row>
<el-row>
<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
<el-row>
<el-col :span="15">
<el-form-item label="分组属性">
<el-select style="width:100px;" size="small" v-model="params.groupBy" @change="onXmTaskSomeFieldsChange('groupBy',$event)" clearable>
<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="归属项目" >
<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;" :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="任务状态" prop="taskState">
<el-select style="width:100px;" size="small" v-model="params.taskState" @change="onXmTaskSomeFieldsChange('taskState',$event)" clearable>
<el-option v-for="i in this.dicts.taskState" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="taskType" >
<el-select style="width:100px;" size="small" v-model="params.taskType" @change="onXmTaskSomeFieldsChange('taskType',$event)" clearable>
<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务来源" prop="planType">
<el-select style="width:100px;" size="small" v-model="params.planType" @change="onXmTaskSomeFieldsChange('planType',$event)" clearable>
<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务层次" prop="settleSchemel" >
<el-select style="width:100px;" size="small" v-model="params.settleSchemel" @change="onXmTaskSomeFieldsChange('settleSchemel',$event)" clearable>
<el-option v-for="i in this.dicts.xmTaskSettleSchemel" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="优先级别" prop="priority" >
<el-select style="width:100px;" size="small" v-model="params.priority" @change="onXmTaskSomeFieldsChange('priority',$event)" clearable>
<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button type="primary" style="float:right;" icon="el-icon-search" @click="searchXmTaskSort">查询</el-button>
</el-form-item>
</el-form>
</el-row>
</el-popover>
</el-col> </el-col>
</el-row> </el-row>
</section> </section>

Loading…
Cancel
Save