Browse Source

优化故事管理界面

master
陈裕财 4 years ago
parent
commit
8f636e56f3
  1. 4
      config/index.js
  2. 24
      src/views/xm/core/xmIteration/XmIterationMng.vue
  3. 15
      src/views/xm/core/xmIteration/XmIterationSelect.vue
  4. 141
      src/views/xm/core/xmMenu/XmMenuMng.vue
  5. 20
      src/views/xm/core/xmMenu/XmMenuMngBatch.vue
  6. 16
      src/views/xm/core/xmMenu/XmMenuSelect.vue
  7. 18
      src/views/xm/core/xmProduct/XmProductSelect.vue
  8. 11
      src/views/xm/core/xmProject/XmProjectAdd.vue
  9. 6
      src/views/xm/core/xmProject/XmProjectEdit.vue
  10. 16
      src/views/xm/core/xmProject/XmProjectMng.vue
  11. 6
      src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue
  12. 6
      src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue
  13. 11
      src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue
  14. 11
      src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue
  15. 2
      src/views/xm/core/xmQuestion/XmQuestionAdd.vue
  16. 2
      src/views/xm/core/xmQuestion/XmQuestionEdit.vue
  17. 21
      src/views/xm/core/xmQuestion/XmQuestionMng.vue
  18. 15
      src/views/xm/core/xmTask/XmTaskList.vue
  19. 6
      src/views/xm/core/xmTask/XmTaskMng.vue
  20. 15
      src/views/xm/core/xmTestCase/XmTestCaseMng.vue
  21. 16
      src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue

4
config/index.js

