From c4753739f742ba60378831bc82cafbd2a9ffe238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 15 Jul 2021 01:01:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmAttachment/XmAttachmentAdd.vue  |   4 +-
 .../xm/core/xmAttachment/XmAttachmentEdit.vue |   4 +-
 .../xm/core/xmAttachment/XmAttachmentMng.vue  |   4 +-
 .../core/xmBranchState/XmBranchStateAdd.vue   |   4 +-
 .../core/xmBranchState/XmBranchStateEdit.vue  |   4 +-
 .../core/xmBranchState/XmBranchStateMng.vue   |   4 +-
 .../XmBranchTaskTypeStateAdd.vue              |   4 +-
 .../XmBranchTaskTypeStateEdit.vue             |   4 +-
 .../XmBranchTaskTypeStateMng.vue              |   4 +-
 src/views/xm/core/xmEnvList/XmEnvListAdd.vue  |   4 +-
 src/views/xm/core/xmEnvList/XmEnvListEdit.vue |   4 +-
 src/views/xm/core/xmEnvList/XmEnvListMng.vue  |   4 +-
 .../xm/core/xmExchange/XmExchangeAdd.vue      |   4 +-
 .../xm/core/xmExchange/XmExchangeEdit.vue     |   4 +-
 src/views/xm/core/xmFile/XmFileAdd.vue        |   4 +-
 src/views/xm/core/xmFile/XmFileEdit.vue       |   4 +-
 .../xm/core/xmIteration/XmIterationAdd.vue    |   4 +-
 .../xm/core/xmIteration/XmIterationEdit.vue   |   4 +-
 .../xm/core/xmIteration/XmIterationMng.vue    |   4 +-
 .../xmIterationMenu/XmIterationMenuAdd.vue    |   4 +-
 .../xmIterationMenu/XmIterationMenuEdit.vue   |   4 +-
 .../xmIterationState/XmIterationStateAdd.vue  |   4 +-
 .../xmIterationState/XmIterationStateEdit.vue |   4 +-
 src/views/xm/core/xmMenu/XmMenuAdd.vue        |   4 +-
 src/views/xm/core/xmMenu/XmMenuEdit.vue       |  17 +-
 src/views/xm/core/xmMenu/XmMenuMng.vue        |  38 ++---
 src/views/xm/core/xmMenu/XmMenuMngBatch.vue   |   4 +-
 src/views/xm/core/xmMenu/XmMenuRichDetail.vue |   4 +-
 src/views/xm/core/xmMenu/XmMenuWithPlan.vue   |   4 +-
 .../xm/core/xmMenuPlan/XmMenuPlanAdd.vue      |   4 +-
 .../xm/core/xmMenuPlan/XmMenuPlanEdit.vue     |   4 +-
 .../xm/core/xmMenuPlan/XmMenuPlanMng.vue      |   4 +-
 .../xm/core/xmMenuState/XmMenuStateAdd.vue    |   4 +-
 .../xm/core/xmMenuState/XmMenuStateEdit.vue   |   4 +-
 .../xm/core/xmMenuState/XmMenuStateMng.vue    |   4 +-
 .../core/xmMenuTemplate/XmMenuTemplateAdd.vue |   4 +-
 .../xmMenuTemplate/XmMenuTemplateEdit.vue     |   4 +-
 .../core/xmMenuTemplate/XmMenuTemplateMng.vue |   4 +-
 src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue  |   4 +-
 src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue |   4 +-
 src/views/xm/core/xmMyFocus/XmMyFocusMng.vue  |   4 +-
 src/views/xm/core/xmProduct/XmProductAdd.vue  |   4 +-
 src/views/xm/core/xmProduct/XmProductEdit.vue |   4 +-
 .../core/xmProductState/XmProductStateAdd.vue |   4 +-
 .../xmProductState/XmProductStateEdit.vue     |   4 +-
 .../XmProductTemplateAdd.vue                  |   4 +-
 .../XmProductTemplateEdit.vue                 |   4 +-
 src/views/xm/core/xmProject/XmProjectAdd.vue  |   4 +-
 src/views/xm/core/xmProject/XmProjectEdit.vue |   4 +-
 .../XmProjectBaselineAdd.vue                  |   4 +-
 .../XmProjectBaselineEdit.vue                 |   4 +-
 .../XmProjectBaselineMng.vue                  |   4 +-
 .../XmProjectContractAdd.vue                  |   4 +-
 .../XmProjectContractEdit.vue                 |   4 +-
 .../XmProjectContractMng.vue                  |   4 +-
 .../xmProjectEnvList/XmProjectEnvListAdd.vue  |   4 +-
 .../xmProjectEnvList/XmProjectEnvListEdit.vue |   4 +-
 .../core/xmProjectGroup/XmProjectGroupAdd.vue |   4 +-
 .../xmProjectGroup/XmProjectGroupEdit.vue     |   4 +-
 .../xmProjectGroup/XmProjectGroupSelect.vue   |   4 +-
 .../XmProjectGroupFormwork.vue                |   4 +-
 .../XmProjectGroupFormworkAdd.vue             |   4 +-
 .../XmProjectGroupFormworkEdit.vue            |   4 +-
 .../XmProjectGroupFormworkMng.vue             |   4 +-
 .../XmProjectGroupStateAdd.vue                |   4 +-
 .../XmProjectGroupStateEdit.vue               |   4 +-
 .../XmProjectGroupStateMng.vue                |   4 +-
 .../XmProjectGroupUserAdd.vue                 |   4 +-
 .../XmProjectGroupUserEdit.vue                |   4 +-
 .../XmProjectGroupUserMng.vue                 |   4 +-
 .../XmProjectGroupUserCandidateAdd.vue        |   4 +-
 .../XmProjectGroupUserCandidateEdit.vue       |   4 +-
 .../XmProjectGroupUserCandidateMng.vue        |   4 +-
 .../xm/core/xmProjectKpi/XmProjectKpiAdd.vue  |   4 +-
 .../xm/core/xmProjectKpi/XmProjectKpiEdit.vue |   4 +-
 .../xmProjectKpiHis/XmProjectKpiHisAdd.vue    |   4 +-
 .../xmProjectKpiHis/XmProjectKpiHisEdit.vue   |   4 +-
 .../xmProjectKpiHis/XmProjectKpiHisMng.vue    |   4 +-
 .../XmProjectMBudgetCostNouserAdd.vue         |   4 +-
 .../XmProjectMBudgetCostNouserEdit.vue        |   4 +-
 .../XmProjectMBudgetCostNouserMng.vue         |   4 +-
 .../XmProjectMBudgetCostUserAdd.vue           |   4 +-
 .../XmProjectMBudgetCostUserEdit.vue          |   4 +-
 .../XmProjectMBudgetCostUserMng.vue           |   4 +-
 .../XmProjectMCostNouserAdd.vue               |   4 +-
 .../XmProjectMCostNouserEdit.vue              |   4 +-
 .../XmProjectMCostNouserMng.vue               |   4 +-
 .../XmProjectMCostUserAdd.vue                 |   4 +-
 .../XmProjectMCostUserEdit.vue                |   4 +-
 .../XmProjectMCostUserList.vue                |   4 +-
 .../XmProjectMCostUserMng.vue                 |   4 +-
 .../xmProjectOptions/XmProjectOptionsAdd.vue  |   4 +-
 .../xmProjectOptions/XmProjectOptionsEdit.vue |   4 +-
 .../xmProjectOptions/XmProjectOptionsMng.vue  |   4 +-
 .../core/xmProjectPhase/XmProjectPhaseMng.vue | 124 +++++++-------
 .../XmProjectPhaseBaselineAdd.vue             |   4 +-
 .../XmProjectPhaseBaselineEdit.vue            |   4 +-
 .../XmProjectPhaseBaselineMng.vue             |   4 +-
 .../XmProjectPhaseTemplateAdd.vue             |   4 +-
 .../XmProjectPhaseTemplateEdit.vue            |   4 +-
 .../xm/core/xmProjectState/XmCockpit.vue      |   4 +-
 .../core/xmProjectState/XmProjectStateAdd.vue |   4 +-
 .../xmProjectState/XmProjectStateEdit.vue     |   4 +-
 .../core/xmProjectState/XmProjectStateMng.vue |   4 +-
 .../XmProjectStateHisAdd.vue                  |   4 +-
 .../XmProjectStateHisEdit.vue                 |   4 +-
 .../XmProjectStateHisMng.vue                  |   4 +-
 .../XmProjectTaskTypeStateAdd.vue             |   4 +-
 .../XmProjectTaskTypeStateEdit.vue            |   4 +-
 .../XmProjectTaskTypeStateMng.vue             |   4 +-
 .../XmProjectTemplateAdd.vue                  |   4 +-
 .../XmProjectTemplateEdit.vue                 |   4 +-
 .../XmProjectTemplateInfo.vue                 |   4 +-
 .../XmProjectTemplateList.vue                 |   4 +-
 .../XmProjectTemplateMng.vue                  |   4 +-
 .../xm/core/xmQuestion/XmQuestionCenter.vue   |   4 +-
 .../xmQuestionHandle/XmQuestionHandleAdd.vue  |   4 +-
 .../xmQuestionHandle/XmQuestionHandleEdit.vue |   4 +-
 .../xmQuestionHandle/XmQuestionHandleMng.vue  |   4 +-
 .../core/xmQuestionTag/XmQuestionTagAdd.vue   |   4 +-
 .../core/xmQuestionTag/XmQuestionTagEdit.vue  |   4 +-
 .../core/xmQuestionTag/XmQuestionTagMng.vue   |   4 +-
 src/views/xm/core/xmTask/XmTaskAdd.vue        |   4 +-
 src/views/xm/core/xmTask/XmTaskEdit.vue       |   2 +-
 src/views/xm/core/xmTask/XmTaskMng.vue        |  77 +++++----
 src/views/xm/core/xmTask/XmTaskMngBatch.vue   |   4 +-
 .../core/xmTaskExecuser/XmTaskExecuserAdd.vue |   4 +-
 .../xmTaskExecuser/XmTaskExecuserEdit.vue     |   4 +-
 .../core/xmTaskExecuser/XmTaskExecuserMng.vue | 157 +++++++++++-------
 .../xm/core/xmTaskSkill/XmTaskSkillAdd.vue    |   4 +-
 .../xm/core/xmTaskSkill/XmTaskSkillEdit.vue   |   4 +-
 .../xm/core/xmTaskSkill/XmTaskSkillMng.vue    |   4 +-
 .../core/xmTaskTemplate/XmTaskTemplateAdd.vue |   4 +-
 .../xmTaskTemplate/XmTaskTemplateEdit.vue     |   4 +-
 .../core/xmTaskTemplate/XmTaskTemplateMng.vue |   4 +-
 .../xm/core/xmTestCase/XmTestCaseAdd.vue      |   4 +-
 .../xm/core/xmTestCase/XmTestCaseEdit.vue     |   4 +-
 .../xm/core/xmTestCase/XmTestCaseMng.vue      |   4 +-
 .../core/xmTestCaseExec/XmTestCaseExecAdd.vue |   4 +-
 .../xmTestCaseExec/XmTestCaseExecEdit.vue     |   4 +-
 140 files changed, 496 insertions(+), 455 deletions(-)

