diff --git a/config/index.js b/config/index.js
index 971d8a40..dc6777d2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -11,7 +11,7 @@ module.exports = {
assetsSubDirectory: '',
assetsPublicPath: '/',
proxyTable: {
- /**
+
'/api/m1/xm': {
target: 'http://localhost:7067',
changeOrigin: true,
@@ -19,7 +19,7 @@ module.exports = {
'^/api/m1/xm': '/xm'
}
},
-
+ /**
'/api/m1/workflow': {
target: 'http://localhost:7080',
changeOrigin: true,
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index 2b4cb7af..9d5028e1 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -11,7 +11,7 @@
@@ -54,7 +54,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -175,13 +175,8 @@ import XmIterationSelect from './XmIterationSelect.vue';
id:'',//迭代编号
},
pickerOptions: util.pickerOptions('datarange'),
- dateRanger: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
- ],//创建时间选择范围
- dateRangerOnline: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
+ dateRanger: [ ],//创建时间选择范围
+ dateRangerOnline: [
],//上线时间选择范围
xmIterations: [],//查询结果
pageInfo:{//分页数据
@@ -265,11 +260,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
pageNum: this.pageInfo.pageNum,
total: this.pageInfo.total,
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){
let orderBys=[];
for(var i=0;i {
var tips=res.data.tips;
diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue
index 3db23c18..cdd81dc5 100644
--- a/src/views/xm/core/xmIteration/XmIterationSelect.vue
+++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue
@@ -36,7 +36,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -114,9 +114,7 @@
id:'',//迭代编号
},
pickerOptions: util.pickerOptions('datarange'),
- dateRangerOnline: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
+ dateRangerOnline: [
],//上线时间选择范围
xmIterations: [],//查询结果
pageInfo:{//分页数据
@@ -200,10 +198,6 @@
total: this.pageInfo.total,
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){
let orderBys=[];
for(var i=0;i {
var tips=res.data.tips;
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 006216eb..b13a9e2f 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -9,20 +9,7 @@
-
-
+
@@ -57,7 +44,7 @@
range-separator="至"
start-placeholder="创建日期"
end-placeholder="创建日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -96,11 +83,11 @@
-
+
- {{scope.row.seqNo}} {{scope.row.menuName}}
+ {{scope.row.seqNo}} {{scope.row.menuName}}
-
-
-
-
-
-
-
-
+
-
+
- 由模板快速导入子故事
-
-
- 查看关联的任务
- 查看关联的任务
-
-
- 查看关联的迭代计划
+ 直接添加子故事
-
- 删除该故事
+
+ 由模板快速导入子故事
-
-
-
+
+
+
+ 任务
+ 任务
+ 迭代
+ 删除
+
@@ -344,10 +322,7 @@
userSelectVisible:false,
selectFiltersMmUserVisible:false,
tableHeight:300,
- dateRanger: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
- ],
+ dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
productVisible:false,
/**begin 自定义属性请在下面加 请加备注**/
@@ -382,28 +357,8 @@
this.pageInfo.count=true;
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;i0){
+ let orderBys=[];
+ for(var i=0;i{
var tips=res.data.tips;
if(tips.isOk){
@@ -858,6 +841,30 @@
this.pageInfo.count=true
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
components: {
'xm-menu-add':XmMenuAdd,
diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
index 163e2d62..8d277d8d 100644
--- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
@@ -15,7 +15,7 @@
range-separator="至"
start-placeholder="创建日期"
end-placeholder="创建日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -60,7 +60,7 @@
range-separator="至"
start-placeholder="创建日期"
end-placeholder="创建日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -298,10 +298,7 @@
userSelectVisible:false,
selectFiltersMmUserVisible:false,
tableHeight:300,
- dateRanger: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
- ],
+ dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
/**begin 自定义属性请在下面加 请加备注**/
@@ -363,11 +360,6 @@
if( 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){
params.mmUserid=this.filters.mmUser.userid;
@@ -378,9 +370,11 @@
}
if(this.filters.taskFilterType){
params.taskFilterType=this.filters.taskFilterType
+ }
+ 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"
let callback= (res)=>{
var tips=res.data.tips;
if(tips.isOk){
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index fa4c69de..2d3729d3 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -47,7 +47,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -181,10 +181,7 @@
selectFiltersMmUserVisible:false,
/**begin 自定义属性请在下面加 请加备注**/
tableHeight:300,
- dateRanger: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
- ],
+ dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
/**end 自定义属性请在上面加 请加备注**/
}
@@ -240,16 +237,15 @@
//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){
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){
params.key="%"+this.filters.key+"%"
}
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index 97836445..45429c36 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -38,7 +38,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -68,7 +68,7 @@
{{scope.row.productName}}
- {{parseInt(scope.row.finishRate)}}%
+ {{scope.row.finishRate?parseInt(scope.row.finishRate):0}}%
@@ -152,10 +152,7 @@
productStateVisible:false,
selectFiltersPmUserVisible:false,
tableHeight:300,
- dateRanger: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
- ],
+ dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
/**begin 自定义属性请在下面加 请加备注**/
@@ -232,12 +229,11 @@
params.projectId=null;
}
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;
diff --git a/src/views/xm/core/xmProject/XmProjectAdd.vue b/src/views/xm/core/xmProject/XmProjectAdd.vue
index 0f564a88..c5f23e6d 100644
--- a/src/views/xm/core/xmProject/XmProjectAdd.vue
+++ b/src/views/xm/core/xmProject/XmProjectAdd.vue
@@ -40,7 +40,7 @@
range-separator="至"
start-placeholder="计划开始日期"
end-placeholder="计划完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -312,10 +312,7 @@
userSelectVisible: false,
groupSelectVisible:false,
/**begin 在下面加自定义属性,记得补上面的一个逗号**/
- dateRanger: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
- ],
+ dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
/**end 在上面加自定义属性**/
}//end return
@@ -347,8 +344,8 @@
this.dateRanger != null &&
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{
this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' });
return;
diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue
index 0bc59f8e..4fd1d7e8 100644
--- a/src/views/xm/core/xmProject/XmProjectEdit.vue
+++ b/src/views/xm/core/xmProject/XmProjectEdit.vue
@@ -41,7 +41,7 @@
range-separator="至"
start-placeholder="计划开始日期"
end-placeholder="计划完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -408,8 +408,8 @@
this.dateRanger != null &&
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{
this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' });
return;
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index d312ed27..bb58bb13 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -56,7 +56,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -295,10 +295,7 @@
xmRecordVisible: false,
productSelectVisible:false,
tableHeight:300,
- dateRanger: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
- ],
+ dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
/**end 自定义属性请在上面加 请加备注**/
}
@@ -344,9 +341,8 @@
//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;
if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
@@ -364,8 +360,8 @@
if(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) => {
var tips=res.data.tips;
if(tips.isOk){
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue
index bc3e71b9..1ad79646 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue
@@ -42,7 +42,7 @@
range-separator="至"
start-placeholder="计划开始日期"
end-placeholder="计划完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -243,14 +243,14 @@
) {
if(this.dateRanger[0]){
if(this.dateRanger[0].length<=10){
- this.addForm.beginDate = this.dateRanger[0] + " 00:00:00";
+ this.addForm.beginDate = this.dateRanger[0] ;
}else{
this.addForm.beginDate = this.dateRanger[0]
}
}
if(this.dateRanger[1]){
if(this.dateRanger[1].length<=10){
- this.addForm.endDate = this.dateRanger[1] + " 23:59:59";
+ this.addForm.endDate = this.dateRanger[1] ;
}else{
this.addForm.endDate = this.dateRanger[1]
}
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue
index 7f2152df..5efc5a73 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue
@@ -57,7 +57,7 @@
range-separator="至"
start-placeholder="计划开始日期"
end-placeholder="计划完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -256,14 +256,14 @@
) {
if(this.dateRanger[0]){
if(this.dateRanger[0].length<=10){
- this.editForm.beginDate = this.dateRanger[0] + " 00:00:00";
+ this.editForm.beginDate = this.dateRanger[0] ;
}else{
this.editForm.beginDate = this.dateRanger[0]
}
}
if(this.dateRanger[1]){
if(this.dateRanger[1].length<=10){
- this.editForm.endDate = this.dateRanger[1] + " 23:59:59";
+ this.editForm.endDate = this.dateRanger[1] ;
}else{
this.editForm.endDate = this.dateRanger[1]
}
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue
index 8c644629..4f36c5fe 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue
@@ -40,7 +40,7 @@
range-separator="至"
start-placeholder="计划开始日期"
end-placeholder="计划完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -294,10 +294,7 @@
},
/**begin 在下面加自定义属性,记得补上面的一个逗号**/
/**begin 在下面加自定义属性,记得补上面的一个逗号**/
- dateRanger: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
- ],
+ dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
/**end 在上面加自定义属性**/
}//end return
@@ -318,8 +315,8 @@
this.dateRanger != null &&
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{
this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' });
return;
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue
index 9836c036..022d1c7e 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue
@@ -44,7 +44,7 @@
range-separator="至"
start-placeholder="计划开始日期"
end-placeholder="计划完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -304,10 +304,7 @@
/**begin 在下面加自定义属性,记得补上面的一个逗号**/
/**begin 在下面加自定义属性,记得补上面的一个逗号**/
- dateRanger: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
- ],
+ dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
activateName:'planWorkload',
/**end 在上面加自定义属性**/
@@ -329,8 +326,8 @@
this.dateRanger != null &&
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{
this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' });
return;
diff --git a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
index df20ab1d..5448749a 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
@@ -37,7 +37,7 @@
{{addForm.askUsername?addForm.askUsername:'未关联提出人'}}
-
+
{{addForm.handlerUsername}} 指派给提出人指派给创建人指派给其它人
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 1b9f5f8e..3a5a1652 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -8,7 +8,7 @@
{{editForm.createUsername}} 于 {{editForm.createTime}} 创建
-
+
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 45ba5bca..365b31a4 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -92,7 +92,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -107,7 +107,7 @@
range-separator="至"
start-placeholder="更新时间"
end-placeholder="更新时间"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -336,10 +336,7 @@
}
],
menuVisible:false,
- dateRanger: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
- ],
+ dateRanger: [ ],
ltimeRanger:[
],
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!="" ){
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){
- 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;
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index 2b0d25b2..4fbc3a36 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -19,7 +19,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -167,10 +167,7 @@
projectPhase: null,
selectProjectVisible:false,
tableHeight:300,
- dateRanger: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
- ],
+ dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
/**end 自定义属性请在上面加 请加备注**/
}
@@ -234,9 +231,9 @@
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){
params.key='%'+this.filters.key+'%'
@@ -266,8 +263,6 @@
params.userid=this.userInfo.userid
params.isMy="1"
}
- params.createTimeStart=this.dateRanger[0]+" 00:00:00"
- params.createTimeEnd=this.dateRanger[1]+" 23:59:59"
getTask(params).then((res) => {
var tips=res.data.tips;
if(tips.isOk){
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 003b3050..e9aa7248 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -101,7 +101,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -758,8 +758,8 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
params.orderBy= orderBys.join(",")
}
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){
params.taskType=this.filters.taskType
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index f37cdc13..911e8cd2 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -53,7 +53,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -192,10 +192,7 @@
selectUserForFiltersVisible:false,
productSelectVisible:false,
nextAction:'',
- dateRanger: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
- ],
+ dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
/**end 自定义属性请在上面加 请加备注**/
}
@@ -250,9 +247,9 @@
//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){
params.productId=this.filters.product.id
@@ -264,8 +261,6 @@
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){
params.key='%'+this.filters.key+'%'
}
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 00328fdc..3de69f1c 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -50,7 +50,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
@@ -296,10 +296,7 @@
addBugVisible:false,
productSelectVisible:false,
nextAction:'',
- dateRanger: [
- util.formatDate.format(beginDate, "yyyy-MM-dd"),
- util.formatDate.format(endDate, "yyyy-MM-dd")
- ],
+ dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
gstcVisible:false,
ganrrColumns: {
@@ -365,9 +362,10 @@
}else{
//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){
params.productId=this.filters.product.id
@@ -379,8 +377,6 @@
if(this.filters.selProject){
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){
params.key='%'+this.filters.key+'%'
}