@ -11,7 +11,7 @@ module.exports = {
assetsSubDirectory: '', assetsSubDirectory: '',
assetsPublicPath: '/', assetsPublicPath: '/',
proxyTable: { proxyTable: {
/**
'/api/m1/xm': { '/api/m1/xm': {
target: 'http://localhost:7067', target: 'http://localhost:7067',
changeOrigin: true, changeOrigin: true,
@ -19,7 +19,7 @@ module.exports = {
'^/api/m1/xm': '/xm' '^/api/m1/xm': '/xm'
} }
}, },
/**
'/api/m1/workflow': { '/api/m1/workflow': {
target: 'http://localhost:7080', target: 'http://localhost:7080',
changeOrigin: true, changeOrigin: true,

24
src/views/xm/core/xmIteration/XmIterationMng.vue

@ -11,7 +11,7 @@
</el-select> </el-select>
<el-input v-if="filters.queryScope=='iterationId'" v-model="filters.id" style="width:20%;" placeholder="输入迭代编号" @keyup.enter.native="searchXmProducts"> </el-input> <el-input v-if="filters.queryScope=='iterationId'" v-model="filters.id" style="width:20%;" placeholder="输入迭代编号" @keyup.enter.native="searchXmProducts"> </el-input>
<el-date-picker v-if="filters.queryScope!='iterationId'" v-model="dateRangerOnline" type="daterange" align="right" unlink-panels range-separator="" <el-date-picker v-if="filters.queryScope!='iterationId'" v-model="dateRangerOnline" type="daterange" align="right" unlink-panels range-separator=""
start-placeholder="上线日期" end-placeholder="上线日期" value-format="yyyy-MM-dd"
start-placeholder="上线日期" end-placeholder="上线日期" value-format="yyyy-MM-dd HH:mm:ss"
class="hidden-md-and-down" class="hidden-md-and-down"
:default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions"> :default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions">
</el-date-picker> </el-date-picker>
@ -54,7 +54,7 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="完成日期" end-placeholder="完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -175,13 +175,8 @@ import XmIterationSelect from './XmIterationSelect.vue';
id:'',// id:'',//
}, },
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],//
dateRanger: [ ],//
dateRangerOnline: [ dateRangerOnline: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],//线 ],//线
xmIterations: [],// xmIterations: [],//
pageInfo:{// pageInfo:{//
@ -266,10 +261,6 @@ import XmIterationSelect from './XmIterationSelect.vue';
total: this.pageInfo.total, total: this.pageInfo.total,
count:this.pageInfo.count count:this.pageInfo.count
}; };
if(!this.dateRangerOnline || this.dateRangerOnline.length==0){
this.$message({showClose: true, message: "上线日期范围不能为空", type: 'error' });
return;
}
if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){ if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
let orderBys=[]; let orderBys=[];
for(var i=0;i<this.pageInfo.orderFields.length;i++){ for(var i=0;i<this.pageInfo.orderFields.length;i++){
@ -302,12 +293,13 @@ import XmIterationSelect from './XmIterationSelect.vue';
if(this.filters.queryScope=="branchId"){ if(this.filters.queryScope=="branchId"){
params.branchId=this.userInfo.branchId params.branchId=this.userInfo.branchId
} }
if(this.filters.queryScope!="iterationId"){
params.onlineTimeStart=this.dateRangerOnline[0]+" 00:00:00"
params.onlineTimeEnd=this.dateRangerOnline[1]+" 23:59:59"
}
} }
if(this.filters.queryScope!="iterationId" && this.dateRangerOnline && dateRangerOnline.length==2){
params.onlineTimeStart=this.dateRangerOnline[0]
params.onlineTimeEnd=this.dateRangerOnline[1]
}
this.load.list = true; this.load.list = true;
listXmIterationWithState(params).then((res) => { listXmIterationWithState(params).then((res) => {
var tips=res.data.tips; var tips=res.data.tips;

15
src/views/xm/core/xmIteration/XmIterationSelect.vue

@ -36,7 +36,7 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="完成日期" end-placeholder="完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -115,8 +115,6 @@
}, },
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
dateRangerOnline: [ dateRangerOnline: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],//线 ],//线
xmIterations: [],// xmIterations: [],//
pageInfo:{// pageInfo:{//
@ -200,10 +198,6 @@
total: this.pageInfo.total, total: this.pageInfo.total,
count:this.pageInfo.count count:this.pageInfo.count
}; };
if(!this.dateRangerOnline || this.dateRangerOnline.length==0){
this.$message({showClose: true, message: "上线日期范围不能为空", type: 'error' });
return;
}
if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){ if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
let orderBys=[]; let orderBys=[];
for(var i=0;i<this.pageInfo.orderFields.length;i++){ for(var i=0;i<this.pageInfo.orderFields.length;i++){
@ -233,10 +227,13 @@
if(this.filters.queryScope=="branchId"){ if(this.filters.queryScope=="branchId"){
params.branchId=this.userInfo.branchId params.branchId=this.userInfo.branchId
} }
params.onlineTimeStart=this.dateRangerOnline[0]+" 00:00:00"
params.onlineTimeEnd=this.dateRangerOnline[1]+" 23:59:59"
} }
if(this.dateRangerOnline && this.dateRangerOnline.length==2){
params.onlineTimeStart=this.dateRangerOnline[0]
params.onlineTimeEnd=this.dateRangerOnline[1]
}
this.load.list = true; this.load.list = true;
listXmIterationWithState(params).then((res) => { listXmIterationWithState(params).then((res) => {
var tips=res.data.tips; var tips=res.data.tips;

141
src/views/xm/core/xmMenu/XmMenuMng.vue

@ -10,19 +10,6 @@
<el-option value="not-join" label="未分配任何任务的故事"></el-option> <el-option value="not-join" label="未分配任何任务的故事"></el-option>
<el-option value="join" label="已分配任务的故事"></el-option> <el-option value="join" label="已分配任务的故事"></el-option>
</el-select> </el-select>
<el-date-picker
v-model="dateRanger"
type="daterange"
align="right"
class="hidden-md-and-down"
unlink-panels
range-separator="至"
start-placeholder="创建日期"
end-placeholder="创建日期"
value-format="yyyy-MM-dd"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
></el-date-picker>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询" clearable> <el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询" clearable>
</el-input> </el-input>
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search"></el-button> <el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search"></el-button>
@ -57,7 +44,7 @@
range-separator="至" range-separator="至"
start-placeholder="创建日期" start-placeholder="创建日期"
end-placeholder="创建日期" end-placeholder="创建日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -96,11 +83,11 @@
</el-breadcrumb> </el-breadcrumb>
</el-row> </el-row>
<el-row class="padding-top"> <el-row class="padding-top">
<el-table stripe fit border ref="table" :max-height="tableHeight" :data="xmMenusTreeData" row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
<el-table lazy :load="loadMenusLazy" stripe fit border ref="table" :max-height="tableHeight" :data="xmMenusTreeData" row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
<el-table-column sortable type="selection" width="40"></el-table-column> <el-table-column sortable type="selection" width="40"></el-table-column>
<el-table-column prop="menuName" label="故事名称" min-width="160" show-overflow-tooltip> <el-table-column prop="menuName" label="故事名称" min-width="160" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="primary" @click="showEdit(scope.row)">{{scope.row.seqNo}}&nbsp;&nbsp;{{scope.row.menuName}}</el-link>
<el-link type="primary" @click="showEdit(scope.row)" :icon="scope.row.ntype=='1'?'el-icon-folder-opened':''">{{scope.row.seqNo}}&nbsp;&nbsp;{{scope.row.menuName}}</el-link>
<font class="align-right"> <font class="align-right">
<el-popover <el-popover
placement="top-start" placement="top-start"
@ -131,13 +118,6 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="260" show-overflow-tooltip> <el-table-column label="操作" width="260" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip v-if="!selProject&&!xmIteration" content="添加子故事">
<el-button type="primary" @click="showSubAdd( scope.row,scope.$index)" icon="el-icon-plus"></el-button>
</el-tooltip>
<el-tooltip content="查看子故事">
<el-button @click="searchSubMenus( scope.row,scope.$index)" icon="el-icon-right"></el-button>
</el-tooltip>
<el-popover style="padding-left:10px;" <el-popover style="padding-left:10px;"
v-if="isPmUser" v-if="isPmUser"
placement="top-start" placement="top-start"
@ -145,22 +125,20 @@
trigger="click" > trigger="click" >
<el-row> <el-row>
<el-col :span="24" style="padding-top:5px;"> <el-col :span="24" style="padding-top:5px;">
<el-button @click="showImportFromMenuTemplate(scope.row)" icon="el-icon-upload2">由模板快速导入子故事</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-button v-if="!selProject" @click="showTaskListForMenu(scope.row,scope.$index)" icon="el-icon-s-operation">查看关联的任务</el-button>
<el-button v-if="selProject" @click="showTasks(scope.row,scope.$index)" icon="el-icon-s-operation">查看关联的任务</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-button @click="toIterationList(scope.row,scope.$index)" icon="el-icon-document-copy">查看关联的迭代计划</el-button>
<el-button @click="showSubAdd( scope.row,scope.$index)" icon="el-icon-plus">直接添加子故事</el-button>
</el-col> </el-col>
<el-col :span="24" style="padding-top:5px;">
<el-button @click="handleDel(scope.row)" icon="el-icon-delete">删除该故事</el-button>
<el-col :span="24" style="padding-top:5px;">
<el-button @click="showImportFromMenuTemplate(scope.row)" icon="el-icon-upload2">由模板快速导入子故事</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-button slot="reference" icon="el-icon-more"></el-button>
<el-button type="primary" :disabled="scope.row.ntype!='1'" slot="reference" icon="el-icon-plus"></el-button>
</el-popover> </el-popover>
<el-button v-if="!selProject" :disabled="scope.row.ntype=='1'" type="text" @click="showTaskListForMenu(scope.row,scope.$index)" icon="el-icon-s-operation">任务</el-button>
<el-button v-if="selProject" :disabled="scope.row.ntype=='1'" type="text" @click="showTasks(scope.row,scope.$index)" icon="el-icon-s-operation">任务</el-button>
<el-button type="text" :disabled="scope.row.ntype=='1'" @click="toIterationList(scope.row,scope.$index)" icon="el-icon-document-copy">迭代</el-button>
<el-button type="text" :disabled="scope.row.childrenCnt>0" @click="handleDel(scope.row)" icon="el-icon-delete">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -344,10 +322,7 @@
userSelectVisible:false, userSelectVisible:false,
selectFiltersMmUserVisible:false, selectFiltersMmUserVisible:false,
tableHeight:300, tableHeight:300,
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
productVisible:false, productVisible:false,
/**begin 自定义属性请在下面加 请加备注**/ /**begin 自定义属性请在下面加 请加备注**/
@ -382,28 +357,8 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenus(); this.getXmMenus();
}, },
// XmMenu xm_project_menu
getXmMenus() {
let params = {
pageSize: this.pageInfo.pageSize,
pageNum: this.pageInfo.pageNum,
total: this.pageInfo.total,
count:this.pageInfo.count
};
if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
let orderBys=[];
for(var i=0;i<this.pageInfo.orderFields.length;i++){
orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
}
params.orderBy= orderBys.join(",")
}
if( this.filters.product && this.filters.product.id){
params.productId=this.filters.product.id
}else {
this.$message({showClose: true, message: "请先选择产品", type: 'success' });
return;
//params.xxx=xxxxx
}
getParams(params){
if(!params.productId){ if(!params.productId){
params.branchId=this.userInfo.branchId params.branchId=this.userInfo.branchId
} }
@ -412,10 +367,6 @@
params.key="%"+this.filters.key+"%" params.key="%"+this.filters.key+"%"
} }
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' });
return;
}
if(this.filters.mmUser){ if(this.filters.mmUser){
params.mmUserid=this.filters.mmUser.userid; params.mmUserid=this.filters.mmUser.userid;
} }
@ -436,8 +387,40 @@
if(this.filters.parentMenu){ if(this.filters.parentMenu){
params.pmenuId=this.filters.parentMenu.menuId params.pmenuId=this.filters.parentMenu.menuId
} }
params.ctimeStart=this.dateRanger[0]+" 00:00:00"
params.ctimeEnd=this.dateRanger[1]+" 23:59:59"
if( this.dateRanger && this.dateRanger.length==2){
params.ctimeStart=this.dateRanger[0]
params.ctimeEnd=this.dateRanger[1]
}
if(!(params.ctimeStart||params.pmenuId||params.projectId||params.iterationId||params.iterationFilterType||params.mmUserid||params.key||params.taskFilterType)){
params.isTop="1"
}
return params;
},
// XmMenu xm_project_menu
getXmMenus() {
let params = {
pageSize: this.pageInfo.pageSize,
pageNum: this.pageInfo.pageNum,
total: this.pageInfo.total,
count:this.pageInfo.count
};
if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
let orderBys=[];
for(var i=0;i<this.pageInfo.orderFields.length;i++){
orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
}
params.orderBy= orderBys.join(",")
}
if( this.filters.product && this.filters.product.id){
params.productId=this.filters.product.id
}else {
this.$message({showClose: true, message: "请先选择产品", type: 'success' });
return;
}
params=this.getParams(params);
//params.isTop="1"
let callback= (res)=>{ let callback= (res)=>{
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ if(tips.isOk){
@ -858,6 +841,30 @@
this.pageInfo.count=true this.pageInfo.count=true
this.searchXmMenus(); this.searchXmMenus();
}, },
loadMenusLazy(row, treeNode, resolve) {
if(row.children&&row.children.length>0){
resolve(row.children)
}else{
var params={pmenuId:row.menuId}
params=this.getParams(params);
params.isTop=""
this.load.list = true;
var func=listXmMenuWithState
if(this.selProject&&this.selProject.id){
func=listXmMenuWithPlan
}
func(params).then(res=>{
this.load.list = false
var tips = res.data.tips;
if(tips.isOk){
resolve(res.data.data)
}else{
resolve([])
}
}).catch( err => this.load.list = false );
}
}
},//end methods },//end methods
components: { components: {
'xm-menu-add':XmMenuAdd, 'xm-menu-add':XmMenuAdd,

20
src/views/xm/core/xmMenu/XmMenuMngBatch.vue

@ -15,7 +15,7 @@
range-separator="至" range-separator="至"
start-placeholder="创建日期" start-placeholder="创建日期"
end-placeholder="创建日期" end-placeholder="创建日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -60,7 +60,7 @@
range-separator="至" range-separator="至"
start-placeholder="创建日期" start-placeholder="创建日期"
end-placeholder="创建日期" end-placeholder="创建日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -298,10 +298,7 @@
userSelectVisible:false, userSelectVisible:false,
selectFiltersMmUserVisible:false, selectFiltersMmUserVisible:false,
tableHeight:300, tableHeight:300,
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
/**begin 自定义属性请在下面加 请加备注**/ /**begin 自定义属性请在下面加 请加备注**/
@ -364,11 +361,6 @@
if( this.filters.key){ if( this.filters.key){
params.key="%"+this.filters.key+"%" params.key="%"+this.filters.key+"%"
} }
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' });
return;
}
if(this.filters.mmUser){ if(this.filters.mmUser){
params.mmUserid=this.filters.mmUser.userid; params.mmUserid=this.filters.mmUser.userid;
} }
@ -379,8 +371,10 @@
if(this.filters.taskFilterType){ if(this.filters.taskFilterType){
params.taskFilterType=this.filters.taskFilterType params.taskFilterType=this.filters.taskFilterType
} }
params.ctimeStart=this.dateRanger[0]+" 00:00:00"
params.ctimeEnd=this.dateRanger[1]+" 23:59:59"
if( this.dateRanger && this.dateRanger.length==2){
params.ctimeStart=this.dateRanger[0]
params.ctimeEnd=this.dateRanger[1]
}
let callback= (res)=>{ let callback= (res)=>{
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ if(tips.isOk){

16
src/views/xm/core/xmMenu/XmMenuSelect.vue

@ -47,7 +47,7 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="完成日期" end-placeholder="完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -181,10 +181,7 @@
selectFiltersMmUserVisible:false, selectFiltersMmUserVisible:false,
/**begin 自定义属性请在下面加 请加备注**/ /**begin 自定义属性请在下面加 请加备注**/
tableHeight:300, tableHeight:300,
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
/**end 自定义属性请在上面加 请加备注**/ /**end 自定义属性请在上面加 请加备注**/
} }
@ -240,16 +237,15 @@
//params.xxx=xxxxx //params.xxx=xxxxx
} }
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' });
return;
if( this.dateRanger && this.dateRanger.length==2){
params.ctimeStart=this.dateRanger[0]
params.ctimeEnd=this.dateRanger[1]
} }
if(this.filters.mmUser){ if(this.filters.mmUser){
params.mmUserid=this.filters.mmUser.userid; params.mmUserid=this.filters.mmUser.userid;
} }
params.ctimeStart=this.dateRanger[0]+" 00:00:00"
params.ctimeEnd=this.dateRanger[1]+" 23:59:59"
if( this.filters.key){ if( this.filters.key){
params.key="%"+this.filters.key+"%" params.key="%"+this.filters.key+"%"
} }