diff --git a/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue b/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue
index 874cc2d0..630d1cc1 100644
--- a/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue
+++ b/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmAttachment xm_attachment--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue b/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue
index f1457cae..5880034a 100644
--- a/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue
+++ b/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmAttachment xm_attachment--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmAttachment/XmAttachmentMng.vue b/src/views/xm/core/xmAttachment/XmAttachmentMng.vue
index 119770ba..c98f2ea0 100644
--- a/src/views/xm/core/xmAttachment/XmAttachmentMng.vue
+++ b/src/views/xm/core/xmAttachment/XmAttachmentMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmAttachments">查询</el-button>
 			<el-button type="primary" @click="showAdd">+xm_attachment</el-button>
diff --git a/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue b/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue
index b932caf9..296718a4 100644
--- a/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue
+++ b/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmBranchState 机构内所有项目指标汇总--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="统计日期yyyy-mm-dd类型" prop="bizDate">
diff --git a/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue b/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue
index 3c93c69c..4929d230 100644
--- a/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue
+++ b/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmBranchState 机构内所有项目指标汇总--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="统计日期yyyy-mm-dd类型" prop="bizDate">
diff --git a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
index 90da6432..e23c7bb7 100644
--- a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
+++ b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmBranchStates">查询</el-button>
 			<el-button type="warning" v-loading="load.edit" @click="loadProjectStateToXmBranchState">刷新数据</el-button>
diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue
index c496eee6..97528960 100644
--- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue
+++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmBranchTaskTypeState 按机构编号任务类型汇总--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="任务类型" prop="taskType">
diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue
index 37d65e12..a7b145c5 100644
--- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue
+++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmBranchTaskTypeState 按机构编号任务类型汇总--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="任务类型" prop="taskType">
diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue
index 2dff53b5..b78cc084 100644
--- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue
+++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmBranchTaskTypeStates">查询</el-button>
 			<el-button type="primary" @click="showAdd">+按机构编号任务类型汇总</el-button>
diff --git a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
index c467b0a1..b79ddd09 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmEnvList xm_env_list--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="内网ip地址" prop="ipAddress">
diff --git a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
index 50aa0f38..a8c679a1 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmEnvList xm_env_list--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="内网ip地址" prop="ipAddress">
diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
index c5e1f21d..20775a5d 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmEnvLists">查询</el-button>
 			<el-button type="primary" @click="showAdd">添加环境清单</el-button>
diff --git a/src/views/xm/core/xmExchange/XmExchangeAdd.vue b/src/views/xm/core/xmExchange/XmExchangeAdd.vue
index 487fbbcb..b5322cc7 100644
--- a/src/views/xm/core/xmExchange/XmExchangeAdd.vue
+++ b/src/views/xm/core/xmExchange/XmExchangeAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmExchange 故事表--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="故事编号" prop="taskId">
diff --git a/src/views/xm/core/xmExchange/XmExchangeEdit.vue b/src/views/xm/core/xmExchange/XmExchangeEdit.vue
index 06a5ee66..1206ffb7 100644
--- a/src/views/xm/core/xmExchange/XmExchangeEdit.vue
+++ b/src/views/xm/core/xmExchange/XmExchangeEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmExchange 故事表--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="故事编号" prop="taskId">
diff --git a/src/views/xm/core/xmFile/XmFileAdd.vue b/src/views/xm/core/xmFile/XmFileAdd.vue
index 4f9bcf2b..12bd6f38 100644
--- a/src/views/xm/core/xmFile/XmFileAdd.vue
+++ b/src/views/xm/core/xmFile/XmFileAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmFile xm_file--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="项目名称">
diff --git a/src/views/xm/core/xmFile/XmFileEdit.vue b/src/views/xm/core/xmFile/XmFileEdit.vue
index f26fbcbf..31666081 100644
--- a/src/views/xm/core/xmFile/XmFileEdit.vue
+++ b/src/views/xm/core/xmFile/XmFileEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmFile xm_file--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="项目名称" prop="projectName">
diff --git a/src/views/xm/core/xmIteration/XmIterationAdd.vue b/src/views/xm/core/xmIteration/XmIterationAdd.vue
index e9e236af..1134d59a 100644
--- a/src/views/xm/core/xmIteration/XmIterationAdd.vue
+++ b/src/views/xm/core/xmIteration/XmIterationAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmIteration 迭代定义--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">  
 				<el-form-item v-if="parentIteration" label="上级迭代" prop="pid">
diff --git a/src/views/xm/core/xmIteration/XmIterationEdit.vue b/src/views/xm/core/xmIteration/XmIterationEdit.vue
index 7a75da39..3782ee12 100644
--- a/src/views/xm/core/xmIteration/XmIterationEdit.vue
+++ b/src/views/xm/core/xmIteration/XmIterationEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmIteration 迭代定义--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">  
 				<el-form-item label="迭代名称" prop="iterationName">
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index 55658c27..373f5fdb 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
       		<el-checkbox v-model="gstcVisible"  class="hidden-md-and-down">甘特图</el-checkbox>  
 			  
 			<el-select  v-model="filters.queryScope"  placeholder="迭代查询范围">
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue
index 3935b197..d5fd2f2f 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmIterationMenu 迭代定义--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue
index e1fa41a3..b4225ed9 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmIterationMenu 迭代定义--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue b/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue
index 6746271e..e9471981 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmIterationState 迭代定义--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="迭代编码" prop="id">
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue b/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue
index 9ce8a69b..2c0b7f22 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmIterationState 迭代定义--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="迭代编码" prop="id">
diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue
index 737e01de..8aaf9d1a 100644
--- a/src/views/xm/core/xmMenu/XmMenuAdd.vue
+++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmMenu 项目故事表--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item v-if="parentMenu" label="上级故事" prop="pmenuId">
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 3b74acb1..a315a570 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height border padding">
+		<el-row class="page-main page-main-height">
 			<!--新增界面 XmMenu 项目故事表--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="序号" prop="seqNo">
@@ -28,19 +28,18 @@
 				</el-form-item>  
 				<el-form-item label="概述" prop="remark">
 					<el-input type="textarea" v-model="editForm.remark" :autosize="{ minRows: 4, maxRows: 20}"  placeholder="什么人？做什么事？，为什么？如： 作为招聘专员，我需要统计员工半年在职/离职人数，以便我能够制定招聘计划" ></el-input>
-				</el-form-item> 
-				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>  
-					</el-col>
-				</el-form-item> 
+				</el-form-item>  
 			</el-form>
 			
 			<el-dialog title="选择员工" :visible.sync="userSelectVisible" width="60%" append-to-body>
 				<users-select  @confirm="onUserSelected" ref="usersSelect"></users-select>
 			</el-dialog>	
 		</el-row>
+		<el-row class="page-bottom">
+			
+						<el-button @click.native="handleCancel">取消</el-button>  
+						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button> 
+		</el-row>
 	</section>
 </template>
 
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index fb25ac0e..97d65558 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -146,49 +146,49 @@
 							
 					</el-row> 
 				<!--编辑 XmMenu xm_project_menu界面-->
-				<el-drawer title="编辑故事" :visible.sync="editFormVisible"  width="50%"  append-to-body   :close-on-click-modal="false">
+				<el-drawer title="编辑故事" :visible.sync="editFormVisible" :with-header="false"  size="50%"  append-to-body   :close-on-click-modal="false">
 					<xm-menu-edit :xm-menu="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-menu-edit>
 				</el-drawer>
 		
 				<!--新增 XmMenu xm_project_menu界面-->
-				<el-dialog title="新增故事" :visible.sync="addFormVisible"  width="50%"  append-to-body   :close-on-click-modal="false">
+				<el-drawer title="新增故事" :visible.sync="addFormVisible"  :with-header="false" size="50%"  append-to-body   :close-on-click-modal="false">
 					<xm-menu-add  :product="filters.product"   :parent-menu="parentMenu"  :xm-menu="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-menu-add>
-				</el-dialog> 
-				<el-dialog title="故事模板" :visible.sync="menuTemplateVisible"  width="80%"  append-to-body   :close-on-click-modal="false">
+				</el-drawer> 
+				<el-drawer title="故事模板" :visible.sync="menuTemplateVisible"   size="80%"  append-to-body   :close-on-click-modal="false">
 					<xm-menu-template-mng  :is-select-menu="true"  :visible="menuTemplateVisible" @cancel="menuTemplateVisible=false" @selected-menus="onSelectedMenuTemplates"></xm-menu-template-mng>
-				</el-dialog> 
+				</el-drawer> 
 				
