diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js
index 35057db9..660f6775 100644
--- a/src/router/routes_xm.js
+++ b/src/router/routes_xm.js
@@ -87,6 +87,23 @@ export default {
hidden:true
},
},
+
+ {
+ path: '/xm/rpt',
+ name: 'reportIndex',
+ component: Layout,
+ iconCls: 'fa el-icon-menu',
+ meta: {
+ title: '报表统计',
+ icon: 'report',
+ hidden:true
+ },
+
+ children: [
+
+ { path: 'reportIndex', component: _import('xm/rpt/reportIndex'), name: 'reportIndex', meta: { title: '报表统计', icon: 'chart' }},
+ ]
+ },
{
path: '/xm/core',
component: Layout,
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 99112751..76ab50dc 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -121,11 +121,8 @@
-
-
-
- 提交概述
-
+
+
@@ -243,7 +240,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
'xmMenu':function( xmMenu ) {
//this.editForm = {...xmMenu};
},
- 'visible':function(visible) {
+ 'visible':function(visible) {
if(visible==true){
if(this.reload==true){
@@ -251,6 +248,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
}else{
this.editForm = {...this.xmMenu};
if(this.editForm.startTime && this.editForm.endTime){
+ this.dateRanger=[]
this.dateRanger.push(this.editForm.startTime)
this.dateRanger.push(this.editForm.endTime)
}
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 23c06d72..1501fcd6 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -613,6 +613,7 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue';
editXmTaskSomeFields(params).then(res=>{
var tips = res.data.tips;
if(tips.isOk){
+ this.$emit('edit-fields',params)
Object.assign(row,params)
}else{
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 58ee26c8..93778b24 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -714,6 +714,7 @@
@after-add-submit="afterExecEditSubmit"
@after-edit-submit="afterExecEditSubmit"
@submit="afterEditSubmit"
+ @edit-fields="onEditSomeFields"
>
@@ -1472,8 +1473,7 @@ export default {
//显示编辑界面 XmTask xm_task
showEdit: function (row, index) {
this.editFormVisible = true;
- this.editForm = Object.assign({}, row);
- console.log("editForm", this.editForm);
+ this.editForm=row
},
showTaskTemplate: function (row) {
if(!this.checkCanAdd(row)){
@@ -1557,6 +1557,9 @@ export default {
this.getXmTasks()
treeTool.reloadChildren(this.$refs.table,this.maps,row.parentTaskid,'parentTaskid',this.loadXmTaskLazy)
},
+ onEditSomeFields(params){
+ Object.assign(this.editForm,params )
+ },
//选择行xmTask
selsChange: function (sels) {
this.sels = sels;
diff --git a/src/views/xm/rpt/iteration/burnout.vue b/src/views/xm/rpt/iteration/burnout.vue
new file mode 100644
index 00000000..385a49be
--- /dev/null
+++ b/src/views/xm/rpt/iteration/burnout.vue
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/xm/rpt/reportIndex.vue b/src/views/xm/rpt/reportIndex.vue
new file mode 100644
index 00000000..987ba19b
--- /dev/null
+++ b/src/views/xm/rpt/reportIndex.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{p.rptName}}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file