18
src/views/xm/core/xmProduct/XmProductSelect.vue

@ -38,7 +38,7 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="完成日期" end-placeholder="完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -68,7 +68,7 @@
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<font>{{scope.row.productName}}</font> <font>{{scope.row.productName}}</font>
<font class="align-right"><el-tag :type="scope.row.finishRate>=100?'success':'warning'">{{parseInt(scope.row.finishRate)}}%</el-tag>
<font class="align-right"><el-tag :type="scope.row.finishRate>=100?'success':'warning'">{{scope.row.finishRate?parseInt(scope.row.finishRate):0}}%</el-tag>
</font> </font>
</template> </template>
</el-table-column> </el-table-column>
@ -152,10 +152,7 @@
productStateVisible:false, productStateVisible:false,
selectFiltersPmUserVisible:false, selectFiltersPmUserVisible:false,
tableHeight:300, tableHeight:300,
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
/**begin 自定义属性请在下面加 请加备注**/ /**begin 自定义属性请在下面加 请加备注**/
@ -232,12 +229,11 @@
params.projectId=null; params.projectId=null;
} }
if(!this.selProject && !this.xmIteration && this.filters.queryScope!='productId'){ if(!this.selProject && !this.xmIteration && this.filters.queryScope!='productId'){
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' });
return;
if(this.dateRanger&&this.dateRanger.length==2){
params.ctimeStart=this.dateRanger[0]
params.ctimeEnd=this.dateRanger[1]
} }
params.ctimeStart=this.dateRanger[0]+" 00:00:00"
params.ctimeEnd=this.dateRanger[1]+" 23:59:59"
} }
this.load.list = true; this.load.list = true;