-				<el-dialog title="故事谈论" :visible.sync=" menuDetailVisible"  width="80%"  append-to-body   :close-on-click-modal="false">
+				<el-drawer title="故事谈论" :visible.sync=" menuDetailVisible"   size="80%"  append-to-body   :close-on-click-modal="false">
 					<xm-menu-rich-detail :visible="menuDetailVisible"  :reload="false" :xm-menu="editForm" ></xm-menu-rich-detail>
-				</el-dialog> 
+				</el-drawer> 
 				
-				<el-dialog  title="选择产品" :visible.sync="productVisible"  width="60%"  append-to-body   :close-on-click-modal="false">
+				<el-drawer  title="选择产品" :visible.sync="productVisible"  width="60%"  append-to-body   :close-on-click-modal="false">
 					<xm-product-mng :sel-project="selProject" @row-click="onProductSelected" ref="xmProductMng" :simple="true"></xm-product-mng>
-				</el-dialog> 
-				<el-dialog title="选中任务" :visible.sync="selectTaskVisible"  width="80%"  append-to-body   :close-on-click-modal="false">
+				</el-drawer> 
+				<el-drawer title="选中任务" :visible.sync="selectTaskVisible"   size="80%"  append-to-body   :close-on-click-modal="false">
 					<xm-task-list  :sel-project="selProject" :is-multi-select="true"  @tasks-selected="onSelectedTasks"></xm-task-list>
-				</el-dialog> 
-				<el-dialog title="查看任务" :visible.sync="taskListForMenuVisible"  width="80%"  append-to-body   :close-on-click-modal="false">
+				</el-drawer> 
+				<el-drawer title="查看任务" :visible.sync="taskListForMenuVisible"   size="80%"  append-to-body   :close-on-click-modal="false">
 					<xm-task-list-for-menu   :is-multi-select="true" :menu-id="editForm.menuId"></xm-task-list-for-menu>
-				</el-dialog> 
-				<el-dialog
+				</el-drawer> 
+				<el-drawer
 					append-to-body
 					title="任务"
 					:visible.sync="taskMngVisible"
 					fullscreen>
 					<xm-task-mng :sel-project="selProject"   :menu-id="editForm.menuId" :menu-name="editForm.menuName"></xm-task-mng> 
-				</el-dialog>
-				<el-dialog
+				</el-drawer>
+				<el-drawer
 					append-to-body
 					title="故事关联的迭代查询"
 					:visible.sync="iterationVisible" 
 					>
 						<xm-iteration-mng :visible="iterationVisible" :product-id="editForm.productId" :menu-id="editForm.menuId" ></xm-iteration-mng>
-				</el-dialog>
+				</el-drawer>
 
-				<el-dialog title="选择员工" :visible.sync="selectFiltersMmUserVisible" width="60%" append-to-body>
+				<el-drawer title="选择员工" :visible.sync="selectFiltersMmUserVisible" width="60%" append-to-body>
 					<users-select  @confirm="onFiltersMmUserSelected" ref="selectFiltersMmUser"></users-select>
-				</el-dialog>	
+				</el-drawer>	
 			</el-col> 	 
 		</el-row>
 		
diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
index 1f30c0fe..4822b9c8 100644
--- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">  
+	<section class="page-container page-full-height padding border">
+		<el-row>  
 			<el-row >  
 				<el-select class="hidden-lg-and-down" v-model="filters.taskFilterType" placeholder="是否分配了任务？" clearable >
 					<el-option   value="not-join"  label="未分配任何任务的故事"></el-option>  
diff --git a/src/views/xm/core/xmMenu/XmMenuRichDetail.vue b/src/views/xm/core/xmMenu/XmMenuRichDetail.vue
index 0518b45a..cf44adb4 100644
--- a/src/views/xm/core/xmMenu/XmMenuRichDetail.vue
+++ b/src/views/xm/core/xmMenu/XmMenuRichDetail.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 			<el-col :span="14"> 
 				<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 					<el-form-item label="名称" prop="menuName" >
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index bf301c37..d3900a56 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">  
+	<section class="page-container page-full-height padding border">
+		<el-row>  
       <el-checkbox v-model="gstcVisible"  >甘特图</el-checkbox>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
 				<template slot="append"> 
diff --git a/src/views/xm/core/xmMenuPlan/XmMenuPlanAdd.vue b/src/views/xm/core/xmMenuPlan/XmMenuPlanAdd.vue
index 1a4c8080..0665e0c0 100644
--- a/src/views/xm/core/xmMenuPlan/XmMenuPlanAdd.vue
+++ b/src/views/xm/core/xmMenuPlan/XmMenuPlanAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmMenuPlan 功能计划表,无需前端维护，所有数据由汇总统计得出--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="项目编号" prop="projectId">
diff --git a/src/views/xm/core/xmMenuPlan/XmMenuPlanEdit.vue b/src/views/xm/core/xmMenuPlan/XmMenuPlanEdit.vue
index 66046dd1..8a2e648a 100644
--- a/src/views/xm/core/xmMenuPlan/XmMenuPlanEdit.vue
+++ b/src/views/xm/core/xmMenuPlan/XmMenuPlanEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmMenuPlan 功能计划表,无需前端维护，所有数据由汇总统计得出--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="项目编号" prop="projectId">
diff --git a/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue b/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
index cefcf142..5a4305d5 100644
--- a/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
+++ b/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenuPlans">查询</el-button>
 			<el-button type="primary" @click="showAdd">+功能计划表,无需前端维护，所有数据由汇总统计得出</el-button>
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue b/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue
index 92276010..96d1c87d 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmMenuState 功能状态表,无需前端维护，所有数据由汇总统计得出--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue b/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue
index 6668c1c5..36ddc008 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmMenuState 功能状态表,无需前端维护，所有数据由汇总统计得出--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
index c23744e6..d8d5daaf 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">  
+	<section class="page-container page-full-height padding border">
+		<el-row>  
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button   type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus">查询</el-button>
 			<el-button   type="warning" v-if=" batchEditVisible!=true " v-loading="load.edit" :disabled="load.edit==true" v-on:click="loadTasksToXmMenuState">根据任务汇总更新数据</el-button>			
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue
index a5ee6023..6a39a7c6 100644
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmMenuTemplate 项目故事表--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="序号" prop="seqNo">
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue
index 98a5050c..a4470f55 100644
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmMenuTemplate 项目故事表--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="序号" prop="seqNo">
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
index c5319d58..d74b1713 100644
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">  
+	<section class="page-container page-full-height padding border">
+		<el-row>  
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button   type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenuTemplates">查询</el-button>
 			<el-button v-if="isSelectMenu!=true" type="primary" @click="showProdcutAdd">+产品</el-button> <el-button type="primary" @click="showAdd">+顶级故事</el-button>
diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue b/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue
index c5ff475d..637f9d44 100644
--- a/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue
+++ b/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmMyFocus xm_my_focus--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="用户编号" prop="userid">
diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue b/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue
index 37a788ee..1e2c6c9f 100644
--- a/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue
+++ b/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmMyFocus xm_my_focus--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="用户编号" prop="userid">
diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue b/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue
index 898801cb..8fdb0784 100644
--- a/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue
+++ b/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMyFocuss">查询</el-button>
 			<el-button type="primary" @click="showAdd">+xm_my_focus</el-button>
diff --git a/src/views/xm/core/xmProduct/XmProductAdd.vue b/src/views/xm/core/xmProduct/XmProductAdd.vue
index 5898afdb..433b7438 100644
--- a/src/views/xm/core/xmProduct/XmProductAdd.vue
+++ b/src/views/xm/core/xmProduct/XmProductAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProduct 产品表--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="产品编号" prop="id">
diff --git a/src/views/xm/core/xmProduct/XmProductEdit.vue b/src/views/xm/core/xmProduct/XmProductEdit.vue
index 4d76a63b..ce4fe29e 100644
--- a/src/views/xm/core/xmProduct/XmProductEdit.vue
+++ b/src/views/xm/core/xmProduct/XmProductEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProduct 产品表--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="产品编号" prop="id">
diff --git a/src/views/xm/core/xmProductState/XmProductStateAdd.vue b/src/views/xm/core/xmProductState/XmProductStateAdd.vue
index a1b2507f..5f5dc6c4 100644
--- a/src/views/xm/core/xmProductState/XmProductStateAdd.vue
+++ b/src/views/xm/core/xmProductState/XmProductStateAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProductState 功能状态表,无需前端维护，所有数据由汇总统计得出--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmProductState/XmProductStateEdit.vue b/src/views/xm/core/xmProductState/XmProductStateEdit.vue
index 5ce2be11..1851fe1b 100644
--- a/src/views/xm/core/xmProductState/XmProductStateEdit.vue
+++ b/src/views/xm/core/xmProductState/XmProductStateEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProductState 功能状态表,无需前端维护，所有数据由汇总统计得出--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue
index 05f88ef1..8bf5930a 100644
--- a/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue
+++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProductTemplate 产品表--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="产品编号" prop="id">
diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue
index 190a3c86..f865d89a 100644
--- a/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue
+++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProductTemplate 产品表--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="产品编号" prop="id">
diff --git a/src/views/xm/core/xmProject/XmProjectAdd.vue b/src/views/xm/core/xmProject/XmProjectAdd.vue
index 2640b057..faea9afb 100644
--- a/src/views/xm/core/xmProject/XmProjectAdd.vue
+++ b/src/views/xm/core/xmProject/XmProjectAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProject xm_project--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">  
 					
diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue
index 1fb76e5a..7de44561 100644
--- a/src/views/xm/core/xmProject/XmProjectEdit.vue
+++ b/src/views/xm/core/xmProject/XmProjectEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProject xm_project--> 
 			<div ref="editFormDiv">
 				<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm" class="editForm">  
diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue
index 512d9e1e..9bfcbc2d 100644
--- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue
+++ b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectBaseline xm_project_baseline--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="基线表主键" prop="id">
diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue
index 468307e1..056981f8 100644
--- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue
+++ b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectBaseline xm_project_baseline--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="基线表主键" prop="id">
diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue
index 3a137acf..f8da4174 100644
--- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue
+++ b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectBaselines">查询</el-button>
 			<el-button type="primary" @click="showAdd">+xm_project_baseline</el-button>
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue b/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue
index 91d5a575..61bc3190 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectContract xm_project_contract--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="合同编号" prop="htId">
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue b/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue
index 963a4542..12751a7b 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectContract xm_project_contract--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="合同编号" prop="htId">
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
index d124893b..de6d6374 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
 				<template slot="append">
 					<el-button  v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectContracts" icon="el-icon-search"></el-button>
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue
index 2ab267db..45423c58 100644
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue
+++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectEnvList xm_project_env_list--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="归属项目组名称" prop="projectName">
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue
index c5649061..6a72d63d 100644
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue
+++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectEnvList xm_project_env_list--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="归属项目组名称" prop="projectName">
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue
index a4193c8e..e157fd1c 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectGroup xm_project_group--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
index de0c677e..c46c6e61 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectGroup xm_project_group--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
index 4679a6cd..586b5949 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 				<el-col :span="16"> 
 					<el-button   type="primary" @click="userConfirm" icon="el-icon-finished">确认选择用户</el-button> 
 				</el-col>
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
index 755a7df7..256a8b55 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 				<el-col :span="24">
 					<el-button v-if="!isSelectSingleUser && !isSelectMultiUser" type="primary" @click="showGroupFormwork" icon="el-icon-plus">导入项目组</el-button>
 					<el-button v-if="!isSelectSingleUser && !isSelectMultiUser" type="primary" @click="groupConfirm" icon="el-icon-finished">保存</el-button>
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkAdd.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkAdd.vue
index 4251cf8d..8fe9f45e 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkAdd.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectGroupFormwork xm_project_group_formwork--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkEdit.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkEdit.vue
index 6cf2ce3f..a7762320 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkEdit.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectGroupFormwork xm_project_group_formwork--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
index 51eed2bc..2793b6fa 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectGroupFormworks">查询</el-button>
 			<el-button type="primary" @click="showAdd">+xm_project_group_formwork</el-button>
diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateAdd.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateAdd.vue
index a0dbb944..a1c9c012 100644
--- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateAdd.vue
+++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectGroupState 功能状态表,无需前端维护，所有数据由汇总统计得出--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateEdit.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateEdit.vue
index 6184b4e1..c7e9f7a5 100644
--- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateEdit.vue
+++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectGroupState 功能状态表,无需前端维护，所有数据由汇总统计得出--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
index 61cbb74d..04d74d0c 100644
--- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
+++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectGroupStates">查询</el-button>
 			<el-button type="warning" v-loading="load.edit"  @click="loadTasksToXmProjectGroupState">刷新数据</el-button>
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue
index 074bd945..a175e779 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectGroupUser xm_project_group_user--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
index af17312b..31649fef 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectGroupUser xm_project_group_user--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
index 2c66058b..84cba01c 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectGroupUsers">查询</el-button>
 			<el-button type="primary" @click="showAdd">+xm_project_group_user</el-button>
diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue
index 718914ae..490b80f6 100644
--- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue
+++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectGroupUserCandidate xm_project_group_user_candidate--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue
index 917bf292..d5e0832b 100644
--- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue
+++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectGroupUserCandidate xm_project_group_user_candidate--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
index fd4db9c6..bfa554fe 100644
--- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
+++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectGroupUserCandidates">查询</el-button>
 			<el-button type="primary" @click="showAdd">+xm_project_group_user_candidate</el-button>
diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue
index 240c77d9..5f584a17 100644
--- a/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue
+++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectKpi xm_project_kpi--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="项目编号" prop="projectId">
diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue
index 0b62ab73..604aa5cf 100644
--- a/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue
+++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectKpi xm_project_kpi--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="项目编号" prop="projectId">
diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue
index ddce8337..002c1bb6 100644
--- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue
+++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectKpiHis xm_project_kpi_his--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="项目编号" prop="projectId">
diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue
index 82526871..49b7845d 100644
--- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue
+++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectKpiHis xm_project_kpi_his--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="项目编号" prop="projectId">
diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue
index a3035663..fdff017e 100644
--- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue
+++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectKpiHiss">查询</el-button>
 			<el-button type="primary" @click="showAdd">+xm_project_kpi_his</el-button>
diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue
index 208a5147..0688ab08 100644
--- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectMBudgetCostNouser xm_project_m_budget_cost_user--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				  
diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue
index fb976793..3ba95ad8 100644
--- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectMBudgetCostNouser xm_project_m_budget_cost_nouser--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm"> 
 				<el-form-item label="预算金额" prop="budgetCost">
diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
index 7179d1b3..9d0223f5 100644
--- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
 				<template slot="append">
 					<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectMBudgetCostNousers" icon="el-icon-search">查询</el-button>
diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue
index 1a6d6f46..b0f85b27 100644
--- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectMBudgetCostUser xm_project_m_budget_cost_user--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				 
diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue
index e399c557..b2913675 100644
--- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectMBudgetCostUser xm_project_m_budget_cost_user--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm"> 
 				<el-form-item label="项目成员编号" prop="userid">
diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
index 967b4351..033a3e63 100644
--- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
 				<template slot="append">
 					<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectMBudgetCostUsers" icon="el-icon-search">查询</el-button>
diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue
index ddc4e062..602100a5 100644
--- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue
+++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectMCostNouser xm_project_m_budget_cost_nouser--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm"> 
 				<el-form-item label="预算金额" prop="budgetCost">
diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue
index 1df1d167..6e570b4a 100644
--- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue
+++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectMCostNouser xm_project_m_cost_nouser--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="项目编号" prop="projectId">
diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
index 7735aec2..fddc8392 100644
--- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
+++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
 				<template slot="append">
 					<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectMCostNousers" icon="el-icon-search">查询</el-button>
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue
index b7520645..779c09b2 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectMCostUser xm_project_m_budget_cost_user--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm"> 
 				<el-form-item label="项目成员编号" prop="userid">
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue
index d0457d5f..f43f4a18 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectMCostUser xm_project_m_cost_user--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="科目编号" prop="subjectId">
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
index 903f00f9..4f711543 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectMCostUsers">查询</el-button>
 		</el-row>
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
index 6745900f..97354698 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
 				<template slot="append">
 					<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectMCostUsers" icon="el-icon-search">查询</el-button>
diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue
index 596655b2..1b63e423 100644
--- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue
+++ b/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectOptions xm_project_options--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue
index 3f759054..e8f7be08 100644
--- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue
+++ b/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectOptions xm_project_options--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue
index 6d9859f7..1df19a9e 100644
--- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue
+++ b/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectOptionss">查询</el-button>
 			<el-button type="primary" @click="showAdd">+xm_project_options</el-button>
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index debf0520..5c58013b 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -1,36 +1,16 @@
 <template>
 	<section>
-		<el-row  class="app-container" v-show="batchEditVisible==false">
-			<el-popover
-				placement="top-start"
-				title="标题"
-				width="200"
-				trigger="hover"> 
-				<el-row> 
-					
-					<el-col :span="24"  style="padding-top:5px;">
-						<el-button type="primary"  @click="showMenu" v-loading="load.add" icon="el-icon-plus">由故事批量创建(推荐)</el-button> 
-					</el-col>
-					<el-col :span="24"  style="padding-top:5px;">
-						<el-button   @click="showAdd" v-loading="load.add" icon="el-icon-plus">直接新建</el-button> 
-					</el-col>
-					<el-col :span="24"  style="padding-top:5px;">
-						<el-button   @click="showPhaseTemplate" v-loading="load.add" icon="el-icon-plus">由模板导入计划</el-button> 
-					</el-col>
-				</el-row>
-				<el-button slot="reference" type="primary" v-loading="load.add" icon="el-icon-plus" circle></el-button> 
-			</el-popover>
-			
-			 
+		<el-row  class="app-container" v-show="batchEditVisible==false"> 
 			<el-button  class="hidden-md-and-down"  @click="loadTasksToXmProjectPhase(sels)" v-loading="load.edit" icon="el-icon-s-data">由任务汇总进度数据</el-button> 
 			<el-button   @click="batchEditVisible=true" v-loading="load.edit" icon="el-icon-edit">批量修改</el-button>
-			<div  v-if="batchEditVisible!=true" style=" float:right;margin-right:10px;" >
+			<span  v-if="batchEditVisible!=true"   >
 				<el-checkbox v-model="gstcVisible"  >甘特图</el-checkbox>
 				<el-input   v-model="filters.key" style="width:200px;" placeholder="模糊查询">
 					<template slot="append">
 						<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectPhases" icon="el-icon-search"></el-button>
 					</template>
 				</el-input> 
+				<!--
 				<el-popover
 					placement="top-start"
 					title="更多查询条件或操作"
@@ -55,7 +35,27 @@
 					</el-row>
 					<el-button  slot="reference" icon="el-icon-more" circle></el-button>
 				</el-popover> 
-			</div> 
+				-->
+			</span> 
+			<el-popover
+				placement="top-start"
+				title="标题"
+				width="200"
+				trigger="hover"> 
+				<el-row> 
+					
+					<el-col :span="24"  style="padding-top:5px;">
+						<el-button type="primary"  @click="showMenu" v-loading="load.add" icon="el-icon-plus">由故事批量创建(推荐)</el-button> 
+					</el-col>
+					<el-col :span="24"  style="padding-top:5px;">
+						<el-button   @click="showAdd" v-loading="load.add" icon="el-icon-plus">直接新建</el-button> 
+					</el-col>
+					<el-col :span="24"  style="padding-top:5px;">
+						<el-button   @click="showPhaseTemplate" v-loading="load.add" icon="el-icon-plus">由模板导入计划</el-button> 
+					</el-col>
+				</el-row>
+				<el-button slot="reference" type="primary" v-loading="load.add" icon="el-icon-plus" circle></el-button> 
+			</el-popover>
 			
 		</el-row>
 		<el-row class="app-container hidden-md-and-down"     v-show="batchEditVisible==false">  
