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

优化

master
陈裕财 3 years ago
parent
99b1c5ff8a
commit
c197628a1f
7 changed files with 18 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/views/mdp/sys/user/UsersSelect.vue
  2. 9
      src/views/mdp/sys/user/UsersSelectOnly.vue
  3. 6
      src/views/xm/core/xmProduct/XmProductRecycle.vue
  4. 6
      src/views/xm/core/xmProject/XmProjectMng.vue
  5. 6
      src/views/xm/core/xmProject/XmProjectRecycle.vue
  6. 2
      src/views/xm/core/xmTask/XmPhaseSelect.vue
  7. 8
      src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue

3
src/views/mdp/sys/user/UsersSelect.vue
View File

@ -7,8 +7,7 @@
</el-row>
<el-table :row-key="'userid'" :data="users" :height="maxTableHeight" highlight-current-row v-loading="load.list" border @selection-change="selsChange" style="width: 100%;" ref="userTable" @row-click="rowClick">
<el-table-column :reserve-selection="true" type="selection" width="65"></el-table-column>
<el-table-column type="index" width="65"></el-table-column>
<el-table-column prop="username" sortable label="用户名称" min-width="120" >
<el-table-column prop="username" sortable label="用户名称" min-width="250" >
<template slot-scope="scope">
<div class="avatar-container">
<div class="avatar-wrapper">

9
src/views/mdp/sys/user/UsersSelectOnly.vue
View File

@ -5,12 +5,12 @@
<dept-tree ref="deptTree" show-root default-expand-all show-checkbox :expand-on-click-node="false" @node-click="handleLeftDeptNodeClick" @branch-row-click="branchRowClick"></dept-tree>
</el-col>
<el-col :span="18">
<el-row>
<el-row class="padding-bottom">
<el-input v-model="filters.key" style="width: 40%;" placeholder="名称 编号 手机号码 模糊查询"></el-input>
<el-button type="primary" v-loading="load.list" v-on:click="searchUsers">查询</el-button>
<el-button type="primary" v-if="sels.length>0" v-on:click="confirmUsers">确定</el-button>
</el-row>
<el-row class="selected-tag">
<el-row class="selected-tag padding-bottom" v-if="sels && sels.length>0">
<span v-for="sel in sels" :key="sel.userid" style="margin-left:5px;">
<el-tag
type="plain"
@ -26,9 +26,8 @@
</el-row>
<!--列表 User sys_user-->
<el-table :row-key="'userid'" :height="maxTableHeight" :data="users" current-row-key="userid" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" style="width: 100%;" ref="userTable" @row-click="rowClick">
<el-table-column :reserve-selection="true" type="selection" width="65"></el-table-column>
<el-table-column type="index" width="65"></el-table-column>
<el-table-column prop="username" sortable label="用户名称" min-width="120" >
<el-table-column :reserve-selection="true" type="selection" width="50"></el-table-column>
<el-table-column prop="username" sortable label="用户名称" min-width="250" >
<template slot-scope="scope">
<div class="avatar-container" @click="showEdit(scope.$index,scope.row)">
<div class="avatar-wrapper">

6
src/views/xm/core/xmProduct/XmProductRecycle.vue
View File

@ -1,6 +1,6 @@
<template>
<section class="padding">
<el-row>
<el-row class="padding-bottom">
<el-select v-model="filters.queryScope" placeholder="产品查询范围">
<el-option :label="userInfo.branchName+'机构下所有的产品'" value="branchId"></el-option>
<el-option label="我相关的产品" value="compete"></el-option>
@ -81,9 +81,9 @@
<el-button slot="reference" icon="el-icon-more"></el-button>
</el-popover>
</el-row>
<el-row >
<el-row>
<!--列表 XmProduct 产品表-->
<el-table ref="table" :height="maxTableHeight" :data="xmProducts" :row-class-name="tableRowClassName" @sort-change="sortChange" :highlight-current-row="true" current-row-key="id" v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table ref="table" border :height="maxTableHeight" :data="xmProducts" :row-class-name="tableRowClassName" @sort-change="sortChange" :highlight-current-row="true" current-row-key="id" v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column type="index" width="60">
</el-table-column>
<el-table-column prop="productName" label="产品名称" min-width="200" sortable>