11
src/views/xm/core/xmProject/XmProjectAdd.vue

@ -40,7 +40,7 @@
range-separator="至" range-separator="至"
start-placeholder="计划开始日期" start-placeholder="计划开始日期"
end-placeholder="计划完成日期" end-placeholder="计划完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -312,10 +312,7 @@
userSelectVisible: false, userSelectVisible: false,
groupSelectVisible:false, groupSelectVisible:false,
/**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
/**end 在上面加自定义属性**/ /**end 在上面加自定义属性**/
}//end return }//end return
@ -347,8 +344,8 @@
this.dateRanger != null && this.dateRanger != null &&
this.dateRanger.length == 2 this.dateRanger.length == 2
) { ) {
this.addForm.startTime = this.dateRanger[0] + " 00:00:00";
this.addForm.endTime = this.dateRanger[1] + " 23:59:59";
this.addForm.startTime = this.dateRanger[0]
this.addForm.endTime = this.dateRanger[1]
}else{ }else{
this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' });
return; return;

6
src/views/xm/core/xmProject/XmProjectEdit.vue

@ -41,7 +41,7 @@
range-separator="至" range-separator="至"
start-placeholder="计划开始日期" start-placeholder="计划开始日期"
end-placeholder="计划完成日期" end-placeholder="计划完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -408,8 +408,8 @@
this.dateRanger != null && this.dateRanger != null &&
this.dateRanger.length == 2 this.dateRanger.length == 2
) { ) {
this.editForm.startTime = this.dateRanger[0] + " 00:00:00";
this.editForm.endTime = this.dateRanger[1] + " 23:59:59";
this.editForm.startTime = this.dateRanger[0] ;
this.editForm.endTime = this.dateRanger[1] ;
}else{ }else{
this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' });
return; return;

16
src/views/xm/core/xmProject/XmProjectMng.vue

@ -56,7 +56,7 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="完成日期" end-placeholder="完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -295,10 +295,7 @@
xmRecordVisible: false, xmRecordVisible: false,
productSelectVisible:false, productSelectVisible:false,
tableHeight:300, tableHeight:300,
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
/**end 自定义属性请在上面加 请加备注**/ /**end 自定义属性请在上面加 请加备注**/
} }
@ -344,9 +341,8 @@
//params.xxx=xxxxx //params.xxx=xxxxx
} }
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' });
return;
if(this.dateRanger&&this.dateRanger.length==2){
} }
this.load.list = true; this.load.list = true;
if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){ if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
@ -364,8 +360,8 @@
if(this.filters.productId){ if(this.filters.productId){
params.productId = this.filters.productId params.productId = this.filters.productId
} }
params.createTimeStart=this.dateRanger[0]+" 00:00:00"
params.createTimeEnd=this.dateRanger[1]+" 23:59:59"
params.createTimeStart=this.dateRanger[0]
params.createTimeEnd=this.dateRanger[1]
listXmProject(params).then((res) => { listXmProject(params).then((res) => {
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ if(tips.isOk){

6
src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue

@ -42,7 +42,7 @@
range-separator="至" range-separator="至"
start-placeholder="计划开始日期" start-placeholder="计划开始日期"
end-placeholder="计划完成日期" end-placeholder="计划完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -243,14 +243,14 @@
) { ) {
if(this.dateRanger[0]){ if(this.dateRanger[0]){
if(this.dateRanger[0].length<=10){ if(this.dateRanger[0].length<=10){
this.addForm.beginDate = this.dateRanger[0] + " 00:00:00";
this.addForm.beginDate = this.dateRanger[0] ;
}else{ }else{
this.addForm.beginDate = this.dateRanger[0] this.addForm.beginDate = this.dateRanger[0]
} }
} }
if(this.dateRanger[1]){ if(this.dateRanger[1]){
if(this.dateRanger[1].length<=10){ if(this.dateRanger[1].length<=10){
this.addForm.endDate = this.dateRanger[1] + " 23:59:59";
this.addForm.endDate = this.dateRanger[1] ;
}else{ }else{
this.addForm.endDate = this.dateRanger[1] this.addForm.endDate = this.dateRanger[1]
} }

6
src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue

@ -57,7 +57,7 @@
range-separator="至" range-separator="至"
start-placeholder="计划开始日期" start-placeholder="计划开始日期"
end-placeholder="计划完成日期" end-placeholder="计划完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -256,14 +256,14 @@
) { ) {
if(this.dateRanger[0]){ if(this.dateRanger[0]){
if(this.dateRanger[0].length<=10){ if(this.dateRanger[0].length<=10){
this.editForm.beginDate = this.dateRanger[0] + " 00:00:00";
this.editForm.beginDate = this.dateRanger[0] ;
}else{ }else{
this.editForm.beginDate = this.dateRanger[0] this.editForm.beginDate = this.dateRanger[0]
} }
} }
if(this.dateRanger[1]){ if(this.dateRanger[1]){
if(this.dateRanger[1].length<=10){ if(this.dateRanger[1].length<=10){
this.editForm.endDate = this.dateRanger[1] + " 23:59:59";
this.editForm.endDate = this.dateRanger[1] ;
}else{ }else{
this.editForm.endDate = this.dateRanger[1] this.editForm.endDate = this.dateRanger[1]
} }

11
src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue

@ -40,7 +40,7 @@
range-separator="至" range-separator="至"
start-placeholder="计划开始日期" start-placeholder="计划开始日期"
end-placeholder="计划完成日期" end-placeholder="计划完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -294,10 +294,7 @@
}, },
/**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/
/**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
/**end 在上面加自定义属性**/ /**end 在上面加自定义属性**/
}//end return }//end return
@ -318,8 +315,8 @@
this.dateRanger != null && this.dateRanger != null &&
this.dateRanger.length == 2 this.dateRanger.length == 2
) { ) {
this.addForm.startTime = this.dateRanger[0] + " 00:00:00";
this.addForm.endTime = this.dateRanger[1] + " 23:59:59";
this.addForm.startTime = this.dateRanger[0] ;
this.addForm.endTime = this.dateRanger[1] ;
}else{ }else{
this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' });
return; return;

11
src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue

@ -44,7 +44,7 @@
range-separator="至" range-separator="至"
start-placeholder="计划开始日期" start-placeholder="计划开始日期"
end-placeholder="计划完成日期" end-placeholder="计划完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -304,10 +304,7 @@
/**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/
/**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
activateName:'planWorkload', activateName:'planWorkload',
/**end 在上面加自定义属性**/ /**end 在上面加自定义属性**/
@ -329,8 +326,8 @@
this.dateRanger != null && this.dateRanger != null &&
this.dateRanger.length == 2 this.dateRanger.length == 2
) { ) {
this.editForm.startTime = this.dateRanger[0] + " 00:00:00";
this.editForm.endTime = this.dateRanger[1] + " 23:59:59";
this.editForm.startTime = this.dateRanger[0] ;
this.editForm.endTime = this.dateRanger[1] ;
}else{ }else{
this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' });
return; return;

2
src/views/xm/core/xmQuestion/XmQuestionAdd.vue

@ -37,7 +37,7 @@
</el-form-item> </el-form-item>
<el-form-item label="提出人" prop="askUsername"> <el-form-item label="提出人" prop="askUsername">
<el-tag @click="showGroupUsers('askUsername')">{{addForm.askUsername?addForm.askUsername:'未关联提出人'}}</el-tag> <el-tag @click="showGroupUsers('askUsername')">{{addForm.askUsername?addForm.askUsername:'未关联提出人'}}</el-tag>
<el-tooltip content="最晚解决时间"><el-date-picker :clearable="false" style="width:150px;" type="date" placeholder="选择日期" v-model="addForm.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker></el-tooltip>
<el-tooltip content="最晚解决时间"><el-date-picker :clearable="false" style="width:150px;" type="date" placeholder="选择日期" v-model="addForm.endTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker></el-tooltip>
</el-form-item> </el-form-item>
<el-form-item label="指派给" prop="handlerUsername"> <el-form-item label="指派给" prop="handlerUsername">
{{addForm.handlerUsername}} <el-button @click="sendToAsk">指派给提出人</el-button><el-button @click="sendToCreater">指派给创建人</el-button><el-button @click="showGroupUsers('handlerUsername')">指派给其它人</el-button> {{addForm.handlerUsername}} <el-button @click="sendToAsk">指派给提出人</el-button><el-button @click="sendToCreater">指派给创建人</el-button><el-button @click="showGroupUsers('handlerUsername')">指派给其它人</el-button>

2
src/views/xm/core/xmQuestion/XmQuestionEdit.vue

@ -8,7 +8,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-tag>{{editForm.createUsername}} {{editForm.createTime}} 创建 </el-tag> <el-tag>{{editForm.createUsername}} {{editForm.createTime}} 创建 </el-tag>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-date-picker :clearable="false" style="width:150px;" type="date" placeholder="到期日期" v-model="editForm.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
<el-date-picker :clearable="false" style="width:150px;" type="date" placeholder="到期日期" v-model="editForm.endTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-row> </el-row>
<el-row class="padding-bottom"> <el-row class="padding-bottom">
<el-steps :active="calcBugStep" simple finish-status="success"> <el-steps :active="calcBugStep" simple finish-status="success">

21
src/views/xm/core/xmQuestion/XmQuestionMng.vue

@ -92,7 +92,7 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="完成日期" end-placeholder="完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -107,7 +107,7 @@
range-separator="至" range-separator="至"
start-placeholder="更新时间" start-placeholder="更新时间"
end-placeholder="更新时间" end-placeholder="更新时间"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -336,10 +336,7 @@
} }
], ],
menuVisible:false, menuVisible:false,
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
dateRanger: [ ],
ltimeRanger:[ ltimeRanger:[
], ],
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
@ -393,9 +390,9 @@
} }
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' });
return;
if(this.dateRanger&&this.dateRanger.length==2){
params.createTimeStart=this.dateRanger[0]
params.createTimeEnd=this.dateRanger[1]
} }
if( this.filters.bugStatus!=null && this.filters.bugStatus!="" ){ if( this.filters.bugStatus!=null && this.filters.bugStatus!="" ){
params.bugStatus=this.filters.bugStatus params.bugStatus=this.filters.bugStatus
@ -442,12 +439,10 @@
} }
} }
params.createTimeStart=this.dateRanger[0]+" 00:00:00"
params.createTimeEnd=this.dateRanger[1]+" 23:59:59"
if(this.ltimeRanger && this.ltimeRanger.length>=2){ if(this.ltimeRanger && this.ltimeRanger.length>=2){
params.ltimeStart=this.ltimeRanger[0]+" 00:00:00"
params.ltimeEnd=this.ltimeRanger[1]+" 23:59:59"
params.ltimeStart=this.ltimeRanger[0]
params.ltimeEnd=this.ltimeRanger[1]
} }
this.load.list = true; this.load.list = true;