@@ -68,12 +68,44 @@
  		<el-row class="app-container" v-show="batchEditVisible==false"> 
 			<!--列表 XmProjectPhase xm_project_phase-->
 			<el-table ref="table" :height="tableHeight" v-show="!gstcVisible "  default-expand-all :data="projectPhaseTreeData"  :summary-method="getSummariesForNoBatchEdit"  :show-summary="true"  row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
-				<el-table-column   sortable type="selection" width="40"></el-table-column>
- 				<el-table-column prop="phaseName" label="阶段名称" min-width="150" show-overflow-tooltip> 
+  				<el-table-column prop="phaseName" label="阶段名称" min-width="150" show-overflow-tooltip> 
 					 <template slot-scope="scope">  
 						<span>{{scope.row.seqNo}} &nbsp;&nbsp;<el-link type="primary" @click="showEdit(scope.row)"> {{scope.row.phaseName}}</el-link></span>
+						<font style="float:right;">
+						<span>
+							<el-button type="text" v-if="!scope.row.mngUserid"  v-model="scope.row.mngUsername" @click="groupUserSelectVisible=true" icon="el-icon-setting">去设置</el-button>  
+							<el-link v-else type="primary"   @click="groupUserSelectVisible=true">{{scope.row.mngUsername}}</el-link>
+						</span> 
+						<span>
+							<el-tag :type="scope.row.actRate>=100?'success':'primary'"> {{ (scope.row.actRate!=null?scope.row.actRate:0)+'%'}} </el-tag> 
+						</span>
+						<span>
+							<font class="hidden-md-and-down" >{{formatDate(scope.row.beginDate)}}<br>{{formatDate(scope.row.endDate)}}  </font>
+							<font v-for="item in [calcTaskStateByTime(scope.row.beginDate,scope.row.endDate,scope.row.actRate,scope.phaseStatus)]" :key="item.status"><el-tag :type="item.status">{{item.remark}}</el-tag></font> 
+						</span>
+						<span>
+							<el-dropdown @command="handleCommand" :hide-on-click="false">
+							<span class="el-dropdown-link">
+								<i class="el-icon-setting"></i>
+							</span>
+								<el-dropdown-menu slot="dropdown">
+									<el-dropdown-item :command="{type:'showSubAdd',data:scope.row}">+子阶段</el-dropdown-item>
+									<el-dropdown-item :command="{type:'showPhaseTemplate',data:scope.row}">+从模板批量导入子阶段</el-dropdown-item> 
+									<el-dropdown-item :command="{type:'showMenu',data:scope.row}">+由故事创建子阶段</el-dropdown-item> 
+
+									<el-dropdown-item :command="{type:'showEdit',data:scope.row}">编辑</el-dropdown-item>  
+									<el-dropdown-item :command="{type:'loadTasksToXmProjectPhase',data:scope.row}" >从任务汇总实际数据</el-dropdown-item>  
+									<el-dropdown-item :command="{type:'showLog',data:scope.row}">日志</el-dropdown-item>  
+									<el-dropdown-item :command="{type:'handleDel',data:scope.row}" >删除</el-dropdown-item>  
+									<el-dropdown-item icon="el-icon-success"   :command="{type:'sendToProcessApprova',row:scope.row,bizKey:'xm_project_start_approva'}">变更发审(审核通过后起效)</el-dropdown-item> 
+									<el-dropdown-item icon="el-icon-success"   :command="{type:'sendToProcessApprova',row:scope.row,bizKey:'xm_project_delete_approva'}">删除发审(审核通过后删除)</el-dropdown-item>  
+								</el-dropdown-menu>
+							</el-dropdown> 
+						</span>
+						</font>
 					 </template>
 				</el-table-column>   
+				<!--
 				<el-table-column  prop="mngUsername" label="责任人" width="80" show-overflow-tooltip> 
 					<template  slot-scope="scope">
 						<el-button type="text" v-if="!scope.row.mngUserid"  v-model="scope.row.mngUsername" @click="groupUserSelectVisible=true" icon="el-icon-setting">去设置</el-button>  
@@ -88,20 +120,20 @@
 				</el-table-column>
 				<el-table-column prop="actRate" label="进度.状态" width="100">
 					<template slot-scope="scope"> 
-							<el-tag :type="scope.row.actRate>=100?'success':'primary'"> {{ (scope.row.actRate!=null?scope.row.actRate:0)+'%'}} </el-tag> 
-							<!--<el-tag > {{ formateOption('xmPhaseStatus',scope.row.phaseStatus)}} </el-tag>  -->
+							<el-tag :type="scope.row.actRate>=100?'success':'primary'"> {{ (scope.row.actRate!=null?scope.row.actRate:0)+'%'}} </el-tag>  
 					</template>
 				</el-table-column>
-				<el-table-column  prop="phaseBudgetHours" label="工时.人时" width="150" > 
+				-->
+				<el-table-column  prop="phaseBudgetHours" label="工时(计划>实际).人时" width="150" > 
 					<template slot-scope="scope">  
-						计划&nbsp;{{scope.row.phaseBudgetWorkload}} <br/> 
-						实际&nbsp;{{scope.row.phaseActWorkload}} 
+						 {{scope.row.phaseBudgetWorkload}} <i class="el-icon-d-arrow-right"></i>
+						 {{scope.row.phaseActWorkload}} 
 					</template>
 				</el-table-column>  
-				<el-table-column  prop="phaseBudgetCostAt" label="成本合计.元" width="150" > 
+				<el-table-column  prop="phaseBudgetCostAt" label="成本(计划>实际).元" width="150" > 
 					<template slot-scope="scope">  
-						计划&nbsp;{{scope.row.phaseBudgetCostAt}} <br/> 
-						实际&nbsp;{{scope.row.actCostAt}}
+						 {{scope.row.phaseBudgetCostAt}} <i class="el-icon-d-arrow-right"></i>
+						 {{scope.row.actCostAt}}
 					</template> 
 				</el-table-column>     
 				<el-table-column  prop="bizFlowState" label="审批状态" width="100" >  
@@ -114,29 +146,7 @@
 						<el-tag v-else-if="scope.row.flowState=='4'">已取消</el-tag> 
 						</el-tooltip> 
 					</template>
-				</el-table-column> 
-				<el-table-column  label="操作" width="100" fixed="right">
-					<template slot-scope="scope"> 
-						<el-dropdown @command="handleCommand" :hide-on-click="false">
-							<span class="el-dropdown-link">
-								更多<i class="el-icon-setting"></i>
-							</span>
-							<el-dropdown-menu slot="dropdown">
-								<el-dropdown-item :command="{type:'showSubAdd',data:scope.row}">+子阶段</el-dropdown-item>
-								<el-dropdown-item :command="{type:'showPhaseTemplate',data:scope.row}">+从模板批量导入子阶段</el-dropdown-item> 
-								<el-dropdown-item :command="{type:'showMenu',data:scope.row}">+由故事创建子阶段</el-dropdown-item> 
-
-								<el-dropdown-item :command="{type:'showEdit',data:scope.row}">编辑</el-dropdown-item>  
-								<el-dropdown-item :command="{type:'loadTasksToXmProjectPhase',data:scope.row}" >从任务汇总实际数据</el-dropdown-item>  
-								<el-dropdown-item :command="{type:'showLog',data:scope.row}">日志</el-dropdown-item>  
-								<el-dropdown-item :command="{type:'handleDel',data:scope.row}" >删除</el-dropdown-item>  
-								<el-dropdown-item icon="el-icon-success"   :command="{type:'sendToProcessApprova',row:scope.row,bizKey:'xm_project_start_approva'}">变更发审(审核通过后起效)</el-dropdown-item> 
-								<el-dropdown-item icon="el-icon-success"   :command="{type:'sendToProcessApprova',row:scope.row,bizKey:'xm_project_delete_approva'}">删除发审(审核通过后删除)</el-dropdown-item>  
-							</el-dropdown-menu>
-						</el-dropdown> 
-							
-					</template>
-				</el-table-column> 
+				</el-table-column>  
 				
 			</el-table>
       		<xm-gantt v-if="gstcVisible && batchEditVisible==false" :tree-data="projectPhaseTreeData" :project-phase="selProject" :columns="ganrrColumns" :useRealTime="false"></xm-gantt>
diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue
index 07f5a594..0a0c5681 100644
--- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue
+++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectPhaseBaseline xm_project_phase_baseline--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="基线建立时间" prop="baseCtime">
diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue
index b862506a..28bc17ad 100644
--- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue
+++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectPhaseBaseline xm_project_phase_baseline--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="基线建立时间" prop="baseCtime">
diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue
index 58ba6e28..6ae09bc2 100644
--- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue
+++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectPhaseBaselines">查询</el-button>
 			<el-button type="primary" @click="showAdd">+xm_project_phase_baseline</el-button>
diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue
index 55495995..67521dee 100644
--- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue
+++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectPhaseTemplate xm_phase_template--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm"> 
 				<el-form-item label="阶段名称" prop="phaseName">
diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue
index b80de8ed..235753cb 100644
--- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue
+++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectPhaseTemplate xm_phase_template--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm"> 
 				<el-form-item label="阶段名称" prop="phaseName">
diff --git a/src/views/xm/core/xmProjectState/XmCockpit.vue b/src/views/xm/core/xmProjectState/XmCockpit.vue
index f48385f7..139f6d86 100644
--- a/src/views/xm/core/xmProjectState/XmCockpit.vue
+++ b/src/views/xm/core/xmProjectState/XmCockpit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectStates">查询</el-button>
 			<el-button type="primary" @click="showAdd">+项目指标日统计表</el-button>
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue b/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue
index 5bb45ab9..03e37de5 100644
--- a/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue
+++ b/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectState 项目指标日统计表--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="项目编号" prop="projectId">
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue b/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue
index 381087ce..4f52a7a5 100644
--- a/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue
+++ b/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectState 项目指标日统计表--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="项目编号" prop="projectId">
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
index bddd0c61..be439187 100644
--- a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
+++ b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
 				<template slot="append">
 					<el-button  v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectStates" icon="el-icon-search"></el-button>
diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue
index aee6f3bf..114e7c25 100644
--- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue
+++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectStateHis xm_project_state_his--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="项目编号" prop="projectId">
diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue
index b2f5842a..3729d3cc 100644
--- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue
+++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectStateHis xm_project_state_his--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="项目编号" prop="projectId">
diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue
index 5ffbe45b..1f3fdcc3 100644
--- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue
+++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectStateHiss">查询</el-button>
 			<el-button type="primary" @click="showAdd">+xm_project_state_his</el-button>
diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue
index 4f1d447a..2b1f5eba 100644
--- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue
+++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmProjectTaskTypeState 按任务类型汇总--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="项目编号" prop="projectId">
diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue
index 9194a8dd..c4cd8eb7 100644
--- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue
+++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectTaskTypeState 按任务类型汇总--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="项目编号" prop="projectId">
diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
index 91bcff64..fed32162 100644
--- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
+++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectTaskTypeStates">查询</el-button>
 			<el-button type="primary" @click="showAdd">+按任务类型汇总</el-button>
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue
index 4edefd5f..8c644629 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectTemplate xm_project--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">  
 					
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue
index 9de443e0..9836c036 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmProjectTemplate xm_project--> 
 			<div ref="editFormDiv">
 				<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm" class="editForm">  
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue
index 880f8f1e..02dceed0 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 			<div class="project-info" v-loading.lock="load.list || load.edit">
 				<div class="info-type">
 					<el-radio-group v-model="infotype" size="medium">
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
index 651b36ea..ac9056ed 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input>  
 			<el-select v-model="filters.xmType" @change="searchXmProjectTemplates">
 				<el-option v-for="i in this.options.projectType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
index 3bc3f411..a618bc25 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			
 			<el-select v-model="filters.xmType" @change="searchXmProjectTemplates">
diff --git a/src/views/xm/core/xmQuestion/XmQuestionCenter.vue b/src/views/xm/core/xmQuestion/XmQuestionCenter.vue
index ee464bfa..d7d1cd44 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionCenter.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionCenter.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmQuestions">查询</el-button>
 			<el-button type="primary" @click="showAdd">+xm_question</el-button>
diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleAdd.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleAdd.vue
index e163e820..5acf1f26 100644
--- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleAdd.vue
+++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmQuestionHandle xm_question_handle--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleEdit.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleEdit.vue
index 1c84b829..0ddf5437 100644
--- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleEdit.vue
+++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmQuestionHandle xm_question_handle--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
index 8a3dcf6a..6d61044f 100644
--- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
+++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmQuestionHandles">查询</el-button>
 			<el-button type="primary" @click="showAdd">+xm_question_handle</el-button>
diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue
index b63b48f5..e2fcbf46 100644
--- a/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue
+++ b/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmQuestionTag 缺陷标签关联表--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="缺陷编号" prop="questionId">
diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue
index f4c19d25..49f7f149 100644
--- a/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue
+++ b/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmQuestionTag 缺陷标签关联表--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="缺陷编号" prop="questionId">
diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue
index 4450c100..f2e41ed6 100644
--- a/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue
+++ b/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmQuestionTags">查询</el-button>
 			<el-button type="primary" @click="showAdd">+缺陷标签关联表</el-button>
diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index 1b06b900..98633911 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmTask xm_task--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="项目名称">
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 4a5deba5..ca740bcf 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -1,5 +1,5 @@
 <template>
-	<section class="page-container page-height padding">
+	<section class="page-container page-full-height padding">
 		<el-row> 
 			<el-button type="text" @click="goAnchor('baseInfo')">基础信息</el-button> 
 			<el-button type="text" @click="goAnchor('planInfo')">进度计划</el-button> 
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 2f346612..7d2913ac 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -230,9 +230,9 @@
 		<el-row  v-if="batchEditVisible" >
 			<xm-task-mng-batch :sel-project="selProject" :sel-project-phase="currentProjectPhase" :visible="batchEditVisible" @back="batchEditBack"></xm-task-mng-batch>
 		</el-row>
-		<el-dialog
+		<el-drawer
 			v-if="drawerVisible == true"
-			width="600"
+			:size="600"
 			:visible.sync="drawerVisible"  append-to-body >
 			<el-row style="font-size: 12px;overflow-x:hidden"> 
 				<div class="task-header extra">
@@ -266,12 +266,9 @@
 							</el-slider>  
 						</el-row>
 						<el-row> 
-							<el-button   @click="editProgress(editForm.rate)">保存进度</el-button> 
-							<el-button      style="font-size:12px;" @click="editProgress(20)">完成20%</el-button>
-							<el-button      style="font-size:12px;" @click="editProgress(40)">完成40%</el-button>
-							<el-button      style="font-size:12px;" @click="editProgress(60)">完成60%</el-button>
-							<el-button      style="font-size:12px;" @click="editProgress(80)">完成80%</el-button>
-							<el-button      style="font-size:12px;" @click="editProgress(99)">完成99%</el-button>
+							<el-button   @click="editProgress(editForm.rate)">保存进度</el-button>  
+							<el-button      style="font-size:12px;" @click="editProgress(40)">完成40%</el-button> 
+							<el-button      style="font-size:12px;" @click="editProgress(80)">完成80%</el-button> 
 							<el-button      style="font-size:12px;" @click="editProgress(100)">完成100%</el-button>
 						</el-row>
 				</div>
@@ -298,67 +295,67 @@
 			<div v-if="drawerkey == '1' && drawerVisible==true" style="overflow-x:hidden">
 				 <xm-exchange-mng :xm-task="editForm"></xm-exchange-mng>
 			</div>
-		</el-dialog>
+		</el-drawer>
 		<!--编辑 XmTask xm_task界面-->
-		<el-drawer title="编辑任务" :visible.sync="editFormVisible"  :size="650" append-to-body  :close-on-click-modal="false">
+		<el-drawer title="编辑任务" :visible.sync="editFormVisible" :with-header="false" :size="650" append-to-body  :close-on-click-modal="false">
 				<xm-task-edit :xm-project="currentProject" :xm-task="editForm" :project-phase="currentProjectPhase" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-task-edit>
 		</el-drawer>
 
 		<!-- 新增 XmTask xm_task界面-->
-		<el-dialog class="xm-task-add" title="新增任务" :visible.sync="addFormVisible"  width="80%" append-to-body  :close-on-click-modal="false">
+		<el-drawer class="xm-task-add" title="新增任务" :visible.sync="addFormVisible"  width="80%" append-to-body  :close-on-click-modal="false">
 			<xm-task-add :xm-project="currentProject" :project-phase="currentProjectPhase"   :xm-task="addForm" :parent-task="parentTask" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-task-add>
-		</el-dialog>
+		</el-drawer>
 
-		<el-dialog :title="'任务'+currTaskName+'的执行人'" :visible.sync="execUserVisible" fullscreen width="80%" append-to-body  :close-on-click-modal="false">
+		<el-drawer :title="'任务'+currTaskName+'的执行人'" :visible.sync="execUserVisible" fullscreen :size="650" append-to-body  :close-on-click-modal="false">
 			<xm-execuser-mng :visible="execUserVisible" :xm-task="editForm"  :is-my="isMy"  @after-add-submit="afterExecuserSubmit" @after-edit-submit="afterExecuserSubmit" @after-delete-submit="afterExecuserSubmit" ref="execuserMng"></xm-execuser-mng>
-		</el-dialog>
+		</el-drawer>
 
-		<!-- <el-dialog :title="'技能要求——'+currTaskName" :visible.sync="skillVisible"  width="80%" append-to-body  :close-on-click-modal="false">
+		<!-- <el-drawer :title="'技能要求——'+currTaskName" :visible.sync="skillVisible"  width="80%" append-to-body  :close-on-click-modal="false">
 			<xm-skill-mng :visible="skillVisible" :task-id="currTaskId" :task-name="currTaskName"></xm-skill-mng>
-		</el-dialog> -->
+		</el-drawer> -->
 
-		<el-dialog  :title="'任务'+currTaskName+'的技能要求'" :visible.sync="skillVisible" width="60%" append-to-body  :close-on-click-modal="false">
+		<el-drawer  :title="'任务'+currTaskName+'的技能要求'" :visible.sync="skillVisible" :size="650" append-to-body  :close-on-click-modal="false">
 			<skill-mng :task-skills="taskSkills" :jump="true" @select-confirm="onTaskSkillsSelected"></skill-mng>
-		</el-dialog>
-		<el-dialog  :title="'技能条件'" :visible.sync="showSkillSearchVisible" width="60%" append-to-body  :close-on-click-modal="false">
+		</el-drawer>
+		<el-drawer  :title="'技能条件'" :visible.sync="showSkillSearchVisible" :size="650" append-to-body  :close-on-click-modal="false">
 			<skill-mng :task-skills="filters.skillTags" :jump="true" @select-confirm="onTaskSkillsSearchSelected"></skill-mng>
-		</el-dialog>
+		</el-drawer>
 
-		<el-dialog  title="任务模板" :visible.sync="taskTemplateVisible" width="70%" append-to-body  :close-on-click-modal="false">
+		<el-drawer  title="任务模板" :visible.sync="taskTemplateVisible" :size="650" append-to-body  :close-on-click-modal="false">
 			<xm-task-template-mng :is-select="true" @select-confirm="onTaskTemplatesSelected"></xm-task-template-mng>
-		</el-dialog>
+		</el-drawer>
 