6
src/views/xm/core/xmProject/XmProjectMng.vue
View File

@ -185,7 +185,7 @@
<mdp-select-user-xm v-if="p.pmUserid" :value="p" userid-key="pmUserid" username-key="pmUsername" :disabled="true"></mdp-select-user-xm>
<mdp-select-user-xm v-else-if="p.createUserid" :value="p" userid-key="createUserid" username-key="createUsername" :disabled="true"></mdp-select-user-xm>
</div>
</div>
<div class="project-period">{{p.startTime?p.startTime.substr(0,10):''}} ~{{p.endTime?p.endTime.substr(0,10):''}}</div>
</div>
</el-card>
@ -1083,10 +1083,10 @@
display: flex;
}
.project-footer>div{
width: 30%;
width: 50%;
}
.project-footer>div:not(:first-child){
width: 70%;
width: 50%;
}
.project-period{
line-height: 40px;

6
src/views/xm/core/xmProject/XmProjectRecycle.vue
View File

@ -5,8 +5,8 @@
</el-input>
<el-button @click="searchXmProjects" icon="el-icon-search"></el-button>
</el-row>
<el-row class="page-main ">
<el-table ref="table" :height="maxTableHeight" v-cloak stripe :data="xmProjects" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-row class="padding-top">
<el-table ref="table" border :height="maxTableHeight" v-cloak stripe :data="xmProjects" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column type="index" label="序号" width="80" ></el-table-column>
<el-table-column prop="id" label="项目编码" min-width="120" ></el-table-column>
<el-table-column prop="name" label="标题" min-width="200" >
@ -28,7 +28,7 @@
{{scope.row.startTime? scope.row.startTime.substr(0,10) : ""}}~{{scope.row.endTime? scope.row.endTime.substr(0,10) : ""}}
</template>
</el-table-column>
<el-table-column label="操作" width="245" fixed="right">
<el-table-column label="操作" width="120" fixed="right">
<template slot-scope="scope">
<el-button type="primary" @click.stop="unDel(scope.row)" >撤销删除</el-button>
</template>

2
src/views/xm/core/xmTask/XmPhaseSelect.vue
View File

@ -1,6 +1,6 @@
<template>
<section>
<el-row>
<el-row class="padding-bottom">
<div style="display:flex;justify-content: space-between;">
<xm-project-select style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="isTaskCenter?false:true" :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null" @row-click="onProjectRowClick" @clear="onProjectClear" ></xm-project-select>
<el-input v-else v-model="filters.key" placeholder="名称模糊查询" clearable></el-input>

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

@ -79,12 +79,11 @@
<el-table-column prop="skillRemark" label="技能" min-width="150" sortable show-overflow-tooltip>
</el-table-column>
<el-table-column prop="remarks" label="备注" min-width="150" sortable show-overflow-tooltip>
</el-table-column>
<el-table-column label="报价信息" min-width="150">
</el-table-column>
<el-table-column prop="createTime" label="报价时间" width="150" sortable>
</el-table-column>
<el-table-column prop="quoteWorkload" label="报价工作量" width="100" sortable>
<el-table-column prop="quoteWorkload" label="报价工时" width="100" sortable>
<template slot-scope="scope">
{{scope.row.quoteWorkload?scope.row.quoteWorkload:'-'}}h
</template>
@ -94,8 +93,7 @@
<template slot-scope="scope">
￥{{scope.row.quotePrice?scope.row.quotePrice:'-'}}元
</template>
</el-table-column>
</el-table-column>
</el-table-column>
</el-table>
<el-pagination layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :total="pageInfo.total" style="float:right;"></el-pagination>

Write Preview
Loading…
Cancel
Save