15
src/views/xm/core/xmTask/XmTaskList.vue

@ -19,7 +19,7 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="完成日期" end-placeholder="完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -167,10 +167,7 @@
projectPhase: null, projectPhase: null,
selectProjectVisible:false, selectProjectVisible:false,
tableHeight:300, tableHeight:300,
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
/**end 自定义属性请在上面加 请加备注**/ /**end 自定义属性请在上面加 请加备注**/
} }
@ -234,9 +231,9 @@
params.orderBy= orderBys.join(",") params.orderBy= orderBys.join(",")
} }
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' });
return;
if(this.dateRanger&&this.dateRanger.length==2){
params.createTimeStart=this.dateRanger[0]
params.createTimeEnd=this.dateRanger[1]
} }
if(this.filters.key){ if(this.filters.key){
params.key='%'+this.filters.key+'%' params.key='%'+this.filters.key+'%'
@ -266,8 +263,6 @@
params.userid=this.userInfo.userid params.userid=this.userInfo.userid
params.isMy="1" params.isMy="1"
} }
params.createTimeStart=this.dateRanger[0]+" 00:00:00"
params.createTimeEnd=this.dateRanger[1]+" 23:59:59"
getTask(params).then((res) => { getTask(params).then((res) => {
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ if(tips.isOk){

6
src/views/xm/core/xmTask/XmTaskMng.vue

@ -101,7 +101,7 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="完成日期" end-placeholder="完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -758,8 +758,8 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
params.orderBy= orderBys.join(",") params.orderBy= orderBys.join(",")
} }
if(this.dateRanger && this.dateRanger.length==2){ if(this.dateRanger && this.dateRanger.length==2){
params.createTimeStart=this.dateRanger[0]+" 00:00:00"
params.createTimeEnd=this.dateRanger[1]+" 23:59:59"
params.createTimeStart=this.dateRanger[0]
params.createTimeEnd=this.dateRanger[1]
} }
if(this.filters.taskType!="all" && this.filters.taskType!="" && this.filters.taskType!=null){ if(this.filters.taskType!="all" && this.filters.taskType!="" && this.filters.taskType!=null){
params.taskType=this.filters.taskType params.taskType=this.filters.taskType

15
src/views/xm/core/xmTestCase/XmTestCaseMng.vue

@ -53,7 +53,7 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="完成日期" end-placeholder="完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -192,10 +192,7 @@
selectUserForFiltersVisible:false, selectUserForFiltersVisible:false,
productSelectVisible:false, productSelectVisible:false,
nextAction:'', nextAction:'',
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
/**end 自定义属性请在上面加 请加备注**/ /**end 自定义属性请在上面加 请加备注**/
} }
@ -250,9 +247,9 @@
//params.xxx=xxxxx //params.xxx=xxxxx
} }
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' });
return;
if(this.dateRanger&&this.dateRanger.length==2){
params.ctimeStart=this.dateRanger[0]
params.ctimeEnd=this.dateRanger[1]
} }
if(this.filters.product){ if(this.filters.product){
params.productId=this.filters.product.id params.productId=this.filters.product.id
@ -264,8 +261,6 @@
params.projectId=this.filters.selProject.id params.projectId=this.filters.selProject.id
} }
params.ctimeStart=this.dateRanger[0]+" 00:00:00"
params.ctimeEnd=this.dateRanger[1]+" 23:59:59"
if(this.filters.key){ if(this.filters.key){
params.key='%'+this.filters.key+'%' params.key='%'+this.filters.key+'%'
} }