-		<el-dialog   :title="currentProject==null?'项目明细':currentProject.name" center :fullscreen="true" :visible.sync="projectInfoVisible"  width="50%"  :close-on-click-modal="false" append-to-body>
+		<el-drawer   :title="currentProject==null?'项目明细':currentProject.name" center :fullscreen="true" :visible.sync="projectInfoVisible"  size="50%"  :close-on-click-modal="false" append-to-body>
 			<xm-project-info :sel-project="currentProject" @changeShowInfo="changeShowInfo" @submit="changeShowInfo"></xm-project-info>
-		</el-dialog>
+		</el-drawer>
 
-		<el-dialog title="选中项目" :visible.sync="selectProjectVisible"  width="80%"  append-to-body   :close-on-click-modal="false">
+		<el-drawer title="选中项目" :visible.sync="selectProjectVisible"  :size="650"  append-to-body   :close-on-click-modal="false">
 			<xm-project-list    @project-confirm="onPorjectConfirm"></xm-project-list>
-		</el-dialog>
+		</el-drawer>
 
-		<el-dialog append-to-body title="故事选择" :visible.sync="menuVisible" fullscreen   :close-on-click-modal="false">
+		<el-drawer append-to-body title="故事选择" :visible.sync="menuVisible" fullscreen   :close-on-click-modal="false">
 			<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true"    @menus-selected="onSelectedMenus" ></xm-menu-select>
-		</el-dialog>
-    <el-dialog append-to-body title="故事选择" :visible.sync="menuStory" width="80%"    :close-on-click-modal="false">
+		</el-drawer>
+    <el-drawer append-to-body title="故事选择" :visible.sync="menuStory" size="100%"    :close-on-click-modal="false">
     	<xm-menu-select :visible="menuStory" :is-select-menu="true" :multi="true" @menus-selected="onSelectedStory"></xm-menu-select>
-    </el-dialog>
+    </el-drawer>
 
-    <el-dialog append-to-body title="选择负责人" :visible.sync="menuGroupUser" width="80%"    :close-on-click-modal="false">
+    <el-drawer append-to-body title="选择负责人" :visible.sync="menuGroupUser" :size="650"    :close-on-click-modal="false">
     	<xm-project-group-select :visible="menuGroupUser" :sel-project="selProject" :isSelectSingleUser="1" @user-confirm="seleConfirm" ></xm-project-group-select>
-    </el-dialog>
-    <el-dialog append-to-body title="选择执行人" :visible.sync="menuExecutor" width="80%"    :close-on-click-modal="false">
+    </el-drawer>
+    <el-drawer append-to-body title="选择执行人" :visible.sync="menuExecutor" :size="650"    :close-on-click-modal="false">
     	<xm-project-group-select :visible="menuExecutor" :sel-project="selProject" :isSelectSingleUser="1" @user-confirm="seleExecutor" ></xm-project-group-select>
-    </el-dialog>
-		<el-dialog append-to-body title="故事明细" :visible.sync="menuDetailVisible" width="80%"    :close-on-click-modal="false">
+    </el-drawer>
+		<el-drawer append-to-body title="故事明细" :visible.sync="menuDetailVisible" :size="650"    :close-on-click-modal="false">
 			<xm-menu-rich-detail :visible="menuDetailVisible"  :reload="true" :xm-menu="{menuId:editForm.menuId,menuName:editForm.menuName}" ></xm-menu-rich-detail>
-		</el-dialog>
-		<el-dialog append-to-body title="选择负责人" :visible.sync="groupUserSelectVisible" width="80%"    :close-on-click-modal="false">
+		</el-drawer>
+		<el-drawer append-to-body title="选择负责人" :visible.sync="groupUserSelectVisible" :size="650"    :close-on-click-modal="false">
 			<xm-project-group-select :visible="groupUserSelectVisible" :sel-project="selProject" :isSelectSingleUser="1" @user-confirm="groupUserSelectConfirm"></xm-project-group-select>
-		</el-dialog>
+		</el-drawer>
 
-		<el-dialog title="选择产品" :visible.sync="productSelectVisible"  width="80%"  append-to-body   :close-on-click-modal="false">
+		<el-drawer title="选择产品" :visible.sync="productSelectVisible"  :size="650"  append-to-body   :close-on-click-modal="false">
 				<xm-product-select   :isSelectProduct="true" :selProject="filters.selProject" :visible="productSelectVisible" @cancel="productSelectVisible=false" @selected="onProductSelected"></xm-product-select>
-		</el-dialog>
+		</el-drawer>
 	</section>
 </template>
 
diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
index e1a2cb22..8abe56a1 100644
--- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue
+++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 			<el-row    v-if="projectPhase">   
  					<el-button type="warning"   @click="saveBatchEdit" v-loading="load.edit" icon="el-icon-finished">保存</el-button>
 					<el-button type="success"  @click="handlePopover(null,'add')" icon="el-icon-plus" ></el-button>
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue
index 1ad159c3..7f555f5b 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmTaskExecuser xm_task_execuser--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<!-- <el-form-item label="创建时间" prop="createTime">
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
index 68197735..23c1987d 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmTaskExecuser xm_task_execuser--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="执行人姓名" prop="username">
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index b1f5a6fb..701ad240 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@@ -10,20 +10,15 @@
 		<el-row class="app-container"> 
 			<!--列表 XmTaskExecuser xm_task_execuser-->
 			<el-table ref="table" :height="tableHeight" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
-				<el-table-column sortable type="selection" width="40"></el-table-column> <!-- :selectable="checkSelectable" -->
-				<el-table-column sortable type="index" width="40"></el-table-column>
-				<el-table-column type="expand">
+				 <el-table-column type="expand">
 					<template slot-scope="props">
 						<el-form label-position="left"  class="demo-table-expand">
-							<el-form-item label="报价金额">
-								<span>{{ props.row.name }}元</span>
+							<el-form-item label="报价">
+								工作量：<span>{{ props.row.quoteWorkload }} 人时</span> 金额：<span>{{ props.row.name }}元</span>
 							</el-form-item>
 							<el-form-item label="报价工期">
 								<span>{{ props.row.quoteWeekday }} 天 :{{props.row.quoteStartTime }}~{{props.row.quoteEndTime}}</span>
-							</el-form-item>
-							<el-form-item label="报价工作量">
-								<span>{{ props.row.quoteWorkload }} 人时</span>
-							</el-form-item>
+							</el-form-item> 
 							<el-form-item label="匹配指数">
 								<span>{{ props.row.matchScore }}</span>
 							</el-form-item>
@@ -33,37 +28,67 @@
 							<el-form-item label="备注说明">
 								<span>{{ props.row.remarks }}</span>
 							</el-form-item>  
+							<el-form-item  label="操作">
+								<el-button type="primary" v-if="props.row.status=='1'" @click="toTest(props.row)">申请验收</el-button>
+								<el-button type="primary" v-if="props.row.status=='4'" @click="toTest(props.row)">再申请验收</el-button>
+
+								<!--结算状态0未结算1已部分结算2无需结算4已申请结算5结算失败6已全部结算-->
+								<el-button type="primary"  v-if="props.row.status=='3' && props.row.settleStatus!='2' && props.row.settleStatus!='4' && props.row.settleStatus!='6' " @click="settle" >申请结算</el-button> 
+								<el-button type="success"  v-if="props.row.status=='2' " @click="testSuccess(props.row)" >验收通过</el-button>  
+								<el-button type="warning"  v-if="props.row.status=='2' " @click="testFail(props.row)" >验收不通过</el-button>  
+
+								<el-button type="primary" v-if="props.row.status=='7' " @click="becomeCandidate(props.row)">成为候选人</el-button>  
+								<el-button type="danger" v-if="props.row.status=='7' " @click="handleDel(props.row)">删除</el-button>   
+								<el-button type="warning" v-if="props.row.status=='0'"  @click="showQuotePrice(props.row)">修改报价信息</el-button> 
+								<el-button type="primary" v-if="props.row.status=='0'"   @click="execute(props.row)">成为执行人</el-button> 
+								<el-button type="warning" v-if="props.row.status!='7' " @click="leave(props.row)">离开任务</el-button> 
+								<el-button type="primary" v-if="props.row.status=='3' || props.row.status=='6' "  @click="showSettleList(props.row)">结算清单</el-button> 
+		
+							</el-form-item>
 						</el-form>
 					</template>
 				</el-table-column>
-				<el-table-column prop="username" label="姓名" min-width="100" >
-					<template slot-scope="scope">
-						{{scope.row.username}}
-					</template>
-				</el-table-column>  
-				<el-table-column prop="startTime" label="开始~结束时间" width="200" show-overflow-tooltip >
-					<template slot-scope="scope">
-						{{scope.row.startTime}} ~ {{scope.row.endTime}}
-					</template>
-				</el-table-column> 
-				<el-table-column prop="status" label="状态" min-width="80"> 
+				<el-table-column prop="username" label="姓名" min-width="300" >
 					<template slot-scope="scope">