16
src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue

@ -50,7 +50,7 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="完成日期" end-placeholder="完成日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
@ -296,10 +296,7 @@
addBugVisible:false, addBugVisible:false,
productSelectVisible:false, productSelectVisible:false,
nextAction:'', nextAction:'',
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
gstcVisible:false, gstcVisible:false,
ganrrColumns: { ganrrColumns: {
@ -365,9 +362,10 @@
}else{ }else{
//params.xxx=xxxxx //params.xxx=xxxxx
} }
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' });
return;
if(this.dateRanger&&this.dateRanger.length==2){
params.createTimeStart=this.dateRanger[0]
params.createTimeEnd=this.dateRanger[1]
} }
if(this.filters.product){ if(this.filters.product){
params.productId=this.filters.product.id params.productId=this.filters.product.id
@ -379,8 +377,6 @@
if(this.filters.selProject){ if(this.filters.selProject){
params.projectId=this.filters.selProject.id params.projectId=this.filters.selProject.id
} }
params.createTimeStart=this.dateRanger[0]+" 00:00:00"
params.createTimeEnd=this.dateRanger[1]+" 23:59:59"
if(this.filters.key){ if(this.filters.key){
params.key='%'+this.filters.key+'%' params.key='%'+this.filters.key+'%'
} }

Loading…
Cancel
Save