-						<el-tag type="primary" v-if="scope.row.status=='0'">候选中</el-tag>
-						<el-tag type="success" v-else-if="scope.row.status=='1'">执行中</el-tag>
-						<el-tag type="warning" v-else-if="scope.row.status=='2'">验收中</el-tag>
-						<el-tag type="success" v-else-if="scope.row.status=='3'">已验收</el-tag>
-						<el-tag type="danger" v-else-if="scope.row.status=='4'">验收不通过</el-tag>
-						<el-tag type="warning" v-else-if="scope.row.status=='5'">结算中</el-tag>
-						<el-tag type="success" v-else-if="scope.row.status=='6'">已结算完毕</el-tag>
-						<el-tag type="info" v-else-if="scope.row.status=='7'">已放弃任务</el-tag>
-						<el-tag type="danger" v-else-if="scope.row.status=='8'">黑名单</el-tag>
-						<el-tag type="primary" v-else>新建</el-tag>
+						<div>
+						{{scope.row.username}} <el-tag type="info">{{scope.row.quoteStartTime }}~{{scope.row.quoteEndTime}}</el-tag> <el-tooltip  content="报价金额"><el-tag type="danger">{{scope.row.quoteAmount}}元</el-tag></el-tooltip>
+						<el-popover trigger="hover" 
+							width="400" >
+							<el-row>
+									<el-button type="primary" v-if="scope.row.status=='1'" @click="toTest(scope.row)">申请验收</el-button>
+									<el-button type="primary" v-if="scope.row.status=='4'" @click="toTest(scope.row)">再申请验收</el-button>
+
+									<!--结算状态0未结算1已部分结算2无需结算4已申请结算5结算失败6已全部结算-->
+									<el-button type="primary"  v-if="scope.row.status=='3' && scope.row.settleStatus!='2' && scope.row.settleStatus!='4' && scope.row.settleStatus!='6' " @click="settle" >申请结算</el-button> 
+									<el-button type="success"  v-if="scope.row.status=='2' " @click="testSuccess(scope.row)" >验收通过</el-button>  
+									<el-button type="warning"  v-if="scope.row.status=='2' " @click="testFail(scope.row)" >验收不通过</el-button>  
+
+									<el-button type="primary" v-if="scope.row.status=='7' " @click="becomeCandidate(scope.row)">成为候选人</el-button>  
+									<el-button type="danger" v-if="scope.row.status=='7' " @click="handleDel(scope.row)">删除</el-button>   
+									<el-button type="warning" v-if="scope.row.status=='0'"  @click="showQuotePrice(scope.row)">修改报价信息</el-button> 
+									<el-button type="primary" v-if="scope.row.status=='0'"   @click="execute(scope.row)">成为执行人</el-button> 
+									<el-button type="warning" v-if="scope.row.status!='7' " @click="leave(scope.row)">离开任务</el-button> 
+									<el-button type="primary" v-if="scope.row.status=='3' || scope.row.status=='6' "  @click="showSettleList(scope.row)">结算清单</el-button> 
+								 
+							</el-row> 
+								<font slot="reference"> 
+										<el-link type="primary" v-if="scope.row.status=='0'">候选中({{formatToDoByStatus(scope.row)}})</el-link>
+										<el-link type="success" v-else-if="scope.row.status=='1'">执行中({{formatToDoByStatus(scope.row)}})</el-link>
+										<el-link type="warning" v-else-if="scope.row.status=='2'">验收中({{formatToDoByStatus(scope.row)}})</el-link>
+										<el-link type="success" v-else-if="scope.row.status=='3'">已验收({{formatToDoByStatus(scope.row)}})</el-link>
+										<el-link type="danger" v-else-if="scope.row.status=='4'">验收不通过({{formatToDoByStatus(scope.row)}})</el-link>
+										<el-link type="warning" v-else-if="scope.row.status=='5'">结算中({{formatToDoByStatus(scope.row)}})</el-link>
+										<el-link type="success" v-else-if="scope.row.status=='6'">已结算完毕({{formatToDoByStatus(scope.row)}})</el-link>
+										<el-link type="info" v-else-if="scope.row.status=='7'">已放弃任务({{formatToDoByStatus(scope.row)}})</el-link>
+										<el-link type="danger" v-else-if="scope.row.status=='8'">黑名单({{formatToDoByStatus(scope.row)}})</el-link>
+										<el-link type="primary" v-else>新建</el-link> 
+								</font>
+							
+						</el-popover>
+						</div>
 					</template>
-				 </el-table-column>   
-				<el-table-column  sortable  prop="quoteAmount" label="报价金额" min-width="80" ></el-table-column>
-				<el-table-column  sortable  prop="quoteWeekday" label="报价工期" min-width="80" ></el-table-column>
-				<el-table-column  sortable prop="matchScore" label="匹配指数" min-width="80" ></el-table-column>    
-				<el-table-column prop="settleStatus" label="结算状态" min-width="80"> 
+				</el-table-column>   
+ 				<el-table-column prop="settleStatus" label="结算" min-width="80"> 
 					<template slot-scope="scope"> 
 						<el-tag type="success" v-if="scope.row.settleStatus=='1'">已部分结算</el-tag>
 						<el-tag type="success" v-else-if="scope.row.settleStatus=='2'">无需结算</el-tag> 
@@ -73,32 +98,18 @@
 						<el-tooltip v-else content="验收通过后可以申请结算">
 							<el-tag type="primary" >未开始结算</el-tag>
 						</el-tooltip>
+						<el-tooltip   content="结算金额">
+							{{scope.row.settleAmount}}
+						</el-tooltip>
+						<el-tooltip   content="结算工作量">
+							{{scope.row.settleWorkload}}
+						</el-tooltip>
+						<el-tooltip   content="结算时间">
+							{{scope.row.settleTime}}
+						</el-tooltip>
+						
 					</template>
-				 </el-table-column>
-				<el-table-column  sortable prop="settleAmount" label="结算金额" min-width="80" ></el-table-column>
-				<el-table-column  sortable prop="settleWorkload" label="结算工作量" min-width="80" ></el-table-column> 
-				<el-table-column  sortable prop="settleTime" label="结算时间" min-width="80" ></el-table-column> 
-				
-				<el-table-column label="操作" width="450" fixed="right">
-					<template slot-scope="scope"> 
-						<el-button type="primary" v-if="scope.row.status=='1'" @click="toTest(scope.row)">申请验收</el-button>
-						<el-button type="primary" v-if="scope.row.status=='4'" @click="toTest(scope.row)">再申请验收</el-button>
-
- 						<!--结算状态0未结算1已部分结算2无需结算4已申请结算5结算失败6已全部结算-->
-						<el-button type="primary"  v-if="scope.row.status=='3' && scope.row.settleStatus!='2' && scope.row.settleStatus!='4' && scope.row.settleStatus!='6' " @click="settle" >申请结算</el-button> 
-						<el-button type="success"  v-if="scope.row.status=='2' " @click="testSuccess(scope.row)" >验收通过</el-button>  
-						<el-button type="warning"  v-if="scope.row.status=='2' " @click="testFail(scope.row)" >验收不通过</el-button>  
-
- 						<el-button type="primary" v-if="scope.row.status=='7' " @click="becomeCandidate(scope.row)">成为候选人</el-button>  
-						<el-button type="danger" v-if="scope.row.status=='7' " @click="handleDel(scope.row)">删除</el-button>   
-						<el-button type="warning" v-if="scope.row.status=='0'"  @click="showQuotePrice(scope.row)">修改报价信息</el-button> 
-						<el-button type="primary" v-if="scope.row.status=='0'"   @click="execute(scope.row)">成为执行人</el-button> 
-						<el-button type="warning" v-if="scope.row.status!='7' " @click="leave(scope.row)">离开任务</el-button> 
-						<el-button type="primary" v-if="scope.row.status=='3' || scope.row.status=='6' "  @click="showSettleList(scope.row)">结算清单</el-button> 
- 
-						<!-- <el-button type="danger" @click="handleDel(scope.row,scope.$index)">删</el-button> -->
-					</template>
-				</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> 
 
@@ -769,7 +780,27 @@
 						this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
 
 					}) 
-			}, 
+			},  
+			formatToDoByStatus(row){
+				var status=row.status; 
+				var msg="点我操作"
+				if(status=='1'){
+					msg="请申请验收";
+				}else if( row.status=='3' &&  row.settleStatus!='2' &&  row.settleStatus!='4' &&  row.settleStatus!='6' ){
+					msg="请申请结算";
+				}else if(status=='2' ){
+					msg="请给出验收结论";
+				}else if(status=='7' ){
+					msg="申请成为候选人";
+				}else if(status=='0' ){
+					msg="申请成为执行人";
+				}else if( row.status=='3' ||  row.status=='6' ){
+					msg="查看结算清单";
+				} else if( row.status=='4'){
+					msg="再次申请验收";
+				}
+				return msg;	
+			}
 			/**end 自定义函数请在上面加**/
 			
 		},//end methods
@@ -807,4 +838,8 @@
 	overflow: auto hidden;
 	line-height: 50px;
 }
+.badge {
+  margin-top: 7px;
+  padding-bottom: 10px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue
index 5fba0245..6657152d 100644
--- a/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue
+++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmTaskSkill xm_task_skill--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue
index aa9fd2e7..94cc378d 100644
--- a/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue
+++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmTaskSkill xm_task_skill--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="主键" prop="id">
diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue
index 654e70cd..26cdab05 100644
--- a/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue
+++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTaskSkills">查询</el-button>
 			<el-button type="primary" v-loading="load.list" @click="showAdd">添加技能</el-button>
diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue
index 6a923eed..263ec680 100644
--- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue
+++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmTaskTemplate xm_task--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm"> 
 				<el-form-item label="任务名称" prop="name">
diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue
index cb34da72..aa2b6525 100644
--- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue
+++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmTaskTemplate xm_task--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm"> 
 				<el-form-item label="任务名称" prop="name">
diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
index 4cd1332c..43d67786 100644
--- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
+++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTaskTemplates">查询</el-button>
 			<el-button v-if="!selProjectTemplate" type="info" @click="showProjectTemplate">选择模板</el-button>  
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue
index 4ef2b533..6e8bf618 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmTestCase 测试用例--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm"> 
 				<el-form-item label="标题" prop="caseName">
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
index 9f426745..a54cc730 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmTestCase 测试用例--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm"> 
 				<el-form-item label="标题" prop="caseName">
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index ef59b88b..580a3f66 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 			<div>
 				<el-tag    v-if="  filters.product "  closable    @close="clearProduct">{{this.filters.product.productName}}</el-tag>
 				<el-button v-else    @click="showProductVisible" type="plian">选产品</el-button>
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue
index 58811912..03445426 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container">
+	<section class="page-container page-full-height padding border">
+		<el-row>
 			<!--新增界面 XmTestCaseExec xm_test_case_exec--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="执行人" prop="execUserid">
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue
index 27796853..364062c5 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row class="app-container"> 
+	<section class="page-container page-full-height padding border">
+		<el-row> 
 		<!--编辑界面 XmTestCaseExec xm_test_case_exec--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="执行人" prop="execUserid">