diff --git a/src/api/login.js b/src/api/login.js
index 94519cc9..695083cc 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -7,14 +7,13 @@ import config from '@/common/config'
 let base=config.getOauth2LoginBasePath();
 
 //let base='';
-export function doLoginByUserloginid(userloginid, password,grantType,authType,branchId,deptid) {
+export function doLoginByUserloginid(userloginid, password,grantType,authType,deptid) {
   removeToken();
   const data = {
     userloginid: userloginid,
     password: password, 
     authType:authType,
-    deptid:deptid,
-    branchId:branchId,
+    deptid:deptid
   }
   return axios({
     url: base+'/login/token?grantType='+grantType,
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index b5d0a689..aafc2ade 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -5,39 +5,7 @@
         <span v-if='item.redirect==="noredirect"||index==levelList.length-1' class="no-redirect">{{generateTitle(item.meta.title)}}</span>
         <router-link v-else :to="item.redirect||item.path">{{generateTitle(item.meta.title)}}</router-link>
       </el-breadcrumb-item>
-    </transition-group>
-    <el-button @click="drawer = true" type="primary" round plain style="margin-left: 16px;"> <i class="el-icon-menu" style="margin-right:5px"></i>全部应用</el-button>
-    <div class="drawer-box">
-        <el-drawer
-        :visible.sync="drawer"
-        :direction="direction">
-        <div class="drawer">
-          <div class="drawer-content">
-            <div class="drawer-content-input">
-              <el-input placeholder="请输入中文" v-model.trim="key" clearable prefix-icon = "el-icon-search" size="small" style="width:60%">
-              </el-input>
-            </div>
-            <div class="drawer-content-category" v-for="(item,index) in categorys" :key="index">
-              <div class="category-name" v-text="item.title"></div>
-              <div class="category-list">
-                <div
-                  class="category-item"
-                  v-for="(module,mindex) in item.childrens" :key="index+'_'+mindex"
-                  @click="gotolink(module)"
-                  :class="{highlight : module.isHighlight }"
-                > 
-                  <div class="module-icon">
-                    <img :src="module.icon">
-                  </div>
-                  <div class="module-name" v-text="module.moduleName"></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </el-drawer>
-    </div>
-    
+    </transition-group>  
   </el-breadcrumb>
 </template>
 
@@ -53,404 +21,13 @@ export default {
       levelList: null,
       drawer: false,
       direction: 'ttb',
-      key:"",
-      //模块分类
-      categorys:[
-        {
-          title:"日常应用",
-          childrens:[
-          {
-            moduleName:"任务中心",
-            topModuleId:'oa',
-            link:"/mdp/workflow/ru/task/TaskListAssigneeToMe",
-            icon: require("../../assets/image/platform/module-task.png"),
-            isHighlight:false,
-            moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-          },
-          {
-            moduleName:"流程中心",
-            topModuleId:'oa',
-            link:"/mdp/workflow/ru/execution/ExecutionListMyMonitors",
-            icon: require("../../assets/image/platform/module-flow.png"),
-            isHighlight:false,
-            moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-          },
-          {
-            moduleName:"历史流程",
-            topModuleId:'oa',
-            link:"/mdp/workflow/hi/procinst/ProcinstListMyStart",
-            icon: require("../../assets/image/platform/module-historical.png"),
-            isHighlight:false,
-            moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-          },
-          {
-            moduleName:"模型中心",
-            topModuleId:'oa',
-            link:"/mdp/workflow/de/ModelMng",
-            icon: require("../../assets/image/platform/module-odelCenter.png"),
-            isHighlight:false,
-            moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-          },
-          {
-            moduleName:"智能表单",
-            topModuleId:'oa',
-            link:"/mdp/form/formDef/FormDefAdd",
-            icon: require("../../assets/image/platform/module-intelligentForms.png"),
-            isHighlight:false,
-            moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-          },
-          {
-            moduleName:"新闻管理",
-            topModuleId:'arc',
-            link:"/mdp/arc/news/newsMng",
-            icon: require("../../assets/image/platform/module-news.png"),
-            isHighlight:false,
-            moduleType : '3', // 模块类型，1-系统类模块 2-系统外模块 3-系统外模块的模块
-          },
-          {
-            moduleName:"公告管理",
-            topModuleId:'arc',
-            link:"/mdp/arc/notice/noticeMng",
-            icon: require("../../assets/image/platform/module-notice.png"),
-            isHighlight:false,
-            moduleType : '3' // 模块类型，1-系统类模块 2-系统外模块 3-系统外模块的模块
-          },
-          ]
-        },
-        {
-          title:"通讯沟通",
-          childrens:[
-            {
-              moduleName:"通讯录",
-              topModuleId:'sys',
-              link:"/mdp/sys/user/deptUserMng",
-              icon: require("../../assets/image/platform/module-addressBook.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"内部邮件",
-              topModuleId:'oa',
-              link:"/oa/mail/mailEmail/MailEmailInbox",
-              icon: require("../../assets/image/platform/module-email1.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"外部邮件",
-              topModuleId:'oa',
-              link:"/oa/mail/mailAccount/MailAccountMng",
-              icon: require("../../assets/image/platform/module-email2.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"短信",
-              topModuleId:'sms',
-              link:"",
-              icon: require("../../assets/image/platform/module-note.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"聊天",
-              topModuleId:'im',
-              link:"",
-              icon: require("../../assets/image/platform/module-project.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },
-          ]
-        },
-        {
-          title:"工作执行",
-          childrens:[
-            {
-              moduleName:"日程管理",
-              topModuleId:'oa',
-              link:"/oa/rc/rcScheduleMy/RcScheduleMyMng",
-              icon: require("../../assets/image/platform/module-schedule.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"督办管理",
-              topModuleId:'oa',
-              link:"/oa/duban/dubanItem/DubanItem",
-              icon: require("../../assets/image/platform/module-supervise.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"督办任务",
-              topModuleId:'oa',
-              link:"/oa/duban/dubanItemTask/HostDubanItemTask",
-              icon: require("../../assets/image/platform/module-supervisoryTask.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-          ]
-        },
-        {
-          title:"行政管理",
-          childrens:[
-            {
-              moduleName:"组织",
-              topModuleId:'sys',
-              link:"/mdp/sys/dept/DeptMng",
-              icon: require("../../assets/image/platform/module-organization.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"资产管理",
-              topModuleId:'oa',
-              link:"/oa/erp/pur/require/RequireMng",
-              icon: require("../../assets/image/platform/module-property.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"会议管理",
-              topModuleId:'oa',
-              link:"/oa/meet/meetMeeting/MeetMeetingRequire",
-              icon: require("../../assets/image/platform/module-meeting.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"印章中心",
-              topModuleId:'oa',
-              link:"/oa/sig/sigSignet/SigSignetMng",
-              icon: require("../../assets/image/platform/module-sealCenter.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"车辆中心",
-              topModuleId:'oa',
-              link:"/oa/car/carOfficeCar/CarOfficeCarMng",
-              icon: require("../../assets/image/platform/module-car.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"办公用品",
-              topModuleId:'oa',
-              link:"/oa/om/omCategory/OmCategoryMng",
-              icon: require("../../assets/image/platform/module-office.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            
-          ]
-        },
-        {
-          title:"人事管理",
-          childrens:[
-            {
-              moduleName:"考勤管理",
-              topModuleId:'oa',
-              link:"/oa/kq/attendance/AttendanceMonth",
-              icon: require("../../assets/image/platform/module-attendance.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"绩效考核",
-              topModuleId:'oa',
-              link:"/oa/jx/MyAssessment",
-              icon: require("../../assets/image/platform/module-performance.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"档案信息",
-              topModuleId:'oa',
-              link:"/oa/hr/user/employeeInfo",
-              icon: require("../../assets/image/platform/module-record.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-          ]
-        },
-        {
-          title:"仓储管理",
-          childrens:[
-            {
-              moduleName:"合同管理",
-              topModuleId:'oa',
-              link:"/oa/ht/contractCard/ContractCardMng",
-              icon: require("../../assets/image/platform/module-contract.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            }
-          ]
-        },
-        {
-          title:"业务管控",
-          childrens:[
-            {
-              moduleName:"业务中心",
-              topModuleId:'oa',
-              link:"/mdp/workflow/re/procdef/ProcdefListForParames",
-              icon: require("../../assets/image/platform/module-business.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"客户管理",
-              topModuleId:'oa',
-              link:"/oa/crm/customer/CustomerIndex",
-              icon: require("../../assets/image/platform/module-customerCenter.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"项目管理",
-              topModuleId:'xm',
-              link:"/xm/core/xmProject/XmProjectMng",
-              icon: require("../../assets/image/platform/module-project.png"),
-              isHighlight:false,
-              moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"费用管理",
-              topModuleId:'ac',
-              link:"",
-              icon: require("../../assets/image/platform/module-cost.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            }, 
-            {
-              moduleName:"防伪",
-              topModuleId:'audit',
-              link:"/audit/base/productLifeCycle/productLifeCycleDetail/Safeguard",
-              icon: require("../../assets/image/platform/anti-fake.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },{
-              moduleName:"溯源",
-              topModuleId:'audit',
-              link:"/audit/base/productLifeCycle/productLifeCycleDetail/ProductLifeCycleDetailMng",
-              icon: require("../../assets/image/platform/traceSource.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },{
-              moduleName:"审计",
-              topModuleId:'audit',
-              link:"/audit/base/oper/operLog/OperLogMng",
-              icon: require("../../assets/image/platform/audit.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },
-
-          ]
-        },
-        {
-          title:"系统模块",
-          childrens:[
-            {
-              moduleName:"组织",
-              topModuleId:'sys',
-              link:"",
-              icon: require("../../assets/image/platform/module-organization.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"内容",
-              topModuleId:'arc',
-              link:"",
-              icon: require("../../assets/image/platform/module-content.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"流程",
-              topModuleId:'oa',
-              link:"",
-              icon: require("../../assets/image/platform/module-oa.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"商城",
-              topModuleId:'mallm',
-              link:"",
-              icon: require("../../assets/image/platform/module-store.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            } ,
-            {
-              moduleName:"营销",
-              topModuleId:'mk',
-              link:"",
-              icon: require("../../assets/image/platform/module-marketing.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"财务",
-              topModuleId:'ac',
-              link:"",
-              icon: require("../../assets/image/platform/module-finance.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"短信",
-              topModuleId:'',
-              link:"sms",
-              icon: require("../../assets/image/platform/module-note.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"聊天",
-              topModuleId:'im',
-              link:"",
-              icon: require("../../assets/image/platform/module-project.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            {
-              moduleName:"防伪",
-              topModuleId:'audit',
-              link:"/audit/base/productLifeCycle/productLifeCycleDetail/Safeguard",
-              icon: require("../../assets/image/platform/anti-fake.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },{
-              moduleName:"溯源",
-              topModuleId:'audit',
-              link:"/audit/base/productLifeCycle/productLifeCycleDetail/ProductLifeCycleDetailMng",
-              icon: require("../../assets/image/platform/traceSource.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },{
-              moduleName:"审计",
-              topModuleId:'audit',
-              link:"/audit/base/oper/operLog/OperLogMng",
-              icon: require("../../assets/image/platform/audit.png"),
-              isHighlight:false,
-              moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
-            },
-            
-          ]
-        },
-        
-      ],
+      key:"", 
     }
   },
   watch: {
     $route() {
       this.getBreadcrumb()
-    },
-    key(val){
-      console.log(this.key);
-      this.searchModule();
-    }
+    }, 
   },
   methods: {
     generateTitle,
@@ -461,43 +38,7 @@ export default {
         matched = [{ path: '/dashboard', meta: { title: 'dashboard' }}].concat(matched)
       }
       this.levelList = matched
-    },
-    //路由跳转
-    gotolink(module) {
-      if(module.topModuleId==process.env.CONTEXT){
-        this.drawer = false
-        this.$router.replace(module.link);
-      } else{
-        this.jumpToOtherSystem(module);
-      }   
-    },
-    //系统跳转
-    jumpToOtherSystem(module) { 
-        let href = window.location.protocol + "//" + window.location.host + "/" + module.topModuleId + "/"+ process.env.VERSION +"/#" + module.link; 
-        window.open(href, module.moduleName,null,true);
-        NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
-
-      },
-    //搜索
-    searchModule(){
-      for(let i =0 ; i <this.categorys.length; i++){
-        for(let j =0 ; j <this.categorys[i].childrens.length; j++){
-          let module = this.categorys[i].childrens[j];
-            this.categorys[i].childrens[j].isHighlight = false;
-        }
-
-      }
-      if(this.key != ""){
-        for(let i =0 ; i <this.categorys.length; i++){
-          for(let j =0 ; j <this.categorys[i].childrens.length; j++){
-            let module = this.categorys[i].childrens[j];
-            if(module.moduleName.indexOf(this.key) > -1){
-              this.categorys[i].childrens[j].isHighlight = true;
-            }
-          }
-        }
-      }
-    }
+    }, 
   }
 }
 </script>
@@ -512,76 +53,5 @@ export default {
       color: #97a8be;
       cursor: text;
     }
-  }
-  .drawer-box{
-    .drawer{
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      .drawer-content{
-        width: 900px;
-        height: 100%;
-        .drawer-content-input{
-          display: flex;
-          justify-content: center;
-        }
-        .drawer-content-category{
-          .category-name{
-            color: #333333;
-            font-size: 16px;
-          }
-          .category-list{
-            display: flex;
-            justify-content: flex-start;
-            flex-wrap: wrap;
-            .category-item{
-              height: 70px;
-              width: 70px;
-              margin-right: 20px;
-              transition: all 0.3s;
-              .module-icon{
-                width: 70px;
-                height: 38px;
-                text-align: center;
-                display: flex;
-                flex-direction: column;
-                justify-content: center;  
-                align-items: center;
-                img{
-                  width: 20px;
-                }
-                }
-              .module-name{
-                height: 32px;
-                line-height: 32px;
-                color:#666666;
-                font-size: 12px;
-                text-align: center;
-              }
-            }
-            .category-item:hover{
-              background: rgb(240, 241, 245);
-            }
-          }
-        }
-      }
-    }
-    .highlight{
-      transform: scale(1.05);
-      -webkit-box-shadow: 0 0 30px rgba(0, 0, 0, 0.1);
-      border-radius: 50%;
-      box-shadow: 0 0 30px rgba(0, 0, 0, 0.15);
-    }
-    
-  }
-  
-</style>
-<style rel="stylesheet/scss" lang="scss">
-.drawer-box{
-  .el-drawer{
-    height: 95%!important;
-    overflow: auto;
-  }
-}
-
-</style>
+  }   
+</style> 
diff --git a/src/components/TopModules/all_modules.js b/src/components/TopModules/all_modules.js
new file mode 100644
index 00000000..fd26092b
--- /dev/null
+++ b/src/components/TopModules/all_modules.js
@@ -0,0 +1,388 @@
+var categorys= 
+[
+  {
+    title:"日常应用",
+    childrens:[
+    {
+      moduleName:"任务中心",
+      topModuleId:'oa',
+      link:"/mdp/workflow/ru/task/TaskListAssigneeToMe",
+      icon: require("../../assets/image/platform/module-task.png"),
+      isHighlight:false,
+      moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+    },
+    {
+      moduleName:"流程中心",
+      topModuleId:'oa',
+      link:"/mdp/workflow/ru/execution/ExecutionListMyMonitors",
+      icon: require("../../assets/image/platform/module-flow.png"),
+      isHighlight:false,
+      moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+    },
+    {
+      moduleName:"历史流程",
+      topModuleId:'oa',
+      link:"/mdp/workflow/hi/procinst/ProcinstListMyStart",
+      icon: require("../../assets/image/platform/module-historical.png"),
+      isHighlight:false,
+      moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+    },
+    {
+      moduleName:"模型中心",
+      topModuleId:'oa',
+      link:"/mdp/workflow/de/ModelMng",
+      icon: require("../../assets/image/platform/module-odelCenter.png"),
+      isHighlight:false,
+      moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+    },
+    {
+      moduleName:"智能表单",
+      topModuleId:'oa',
+      link:"/mdp/form/formDef/FormDefAdd",
+      icon: require("../../assets/image/platform/module-intelligentForms.png"),
+      isHighlight:false,
+      moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+    },
+    {
+      moduleName:"新闻管理",
+      topModuleId:'arc',
+      link:"/mdp/arc/news/newsMng",
+      icon: require("../../assets/image/platform/module-news.png"),
+      isHighlight:false,
+      moduleType : '3', // 模块类型，1-系统类模块 2-系统外模块 3-系统外模块的模块
+    },
+    {
+      moduleName:"公告管理",
+      topModuleId:'arc',
+      link:"/mdp/arc/notice/noticeMng",
+      icon: require("../../assets/image/platform/module-notice.png"),
+      isHighlight:false,
+      moduleType : '3' // 模块类型，1-系统类模块 2-系统外模块 3-系统外模块的模块
+    },
+    ]
+  },
+  {
+    title:"通讯沟通",
+    childrens:[
+      {
+        moduleName:"通讯录",
+        topModuleId:'sys',
+        link:"/mdp/sys/user/deptUserMng",
+        icon: require("../../assets/image/platform/module-addressBook.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"内部邮件",
+        topModuleId:'oa',
+        link:"/oa/mail/mailEmail/MailEmailInbox",
+        icon: require("../../assets/image/platform/module-email1.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"外部邮件",
+        topModuleId:'oa',
+        link:"/oa/mail/mailAccount/MailAccountMng",
+        icon: require("../../assets/image/platform/module-email2.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"短信",
+        topModuleId:'sms',
+        link:"",
+        icon: require("../../assets/image/platform/module-note.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"聊天",
+        topModuleId:'im',
+        link:"",
+        icon: require("../../assets/image/platform/module-project.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },
+    ]
+  },
+  {
+    title:"工作执行",
+    childrens:[
+      {
+        moduleName:"日程管理",
+        topModuleId:'oa',
+        link:"/oa/rc/rcScheduleMy/RcScheduleMyMng",
+        icon: require("../../assets/image/platform/module-schedule.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"督办管理",
+        topModuleId:'oa',
+        link:"/oa/duban/dubanItem/DubanItem",
+        icon: require("../../assets/image/platform/module-supervise.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"督办任务",
+        topModuleId:'oa',
+        link:"/oa/duban/dubanItemTask/HostDubanItemTask",
+        icon: require("../../assets/image/platform/module-supervisoryTask.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+    ]
+  },
+  {
+    title:"行政管理",
+    childrens:[
+      {
+        moduleName:"组织",
+        topModuleId:'sys',
+        link:"/mdp/sys/dept/DeptMng",
+        icon: require("../../assets/image/platform/module-organization.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"资产管理",
+        topModuleId:'oa',
+        link:"/oa/erp/pur/require/RequireMng",
+        icon: require("../../assets/image/platform/module-property.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"会议管理",
+        topModuleId:'oa',
+        link:"/oa/meet/meetMeeting/MeetMeetingRequire",
+        icon: require("../../assets/image/platform/module-meeting.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"印章中心",
+        topModuleId:'oa',
+        link:"/oa/sig/sigSignet/SigSignetMng",
+        icon: require("../../assets/image/platform/module-sealCenter.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"车辆中心",
+        topModuleId:'oa',
+        link:"/oa/car/carOfficeCar/CarOfficeCarMng",
+        icon: require("../../assets/image/platform/module-car.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"办公用品",
+        topModuleId:'oa',
+        link:"/oa/om/omCategory/OmCategoryMng",
+        icon: require("../../assets/image/platform/module-office.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      
+    ]
+  },
+  {
+    title:"人事管理",
+    childrens:[
+      {
+        moduleName:"考勤管理",
+        topModuleId:'oa',
+        link:"/oa/kq/attendance/AttendanceMonth",
+        icon: require("../../assets/image/platform/module-attendance.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"绩效考核",
+        topModuleId:'oa',
+        link:"/oa/jx/MyAssessment",
+        icon: require("../../assets/image/platform/module-performance.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"档案信息",
+        topModuleId:'oa',
+        link:"/oa/hr/user/employeeInfo",
+        icon: require("../../assets/image/platform/module-record.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+    ]
+  },
+  {
+    title:"仓储管理",
+    childrens:[
+      {
+        moduleName:"合同管理",
+        topModuleId:'oa',
+        link:"/oa/ht/contractCard/ContractCardMng",
+        icon: require("../../assets/image/platform/module-contract.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      }
+    ]
+  },
+  {
+    title:"业务管控",
+    childrens:[
+      {
+        moduleName:"业务中心",
+        topModuleId:'oa',
+        link:"/mdp/workflow/re/procdef/ProcdefListForParames",
+        icon: require("../../assets/image/platform/module-business.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"客户管理",
+        topModuleId:'oa',
+        link:"/oa/crm/customer/CustomerIndex",
+        icon: require("../../assets/image/platform/module-customerCenter.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"项目管理",
+        topModuleId:'xm',
+        link:"/xm/core/xmProject/XmProjectMng",
+        icon: require("../../assets/image/platform/module-project.png"),
+        isHighlight:false,
+        moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"费用管理",
+        topModuleId:'ac',
+        link:"",
+        icon: require("../../assets/image/platform/module-cost.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      }, 
+      {
+        moduleName:"防伪",
+        topModuleId:'audit',
+        link:"/audit/base/productLifeCycle/productLifeCycleDetail/Safeguard",
+        icon: require("../../assets/image/platform/anti-fake.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },{
+        moduleName:"溯源",
+        topModuleId:'audit',
+        link:"/audit/base/productLifeCycle/productLifeCycleDetail/ProductLifeCycleDetailMng",
+        icon: require("../../assets/image/platform/traceSource.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },{
+        moduleName:"审计",
+        topModuleId:'audit',
+        link:"/audit/base/oper/operLog/OperLogMng",
+        icon: require("../../assets/image/platform/audit.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },
+
+    ]
+  },
+  {
+    title:"系统模块",
+    childrens:[
+      {
+        moduleName:"组织",
+        topModuleId:'sys',
+        link:"",
+        icon: require("../../assets/image/platform/module-organization.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"内容",
+        topModuleId:'arc',
+        link:"",
+        icon: require("../../assets/image/platform/module-content.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"流程",
+        topModuleId:'oa',
+        link:"",
+        icon: require("../../assets/image/platform/module-oa.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"商城",
+        topModuleId:'mallm',
+        link:"",
+        icon: require("../../assets/image/platform/module-store.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      } ,
+      {
+        moduleName:"营销",
+        topModuleId:'mk',
+        link:"",
+        icon: require("../../assets/image/platform/module-marketing.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"财务",
+        topModuleId:'ac',
+        link:"",
+        icon: require("../../assets/image/platform/module-finance.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"短信",
+        topModuleId:'',
+        link:"sms",
+        icon: require("../../assets/image/platform/module-note.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"聊天",
+        topModuleId:'im',
+        link:"",
+        icon: require("../../assets/image/platform/module-project.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      {
+        moduleName:"防伪",
+        topModuleId:'audit',
+        link:"/audit/base/productLifeCycle/productLifeCycleDetail/Safeguard",
+        icon: require("../../assets/image/platform/anti-fake.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },{
+        moduleName:"溯源",
+        topModuleId:'audit',
+        link:"/audit/base/productLifeCycle/productLifeCycleDetail/ProductLifeCycleDetailMng",
+        icon: require("../../assets/image/platform/traceSource.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },{
+        moduleName:"审计",
+        topModuleId:'audit',
+        link:"/audit/base/oper/operLog/OperLogMng",
+        icon: require("../../assets/image/platform/audit.png"),
+        isHighlight:false,
+        moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+      },
+      
+    ]
+  },
+  
+]
+export default categorys;
\ No newline at end of file
diff --git a/src/components/TopModules/index.vue b/src/components/TopModules/index.vue
new file mode 100644
index 00000000..f64c73a8
--- /dev/null
+++ b/src/components/TopModules/index.vue
@@ -0,0 +1,220 @@
+<template>  
+    <section>    
+      <div class="module-item" v-for="(item,index) in topModules" :key="index">
+        <div class="module-text" @click="gotolink(item)"  >
+          <div class="box-icon">
+                <img :src="item.icon" height="20px" />
+          </div>
+          <div class="box-info">{{item.moduleName}}</div> 
+        </div>
+      </div>  
+
+      
+      <div class="module-item"> 
+        <div class="module-text" @click="drawer=true"  >
+          <div class="box-icon">
+                <i class="el-icon-menu" height="20px" />
+          </div>
+          <div class="box-info">全部应用</div> 
+        </div>
+      </div> 
+
+      <div class="drawer-box">
+          <el-drawer  
+          :visible.sync="drawer"  
+          :direction="direction">
+          <div class="drawer">
+            <div class="drawer-content">
+              <div class="drawer-content-input">
+                <el-input placeholder="请输入中文" v-model.trim="key" clearable prefix-icon = "el-icon-search" size="small" style="width:60%">
+                </el-input>
+              </div>
+              <div class="drawer-content-category" v-for="(item,index) in categorys" :key="index">
+                <div class="category-name" v-text="item.title"></div>
+                <div class="category-list">
+                  <div
+                    class="category-item"
+                    v-for="(module,mindex) in item.childrens" :key="index+'_'+mindex"
+                    @click="gotolink(module)"
+                    :class="{highlight : module.isHighlight }"
+                  > 
+                    <div class="module-icon">
+                      <img :src="module.icon">
+                    </div>
+                    <div class="module-name" v-text="module.moduleName"></div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </el-drawer> 
+      </div>
+    </section>
+</template>
+
+<script> 
+
+import NProgress from 'nprogress' // progress bar  
+const topModulesData = require("./top_modules_"+process.env.CONTEXT+".js") 
+
+const allModulesData = require("./all_modules.js") 
+ 
+export default {
+  created() {
+  },
+  data() { 
+    return {
+      levelList: null,
+      drawer: false,
+      direction: 'rtl',
+      key:"",
+      topModules: topModulesData.default,
+      //模块分类
+      categorys:allModulesData.default,
+    }
+  },
+  watch: { 
+    key(val){ 
+      this.searchModule();
+    }
+  },
+  methods: { 
+    //路由跳转
+    gotolink(module) {
+      if(module.topModuleId==process.env.CONTEXT){
+        this.drawer = false
+        this.$router.push({path:module.link});
+      } else{
+        this.jumpToOtherSystem(module);
+      }   
+    },
+    //系统跳转
+    jumpToOtherSystem(module) {  
+        let href = window.location.protocol + "//" + window.location.host + "/" + module.topModuleId + "/"+ process.env.VERSION +"/#" + module.link; 
+        window.open(href, module.moduleName,null,true);
+        NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
+
+      },
+    //搜索
+    searchModule(){
+      for(let i =0 ; i <this.categorys.length; i++){
+        for(let j =0 ; j <this.categorys[i].childrens.length; j++){
+          let module = this.categorys[i].childrens[j];
+            this.categorys[i].childrens[j].isHighlight = false;
+        }
+
+      }
+      if(this.key != ""){
+        for(let i =0 ; i <this.categorys.length; i++){
+          for(let j =0 ; j <this.categorys[i].childrens.length; j++){
+            let module = this.categorys[i].childrens[j];
+            if(module.moduleName.indexOf(this.key) > -1){
+              this.categorys[i].childrens[j].isHighlight = true;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped> 
+
+ .drawer-box{
+    .drawer{
+      padding-left: 10px;
+      padding-right: 10px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .drawer-content{
+        width: 900px;
+        height: 100%;
+        .drawer-content-input{
+          display: flex;
+          justify-content: center;
+        }
+        .drawer-content-category{
+          .category-name{
+            color: #333333;
+            font-size: 16px;
+          }
+          .category-list{
+            display: flex;
+            justify-content: flex-start;
+            flex-wrap: wrap;
+            .category-item{
+              height: 70px;
+              width: 70px;
+              margin-right: 20px;
+              transition: all 0.3s;
+              .module-icon{
+                width: 70px;
+                height: 38px;
+                text-align: center;
+                display: flex;
+                flex-direction: column;
+                justify-content: center;  
+                align-items: center;
+                img{
+                  width: 20px;
+                }
+                }
+              .module-name{
+                height: 32px;
+                line-height: 32px;
+                color:#666666;
+                font-size: 12px;
+                text-align: center;
+              }
+            }
+            .category-item:hover{
+              background: rgb(240, 241, 245);
+            }
+          }
+        }
+      }
+    }
+    .highlight{
+      transform: scale(1.05);
+      -webkit-box-shadow: 0 0 30px rgba(0, 0, 0, 0.1);
+      border-radius: 50%;
+      box-shadow: 0 0 30px rgba(0, 0, 0, 0.15);
+    }
+    
+  }
+  .module-item {
+    display: inline-block;
+    cursor: pointer;
+    fill: #5a5e66;
+    align-items: center; 
+    text-align: center;
+    margin-left: 10px;  
+     
+    .module-text{  
+      line-height: 22px;
+      font-size: 22px;  
+    }
+    
+    .box-icon {
+      padding-top:5px; 
+      text-align: center;
+    }
+
+    .box-info {
+      text-align: center;
+      font-size: 14px;
+      color: #000000; 
+    }
+}
+
+</style>
+<style rel="stylesheet/scss" lang="scss"> 
+.drawer-box{
+  .el-drawer{
+    height: 100%!important;
+    overflow: auto;
+  }
+} 
+</style>
diff --git a/src/components/TopModules/top_modules_oa.js b/src/components/TopModules/top_modules_oa.js
new file mode 100644
index 00000000..1b60c726
--- /dev/null
+++ b/src/components/TopModules/top_modules_oa.js
@@ -0,0 +1,85 @@
+var topModules=
+[
+    {
+      moduleName:"待审批",
+      topModuleId:'oa',
+      link:"/mdp/workflow/ru/task/TaskListAssigneeToMe",
+      icon: require("../../assets/image/platform/module-task.png"),
+      isHighlight:false,
+      moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+    },
+    {
+      moduleName:"日程",
+      topModuleId:'oa',
+      link:"/oa/rc/rcScheduleMy/RcScheduleMyMng",
+      icon: require("../../assets/image/platform/module-schedule.png"),
+      isHighlight:false,
+      moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+    },
+    {
+      moduleName:"会议",
+      topModuleId:'oa',
+      link:"/oa/meet/meetMeeting/MeetMeetingRequire",
+      icon: require("../../assets/image/platform/module-meeting.png"),
+      isHighlight:false,
+      moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+    },
+    {
+      moduleName:"办公用品",
+      topModuleId:'oa',
+      link:"/oa/om/omCategory/OmCategoryMng",
+      icon: require("../../assets/image/platform/module-office.png"),
+      isHighlight:false,
+      moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+    },
+    {
+      moduleName:"档案",
+      topModuleId:'oa',
+      link:"/oa/hr/user/employeeInfo",
+      icon: require("../../assets/image/platform/module-record.png"),
+      isHighlight:false,
+      moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+    },
+    {
+      moduleName:"通讯录",
+      topModuleId:'sys',
+      link:"/mdp/sys/user/deptUserMng",
+      icon: require("../../assets/image/platform/module-addressBook.png"),
+      isHighlight:false,
+      moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+    },
+    {
+      moduleName:"合同",
+      topModuleId:'oa',
+      link:"/oa/ht/contractCard/ContractCardMng",
+      icon: require("../../assets/image/platform/module-contract.png"),
+      isHighlight:false,
+      moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+    },
+    {
+      moduleName:"财务",
+      topModuleId:'ac',
+      link:"",
+      icon: require("../../assets/image/platform/module-finance.png"),
+      isHighlight:false,
+      moduleType : '2' // 模块类型，1-系统类模块 2-系统外模块
+    },
+    {
+      moduleName:"项目",
+      topModuleId:'xm',
+      link:"/xm/core/xmProject/XmProjectMng",
+      icon: require("../../assets/image/platform/module-project.png"),
+      isHighlight:false,
+      moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+    },
+    {
+      moduleName:"资产",
+      topModuleId:'oa',
+      link:"/oa/erp/pur/require/RequireMng",
+      icon: require("../../assets/image/platform/module-property.png"),
+      isHighlight:false,
+      moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
+    },
+]
+
+export default topModules
\ No newline at end of file
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index cf8e2dcd..8abd4aad 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -1,10 +1,12 @@
 <template>
   <el-menu class="navbar" mode="horizontal">
     <hamburger class="hamburger-container" :toggleClick="toggleSideBar" :isActive="sidebar.opened"></hamburger>
-
-    <breadcrumb class="breadcrumb-container hidden-sm-and-down"></breadcrumb>
-
+     
+    <!--<breadcrumb class="breadcrumb-container"></breadcrumb>-->
+    <top-modules class="modules-container"></top-modules> 
+    
     <div class="right-menu">
+      <!--
       <div class="hidden-sm-and-down" style="float:left;display:flex;align-items: center;height:100%;">				
         <el-tooltip v-if="workShop.locationName" class="item" effect="dark" :content="workShop.branchId+' '+workShop.shopId+' '+workShop.locationId" placement="top-start">
 				  <el-tag>{{workShop.branchName}} {{workShop.locationName}}</el-tag>
@@ -14,10 +16,11 @@
 				</el-tooltip>
 				<el-button @click="showSelectShopMethod" type="primary" v-if="workShop.isSuperAdmin||workShop.isPlatFormAdmin">切换商户</el-button>
 			</div>
+      -->
      <error-log class="errLog-container right-menu-item hidden-sm-and-down"></error-log>
 		 
-        <screenfull class="screenfull right-menu-item"></screenfull> 
-
+ 
+      <screenfull class="screenfull right-menu-item"></screenfull> 
       <lang-select class="international right-menu-item hidden-sm-and-down"></lang-select>
 
       <el-tooltip class="hidden-sm-and-down"  effect="dark" :content="$t('navbar.theme')" placement="bottom">
@@ -95,6 +98,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
+import TopModules from '@/components/TopModules'
 import Hamburger from '@/components/Hamburger'
 import ErrorLog from '@/components/ErrorLog'
 import Screenfull from '@/components/Screenfull'
@@ -109,7 +113,8 @@ export default {
     ErrorLog,
     Screenfull,
     LangSelect,
-    ThemePicker
+    ThemePicker,
+    TopModules
   },
   data:function(){
 	return {
@@ -230,16 +235,24 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>  
 @import './iconfont.css';
-.navbar {
+.navbar { 
   height: 50px;
   line-height: 50px;
   border-radius: 0px !important;
+  background-color: lightblue;
   .hamburger-container {
     line-height: 58px;
     height: 50px;
     float: left;
     padding: 0 10px;
   }
+  
+  .modules-container {
+    line-height: 58px;
+    height: 50px;
+    float: left;
+    padding: 0 10px;
+  }
   .breadcrumb-container{
     float: left;
   }
diff --git a/src/views/layout/components/Sidebar/Logo.vue b/src/views/layout/components/Sidebar/Logo.vue
index 68caea7c..96146f23 100644
--- a/src/views/layout/components/Sidebar/Logo.vue
+++ b/src/views/layout/components/Sidebar/Logo.vue
@@ -41,7 +41,6 @@ export default {
 }
 
 .sidebar-logo-container {
-  position: relative;
   width: 100%;
   height: 50px;
   line-height: 50px;
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 7648f654..b577ee62 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -1,5 +1,7 @@
 <template> 
-  <scroll-bar>
+  <section>
+  <logo :collapse="isCollapse"/>
+  <scroll-bar> 
     <el-menu
       mode="vertical"
       :show-timeout="200"
@@ -8,11 +10,11 @@
       background-color="#304156"
       text-color="#bfcbd9"
       active-text-color="#409EFF"
-    >
-      <logo :collapse="isCollapse"/>
+    > 
       <sidebar-item :routes="permission_routers"></sidebar-item>
     </el-menu>
   </scroll-bar>
+  </section>
 </template>
 
 <script>
diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index e34a51be..7d01571b 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -1,18 +1,6 @@
 <template>
-  <div class="tags-view-container">
-    <scroll-pane class='tags-view-wrapper' ref='scrollPane'>
-      <router-link ref='tag' class="tags-view-item" :class="isActive(tag)?'active':''" v-for="tag in Array.from(visitedViews)"
-        :to="tag" :key="tag.path" @contextmenu.prevent.native="openMenu(tag,$event)">
-        {{generateTitle(tag.title)}}
-        <span class='el-icon-close' @click.prevent.stop='closeSelectedTag(tag)'></span>
-      </router-link>
-    </scroll-pane>
-    <ul class='contextmenu' v-show="visible" :style="{left:left+'px',top:top+'px'}">
-      <li @click="closeSelectedTag(selectedTag)">{{$t('tagsView.close')}}</li>
-      <li @click="closeOthersTags">{{$t('tagsView.closeOthers')}}</li>
-      <li @click="closeAllTags">{{$t('tagsView.closeAll')}}</li>
-    </ul>
-  </div>
+  <section>
+  </section>
 </template>
 
 <script>
@@ -37,7 +25,7 @@ export default {
   watch: {
     $route() {
       this.addViewTags()
-      this.moveToCurrentTag()
+      //this.moveToCurrentTag()
     },
     visible(value) {
       if (value) {
diff --git a/src/views/mdp/arc/archiveAttachment/AttachmentUpload.vue b/src/views/mdp/arc/archiveAttachment/AttachmentUpload.vue
index 445a3099..1d26e736 100644
--- a/src/views/mdp/arc/archiveAttachment/AttachmentUpload.vue
+++ b/src/views/mdp/arc/archiveAttachment/AttachmentUpload.vue
@@ -56,9 +56,19 @@
           :disabled="isDisabled"
         >
           <el-button type="text" :class="{ change: isDisabled }">上传附件</el-button>
+          <!-- <el-button >查看附件</el-button> -->
         </el-upload>
       </el-col>
-      <el-col :span="6" style="padding-right: 50px;">
+
+      <el-col v-if="isUserInfo&&isUserInfo==1" :span="6" style="padding-right: 50px;">
+        <el-button v-if="fileList==[]||fileList.length==0" @click="showFile">显示附件</el-button>
+        <el-button v-else @click="hideFile">隐藏附件</el-button>
+        <!-- <el-button
+          @click="handleOnlinePeview"
+          :disabled="previewOnlineUrls.length<=0"
+        >预览{{previewOnlineUrls.length}}张图</el-button> -->
+      </el-col>
+      <el-col v-else :span="6" style="padding-right: 50px;">
         <el-button
           @click="handleOnlinePeview"
           :disabled="previewOnlineUrls.length<=0"
@@ -74,7 +84,7 @@ import {
   listArchiveAttachment,
   delArchiveAttachment
 } from "@/api/mdp/arc/archiveAttachment";
-
+import {listHrUserAccessory} from "@/api/oa/hr/user/hrUserAccessory";
 export default {
   props: [
     "branchId",
@@ -84,22 +94,37 @@ export default {
     "listType",
     "limit",
     "eliminate",
-    "isDisabled"
+    "isDisabled",
+    "userId",
+    "isUserInfo"
   ],
   watch: {
+    // archiveId: function(archiveId){
+    //   this.fileList = [];
+    //   console.log(1,archiveId);
+    //   // listHrUserAccessory({relevanceId:this.archiveId}).then(res => {
+    //   //   var files1 = res.data.data
+    //   //   files1.forEach(i => (i.name = i.name));
+    //   //   console.log(2,files1);
+    //   // });
+    // },
     archiveId: function(archiveId) {
       var that = this;
       this.$nextTick(_ => {
         this.fileList = [];
-        listArchiveAttachment({ archiveId: this.archiveId }).then(res => {
-          var files = res.data.data;
-          if (files && files.length > 0) {
-            files.forEach(i => {
-              i.name = i.name;
-              that.fileList.push(i);
-            });
-          }
-        });
+        if(this.isUserInfo==1){
+        }else{
+          listArchiveAttachment({ archiveId: that.archiveId }).then(res => {
+            var files = res.data.data;
+            if (files && files.length > 0) {
+              files.forEach(i => {
+                i.name = i.name;
+                that.fileList.push(i);
+              });
+            }
+          });
+        }
+
       });
     },
     eliminate: function(eliminate) {
@@ -128,7 +153,7 @@ export default {
       });
       previewOnlineUrls.forEach(i => {
         i.url =
-          config.getArcFileUploadBasePath() + "/" + i.url + "?name=" + i.name;
+          config.getArcFileUploadBasePath() + "/" + i.accessory + "?name=" + i.name;
       });
       console.log(
         "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx00000000000000000000000000000000000"
@@ -144,7 +169,9 @@ export default {
       fileList: [],
       showPreviewImage: false,
       showOnePreviewImage: false,
-      image: null
+      image: null,
+      isshow:false,
+      isshowtrue:false
       /**end 在上面加自定义属性**/
     }; //end return
   }, //end data
@@ -157,16 +184,39 @@ export default {
     handleSuccess(res, file) {
       if (res.tips.isOk) {
         file = Object.assign(file, res.data);
+        console.log(this.isshowtrue);
         this.fileList.push(res.data);
+        if(!this.isshowtrue){
+          this.fileList = [];
+        }
+        console.log(this.fileList);
         this.$emit('getCarFrontImageUrl',res.data.url)
         this.$emit('getCarBackImageUrl',res.data.url)
         this.$emit('getCarInnerImageUrl',res.data.url)
         this.$emit('uploadSuccess',file)
+        this.$message.success('上传附件成功');
       } else {
         this.$message.warning(res.tips.msg);
         return false;
       }
     },
+    showFile(){
+      console.log(6,this.fileList);
+      this.isshowtrue = true;
+      listHrUserAccessory({relevanceId:this.archiveId,userid:this.userId}).then(res => {
+        var files = res.data.data;
+        files.forEach(i => (i.name = i.name));
+        this.fileList = files;
+        console.log(2,this.fileList);
+        if(this.fileList.length == 0||!this.fileList.length){
+          this.$message('暂无附件');
+        }
+      });
+    },
+    hideFile(){
+      this.isshowtrue = false;
+      this.fileList = [];
+    },
     handleRemove(file, fileList) {
       if (!file.id || file.id == null || file.id == "") {
         return true;
@@ -226,13 +276,14 @@ export default {
       var canDel = false;
       this.fileList.forEach(item => {
         if (item.name == file.name) {
-          if (item.canDel == "1") {
+          if (item.canDel == "1"||item.type == "1") {
             canDel = true;
             return;
           }
         }
       });
       if (canDel == false && file.id && file.id != null && file.id != "") {
+        console.log(66);
         this.$message.warning(file.name + "设置了不允许删除");
         return false;
       } else if (
@@ -252,13 +303,13 @@ export default {
         this.$message({ message: "文件已经存在", type: "warning" });
         return false;
       } else {
-        if (file.size > 1024 * 1024 * 4) {
+        if (file.size > 1024 * 1024) {
           //4M
           this.$message({
             message:
               "文件大小为" +
               file.size / (1024 * 1024) +
-              "M,大于4M，不允许上传。",
+              "M,大于1M，不允许上传。",
             type: "warning"
           });
           return false;
@@ -281,12 +332,6 @@ export default {
     if (!this.archiveId) {
       return;
     }
-    
-    listArchiveAttachment({ archiveId: this.archiveId }).then(res => {
-      var files = res.data.data;
-      files.forEach(i => (i.name = i.name));
-      this.fileList = files;
-    });
     /**在下面写其它函数***/
   } //end mounted
 };
@@ -299,4 +344,4 @@ export default {
   cursor: none;
 }
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/mdp/arc/tag/TagMng.vue b/src/views/mdp/arc/tag/TagMng.vue
index 3c9208a1..7efdef53 100644
--- a/src/views/mdp/arc/tag/TagMng.vue
+++ b/src/views/mdp/arc/tag/TagMng.vue
@@ -1,35 +1,49 @@
 <template>
-	<section>
-		<sticky :className="'sub-navbar draft'" style="margin-left:-20px;margin-right:-20px;">
-		<el-row>
-			 <el-col :span="6"> 
-				<el-input  style="width:99%;"  v-model="needAddTagCategoryNameInputValue" placeholder="标签分类，回车直接添加"
-				 @keyup.enter.native="addTagCategorySubmitMethod"></el-input>
-         		
-			 </el-col>
-			 <el-col :span="14">
-				 <el-checkbox  v-if="userInfo.isPlatformAdmin||userInfo.isSuperAdmin" v-model="isPub" true-label='1' false-label='0'>公共分类</el-checkbox>
-        	<el-button type="primary" v-if="jump==true" @click="selectConfirm">确认</el-button>
-			<el-button type="primary"   @click="getTags" v-loading="sectionLoading">查询</el-button> 
-			 
-			</el-col>
-			<el-col :span="4" class="hidden-sm-and-down">
+  <section>
+    <!-- <sticky :className="'sub-navbar draft'" style="margin-left:-20px;margin-right:-20px;"> -->
+    <el-row>
+      <el-col :span="6">
+        <el-input style="width:99%;" v-model="needAddTagCategoryNameInputValue" placeholder="标签分类，回车直接添加"
+          @keyup.enter.native="addTagCategorySubmitMethod"></el-input>
+
+      </el-col>
+      <el-col :span="14">
+        <el-checkbox v-if="userInfo.isPlatformAdmin||userInfo.isSuperAdmin" v-model="isPub" true-label='1'
+          false-label='0'>公共分类</el-checkbox>
+        <el-button @click="getTags" v-loading="sectionLoading" style="">查询</el-button>
+        <el-button type="primary" v-if="jump==true" @click="selectConfirm">确认</el-button>
+
+
+      </el-col>
+      <!-- <el-col :span="4" class="hidden-sm-and-down">
 			 	<el-tooltip content="黄色表示已经有的标签"><span class="addTagSquare"></span></el-tooltip>
 				 <el-tooltip content="白色表示尚未拥有的标签"><span class="closeTagSquare"></span></el-tooltip>
-				
-			</el-col> 
-		</el-row>
-		</sticky>
-		<el-row class="app-container">
-
-			<el-row v-for="(item,index) in convertTags" :key="item.categoryId">
-				<h3> 
-					<div>{{item.categoryName+(item.pubc=='1'?'(公共)':'')}}<i class="el-icon-close closeStyle" @click.stop="delTagCategoryMethod(item.categoryId,index)"></i>:</div>
-				 
-				</h3>
-				<!--el-icon-circle-close--> 
-				<el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;width: 100%;">
-					<div :class="v.checked?'checkCopyButton':'copyButton'" v-for="(v,valueIndex) in item.values" :key="valueIndex"
+
+			</el-col> -->
+    </el-row>
+    </sticky>
+    <el-row class="page-container border">
+
+      <el-row v-for="(item,index) in convertTags" :key="item.categoryId">
+        <h3>
+          <div>{{item.categoryName+(item.pubc=='1'?'(公共)':'')}}<i class="el-icon-close closeStyle"
+              @click.stop="delTagCategoryMethod(item.categoryId,index)"></i></div>
+
+        </h3>
+        <!--el-icon-circle-close-->
+
+        <el-tag :key="tagName" v-for="(i,valueIndex) in item.values" closable :disable-transitions="false"
+          @close="delTagMethod(i.tagId,index,valueIndex)" :color="i.checked?'':'#ffffff'" :effect="i.checked?'dark':'light'"  @click="clickTagMethod(index,valueIndex)">
+          {{i.tagName +(i.pubTag=='1'?'(公共)':'')}}
+        </el-tag>
+        <el-input class="input-new-tag" v-if="item.showAddButtonVisible" v-model="item.showAddButtonInputValue"
+          ref="saveTagInput" size="small" @keyup.enter.native="addTagMethod(index)" @blur="addTagMethod(index)">
+        </el-input>
+        <el-button v-else class="button-new-tag" size="small" @click="showAddButtonMethod(index)">+ 标签</el-button>
+
+
+        <!-- <el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;width: 100%;">
+					<div :class="v.checked?'checkCopyButton':''" v-for="(v,valueIndex) in item.values" :key="valueIndex"
 					 @click="clickTagMethod(index,valueIndex)">{{v.tagName +(v.pubTag=='1'?'(公共)':'')}}
 						<i class="el-icon-close closeStyle" @click.stop="delTagMethod(v.tagId,index,valueIndex)"></i>
 					</div>
@@ -38,657 +52,701 @@
 
           			</div>
 					<div v-else class="add" @click="showAddButtonMethod(index)"><i class="el-icon-circle-plus-outline" style="font-size:35px;"></i></div>
-				</el-col> 
-			</el-row>
+				</el-col> -->
+      </el-row>
 
 
-		</el-row>
-	</section>
+    </el-row>
+  </section>
 </template>
 
 <script>
-	import util from '@/common/js/util'; //全局公共库
-	import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-  import { listTag, delTag, batchDelTag,addTag, getAllTag,deleteTagCategory} from '@/api/mdp/arc/tag';
-	import {
-		mapGetters
-	} from 'vuex'
-	import { 
-		listTagCategory,
-		addTagCategory
-	} from '@/api/mdp/arc/tagCategory';
-
-	export default {
-		computed: {
-			...mapGetters([
-				'workShop','userInfo'
-			])
-		},
-		//
-		props: ['jump', 'visible','tagIds'],
-		watch: {
-
-			
-			'tagIds': function(tagIds) { 
-				if(tagIds && tagIds.length>0){
-					this.convertTags.forEach(i=>{
-						if( i.values &&  i.values.length>0){
-							i.values.forEach(k=>{
-							if(tagIds.some(j=>j==k.tagId)){
-								k.checked=true;
-							}else{
-								k.checked=false;
-							}
-						});
-					 } 
-				 });
-				}
-				 
-			},
-			'visible': function(visible) {
-				if (visible == true) {
-					//从新打开页面时某些数据需要重新加载，可以在这里添加
-					console.log("visit---:MemMenmberTagMng")
-					//this.getTags();
-				}
-			}
-		},
-
-		data() {
-			return {
-				userFormVisible: false, //该组用户
-				showwAddTagCategoryVisible: false,
-				needAddTagCategoryNameInputValue: '',
-				sectionLoading: false,
-				convertTags: [],
-				filters: {
-					key: ''
-				},
-				memMemberUserId: null, //过滤条件,userid
-				memMemberTags: [], //查询结果
-				pageInfo: { //分页数据
-					total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize: 10, //每页数据
-					count: false, //是否需要重新计算总记录数
-					pageNum: 1, //当前页码、从1开始计算
-					orderFields: [], //排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs: [] //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-				},
-				load: {
-					list: false,
-					edit: false,
-					del: false,
-					add: false
-				}, //查询中...
-				sels: [], //列表选中数据
-				options: {}, //下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
-
-				addFormVisible: false, //新增memMemberTag界面是否显示
-				//新增memMemberTag界面初始化数据
-				addForm: {
-					userid: '',
-					tag: '',
-					addUserid: '',
-					addTime: '',
-					state: '',
-					id: '',
-          			isPub :'',
-				},
-
-				editFormVisible: false, //编辑界面是否显示
-				/*userFormVisible: false,*/ //该组用户
-				//编辑memMemberTag界面初始化数据
-				editForm: {
-					userid: '',
-					tag: '',
-					addUserid: '',
-					addTime: '',
-					state: '',
-					id: '',
-          isPub:'',
-				},
-				/**begin 自定义属性请在下面加 请加备注**/
-        isPub:'0'
-				/**end 自定义属性请在上面加 请加备注**/
-			}
-		}, //end data
-		methods: {
-			handleSizeChange(pageSize) {
-				this.pageInfo.pageSize = pageSize;
-				this.getTags();
-			},
-			handleCurrentChange(pageNum) {
-				this.pageInfo.pageNum = pageNum;
-				this.getTags();
-			},
-			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-			sortChange(obj) {
-				var dir = 'asc';
-				if (obj.order == 'ascending') {
-					dir = 'asc'
-				} else {
-					dir = 'desc';
-				}
-				if (obj.prop == 'xxx') {
-					this.pageInfo.orderFields = ['xxx'];
-					this.pageInfo.orderDirs = [dir];
-				}
-				this.getTags();
-			},
-			searchTags() {
-				this.pageInfo.count = true;
-				this.getTags();
-			},
-			//获取列表 MemMemberTag mem_member_tag
-			getTags() {
-				this.showwAddTagCategoryVisible = false;
-				let params = {
-					/* pageSize: this.pageInfo.pageSize,
-					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,
-					count:this.pageInfo.count */
-				};
-				if (this.pageInfo.orderFields != null && this.pageInfo.orderFields.length > 0) {
-					let orderBys = [];
-					for (var i = 0; i < this.pageInfo.orderFields.length; i++) {
-						orderBys.push(this.pageInfo.orderFields[i] + " " + this.pageInfo.orderDirs[i])
-					}
-					params.orderBy = orderBys.join(",")
-				}
-				if (this.filters.key !== "") {
-					params.key = "%" + this.filters.key + "%"
-				} else {
-					//params.xxx=xxxxx
-				}
-
-				params.shopId = this.workShop.shopId;
-				params.branchId = this.workShop.branchId;
-				this.sectionLoading = true;
-				this.convertTags = [];
-				getAllTag(params).then((res) => {
-					var tips = res.data.tips;
-					if (tips.isOk) {
-						/* this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false; */ 
-						let allTag = res.data.data; 
-						let convert = [];
-						for (let i = 0; i < allTag.length; i++) {
-							let flag = true; //判断是否需要添加
-							var tag=allTag[i];
-							for (let j = 0; j < convert.length; j++) {
-								
-								if (tag.tagId && tag.categoryId == convert[j].categoryId ) {
-									let json = {
-										"isSaveInDatabase": true,
-										"checked": tag.checked ? true : false,
-										"tagId": tag.tagId,
-										"tagName": tag.tagName,
-                    					"pubTag":tag.pubTag,
-									}
-									if(this.tagIds && this.tagIds.some(id=>id==json.tagId)){
-										json.checked=true;
-									}
-									convert[j].values.push(json);
-									flag = false;
-									break;
-								}
-							}
-							if (flag) {
-								let json = {
-									"showAddButtonVisible": false, //添加标签按钮
-									"showAddButtonInputValue": '', //添加标签按钮的输入框的值
-									"categoryId": tag.categoryId,
-									"categoryName": tag.categoryName,
-									"pubc":tag.pubc,
-									"values": [{
-										"isSaveInDatabase": false,
-										"checked": false,
-										"tagId": tag.tagId,
-										"tagName": tag.tagName,
-                    					"pubTag":tag.pubTag,
-									}]
-								}
-								if (!json.values[0].tagId) {
-									json.values = [];
-								}else{
-									
-									if(this.tagIds && this.tagIds.some(id=>id==json.values[0].tagId)){
-										json.values[0].checked=true;
-									}
-								}
-								convert.push(json);
-							}
-						}
-						this.convertTags = convert;
-					} else {
-						this.$message({
-							message: tips.msg,
-							type: 'error'
-						});
-					}
-					this.sectionLoading = false;
-				}).catch(err => this.sectionLoading = false);
-			},
-
-			//显示编辑界面 MemMemberTag mem_member_tag
-			showEdit: function(row, index) {
-				this.editFormVisible = true;
-				this.editForm = Object.assign({}, row);
-			},
-			//显示新增界面 MemMemberTag mem_member_tag
-			showAdd: function() {
-				this.addFormVisible = true;
-				//this.addForm=Object.assign({}, this.editForm);
-			},
-			//显示该组的User
-			//             showUser: function ( row,index ) {
-			//                 this.userFormVisible = true;
-			//                 this.editForm = Object.assign({}, row);
-			//             },
-			afterAddSubmit() {
-				this.addFormVisible = false;
-				this.pageInfo.count = true;
-				this.getTags();
-			},
-			afterEditSubmit() {
-				this.editFormVisible = false;
-				this.getTags();
-			},
-			//选择行memMemberTag
-			selsChange: function(sels) {
-				this.sels = sels;
-			},
-			//删除memMemberTag
-			handleDel: function(row, index) {
-				this.$confirm('确认删除该记录吗?', '提示', {
-					type: 'warning'
-				}).then(() => {
-					this.load.del = true;
-					let params = {
-						id: row.id
-					};
-					delMemMemberTag(params).then((res) => {
-						this.load.del = false;
-						var tips = res.data.tips;
-						if (tips.isOk) {
-							this.pageInfo.count = true;
-							this.getTags();
-						}
-						this.$message({
-							message: tips.msg,
-							type: tips.isOk ? 'success' : 'error'
-						});
-					}).catch(err => this.load.del = false);
-				});
-			},
-			//批量删除memMemberTag
-			batchDel: function() {
-
-				this.$confirm('确认删除选中记录吗？', '提示', {
-					type: 'warning'
-				}).then(() => {
-					this.load.del = true;
-					batchDelMemMemberTag(this.sels).then((res) => {
-						this.load.del = false;
-						var tips = res.data.tips;
-						if (tips.isOk) {
-							this.pageInfo.count = true;
-							this.getTags();
-						}
-						this.$message({
-							message: tips.msg,
-							type: tips.isOk ? 'success' : 'error'
-						});
-					}).catch(err => this.load.del = false);
-				});
-			},
-			rowClick: function(row, event, column) {
-				this.$emit('row-click', row, event, column); //  @row-click="rowClick"
-			},
-			clickTagMethod(index, valueIndex) {
-				this.convertTags[index].values[valueIndex].checked = !this.convertTags[index].values[valueIndex].checked;
-			},
-
-			//显示添加按钮的方法
-			showAddButtonMethod(index) {
-				this.convertTags[index].showAddButtonVisible = true;
-			},
+  import util from '@/common/js/util'; //全局公共库
+  import Sticky from '@/components/Sticky' // 粘性header组件
+  //import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+  import {
+    listTag,
+    delTag,
+    batchDelTag,
+    addTag,
+    getAllTag,
+    deleteTagCategory
+  } from '@/api/mdp/arc/tag';
+  import {
+    mapGetters
+  } from 'vuex'
+  import {
+    listTagCategory,
+    addTagCategory
+  } from '@/api/mdp/arc/tagCategory';
+
+  export default {
+    computed: {
+      ...mapGetters([
+        'workShop', 'userInfo'
+      ])
+    },
+    //
+    props: ['jump', 'visible', 'tagIds'],
+    watch: {
+
+
+      'tagIds': function(tagIds) {
+        if (tagIds && tagIds.length > 0) {
+          this.convertTags.forEach(i => {
+            if (i.values && i.values.length > 0) {
+              i.values.forEach(k => {
+                if (tagIds.some(j => j == k.tagId)) {
+                  k.checked = true;
+                } else {
+                  k.checked = false;
+                }
+              });
+            }
+          });
+        }
+
+      },
+      'visible': function(visible) {
+        if (visible == true) {
+          //从新打开页面时某些数据需要重新加载，可以在这里添加
+          console.log("visit---:MemMenmberTagMng")
+          //this.getTags();
+        }
+      }
+    },
+
+    data() {
+      return {
+        userFormVisible: false, //该组用户
+        showwAddTagCategoryVisible: false,
+        needAddTagCategoryNameInputValue: '',
+        sectionLoading: false,
+        convertTags: [],
+        filters: {
+          key: ''
+        },
+        memMemberUserId: null, //过滤条件,userid
+        memMemberTags: [], //查询结果
+        pageInfo: { //分页数据
+          total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
+          pageSize: 10, //每页数据
+          count: false, //是否需要重新计算总记录数
+          pageNum: 1, //当前页码、从1开始计算
+          orderFields: [], //排序列 如 ['sex','student_id']，必须为数据库字段
+          orderDirs: [] //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+        },
+        load: {
+          list: false,
+          edit: false,
+          del: false,
+          add: false
+        }, //查询中...
+        sels: [], //列表选中数据
+        options: {}, //下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+
+        addFormVisible: false, //新增memMemberTag界面是否显示
+        //新增memMemberTag界面初始化数据
+        addForm: {
+          userid: '',
+          tag: '',
+          addUserid: '',
+          addTime: '',
+          state: '',
+          id: '',
+          isPub: '',
+        },
+
+        editFormVisible: false, //编辑界面是否显示
+        /*userFormVisible: false,*/ //该组用户
+        //编辑memMemberTag界面初始化数据
+        editForm: {
+          userid: '',
+          tag: '',
+          addUserid: '',
+          addTime: '',
+          state: '',
+          id: '',
+          isPub: '',
+        },
+        /**begin 自定义属性请在下面加 请加备注**/
+        isPub: '0'
+        /**end 自定义属性请在上面加 请加备注**/
+      }
+    }, //end data
+    methods: {
+      handleSizeChange(pageSize) {
+        this.pageInfo.pageSize = pageSize;
+        this.getTags();
+      },
+      handleCurrentChange(pageNum) {
+        this.pageInfo.pageNum = pageNum;
+        this.getTags();
+      },
+      // 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
+      sortChange(obj) {
+        var dir = 'asc';
+        if (obj.order == 'ascending') {
+          dir = 'asc'
+        } else {
+          dir = 'desc';
+        }
+        if (obj.prop == 'xxx') {
+          this.pageInfo.orderFields = ['xxx'];
+          this.pageInfo.orderDirs = [dir];
+        }
+        this.getTags();
+      },
+      searchTags() {
+        this.pageInfo.count = true;
+        this.getTags();
+      },
+      //获取列表 MemMemberTag mem_member_tag
+      getTags() {
+        this.showwAddTagCategoryVisible = false;
+        let params = {
+          /* pageSize: this.pageInfo.pageSize,
+          pageNum: this.pageInfo.pageNum,
+          total: this.pageInfo.total,
+          count:this.pageInfo.count */
+        };
+        if (this.pageInfo.orderFields != null && this.pageInfo.orderFields.length > 0) {
+          let orderBys = [];
+          for (var i = 0; i < this.pageInfo.orderFields.length; i++) {
+            orderBys.push(this.pageInfo.orderFields[i] + " " + this.pageInfo.orderDirs[i])
+          }
+          params.orderBy = orderBys.join(",")
+        }
+        if (this.filters.key !== "") {
+          params.key = "%" + this.filters.key + "%"
+        } else {
+          //params.xxx=xxxxx
+        }
+
+        params.shopId = this.workShop.shopId;
+        params.branchId = this.workShop.branchId;
+        this.sectionLoading = true;
+        this.convertTags = [];
+        getAllTag(params).then((res) => {
+          var tips = res.data.tips;
+          if (tips.isOk) {
+            /* this.pageInfo.total = res.data.total;
+            this.pageInfo.count=false; */
+            let allTag = res.data.data;
+            let convert = [];
+            for (let i = 0; i < allTag.length; i++) {
+              let flag = true; //判断是否需要添加
+              var tag = allTag[i];
+              for (let j = 0; j < convert.length; j++) {
+
+                if (tag.tagId && tag.categoryId == convert[j].categoryId) {
+                  let json = {
+                    "isSaveInDatabase": true,
+                    "checked": tag.checked ? true : false,
+                    "tagId": tag.tagId,
+                    "tagName": tag.tagName,
+                    "pubTag": tag.pubTag,
+                  }
+                  if (this.tagIds && this.tagIds.some(id => id == json.tagId)) {
+                    json.checked = true;
+                  }
+                  convert[j].values.push(json);
+                  flag = false;
+                  break;
+                }
+              }
+              if (flag) {
+                let json = {
+                  "showAddButtonVisible": false, //添加标签按钮
+                  "showAddButtonInputValue": '', //添加标签按钮的输入框的值
+                  "categoryId": tag.categoryId,
+                  "categoryName": tag.categoryName,
+                  "pubc": tag.pubc,
+                  "values": [{
+                    "isSaveInDatabase": false,
+                    "checked": false,
+                    "tagId": tag.tagId,
+                    "tagName": tag.tagName,
+                    "pubTag": tag.pubTag,
+                  }]
+                }
+                if (!json.values[0].tagId) {
+                  json.values = [];
+                } else {
+
+                  if (this.tagIds && this.tagIds.some(id => id == json.values[0].tagId)) {
+                    json.values[0].checked = true;
+                  }
+                }
+                convert.push(json);
+              }
+            }
+            this.convertTags = convert;
+          } else {
+            this.$message({
+              message: tips.msg,
+              type: 'error'
+            });
+          }
+          this.sectionLoading = false;
+        }).catch(err => this.sectionLoading = false);
+      },
+
+      //显示编辑界面 MemMemberTag mem_member_tag
+      showEdit: function(row, index) {
+        this.editFormVisible = true;
+        this.editForm = Object.assign({}, row);
+      },
+      //显示新增界面 MemMemberTag mem_member_tag
+      showAdd: function() {
+        this.addFormVisible = true;
+        //this.addForm=Object.assign({}, this.editForm);
+      },
+      //显示该组的User
+      //             showUser: function ( row,index ) {
+      //                 this.userFormVisible = true;
+      //                 this.editForm = Object.assign({}, row);
+      //             },
+      afterAddSubmit() {
+        this.addFormVisible = false;
+        this.pageInfo.count = true;
+        this.getTags();
+      },
+      afterEditSubmit() {
+        this.editFormVisible = false;
+        this.getTags();
+      },
+      //选择行memMemberTag
+      selsChange: function(sels) {
+        this.sels = sels;
+      },
+      //删除memMemberTag
+      handleDel: function(row, index) {
+        this.$confirm('确认删除该记录吗?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.load.del = true;
+          let params = {
+            id: row.id
+          };
+          delMemMemberTag(params).then((res) => {
+            this.load.del = false;
+            var tips = res.data.tips;
+            if (tips.isOk) {
+              this.pageInfo.count = true;
+              this.getTags();
+            }
+            this.$message({
+              message: tips.msg,
+              type: tips.isOk ? 'success' : 'error'
+            });
+          }).catch(err => this.load.del = false);
+        });
+      },
+      //批量删除memMemberTag
+      batchDel: function() {
+
+        this.$confirm('确认删除选中记录吗？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.load.del = true;
+          batchDelMemMemberTag(this.sels).then((res) => {
+            this.load.del = false;
+            var tips = res.data.tips;
+            if (tips.isOk) {
+              this.pageInfo.count = true;
+              this.getTags();
+            }
+            this.$message({
+              message: tips.msg,
+              type: tips.isOk ? 'success' : 'error'
+            });
+          }).catch(err => this.load.del = false);
+        });
+      },
+      rowClick: function(row, event, column) {
+        this.$emit('row-click', row, event, column); //  @row-click="rowClick"
+      },
+      clickTagMethod(index, valueIndex) {
+        this.convertTags[index].values[valueIndex].checked = !this.convertTags[index].values[valueIndex].checked;
+      },
+
+      //显示添加按钮的方法
+      showAddButtonMethod(index) {
+        this.convertTags[index].showAddButtonVisible = true;
+      },
       //添加标签的方法
-			addTagMethod(index) {
-        if(!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin){
-        	if(this.isPub=='1'){
-        		this.$message({
-        				message:"不是平台管理员，不允许增加公共标签",
-        				type:   'error'
-        		});
-        		return;
-        	}
+      addTagMethod(index) {
+        if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) {
+          if (this.isPub == '1') {
+            this.$message({
+              message: "不是平台管理员，不允许增加公共标签",
+              type: 'error'
+            });
+            return;
+          }
         }
-        if(this.convertTags.some(i=>{
-			return i.values.some(tag=>tag.tagName==this.convertTags[index].showAddButtonInputValue)
-		})){
-        	this.$message({
-        				message:"标签已经存在",
-        				type:   'error'
-        		});
-        	return false;
+        if (this.convertTags.some(i => {
+            return i.values.some(tag => tag.tagName == this.convertTags[index].showAddButtonInputValue)
+          })) {
+          this.$message({
+            message: "标签已经存在",
+            type: 'error'
+          });
+          return false;
         }
-        if(!this.convertTags[index].pubc){
-          if(this.isPub=='1'){
-        	this.$message({
-        				message:"该分类不是公共分类，不能添加公共标签",
-        				type:   'error'
-        		});
-        	return false;
+        if (!this.convertTags[index].pubc) {
+          if (this.isPub == '1') {
+            this.$message({
+              message: "该分类不是公共分类，不能添加公共标签",
+              type: 'error'
+            });
+            return false;
+          }
+        }
+        let that = this;
+        let tagName = this.convertTags[index].showAddButtonInputValue;
+        let categoryId = this.convertTags[index].categoryId;
+        let params = {
+          "branchId": that.workShop.branchId,
+          "shopId": that.workShop.shopId,
+          "categoryId": categoryId,
+          "tagName": tagName,
+          "isPub": this.isPub
+        };
+
+        if (!params.tagName) {
+          return
         }
-      }
-				let that = this;
-        let tagName=this.convertTags[index].showAddButtonInputValue;
-        let categoryId=this.convertTags[index].categoryId;
-				let params = {
-					"branchId": that.workShop.branchId,
-					"shopId": that.workShop.shopId,
-					"categoryId": categoryId,
-					"tagName": tagName,
-          "isPub":this.isPub
-				};
-
-				if (!params.tagName) {
-					return
-				}
         console.log("params")
         console.log(params)
-				this.sectionLoading = true;
-				addTag(params).then((res) => {
-					this.sectionLoading = false;
-					var tips = res.data.tips;
-					if (tips.isOk) {
-						let json = {
-							"isSaveInDatabase": false,
-							"checked": false,
-							"tagId": res.data.data.id,
-							"tagName": res.data.data.tagName,
-              				"pubTag":res.data.data.isPub
-						}
-						this.convertTags[index].showAddButtonInputValue='';
-						this.convertTags[index].values.push(json);
-					}
-					this.$message({
-						message: tips.msg,
-						type: tips.isOk ? 'success' : 'error'
-					});
-				}).catch(err => this.sectionLoading = false);
-			},
-			//删除标签的方法
-			delTagMethod(tagId, index, valueIndex) {
-				if(!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin){
-					if(this.convertTags[index].values.some(i=>i.pubTag=='1'&&i.tagId==tagId)){
-						this.$message({
-								message:"公共标签不允许删除",
-								type:   'error'
-						});
-						return;
-					}
-				}
-				let that = this;
-
-				let params = {
-					"id": tagId
-				}
-				console.log("params.id-------------------------"+params.id);
-				if (!params.id) {
-					return;
-				}
-
-				this.$confirm('此操作将永久删除该标签, 是否继续?', '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning'
-				}).then(() => {
-					that.sectionLoading = true;
-					delTag(params).then((res) => {
-						that.sectionLoading = false;
-						var tips = res.data.tips;
-						if (tips.isOk) {
-							this.convertTags[index].values.splice(valueIndex, 1);
-							/*this.getTags();*/
-						}
-						this.$message({
-							message: tips.msg,
-							type: tips.isOk ? 'success' : 'error'
-						});
-					}).catch(err => this.sectionLoading = false);
-				}).catch(() => {
-
-				});
-			},
-			//添加标签分类的显示的方法
-			showwAddTagCategoryVisibleMethod() {
-				this.showwAddTagCategoryVisible = true;
-			},
-			//添加标签分类的方法
-			addTagCategorySubmitMethod() {
-				let that = this;
-				if(!(this.userInfo.isPlatformAdmin || this.userInfo.isSuperAdmin)){
-					if(this.isPub=='1'){
-						 this.$message({
-							message:"你不是平台管理员不能添加公共标签分类",
-							type:  'error'
-						});
-						return;
-					}
-				}
-
-        if(this.convertTags.some(i=>i.categoryName==this.needAddTagCategoryNameInputValue)){
-        	this.$message({
-        				message:"标签分类已经存在",
-        				type:   'error'
-        		});
-        	return false;
+        this.sectionLoading = true;
+        addTag(params).then((res) => {
+          this.sectionLoading = false;
+          var tips = res.data.tips;
+          if (tips.isOk) {
+            let json = {
+              "isSaveInDatabase": false,
+              "checked": false,
+              "tagId": res.data.data.id,
+              "tagName": res.data.data.tagName,
+              "pubTag": res.data.data.isPub
+            }
+            this.convertTags[index].showAddButtonInputValue = '';
+            this.convertTags[index].values.push(json);
+          }
+          this.$message({
+            message: tips.msg,
+            type: tips.isOk ? 'success' : 'error'
+          });
+        }).catch(err => this.sectionLoading = false);
+      },
+      //删除标签的方法
+      delTagMethod(tagId, index, valueIndex) {
+        if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) {
+          if (this.convertTags[index].values.some(i => i.pubTag == '1' && i.tagId == tagId)) {
+            this.$message({
+              message: "公共标签不允许删除",
+              type: 'error'
+            });
+            return;
+          }
+        }
+        let that = this;
+
+        let params = {
+          "id": tagId
+        }
+        console.log("params.id-------------------------" + params.id);
+        if (!params.id) {
+          return;
+        }
+
+        this.$confirm('此操作将永久删除该标签, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          that.sectionLoading = true;
+          delTag(params).then((res) => {
+            that.sectionLoading = false;
+            var tips = res.data.tips;
+            if (tips.isOk) {
+              this.convertTags[index].values.splice(valueIndex, 1);
+              /*this.getTags();*/
+            }
+            this.$message({
+              message: tips.msg,
+              type: tips.isOk ? 'success' : 'error'
+            });
+          }).catch(err => this.sectionLoading = false);
+        }).catch(() => {
+
+        });
+      },
+      //添加标签分类的显示的方法
+      showwAddTagCategoryVisibleMethod() {
+        this.showwAddTagCategoryVisible = true;
+      },
+      //添加标签分类的方法
+      addTagCategorySubmitMethod() {
+        let that = this;
+        if (!(this.userInfo.isPlatformAdmin || this.userInfo.isSuperAdmin)) {
+          if (this.isPub == '1') {
+            this.$message({
+              message: "你不是平台管理员不能添加公共标签分类",
+              type: 'error'
+            });
+            return;
+          }
+        }
+
+        if (this.convertTags.some(i => i.categoryName == this.needAddTagCategoryNameInputValue)) {
+          this.$message({
+            message: "标签分类已经存在",
+            type: 'error'
+          });
+          return false;
+        }
+        if (!this.needAddTagCategoryNameInputValue) {
+          return;
         }
-				if (!this.needAddTagCategoryNameInputValue) {
-					return;
-				}
-				let params = {
-					"branchId": this.workShop.branchId,
-					"shopId": this.workShop.shopId,
-					"categoryName": this.needAddTagCategoryNameInputValue,
-          "isPub":this.isPub
-				};
-				that.sectionLoading = true;
-				addTagCategory(params).then((res) => {
-					that.sectionLoading = false;
-					var tips = res.data.tips;
-					if (tips.isOk) {
-						that.needAddTagCategoryNameInputValue = '';
-						let json = {
-							"showAddButtonVisible": false, //添加标签按钮
-							"showAddButtonInputValue": '', //添加标签按钮的输入框的值
-							"categoryId": res.data.data.id,
-							"categoryName": res.data.data.categoryName,
-							"values": [],
-              				"pubc":res.data.data.isPub
-						}
-						this.convertTags.push(json);
-					}
-					this.$message({
-						message: tips.msg,
-						type: tips.isOk ? 'success' : 'error'
-					});
-				}).catch(err => this.sectionLoading = false);
-			},
-
-	  selectConfirm(){
-		  let selectTags=[];
-		  this.sels=this.convertTags.forEach(i=>{
-			  if(i.values && i.values.length>0){
-				i.values.forEach(j=>{
-					if(j.checked==true){
-						selectTags.push(j);
-					}
-				})
-			  }
-
-		  })
-		  this.$emit("select-confirm",selectTags);
-	  },
-			//删除标签分类的方法
-			delTagCategoryMethod(categoryId, index) {
-
-				let that = this;
-				if (!categoryId) {
-					return;
-				};
-				let params = {
-					"shopId": this.workShop.shopId,
-					"branchId": this.workShop.branchId,
-					"id": categoryId
-				}
-        if(!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin){
-        	if(this.convertTags.some(i=>i.pubc=='1'&&i.categoryId==categoryId)){
-        		this.$message({
-        				message:"公共分类不允许删除",
-        				type:   'error'
-        		});
-        		return;
-        	}
+        let params = {
+          "branchId": this.workShop.branchId,
+          "shopId": this.workShop.shopId,
+          "categoryName": this.needAddTagCategoryNameInputValue,
+          "isPub": this.isPub
+        };
+        that.sectionLoading = true;
+        addTagCategory(params).then((res) => {
+          that.sectionLoading = false;
+          var tips = res.data.tips;
+          if (tips.isOk) {
+            that.needAddTagCategoryNameInputValue = '';
+            let json = {
+              "showAddButtonVisible": false, //添加标签按钮
+              "showAddButtonInputValue": '', //添加标签按钮的输入框的值
+              "categoryId": res.data.data.id,
+              "categoryName": res.data.data.categoryName,
+              "values": [],
+              "pubc": res.data.data.isPub
+            }
+            this.convertTags.push(json);
+          }
+          this.$message({
+            message: tips.msg,
+            type: tips.isOk ? 'success' : 'error'
+          });
+        }).catch(err => this.sectionLoading = false);
+      },
+
+      selectConfirm() {
+        let selectTags = [];
+        this.sels = this.convertTags.forEach(i => {
+          if (i.values && i.values.length > 0) {
+            i.values.forEach(j => {
+              if (j.checked == true) {
+                selectTags.push(j);
+              }
+            })
+          }
+
+        })
+        this.$emit("select-confirm", selectTags);
+      },
+      //删除标签分类的方法
+      delTagCategoryMethod(categoryId, index) {
+
+        let that = this;
+        if (!categoryId) {
+          return;
+        };
+        let params = {
+          "shopId": this.workShop.shopId,
+          "branchId": this.workShop.branchId,
+          "id": categoryId
         }
-				this.$confirm('此操作将永久删除该标签分类, 并连同该标签分类下面的标签也删除，是否继续?', '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning'
-				}).then(() => {
-					that.sectionLoading = true;
-					deleteTagCategory(params).then((res) => {
-						that.sectionLoading = false;
-						var tips = res.data.tips;
-						if (tips.isOk) {
-							this.convertTags.splice(index, 1);
-							/*this.getTags();*/
-						}
-						this.$message({
-							message: tips.msg,
-							type: tips.isOk ? 'success' : 'error'
-						});
-					}).catch(err => this.sectionLoading = false);
-				}).catch(() => {
-
-				});
-			}
-
-			/**begin 自定义函数请在下面加**/
-
-
-			/**end 自定义函数请在上面加**/
-
-		}, //end methods
-		components: {
-			// 'mem-member-tag-add': MemMemberTagAdd,
-			// 'mem-member-tag-edit': MemMemberTagEdit,
-			// 'mem-member-mng':MemMemberMng,//User列表
-			'sticky': Sticky
-			//在下面添加其它组件
-		},
-		mounted() {
-			this.$nextTick(() => {
-				this.getTags();
-			});
-		}
-	}
+        if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) {
+          if (this.convertTags.some(i => i.pubc == '1' && i.categoryId == categoryId)) {
+            this.$message({
+              message: "公共分类不允许删除",
+              type: 'error'
+            });
+            return;
+          }
+        }
+        this.$confirm('此操作将永久删除该标签分类, 并连同该标签分类下面的标签也删除，是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          that.sectionLoading = true;
+          deleteTagCategory(params).then((res) => {
+            that.sectionLoading = false;
+            var tips = res.data.tips;
+            if (tips.isOk) {
+              this.convertTags.splice(index, 1);
+              /*this.getTags();*/
+            }
+            this.$message({
+              message: tips.msg,
+              type: tips.isOk ? 'success' : 'error'
+            });
+          }).catch(err => this.sectionLoading = false);
+        }).catch(() => {
+
+        });
+      }
+
+      /**begin 自定义函数请在下面加**/
+
+
+      /**end 自定义函数请在上面加**/
+
+    }, //end methods
+    components: {
+      // 'mem-member-tag-add': MemMemberTagAdd,
+      // 'mem-member-tag-edit': MemMemberTagEdit,
+      // 'mem-member-mng':MemMemberMng,//User列表
+      'sticky': Sticky
+      //在下面添加其它组件
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.getTags();
+      });
+    }
+  }
 </script>
 
 <style scoped>
-	.copyButton {
-		margin-left: 5px;
-		border-radius: 20px;
-		padding: 10px 1px;  
-		border: 1px solid rgb(220, 223, 230);
-		/* color:#039; */
-	}
-
-	.copyButton:hover {
-		color: #409eff;
-		border-color: #c6e2ff;
-		background-color: #ecf5ff;
-		cursor: default;
-	}
-
-	.checkCopyButton {
-		/*color: #fff;*/
-		margin-left: 5px;
-		border-radius: 20px;
-		padding: 10px 1px;  
-		border: 1px solid #FFA00A;
-		/*background-color: rgba(230, 162, 60, .1);*/
-		/* background-color: #f9f9f9; */
-		background-color: #fff;
-		/*border-color: rgba(230,162,60,.2);*/
-		color: #FFA00A;
-	}
-
-	.add {
-		display: flex;
-		align-items: center;
-		margin-left: 10px;
-		margin-top: 2px;
-	}
-
-	.add:hover {
-		cursor: pointer;
-		animation: myrotate 0.5s linear infinite;
-	}
-
-
-	.input-tag {
-		margin-left:10px;
-		margin-top: 2px;
-		align-self: center;
-	}
-	.closeStyle {
-		padding: 1px;
-	}
-
-	.closeStyle:hover {
-		cursor: pointer;
-		/* border-color:#f40; */
-		/* border: 1px solid #f40; */
-		background-color: #FFA00A;
-		color: #fff;
-		border-radius: 50%;
-		padding: 1px;
-		animation: myrotate 1s linear;
-	}
-
-	.addTagSquare {
-		width: 15px;
-		height: 15px;
-		display: inline-block;
-		background-color: #FFA00A;
-		animation: myrotate 2s linear infinite;
-	}
-
-	.closeTagSquare {
-		width: 15px;
-		height: 15px;
-		display: inline-block;
-		background-color: #fff;
-		animation: myrotate 2s linear infinite;
-	}
-	@keyframes myrotate {
-		0% {
-			transform: rotate(0deg);
-			box-shadow: 0px 0px 10px #fff;
-		}
-
-		50% {
-			transform: rotate(180deg);
-			box-shadow: 0px 0px 45px #fff;
-		}
-
-		100% {
-			transform: rotate(360deg);
-			box-shadow: 0px 0px 10px #fff;
-		}
-	}
+  .sub-navbar.draft {
+    background: #ffffff;
+  }
+
+
+  .copyButton {
+    margin-left: 5px;
+    border-radius: 20px;
+    padding: 10px 1px;
+    border: 1px solid rgb(220, 223, 230);
+    /* color:#039; */
+  }
+
+  .copyButton:hover {
+    color: #409eff;
+    border-color: #c6e2ff;
+    background-color: #ecf5ff;
+    cursor: default;
+  }
+
+  .checkCopyButton {
+    /*color: #fff;*/
+    margin-left: 5px;
+    border-radius: 20px;
+    padding: 10px;
+    border: 1px solid #FFA00A;
+    /*background-color: rgba(230, 162, 60, .1);*/
+    /* background-color: #f9f9f9; */
+    background-color: #fff;
+    /*border-color: rgba(230,162,60,.2);*/
+    color: #FFA00A;
+  }
+
+  .add {
+    display: flex;
+    align-items: center;
+    margin-left: 10px;
+    margin-top: 2px;
+  }
+
+  .add:hover {
+    cursor: pointer;
+    animation: myrotate 0.5s linear infinite;
+  }
+
+
+  .input-tag {
+    margin-left: 10px;
+    margin-top: 2px;
+    align-self: center;
+  }
+
+  .closeStyle {
+    padding: 1px;
+    margin-left: 10px;
+  }
+
+  .closeStyle:hover {
+    cursor: pointer;
+    /* border-color:#f40; */
+    /* border: 1px solid #f40; */
+    background-color: #FFA00A;
+    color: #fff;
+    border-radius: 50%;
+    padding: 1px;
+    animation: myrotate 1s linear;
+  }
+
+  .addTagSquare {
+    width: 15px;
+    height: 15px;
+    display: inline-block;
+    background-color: #FFA00A;
+    animation: myrotate 2s linear infinite;
+  }
+
+  .closeTagSquare {
+    width: 15px;
+    height: 15px;
+    display: inline-block;
+    background-color: #fff;
+    animation: myrotate 2s linear infinite;
+  }
+
+  @keyframes myrotate {
+    0% {
+      transform: rotate(0deg);
+      box-shadow: 0px 0px 10px #fff;
+    }
+
+    50% {
+      transform: rotate(180deg);
+      box-shadow: 0px 0px 45px #fff;
+    }
+
+    100% {
+      transform: rotate(360deg);
+      box-shadow: 0px 0px 10px #fff;
+    }
+  }
+
+  .el-tag+.el-tag {
+    margin-right: 10px;
+  }
+
+  .button-new-tag {
+    margin-right: 10px;
+    height: 32px;
+    line-height: 30px;
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
+  .input-new-tag {
+    width: 90px;
+    margin-right: 10px;
+    /* vertical-align: bottom; */
+  }
+
+  .el-tag--medium {
+    height: 32px;
+    line-height: 32px;
+    margin-right: 10px;
+    margin-bottom: 10px;
+  }
+
+  .app-container {
+      padding: 20px 0;
+  }
 </style>
diff --git a/src/views/mdp/form/formData/FormDataMng.vue b/src/views/mdp/form/formData/FormDataMng.vue
index 1dcc660a..2ffa58e5 100644
--- a/src/views/mdp/form/formData/FormDataMng.vue
+++ b/src/views/mdp/form/formData/FormDataMng.vue
@@ -91,7 +91,7 @@
 						{{showCalendar==true?'切换列表':'切换日历'}}
 					</el-tag>   
 				</el-row>
-				<el-row class="app-container">
+				<el-row class="page-container border">
 					<el-col :xs="4" :sm="4" :md="3" :lg="3" :xl="3" class="hidden-sm-and-down">
 						<dept-tree ref="deptTree" show-root default-expand-all multiple show-checkbox :expand-on-click-node="false" v-on:check-change="handleDeptTreeCheckChange"></dept-tree> 
 					</el-col>
diff --git a/src/views/mdp/form/formData/FormDataMngForFlow.vue b/src/views/mdp/form/formData/FormDataMngForFlow.vue
index 65c87a25..9c11f58f 100644
--- a/src/views/mdp/form/formData/FormDataMngForFlow.vue
+++ b/src/views/mdp/form/formData/FormDataMngForFlow.vue
@@ -31,7 +31,7 @@
 					   <el-button v-if="filters.flowState!='1'" type="primary"    @click="showAdd">新增数据</el-button>
 						<el-button v-if=" filters.flowState!='1'" type="danger"     @click="batchDel" :disabled="this.sels.length===0">批量删除</el-button>  
 				</sticky> 
-				<el-row class="app-container">
+				<el-row class="page-container border">
 					<el-table v-if="filters.flowState=='0'" :data="formDatas"  @sort-change="sortChange" height="240" highlight-current-row v-loading="listLoading" border @selection-change="selsChange" style="width: 100%;">
 					<el-table-column type="selection" width="55" v-if="showBtn"></el-table-column>
 					<el-table-column type="index" width="60"></el-table-column> 
diff --git a/src/views/mdp/form/formData/FormDataMngForFlowTable.vue b/src/views/mdp/form/formData/FormDataMngForFlowTable.vue
index 2916e45d..50e2336b 100644
--- a/src/views/mdp/form/formData/FormDataMngForFlowTable.vue
+++ b/src/views/mdp/form/formData/FormDataMngForFlowTable.vue
@@ -31,7 +31,7 @@
 					   <el-button v-if="filters.flowState!='1'" type="primary"    @click="showAdd">新增数据</el-button>
 						<el-button v-if=" filters.flowState!='1'" type="danger"     @click="batchDel" :disabled="this.sels.length===0">批量删除</el-button>  
 				</sticky> 
-				<el-row class="app-container">
+				<el-row class="page-container border">
 					<el-table v-if="filters.flowState=='0'" :data="formDatas"  @sort-change="sortChange" height="240" highlight-current-row v-loading="listLoading" border @selection-change="selsChange" style="width: 100%;">
 					<el-table-column type="selection" width="55" v-if="showBtn"></el-table-column>
 					<el-table-column type="index" width="60"></el-table-column> 
diff --git a/src/views/mdp/form/formDef/FormDefAdd.vue b/src/views/mdp/form/formDef/FormDefAdd.vue
index cc25e327..1be3497a 100644
--- a/src/views/mdp/form/formDef/FormDefAdd.vue
+++ b/src/views/mdp/form/formDef/FormDefAdd.vue
@@ -1,7 +1,6 @@
 <template>
 	<section>
-		<el-row class="app-container"> 
-		<!--新增界面 FormDef 表单定义-->  
+		 <el-row class="page-container border padding">  
 			<form-field ref="fields" :form-def.sync="addForm" :fields.sync="fields"></form-field>
 			<el-form  :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 		
diff --git a/src/views/mdp/form/formDef/FormDefForFlowNode.vue b/src/views/mdp/form/formDef/FormDefForFlowNode.vue
index 2c53fc01..a3e78c45 100644
--- a/src/views/mdp/form/formDef/FormDefForFlowNode.vue
+++ b/src/views/mdp/form/formDef/FormDefForFlowNode.vue
@@ -1,7 +1,6 @@
 <template>
 	<section>
-		<el-row class="app-container"> 
-		<!--新增界面 FormDef 表单定义-->  
+		 <el-row class="page-container border padding">  
 			<form-field ref="fields" :visible="visible" :form-def.sync="addForm" :fields.sync="fields" :load-from-db="0"></form-field>
 			<el-form  :model="addForm"  label-width="120px" :rules="addFormRules"  ref="addForm">
 		
diff --git a/src/views/mdp/form/formDef/FormDefList.vue b/src/views/mdp/form/formDef/FormDefList.vue
index 76e569a5..ef7620b8 100644
--- a/src/views/mdp/form/formDef/FormDefList.vue
+++ b/src/views/mdp/form/formDef/FormDefList.vue
@@ -32,7 +32,7 @@
 					  
 					
 		</sticky>
-		<el-row class="app-container">
+		<el-row class="page-container border">
 			
 			
 			<!--工具条2-->  
diff --git a/src/views/mdp/form/formDef/FormDefMng.vue b/src/views/mdp/form/formDef/FormDefMng.vue
index 0e74df14..3abdcd8e 100644
--- a/src/views/mdp/form/formDef/FormDefMng.vue
+++ b/src/views/mdp/form/formDef/FormDefMng.vue
@@ -46,7 +46,7 @@
 				 {{filters.user.username}}
 			</el-tag>    
 		</el-row>
-		<el-row  class="app-container"> 
+		<el-row  class="page-container border"> 
 			<el-col :xs="4" :sm="4" :md="3" :lg="3" :xl="3" class="hidden-sm-and-down">
 				<category-tree  ref="categoryTree" multiple :expandOnClickNode="false" :defaultExpandAll="true" show-checkbox  :current-key="addForm.categoryId"  v-on:check-change="handleCategoryCheckChange" ></category-tree> 
 			</el-col>
diff --git a/src/views/mdp/form/formField/FormField.vue b/src/views/mdp/form/formField/FormField.vue
index 85274e05..ed9df227 100644
--- a/src/views/mdp/form/formField/FormField.vue
+++ b/src/views/mdp/form/formField/FormField.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row class="app-container"> 
+		<el-row class="page-container border"> 
 		<el-col :span="10"> 
 			<draggable id="delDrg"  class="dragArea" :list="delFields" :options="{group:{ name:'g1'}, animation:150}"  :no-transition-on-drag="true" @start="drag=true" @end="drag=false">
 				<el-badge :value="selectedFields.length" class="item">
diff --git a/src/views/mdp/form/formQx/FormQxSet.vue b/src/views/mdp/form/formQx/FormQxSet.vue
index e86a9ed2..bbd14bb1 100644
--- a/src/views/mdp/form/formQx/FormQxSet.vue
+++ b/src/views/mdp/form/formQx/FormQxSet.vue
@@ -1,7 +1,6 @@
 <template>
 	<section>
-		<el-row class="app-container"> 
-		<!--编辑界面 FormQx 表单权限--> 
+		 <el-row class="page-container border padding"> 
 			<el-form :model="editForm"  label-width="140px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="表单" prop="formId">
 					 {{editForm.formId}}-{{formDef?formDef.formName:''}} 
diff --git a/src/views/mdp/meta/category/CategoryAdd.vue b/src/views/mdp/meta/category/CategoryAdd.vue
index 1d6c3ca1..fb6c106d 100644
--- a/src/views/mdp/meta/category/CategoryAdd.vue
+++ b/src/views/mdp/meta/category/CategoryAdd.vue
@@ -1,7 +1,6 @@
 <template>
 	<section>
-		<el-row>
-			<!--新增界面 Category 元数据分类--> 
+		 <el-row class="page-container border padding"> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="分类编号" prop="id">
 					<el-input v-model="addForm.id" auto-complete="off"></el-input><el-tag>为空，则后台自动生成</el-tag>
diff --git a/src/views/mdp/meta/category/CategoryMng.vue b/src/views/mdp/meta/category/CategoryMng.vue
index 731bb3b3..4b3fea30 100644
--- a/src/views/mdp/meta/category/CategoryMng.vue
+++ b/src/views/mdp/meta/category/CategoryMng.vue
@@ -6,7 +6,7 @@
 			<el-button type="primary" @click="showAdd">+元数据分类</el-button>
 			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0">批量删除</el-button> 
 		</sticky>
-		<el-row class="app-container"> 
+		<el-row class="page-container border"> 
 			<!--列表 Category 元数据分类-->
 			<el-table :data="categorys" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column type="selection" width="55"></el-table-column>
diff --git a/src/views/mdp/meta/item/ItemAdd.vue b/src/views/mdp/meta/item/ItemAdd.vue
index 9d53471e..8985dca0 100644
--- a/src/views/mdp/meta/item/ItemAdd.vue
+++ b/src/views/mdp/meta/item/ItemAdd.vue
@@ -1,7 +1,6 @@
 <template>
 	<section>
-		<el-row>
-			<!--新增界面 Item 数据项定义--> 
+		 <el-row class="page-container border padding"> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="编号" prop="id">
 					<el-input v-model="addForm.id" auto-complete="off"></el-input><el-tag>为空，则后台自动生成</el-tag>
diff --git a/src/views/mdp/meta/item/ItemEdit.vue b/src/views/mdp/meta/item/ItemEdit.vue
index 6c76bd80..94d381dc 100644
--- a/src/views/mdp/meta/item/ItemEdit.vue
+++ b/src/views/mdp/meta/item/ItemEdit.vue
@@ -1,7 +1,6 @@
 <template>
 	<section>
-		<el-row>
-			<!--新增界面 Item 数据项定义--> 
+		 <el-row class="page-container border padding"> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="编号" prop="id">
 					<el-tag>{{editForm.id}}</el-tag>
diff --git a/src/views/mdp/meta/item/ItemMng.vue b/src/views/mdp/meta/item/ItemMng.vue
index 22ab2aab..a9dc02bf 100644
--- a/src/views/mdp/meta/item/ItemMng.vue
+++ b/src/views/mdp/meta/item/ItemMng.vue
@@ -12,7 +12,7 @@
 			<el-button type="text" @click="showAdd" :disabled="readOnly==true">+字段</el-button> 
 			<el-button type="text" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || readOnly==true">删除</el-button> 
 		</sticky>
-		<el-row  class="app-container"> 
+		<el-row  class="page-container border"> 
 			<!--列表 Item 数据项定义-->
 			<el-table :data="items" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column type="selection" min-width="55"></el-table-column> 
diff --git a/src/views/mdp/meta/itemOption/ItemOptionAdd.vue b/src/views/mdp/meta/itemOption/ItemOptionAdd.vue
index ff1d3e13..14445b31 100644
--- a/src/views/mdp/meta/itemOption/ItemOptionAdd.vue
+++ b/src/views/mdp/meta/itemOption/ItemOptionAdd.vue
@@ -1,7 +1,6 @@
 <template>
 	<section>
-		<el-row>
-			<!--新增界面 ItemOption 数据项取值列表--> 
+		 <el-row class="page-container border padding"> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="选项值" prop="optionValue">
 					<el-input v-model="addForm.optionValue" auto-complete="off"></el-input>
diff --git a/src/views/mdp/meta/itemOption/ItemOptionMng.vue b/src/views/mdp/meta/itemOption/ItemOptionMng.vue
index 70b112d3..fb660835 100644
--- a/src/views/mdp/meta/itemOption/ItemOptionMng.vue
+++ b/src/views/mdp/meta/itemOption/ItemOptionMng.vue
@@ -12,7 +12,7 @@
 			<el-button type="text" @click="showAdd" :disabled="readOnly==true">+字段值</el-button>
 			<el-button type="text" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || readOnly==true">删除</el-button> 
 			</sticky>  
-			<el-row  class="app-container">
+			<el-row  class="page-container border">
 			<!--列表 ItemOption 数据项取值列表-->
 			<el-table :data="itemOptions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column type="selection" width="55"></el-table-column>
diff --git a/src/views/mdp/meta/sysParam/ItemOptionAdd.vue b/src/views/mdp/meta/sysParam/ItemOptionAdd.vue
index 6adb3c8c..e6b0c41b 100644
--- a/src/views/mdp/meta/sysParam/ItemOptionAdd.vue
+++ b/src/views/mdp/meta/sysParam/ItemOptionAdd.vue
@@ -1,7 +1,6 @@
 <template>
 	<section>
-		<el-row>
-			<!--新增界面 ItemOption 数据项取值列表--> 
+		 <el-row class="page-container border padding"> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="参数代码" prop="id">
 					<el-input v-model="addForm.id" auto-complete="off"></el-input>
diff --git a/src/views/mdp/meta/sysParam/ItemOptionEdit.vue b/src/views/mdp/meta/sysParam/ItemOptionEdit.vue
index d07e23fe..5b4813a6 100644
--- a/src/views/mdp/meta/sysParam/ItemOptionEdit.vue
+++ b/src/views/mdp/meta/sysParam/ItemOptionEdit.vue
@@ -1,7 +1,6 @@
 <template>
 	<section>
-		<el-row>
-			<!--新增界面 ItemOption 数据项取值列表--> 
+		 <el-row class="page-container border padding"> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="参数代码" prop="id">
 					<el-input v-model="editForm.id" auto-complete="off"></el-input>
diff --git a/src/views/mdp/meta/sysParam/SysParamMng.vue b/src/views/mdp/meta/sysParam/SysParamMng.vue
index 8e13e9d0..be030204 100644
--- a/src/views/mdp/meta/sysParam/SysParamMng.vue
+++ b/src/views/mdp/meta/sysParam/SysParamMng.vue
@@ -8,7 +8,7 @@
 			<el-button type="primary" @click="showAdd">+参数</el-button>
 			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0">批量删除</el-button> 
 		</sticky>  
-			<el-row  class="app-container">
+			<el-row  class="page-container border">
 			<!--列表 ItemOption 数据项取值列表-->
 			<el-table :data="itemOptions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column type="selection" width="55"></el-table-column>
diff --git a/src/views/mdp/sys/branch/BranchSelect.vue b/src/views/mdp/sys/branch/BranchSelect.vue
index cb238bf0..a0fb7fc8 100644
--- a/src/views/mdp/sys/branch/BranchSelect.vue
+++ b/src/views/mdp/sys/branch/BranchSelect.vue
@@ -4,7 +4,7 @@
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" v-on:click="searchBranchs">查询</el-button>
 		</sticky>
-		<el-row class="app-container"> 
+		<el-row class="page-container border"> 
 			<!--列表 Branch 管理端机构表（机构下面若干部门）-->
 			<el-table :data="branchs" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column type="index" width="60"></el-table-column>
diff --git a/src/views/mdp/sys/dept/DeptTree.vue b/src/views/mdp/sys/dept/DeptTree.vue
index 73a1e2fe..02f83bff 100644
--- a/src/views/mdp/sys/dept/DeptTree.vue
+++ b/src/views/mdp/sys/dept/DeptTree.vue
@@ -294,4 +294,4 @@
 .filter-input-common{
 	width:100%;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/mdp/sys/post/PostSelectCommon.vue b/src/views/mdp/sys/post/PostSelectCommon.vue
index 27d44559..911ed68b 100644
--- a/src/views/mdp/sys/post/PostSelectCommon.vue
+++ b/src/views/mdp/sys/post/PostSelectCommon.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row class="app-container"> 
+		<el-row class="page-container border"> 
 			<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="searchPosts">查询</el-button>
 			 
@@ -9,7 +9,7 @@
 		       <i class="el-icon-question"></i>
 		    </el-tooltip>
 		</el-row>
-		<el-row class="app-container"> 
+		<el-row class="page-container border"> 
 			<!--列表 Post sys_post-->
 			<el-table :data="posts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column type="selection" width="55"></el-table-column>
diff --git a/src/views/mdp/sys/user/UsersSelect.vue b/src/views/mdp/sys/user/UsersSelect.vue
index 807db2a8..57d33913 100644
--- a/src/views/mdp/sys/user/UsersSelect.vue
+++ b/src/views/mdp/sys/user/UsersSelect.vue
@@ -1,12 +1,12 @@
 <template>
 	<section>
 		<el-row>
-			<el-input v-model="filters.key" style="width: 20%;" placeholder="名称 编号 手机号码 模糊查询"></el-input> 
+			<el-input v-model="filters.key" style="width: 20%;" placeholder="名称 编号 手机号码 模糊查询"></el-input>
 			<el-checkbox v-model="filters.isQueryByDept" :disabled="isSelectByDept" >按部门-{{this.deptTree.deptNodeSelected.deptName}}查</el-checkbox>
 			<el-button type="primary" v-loading="load.list" v-on:click="searchUsers">查询</el-button>
 			<el-button type="primary"   v-on:click="confirmUsers">确定</el-button>
-		</el-row> 
-		<el-row class="selected-tag">已选择：  
+		</el-row>
+		<el-row class="selected-tag">已选择：
 			<el-tag
 				v-for="sel in sels"
 				:key="sel.userid"
@@ -15,16 +15,16 @@
 			</el-tag>
 
 		</el-row>
-		<el-row class="app-container"> 
+		<el-row class="page-container border">
 			<el-col :span="6" style=" overflow-x:auto; height:600px;">
-				<dept-tree show-root default-expand-all show-checkbox :expand-on-click-node="false"  @node-click="handleLeftDeptNodeClick" @branch-row-click="branchRowClick"></dept-tree> 
+				<dept-tree show-root default-expand-all show-checkbox :expand-on-click-node="false"  @node-click="handleLeftDeptNodeClick" @branch-row-click="branchRowClick"></dept-tree>
 			</el-col>
-			<el-col :span="18">	
+			<el-col :span="18">
 				<!--列表 User sys_user-->
 				<el-table :row-key="'userid'"	 :data="users"     @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" style="width: 100%;" ref="userTable">
 					<el-table-column :reserve-selection="true"	type="selection" width="65"></el-table-column>
 					<el-table-column type="index" width="65"></el-table-column>
-					<el-table-column prop="username" sortable label="用户名称" min-width="120" ></el-table-column> 
+					<el-table-column prop="username" sortable label="用户名称" min-width="120" ></el-table-column>
 					<el-table-column prop="displayUserid" label="登录账号" min-width="150" ></el-table-column>
 					<el-table-column prop="sex" label="性别" width="80">
 						<template slot-scope="scope">
@@ -38,22 +38,22 @@
 							<el-tag v-if="scope.row.locked=='0'">√</el-tag>
 							<el-tag v-else>×</el-tag>
 						</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>
 			</el-col>
-		</el-row> 
+		</el-row>
 	</section>
 </template>
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import Sticky from '@/components/Sticky' // 粘性header组件 
+	import Sticky from '@/components/Sticky' // 粘性header组件
 	import { listUser } from '@/api/mdp/sys/user';
-	import DeptTree from '@/views/mdp/sys/dept/DeptTree.vue'; 
-	import { mapGetters } from 'vuex' 
+	import DeptTree from '@/views/mdp/sys/dept/DeptTree.vue';
+	import { mapGetters } from 'vuex'
 	import md5 from 'js-md5';
-	
+
 	export default {
 		props:['isSingleUser','selectUserids','isSelectByDept'],
 	    computed: {
@@ -78,12 +78,12 @@
 						needSearch=true
 					}
 				}
-				if(needSearch==true){ 
+				if(needSearch==true){
 					this.$refs.userTable.clearSelection();
 					this.needSetTableUserChecked=true;
 					this.searchUsers()
 				}
-				
+
 			}
 		},
 		data() {
@@ -104,22 +104,22 @@
 				sels: [],//列表选中数据
 				allSels:[],//所有选中的数据
 				options:{sex:[],locked:[]},//下拉选择框的所有静态数据 options.sex,options.project
-				
+
 				addFormVisible: false,//新增user界面是否显示
 				//新增user界面初始化数据
 				addForm: {
 					unionid:'',displayUserid:'',userid:'',locked:'',startdate:'',nickname:'',username:'',phoneno:'',password:'',salt:'',fingerpassword1:'',fingerpassword2:'',fingerpassword3:'',fingerpassword4:'',pwdtype:'',headimgurl:'',country:'',city:'',province:'',address:'',sex:'',enddate:'',districtId:'',userId:'',userAccount:'',userPwd:'',userName:'',userDesc:''
 				},
-				
+
 				editFormVisible: false,//编辑界面是否显示
 				//编辑user界面初始化数据
-				editForm: { 
+				editForm: {
 					unionid:'',displayUserid:'',userid:'',locked:'',startdate:'',nickname:'',username:'',phoneno:'',password:'',salt:'',fingerpassword1:'',fingerpassword2:'',fingerpassword3:'',fingerpassword4:'',pwdtype:'',headimgurl:'',country:'',city:'',province:'',address:'',sex:'',enddate:'',districtId:'',userId:'',userAccount:'',userPwd:'',userName:'',userDesc:''
 				},
 				/**begin 自定义属性请在下面加 请加备注**/
 				deptTree:{//部门树相关参数设置
-					deptNodeSelected:{},//部门树被选中的节点数据	
-				}, 
+					deptNodeSelected:{},//部门树被选中的节点数据
+				},
 				editUserRoleFormVisible:false,//是否显示用户角色界面
 				editUserDeptFormVisible:false,//是否显示用户部门关系设置界面
 				branch: {},//选中的机构
@@ -127,10 +127,10 @@
 				/**end 自定义属性请在上面加 请加备注**/
 				//当前所选中的部门数据
 				currentSelectDeptData: {},
-				
+
 			}
-		},//end data 
-		
+		},//end data
+
 		methods: {
 			//获取代码对应的名称 用于数据反显 如 getCodeName(options.sex,'1');
 			getCodeName(options,codeValue){
@@ -140,12 +140,12 @@
 					return code[0].codeName
 				}else{
 					return codeValue
-				} 
+				}
 			},
-			handleSizeChange(pageSize) { 
+			handleSizeChange(pageSize) {
 				this.pageInfo.pageSize=pageSize;
 				this.pageInfo.count=true;
-				
+
 				this.getUsers();
 			},
 			handleCurrentChange(pageNum) {
@@ -172,12 +172,12 @@
 					this.$message({ message: "必须先选择一个部门", type: 'error' });
 					return;
 				}
-				 
+
 				 this.pageInfo.count=true;
 				 this.getUsers();
 			},
 			//获取列表 User sys_user
-			getUsers() { 
+			getUsers() {
 
 				let params = {
 					pageSize: this.pageInfo.pageSize,
@@ -186,9 +186,9 @@
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
+					for(var i=0;i<this.pageInfo.orderFields.length;i++){
 						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}  
+					}
 					params.orderBy= orderBys.join(",")
 				}
 				if(this.filters.key!==""){
@@ -196,16 +196,16 @@
 				}
 				if(this.filters.isQueryByDept==true && this.deptTree.deptNodeSelected.deptid && this.deptTree.deptNodeSelected.isBranch!=true){
 					params.deptid=this.deptTree.deptNodeSelected.deptid;
-				} 
+				}
 				if(this.filters.isQueryByDept==true){
 					params.branchId=this.branch.id;
-				} 
+				}
 				if( !this.userInfo.isSuperAdmin && !this.userInfo.isPlatformAdmin){
 					params.branchId=this.userInfo.branchId;
-					if(params.deptid==null || params.deptid==""){ 
+					if(params.deptid==null || params.deptid==""){
 						//params.deptid=this.userInfo.deptid;
 					}
-				}  
+				}
 				if(this.needSetTableUserChecked==true){
 					params.userids=this.selectUserids;
 				}
@@ -214,17 +214,17 @@
 				this.load.list = true;
 				listUser(params).then((res) => {
 					var tips=res.data.tips;
-					if(tips.isOk){ 
+					if(tips.isOk){
 						this.pageInfo.total = res.data.total;this.pageInfo.count=false;
 						this.users = res.data.data;
 					}else{
 						this.$message({ message: tips.msg, type: 'error' });
-					} 
+					}
 					if(this.needSetTableUserChecked==true){
 						this.setTableUserChecked();
 						this.needSetTableUserChecked=false;
 					}
-					
+
 					this.load.list = false;
 				}).catch(() => {
 					this.load.list = false;
@@ -252,8 +252,8 @@
 			},
 			//选择行user
 			selsChange: function (sels) {
-				 this.sels=sels  
-			}, 
+				 this.sels=sels
+			},
 			setTableUserChecked(){
 				if(this.selectUserids.length<=0){
 					return;
@@ -261,13 +261,13 @@
 				this.selectUserids.forEach(u=>{
 					var selected=this.sels.find(i=>i.userid==u);
 					var user=this.users.find(i=>i.userid==u);
-					if(selected){ 
-						 
+					if(selected){
+
 					}else if(user){
 						this.$refs.userTable.toggleRowSelection(user,true);
 					}
-				}) 
-			},  
+				})
+			},
 			confirmUsers: function(){
 				if(this.sels.length<1){
 					this.$message({ message: "请选择一个用户", type: 'error' });
@@ -279,6 +279,10 @@
 						return;
 					}
 				}
+
+        // console.log(this.deptTree.deptNodeSelected)
+        // deptid
+
 				let returnData = this.sels.map(i=>{return {'userid':i.userid,'username':i.username,'sex':i.sex,'headimgurl':i.headimgurl,'email':i.email}});
 				if(this.isSelectByDept)	returnData.deptData = this.currentSelectDeptData;
 				this.$emit('confirm',returnData);
@@ -288,31 +292,31 @@
 					this.branch=row
 					this.deptTree.deptNodeSelected={}
 					this.searchUsers();
-					
-				}  
+
+				}
 			},
-			unselectUser:function(user){  
-				this.$refs.userTable.toggleRowSelection(user,false); 
+			unselectUser:function(user){
+				this.$refs.userTable.toggleRowSelection(user,false);
 			},
-			 
+
 			/**begin 自定义函数请在下面加**/
 			handleLeftDeptNodeClick(data, node,comp) {
 				if( node.level==1 ){
-					 this.branch={id:data.branchId,branchName:data.deptName} 
-				} 
+					 this.branch={id:data.branchId,branchName:data.deptName}
+				}
 				this.deptTree.deptNodeSelected=data;
 				//设置部门信息
 				this.currentSelectDeptData = data;
-				if(this.filters.isQueryByDept==true){ 
+				if(this.filters.isQueryByDept==true){
 					this.searchUsers();
 				}
-				
-		    }, 
+
+		    },
 			/**end 自定义函数请在上面加**/
-			
+
 		},//end methods
-		components: {  
-		    'dept-tree': DeptTree,  
+		components: {
+		    'dept-tree': DeptTree,
 		    //在下面添加其它组件
 		},
 		mounted() {
@@ -324,8 +328,8 @@
 			if(this.isSelectByDept) {
 				return;
 			}
-			this.getUsers(); 
-			
+			this.getUsers();
+
 		}
 	}
 
@@ -333,7 +337,7 @@
 
 <style scoped>
 .selected-tag {
-	margin-top: 14px; 
+	margin-top: 14px;
 	margin-left:14px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/mdp/sys/userDept/UserDeptEdit.vue b/src/views/mdp/sys/userDept/UserDeptEdit.vue
index c3911c64..069113e8 100644
--- a/src/views/mdp/sys/userDept/UserDeptEdit.vue
+++ b/src/views/mdp/sys/userDept/UserDeptEdit.vue
@@ -2,75 +2,22 @@
   <section>
     <el-row>
       <!--编辑界面 UserDept 用户部门关系表-->
-      <el-col :span="6" style=" overflow-x:auto; height:550px;">
-        <dept-tree
-          v-loading="load.list"
-          :branch-id="branch.id"
-          :checked-keys="defaultDeptids"
-          default-expand-all
-          show-checkbox
-          multiple
-          :expand-on-click-node="false"
-          ref="nodeTree"
-          @check-change="deptTreeCheckChange"
-          @branch-row-click="branchChange"
-        ></dept-tree>
+      <el-col :span="6"  style=" overflow-x:auto; height:550px;">
+        <dept-tree v-loading="load.list" :branch-id="branch.id" :checked-keys="defaultChecked" default-expand-all show-checkbox multiple :expand-on-click-node="false" ref="nodeTree" @check-change="deptTreeCheckChange" @branch-row-click="branchChange"></dept-tree>
       </el-col>
       <el-col :span="18">
-        <el-form
-          :model="editForm"
-          label-width="160px"
-          label-position="left"
-          v-loading="load.list"
-          :rules="editFormRules"
-          ref="editForm"
-        >
+        <el-form :model="editForm"   label-width="160px" label-position="left" v-loading="load.list" :rules="editFormRules" ref="editForm">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
-              <span>
-                <font style="color:blue;">{{user.username}}</font>加入的部门：
-                <el-tag v-for="item in deptNodes " :key="item.deptid">{{item.deptName}}</el-tag>
-                {{deptNodes.length>0?'':'还没有加入任何部门'}}
-                <font style="color:green;">
-                  <i class="el-icon-caret-left"></i>先选部门
-                </font>
-                <i class="el-icon-caret-bottom"></i>再选
-                <font style="color:red;">岗位</font>
-              </span>
-              <el-tooltip
-                class="item"
-                effect="dark"
-                content="如果选中的部门没有岗位，请先到【部门管理  -> 岗位设置 】将岗位与部门关联"
-                placement="top"
-              >
+              <span><font style="color:blue;">{{user.username}}</font> - 加入的部门及拥有的岗位如下：  </span>
+              <el-tooltip class="item" effect="dark" content="如果选中的部门没有岗位，请先到【部门管理  -> 岗位设置 】将岗位与部门关联" placement="top">
                 <i class="el-icon-question"></i>
               </el-tooltip>
             </div>
-            <el-form-item
-              v-for="item in allDeptDeptPosts"
-              :label=" item.deptName "
-              style="border-bottom:1px dashed #00F;margin-left:10px;"
-              prop="deptid"
-              :key="item.deptid"
-            >
-              <el-checkbox
-                v-for="deptPost in item.deptPosts"
-                v-model="deptPost.checked"
-                :true-label="'1'"
-                :false-label="'0'"
-                :key="deptPost.postId"
-              >{{deptPost.postName}}</el-checkbox>
-            </el-form-item>
-            <el-form-item
-              v-for="item in noPostDepts"
-              :label=" item.deptName "
-              style="border-bottom:1px dashed #00F;margin-left:10px;"
-              prop="deptid"
-              :key="item.deptid"
-            >
-              <font style="color:red;">该部门还没设置岗位</font>
-              <el-button type="text" class="el-icon-right" @click="goToSetDeptPostPage">>去设置</el-button>
+            <el-form-item v-for="item in allDeptDeptPosts"   :label=" item.deptName " style="border-bottom:1px dashed #00F;margin-left:10px;" prop="deptid" :key="item.deptid">
+              <el-checkbox   v-for="deptPost in item.deptPosts" v-model="deptPost.checked" :true-label="'1'" :false-label="'0'" :key="deptPost.postId" :disabled="deptPost.disabled">{{deptPost.postName}}</el-checkbox>
             </el-form-item>
+
           </el-card>
           <h5></h5>
           <el-form-item>
@@ -88,252 +35,209 @@
 </template>
 
 <script>
-import util from "@/common/js/util"; //全局公共库
-import {
-  editUserDept,
-  listUserDept,
-  batchEditUserDept
-} from "@/api/mdp/sys/userDept";
-import { listDept } from "@/api/mdp/sys/dept";
-import DeptTree from "../dept/DeptTree.vue"; //下拉框数据查询
-import { listBranch } from "@/api/mdp/sys/branch";
-import { mapGetters } from "vuex";
-import {
-  listDeptPost,
-  delDeptPost,
-  batchDelDeptPost,
-  batchAddDeptPost
-} from "@/api/mdp/sys/post/deptPost";
-import { listDeptPostUserWithDeptPosts } from "@/api/mdp/sys/post/deptPostUser";
+	import util from '@/common/js/util';//全局公共库
+	import { editUserDept, listUserDept, batchEditUserDept } from '@/api/mdp/sys/userDept';
+	import { listDept } from '@/api/mdp/sys/dept';
+	import DeptTree from '../dept/DeptTree.vue';//下拉框数据查询
+	import { listBranch } from '@/api/mdp/sys/branch';
+	import { mapGetters } from 'vuex'
+	import { listDeptPost, delDeptPost, batchDelDeptPost,batchAddDeptPost } from '@/api/mdp/sys/post/deptPost';
+	import { listDeptPostUserWithDeptPosts } from '@/api/mdp/sys/post/deptPostUser';
+
+	export default {
+
+	    computed: {
+		    ...mapGetters([
+		      'workShop'
+			]),
+			noQxDeptids(){
+				return [];
+			},
+			defaultChecked(){
+				return this.userDepts.map(i=>i.deptid);
+			},
+		},
+		props:['userDept','visible','user','branch'],
+		watch: {
+	      'visible':function(visible) {
+	      	if(visible==true){
+	      		 this.allDeptDeptPosts=[]
+				   this.userDeptids=[];
+				   if(this.$refs.nodeTree.branch!=null){
+					   this.getUserDepts(this.$refs.nodeTree.branch);
+				   }else{
+					   this.getUserDepts(this.branch);
+				   }
+
+	      		 //this.load.list=false;
+			  }
+	      }
+	    },
+		data() {
+			return {
+				options:{},//下拉选择框的所有静态数据
+				load:{ list: false, edit: false, del: false, add: false },//查询中...
+				editFormRules: {
+					userid: [
+						{ required: true, message: '用户编号不能为空', trigger: 'blur' }
+					]
+				},
+				//编辑界面数据  UserDept 用户部门关系表
+				editForm: {
+					userid:'',deptid:'',enabled:'',seq:'',branchId:'',id:''
+				},
+				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
+				userDepts:[],
+				allDeptDeptPosts: [],//部门岗位关系[{deptid:'',deptName:'',deptPosts:[{deptid:'',postId:'',postName:'',checked:''}]}]
+				deptTreeDatas:[],//树中数据
+				checkedDeptTreeNode:[],//
 
-export default {
-  computed: {
-    ...mapGetters(["workShop"])
-  },
-  props: ["userDept", "visible", "user", "branch"],
-  watch: {
-    visible: function(visible) {
-      if (visible == true) {
-        this.allDeptDeptPosts = [];
-        this.userDeptids = [];
-        this.deptNodes = [];
-        this.noPostDepts = [];
-        this.defaultDeptids = [];
-        if (this.$refs.nodeTree.branch != null) {
-          console.log("===========1111=========");
-          this.getUserDepts(this.$refs.nodeTree.branch);
-        } else {
-          console.log("===========2222========="+JSON.stringify(this.branch));
-          this.getUserDepts(this.branch);
-        }
+				/**end 在上面加自定义属性**/
+			}//end return
+		},//end data
 
-        //this.load.list=false;
-      }
-    }
-  },
-  data() {
-    return {
-      options: {}, //下拉选择框的所有静态数据
-      load: { list: false, edit: false, del: false, add: false }, //查询中...
-      editFormRules: {
-        userid: [
-          { required: true, message: "用户编号不能为空", trigger: "blur" }
-        ]
-      },
-      //编辑界面数据  UserDept 用户部门关系表
-      editForm: {
-        userid: "",
-        deptid: "",
-        enabled: "",
-        seq: "",
-        branchId: "",
-        id: ""
-      },
-      /**begin 在下面加自定义属性,记得补上面的一个逗号**/
-      deptNodes: [], //deptid:'',deptName:'',pdeptid:'',deptType:'',state:'',manager:'',leader:'',shortName:'',displayDeptid:'',orgType:'',managerName:'',leaderName:''
-      userDeptids: [], //选种的部门编号列表
-      userDepts: [],
-      loadingDeptids: [], //正在加载的机构
-      defaultDeptids: [], //第一次加载选中的机构
-      allDeptDeptPosts: [], //部门岗位关系[{deptid:'',deptName:'',deptPosts:[{deptid:'',postId:'',postName:'',checked:''}]}]
-      noPostDepts: []
-      /**end 在上面加自定义属性**/
-    }; //end return
-  }, //end data
+		methods: {
+			// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
+			handleCancel:function(){
+				this.$emit('cancel');
+			},
+			branchChange: function(branch){
+				this.allDeptDeptPosts=[];
+				this.getUserDepts(branch)
+			},
+			//编辑提交UserDept 用户部门关系表父组件监听@submit="afterEditSubmit"
+			editSubmit: function () {
+						if(this.user.userid==''){
+							this.$message.error('用户不能为空');
+							return;
+						}
+						this.load.edit=true
+						var msg="确认提交吗？";
+						this.$confirm(msg, '提示', {}).then(() => {
+							console.log("xxxxxxxxxxxxxx");
+							let delDeptids=[];
+							let deptids=this.$refs.nodeTree.$refs.deptTree.getCheckedKeys();
+							this.userDepts.forEach(ud=>{
+								if(!this.noQxDeptids.some(d=>d==ud.deptid)){
+									if(!deptids.some(deptid=>deptid==ud.deptid)){
+										delDeptids.push(ud.deptid)
+									}
+								}
+							})
+							let addDeptPostUsers=[];
+							let delDeptPostUsers=[];
+							this.allDeptDeptPosts.forEach(i=>{
+ 								i.deptPosts.forEach(k=>{
+ 									if(k.checked=='1'){
+ 										k.userid=this.user.userid
+ 										addDeptPostUsers.push(k)
+ 									}else if(k.checked=='0' && k.id!=''){
+ 										delDeptPostUsers.push(k)
+ 									}
+ 								})
+							})
+							console.log("ffffffffffffffffffffffffffffffffffffffffffffffffff");
 
-  methods: {
-    // 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
-    handleCancel: function() {
-      this.$emit("cancel");
-    },
-    branchChange: function(branch) {
-      this.allDeptDeptPosts = [];
-      this.getUserDepts(branch);
-    },
-    //编辑提交UserDept 用户部门关系表父组件监听@submit="afterEditSubmit"
-    editSubmit: function() {
-      if (this.user.userid == "") {
-        this.$message.error("用户不能为空");
-        return;
-      }
-      this.load.edit = true;
-      var msg = "确认提交吗？";
-      if (this.deptNodes.length == 0) {
-        msg = this.user.username + "不在任何部门，将从公司中删除该用户," + msg;
-      }
-      this.$confirm(msg, "提示", {})
-        .then(() => {
-          console.log("xxxxxxxxxxxxxx");
-          let delDeptids = [];
-          let deptids = this.$refs.nodeTree.$refs.deptTree.getCheckedKeys();
-          this.userDepts.forEach(ud => {
-            if (!deptids.some(deptid => deptid == ud.deptid)) {
-              delDeptids.push(ud.deptid);
-            }
-          });
-          let addDeptPostUsers = [];
-          let delDeptPostUsers = [];
-          this.allDeptDeptPosts.forEach(i => {
-            i.deptPosts.forEach(k => {
-              if (k.checked == "1") {
-                k.userid = this.user.userid;
-                addDeptPostUsers.push(k);
-              } else if (k.checked == "0" && k.id != "") {
-                delDeptPostUsers.push(k);
-              }
-            });
-          });
-          console.log("ffffffffffffffffffffffffffffffffffffffffffffffffff");
+							let branch=this.$refs.nodeTree.branch;
+							let params = {branchId:branch==null?this.branch.id:branch.id,userid:this.user.userid,deptids:deptids,delDeptids:delDeptids,delDeptPostUsers:delDeptPostUsers,addDeptPostUsers:addDeptPostUsers}
+							batchEditUserDept(params).then((res) => {
+								this.load.edit=false
+								var tips=res.data.tips;
+								if(tips.isOk){
+									this.$refs['editForm'].resetFields();
+									this.$emit('submit');//  @submit="afterEditSubmit"
+								}
+								this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
+							}).catch((e) => {
+								console.log(e)
+								this.load.edit=false
+							});
+						}).catch((e)=>{
+							console.log(e)
+							this.load.edit=false;
+						})
+			},
+			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
+			getUserDepts(branch){
+				this.load.list=true
+				let params={userid:this.user.userid};
+					params.branchId=branch.id;
+
+				listUserDept(params).then(res=>{
+					this.load.list=false
+					let uds=res.data.data
+					this.userDepts=uds;
+					let userDeptids=uds.map(i=>i.deptid);
+					this.getDeptPostUserWithDeptPosts(userDeptids);
+
+				}).catch(()=>this.load.list=false);
+			},
+			deptTreeCheckChange: function(data,checked,indeterminate){
+				console.log(data)
+				let deptids=this.$refs.nodeTree.$refs.deptTree.getCheckedKeys();
+				this.deptTreeDatas=this.$refs.nodeTree.depts;
+				this.checkedDeptTreeNode=this.$refs.nodeTree.$refs.deptTree.getCheckedNodes(false)
+				console.log("deptNodes"+this.deptNodes);
+				this.getDeptPostUserWithDeptPosts(deptids);
+			},
+			getDeptPostUserWithDeptPosts: function(deptids){
+				this.load.list=true
+				let params={userid: this.user.userid,deptids:deptids}
+				this.allDeptDeptPosts=[]
+				listDeptPostUserWithDeptPosts(params).then(res=>{
+					this.load.list=false
+					let allDeptDeptPosts=[];
+					let deptPosts=res.data.deptPosts
+					let deptPostUsers=res.data.deptPostUsers
+					deptPosts.forEach(i=>{
+						i.id='';
+						i.checked='0'
+						i.disabled=this.noQxDeptids.some(n=>n==i.deptid)
+						if(deptPostUsers.some(k=>{
+							if(k.deptid==i.deptid && k.postId==i.postId){
+								i.id=k.id
+								return true
+							}else{
+								return false
+							}
+						})){
+							i.checked='1'
+						}
+					})
+					deptPosts.forEach(i=>{
+						if(allDeptDeptPosts.some(k=>k.deptid==i.deptid )){
+							allDeptDeptPosts.forEach(j=>{
+								if(j.deptid==i.deptid){
+									j.deptPosts.push(i)
+								}
+							})
+						}else{
+							allDeptDeptPosts.push({deptid:i.deptid,deptName:i.deptName,deptPosts:[i]})
+						}
+
+					})
+					this.allDeptDeptPosts=allDeptDeptPosts
+				}).catch((e)=>{
+					this.load.list=false;
+				})
+			},
+			goToSetDeptPostPage:function(){
+				this.$router.push({path:'/mdp/sys/dept/DeptMng'});
+			}
+			/**end 在上面加自定义方法**/
+		},//end method
+		components: {
+		    //在下面添加其它组件 'user-dept-edit':UserDeptEdit
+			DeptTree
+		},
+		mounted() {
+			this.editForm=Object.assign(this.editForm, this.userDept);
+			this.getUserDepts(this.branch)
+		}
+	}
 
-          let branch = this.$refs.nodeTree.branch;
-          let params = {
-            branchId: branch == null ? this.branch.id : branch.id,
-            userid: this.user.userid,
-            deptids: deptids,
-            delDeptids: delDeptids,
-            delDeptPostUsers: delDeptPostUsers,
-            addDeptPostUsers: addDeptPostUsers
-          };
-          batchEditUserDept(params)
-            .then(res => {
-              this.load.edit = false;
-              var tips = res.data.tips;
-              if (tips.isOk) {
-                this.$refs["editForm"].resetFields();
-                this.$emit("submit"); //  @submit="afterEditSubmit"
-              }
-              this.$message({
-                message: tips.msg,
-                type: tips.isOk ? "success" : "error"
-              });
-            })
-            .catch(e => {
-              console.log(e);
-              this.load.edit = false;
-            });
-        })
-        .catch(e => {
-          console.log(e);
-          this.load.edit = false;
-        });
-    },
-    /**begin 在下面加自定义方法,记得补上面的一个逗号**/
-    getUserDepts(branch) {
-      this.load.list = true;
-      let params = { userid: this.user.userid };
-      params.branchId = branch.id;
-      console.log("params==="+JSON.stringify(params));
-      listUserDept(params)
-        .then(res => {
-          this.load.list = false;
-          let uds = res.data.data;
-          this.userDepts = uds;
-          this.userDeptids = uds.map(i => i.deptid);
-          this.defaultDeptids = this.userDeptids;
-          this.getDeptPostUserWithDeptPosts(this.defaultDeptids);
-        })
-        .catch(() => (this.load.list = false));
-    },
-    deptTreeCheckChange: function(data, checked, indeterminate) {
-      console.log(
-        "deptTreeCheckChangedeptTreeCheckChangedeptTreeCheckChangedeptTreeCheckChangedeptTreeCheckChange"
-      );
-      console.log(data);
-      let deptids = this.$refs.nodeTree.$refs.deptTree.getCheckedKeys();
-      this.deptNodes = this.$refs.nodeTree.$refs.deptTree.getCheckedNodes(
-        false
-      );
-      console.log("deptNodes" + this.deptNodes);
-      this.getDeptPostUserWithDeptPosts(deptids);
-    },
-    getDeptPostUserWithDeptPosts: function(deptids) {
-      this.load.list = true;
-      let params = { userid: this.user.userid, deptids: deptids };
-      this.allDeptDeptPosts = [];
-      listDeptPostUserWithDeptPosts(params)
-        .then(res => {
-          this.deptNodes = this.$refs.nodeTree.$refs.deptTree.getCheckedNodes(
-            false
-          );
-          this.load.list = false;
-          let allDeptDeptPosts = [];
-          let deptPosts = res.data.deptPosts;
-          let deptPostUsers = res.data.deptPostUsers;
-          deptPosts.forEach(i => {
-            i.id = "";
-            i.checked = "0";
-            if (
-              deptPostUsers.some(k => {
-                if (k.deptid == i.deptid && k.postId == i.postId) {
-                  i.id = k.id;
-                  return true;
-                } else {
-                  return false;
-                }
-              })
-            ) {
-              i.checked = "1";
-            }
-          });
-          deptPosts.forEach(i => {
-            if (allDeptDeptPosts.some(k => k.deptid == i.deptid)) {
-              allDeptDeptPosts.forEach(j => {
-                if (j.deptid == i.deptid) {
-                  j.deptPosts.push(i);
-                }
-              });
-            } else {
-              allDeptDeptPosts.push({
-                deptid: i.deptid,
-                deptName: i.deptName,
-                deptPosts: [i]
-              });
-            }
-          });
-          this.allDeptDeptPosts = allDeptDeptPosts;
-          this.noPostDepts = this.deptNodes.filter(
-            i => !this.allDeptDeptPosts.some(k => k.deptid == i.deptid)
-          );
-        })
-        .catch(e => {
-          this.load.list = false;
-        });
-    },
-    goToSetDeptPostPage: function() {
-      this.$router.push({ path: "/mdp/sys/dept/DeptMng" });
-    }
-    /**end 在上面加自定义方法**/
-  }, //end method
-  components: {
-    //在下面添加其它组件 'user-dept-edit':UserDeptEdit
-    DeptTree
-  },
-  mounted() {
-    this.editForm = Object.assign(this.editForm, this.userDept);
-    this.getUserDepts(this.branch);
-  }
-};
 </script>
 
 <style scoped>
-</style>
\ No newline at end of file
+
+</style>
diff --git a/src/views/mdp/workflow/biz/bizModel/BizModelAdd.vue b/src/views/mdp/workflow/biz/bizModel/BizModelAdd.vue
index 74186ca2..8351264e 100644
--- a/src/views/mdp/workflow/biz/bizModel/BizModelAdd.vue
+++ b/src/views/mdp/workflow/biz/bizModel/BizModelAdd.vue
@@ -1,7 +1,6 @@
 <template>
 	<section>
-		<el-row class="app-container">
-			<!--新增界面 BizModel mdp_biz_model--> 
+		 <el-row class="page-container border padding"> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="业务名称" prop="bizName">
 					<el-input v-model="addForm.bizName" placeholder="业务名称" ></el-input>
diff --git a/src/views/mdp/workflow/biz/bizModel/BizModelEdit.vue b/src/views/mdp/workflow/biz/bizModel/BizModelEdit.vue
index eaed10e7..bd5e008d 100644
--- a/src/views/mdp/workflow/biz/bizModel/BizModelEdit.vue
+++ b/src/views/mdp/workflow/biz/bizModel/BizModelEdit.vue
@@ -1,7 +1,6 @@
 <template>
 	<section>
-		<el-row class="app-container"> 
-		<!--编辑界面 BizModel mdp_biz_model--> 
+		 <el-row class="page-container border padding"> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="业务名称" prop="bizName" required>
 					<el-input v-model="editForm.bizName" placeholder="业务名称" ></el-input>
diff --git a/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue b/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
index 0bc8a731..906388e2 100644
--- a/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
+++ b/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
-		<el-row class="app-container">
-			<el-row>
+		<el-row class="page-container border">
+			<el-row class="page-header">
 				<el-input v-model="filters.key" style="width:30%;" placeholder="模糊查询">
 					<template slot="append">
 						<el-button type="primary"  v-loading="load.list" :disabled="load.list==true"  v-on:click="searchBizModels" icon="el-icon-search">查询</el-button>
@@ -10,9 +10,9 @@
 				<el-button @click="showAdd" icon="el-icon-plus" style="margin-left: 13px;">业务模块</el-button>
 				<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete">批量删除</el-button>
 			</el-row>
-			<el-row style="padding-top:20px;">
+			<el-row class="page-main">
 				<!--列表 BizModel mdp_biz_model-->
-				<el-table  ref="table" :max-height="tableHeight" :data="bizModels"  highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-table  ref="table" :height="tableHeight" :data="bizModels"  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 sortable type="index" width="40"></el-table-column>
 					<el-table-column sortable prop="bizName" label="业务名称" min-width="80" show-overflow-tooltip></el-table-column>
diff --git a/src/views/mdp/workflow/de/model/ModelMng.vue b/src/views/mdp/workflow/de/model/ModelMng.vue
index d8f44556..d2b2bce2 100644
--- a/src/views/mdp/workflow/de/model/ModelMng.vue
+++ b/src/views/mdp/workflow/de/model/ModelMng.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
-		<el-row  class="app-container">
-			<el-row>
+		<el-row  class="page-container border">
+			<el-row class="page-header">
 				<el-input v-model="filters.key" style="width:270px;"  placeholder="模糊查询">
 					<template slot="append">
 						<el-button type="primary"   v-on:click="searchModels" icon="el-icon-search">查询</el-button>
@@ -12,9 +12,9 @@
 					icon="el-icon-download"
 				>导出数据</el-button>
 			</el-row>
-			<el-row style="padding-top:20px;">
+			<el-row class="page-main">
 				<!--列表 Model act_de_model-->
-				<el-table  ref="table" :max-height="tableHeight" :data="models"    highlight-current-row v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-table  ref="table" :height="tableHeight" :data="models"    highlight-current-row v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 					<el-table-column type="index" width="40"></el-table-column>
 					<el-table-column  prop="name" label="流程(点击查已发布版本)" min-width="300" show-overflow-tooltip>
 						<template slot-scope="scope">
diff --git a/src/views/mdp/workflow/hi/comment/commentStep.vue b/src/views/mdp/workflow/hi/comment/commentStep.vue
index 43d4b014..b2e173f1 100644
--- a/src/views/mdp/workflow/hi/comment/commentStep.vue
+++ b/src/views/mdp/workflow/hi/comment/commentStep.vue
@@ -1,7 +1,7 @@
 <template>
 	<section> 
-		<el-row style="max-height:400px;overflow-y:scroll;overflow-x:hidden;">  
-			<div  style="border:1px dashed #000;padding:10px;"> 	
+		<el-row style="border:1px dashed #000;padding:10px;">  
+			<div  > 	
 				  <div v-if="!comments || comments.length<=0" style="padding-left: 10px;">暂无信息</div>
 				  <el-steps :space="60"  direction="vertical" process-status="process" finish-status="success">
 				    <el-step v-for="(item,index) in comments " :key="index" status="success">
diff --git a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
index 05100d6d..de4e08ab 100644
--- a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
+++ b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
@@ -1,13 +1,8 @@
 <template>
   <section>
-    <el-row class="app-container">
-      <!-- <el-col :xs="4" :sm="4" :md="3" :lg="3" :xl="3" class="hidden-md-and-down">
-        <category-tree ref="categoryTree" multiple :expandOnClickNode="false" :defaultExpandAll="true" show-checkbox
-          :current-key="addForm.categoryId" v-on:check-change="handleCategoryCheckChange"></category-tree>
-      </el-col> -->
-      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+    <el-row class="page-container border"> 
         <!--列表 Procinst act_hi_procinst-->
-        <el-row>
+        <el-row class="page-header">
           <el-select v-model="filters.filterType" clearable placeholder="查询范围" class="hidden-lg-and-down">
             <el-option value="" label="全部"> </el-option>
             <el-option value="startUserId" label="我发起"> </el-option>
@@ -19,19 +14,18 @@
             <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
           </el-select>
 
-          <el-date-picker v-model="filters.startTimeRanger" class="hidden-sm-and-down" type="daterange" align="right"
+          <el-date-picker v-model="filters.startTimeRanger" class="hidden-sm-and-down" type="daterange" 
             unlink-panels range-separator="-" start-placeholder="创建日期" end-placeholder="创建日期" value-format="yyyy-MM-dd"
             :default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions">
           </el-date-picker>
-          <el-input v-model="filters.key" style="width:270px;" placeholder="模糊查询">
-            <template slot="append">
-              <el-button v-on:click="searchProcinsts" icon="el-icon-search">查询</el-button>
-            </template>
-          </el-input>
-          <el-popover title="更多查询条件" placement="top-start" width="400" trigger="click">
-            <el-row class="more-filter-item">
-              <el-col :span="24">
-                <font class="more-label-font">
+          <el-input v-model="filters.key" placeholder="模糊查询">  </el-input>
+          <el-button type="primary" class="padding-left" v-on:click="searchProcinsts" icon="el-icon-search">查询</el-button>
+          <el-button class="padding-left"  icon="el-icon-more" @click="moreFilterVisible=true" circle></el-button>
+          <el-drawer title="更多查询条件" :visible.sync="moreFilterVisible"   append-to-body :size="400">
+            <el-row class="page-container more-filter">
+              <el-divider content-position="left">查询条件</el-divider>
+              <el-row>
+                <font >
                   查询范围
                 </font>
                 <el-select size="mini" v-model="filters.filterType" placeholder="查询范围">
@@ -41,17 +35,17 @@
                   <el-option value="sponsors" label="我主办"> </el-option>
                   <el-option value="monitors" label="我监控"> </el-option>
                 </el-select>
-              </el-col>
-              <el-col :span="24">
-                <font class="more-label-font">
+              </el-row>
+              <el-row>
+                <font >
                   分类
                 </font>
                 <el-select size="mini"  v-model="filters.procCategory" clearable filterable placeholder="选择分类" >
                   <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
                 </el-select>
-              </el-col>
-              <el-col :span="24">
-                <font class="more-label-font">
+              </el-row>
+              <el-row>
+                <font >
                   标签查找
                 </font>
                 <el-row v-show="filters.tags && filters.tags.length>0">
@@ -62,9 +56,9 @@
                 </el-row>
                 <el-button v-if="filters.tags==null || filters.tags.length==0" size="mini"
                   @click.native="showTagSelect(false)">选择标签</el-button>
-              </el-col>
-              <el-col :span="24">
-                <font class="more-label-font">
+              </el-row>
+              <el-row>
+                <font >
                   任务执行
                 </font>
                 <el-tag v-if="filters.assignee" :type="'success'" closable :disable-transitions="false"
@@ -72,47 +66,46 @@
                   {{filters.assignee.username}}
                 </el-tag>
                 <el-button v-else size="mini" @click.native="userSelectVisible=true">选择执行人</el-button>
-              </el-col>
-              <el-col :span="24">
-                <font class="more-label-font">
+              </el-row>
+              <el-row>
+                <font >
                   开始日期：
                 </font>
                 <el-date-picker v-model="filters.startTimeRanger" type="daterange" align="right" unlink-panels
                   range-separator="-" start-placeholder="创建日期" end-placeholder="创建日期" value-format="yyyy-MM-dd"
                   :default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions">
                 </el-date-picker>
-              </el-col>
-              <el-col :span="24">
+              </el-row>
+              <el-row>
 
-                <font class="more-label-font">
+                <font >
                   计划完成日期：
                 </font>
                 <el-date-picker v-model="filters.planFinishTimeRanger" type="daterange" align="right" unlink-panels
                   range-separator="-" start-placeholder="计划完成日期" end-placeholder="计划完成日期" value-format="yyyy-MM-dd"
                   :default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions">
                 </el-date-picker>
-              </el-col>
+              </el-row>
               <!-- <el-col :span="24">
                 <category-tree class="hidden-lg-and-up" ref="categoryTree" multiple :expandOnClickNode="false"
                   :defaultExpandAll="true" show-checkbox :current-key="addForm.categoryId"
                   v-on:check-change="handleCategoryCheckChange"></category-tree>
               </el-col> -->
 
-              <el-col :span="24" style="margin-top: 11px;">
+              <el-row>
                 <el-button size="mini" type="primary" v-on:click="searchProcinsts" icon="el-icon-search">查询</el-button>
-              </el-col>
+              </el-row>
 
-              <el-col :span="24">
+              <el-row>
                 <el-divider content-position="left">其它操作</el-divider>
                 <el-button size="mini" @click.native="showTagSelect(true)">给任务打标签</el-button>
                 <el-button size="mini" @click="handleDownload">导出数据</el-button>
-              </el-col>
+               </el-row>
             </el-row>
-            <el-button slot="reference" icon="el-icon-more" style="margin-left: 13px;" circle></el-button>
-          </el-popover>
+          </el-drawer>
         </el-row>
-        <el-row style="padding-top:20px;">
-          <el-table ref="table" :max-height="tableHeight" :data="procinsts" highlight-current-row
+        <el-row class="page-main">
+          <el-table ref="table" :height="tableHeight" :data="procinsts" highlight-current-row
             v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
             <el-table-column type="selection" width="40"></el-table-column>
             <el-table-column type="index" width="40"></el-table-column>
@@ -149,15 +142,14 @@
             @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>
           <!--编辑 Execution act_ru_execution界面-->
-          <el-dialog title="任务详情" fullscreen :visible.sync="editFormVisible" :width="dialogWidth()"
+          <el-drawer title="任务详情"  :visible.sync="editFormVisible" :size="dialogWidth()" :withHeader="false"
             :close-on-click-modal="false">
             <procinst-parames-execution-set :companyEmployees="companyEmployees" :companyDepts="companyDepts"
               :taskInfo="editForm" :procDefId="editForm.procDefId" :procInstId="editForm.procInstId"
               :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit">
             </procinst-parames-execution-set>
-          </el-dialog>
-        </el-row>
-      </el-col>
+          </el-drawer>
+        </el-row> 
 
       <el-dialog append-to-body title="选择员工" :visible.sync="userSelectVisible" width="60%">
         <users-select :select-userids="filters.assignee?[filters.assignee.userid]:[]" @confirm="onUserSelected">
@@ -349,6 +341,7 @@
         isBatchSetProcTags: false,
         userSelectVisible: false,
         tableHeight: 300,
+        moreFilterVisible:false,
         /**end 自定义属性请在上面加 请加备注**/
       };
     }, //end data
@@ -365,10 +358,10 @@
       },
 
       dialogWidth: function() {
-        if (screen.width > 500) {
-          return "80%";
+        if (screen.width > 600) {
+          return "60%";
         } else {
-          return "100%";
+          return "80%";
         }
       },
       handleSizeChange(pageSize) {
@@ -917,7 +910,7 @@
       });
       this.$nextTick(() => {
         var clientRect = this.$refs.table.$el.getBoundingClientRect();
-        var subHeight = 70 / 1000 * window.innerHeight;
+        var subHeight = 60 / 1000 * window.innerHeight;
         this.tableHeight = window.innerHeight - clientRect.y - this.$refs.table.$el.offsetTop - subHeight;
         if (this.isMyStart) {
           this.filters.filterType = "startUserId"
@@ -937,43 +930,5 @@
 </script>
 
 <style scoped>
-  .filters-show {
-    margin-left: 20px;
-    margin-top: 10px;
-    margin-bottom: 0px;
-  }
-
-  .filters-label {
-    font-size: 14px;
-    color: black;
-    font-weight: bold;
-  }
-
-  .more-filter-item {
-    margin: 20px 0px;
-  }
-
-  .more-filter-item .el-col {
-    margin: 2px 2px;
-  }
-
-  .more-filter-item button {
-    margin: 2px 2px;
-  }
-
-  .more-label-font {
-    text-align: center;
-    float: left;
-    height: 28px;
-    line-height: 28px;
-    margin-right: 10px;
-  }
-
-  .el-popover__title {
-    color: #303133;
-    font-size: 18px;
-    line-height: 1;
-    margin-bottom: 12px;
-    margin-top: 11px;
-  }
+  
 </style>
diff --git a/src/views/mdp/workflow/re/deployment/DeploymentMng.vue b/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
index cf65d316..871af792 100644
--- a/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
+++ b/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
-    <el-row class="app-container">
-      <el-row>
+    <el-row class="page-container border">
+      <el-row  class="page-header">
         <el-select v-model="filters.category" clearable filterable placeholder="请选择分类">
           <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
         </el-select>
@@ -12,10 +12,10 @@
         </el-input>
         <el-button @click="handleDownload" icon="el-icon-download" style="">导出数据</el-button>
       </el-row>
-      <el-row style="padding-top:20px;">
+      <el-row class="page-main">
         <!--列表 Deployment act_re_deployment-->
         <el-table
-          ref="table" :max-height="tableHeight"
+          ref="table" :height="tableHeight"
           :data="deployments"
           highlight-current-row
           v-loading="listLoading"
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
index 6d790ab3..486c3fe0 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
@@ -1,26 +1,22 @@
 <template>
   <section>
-    <el-row class="app-container">
-      <el-row> 
-        <el-col>
-          <el-row>
+    <el-row class="page-container border">
+          <el-row class="page-header">
             <el-select v-model="filters.procCategory" clearable filterable placeholder="请选择分类">
               <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
             </el-select>
 
-            <el-input v-model="filters.key" style="width:270px;" placeholder="模糊查询">
-              <template slot="append">
-                <el-button type="primary"   v-on:click="searchProcdefs" icon="el-icon-search">查询</el-button>
-              </template>
+            <el-input v-model="filters.key" placeholder="模糊查询">
             </el-input>
+            <el-button type="primary"   v-on:click="searchProcdefs" icon="el-icon-search">查询</el-button>
             <el-button @click.native="showTagSelect(false)" icon="el-icon-search" style="margin-left: 13px;" class="hidden-sm-and-down">标签</el-button>
             <el-button @click.native="showTagSelect(true)" icon="el-icon-plus" class="hidden-sm-and-down">标签</el-button>
             <el-button @click="handleDownload" 	icon="el-icon-download" class="hidden-md-and-down">导出数据</el-button>
           </el-row>
-          <el-row  style="padding-top:20px;">
+          <el-row class="page-main">
             <!--列表 Procdef act_re_procdef-->
             <el-table
-              ref="table" :max-height="tableHeight"
+              ref="table" :height="tableHeight"
               :data="procdefs"
               highlight-current-row
               v-loading="listLoading"
@@ -141,8 +137,6 @@
               ></tag-mng>
             </el-dialog>
           </el-row>
-        </el-col>
-      </el-row>
     </el-row>
   </section>
 </template>
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
index fb22b129..cfb6bbee 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
@@ -1,19 +1,17 @@
 <template>
   <section>
-    <el-row v-if="flowStartVisible==false" class="app-container">
-      <el-row>
+    <el-row v-if="flowStartVisible==false" class="page-container border">
+      <el-row class="page-header">
         <el-input v-model="filters.key" style="width:270px;" placeholder="模糊查询">
-          <template slot="append">
-            <el-button type="primary" v-loading="listLoading" :disabled="listLoading" v-on:click="searchProcdefs"
-              icon="el-icon-search">查询</el-button>
-          </template>
         </el-input>
+        <el-button type="primary" v-loading="listLoading" :disabled="listLoading" v-on:click="searchProcdefs"
+                   icon="el-icon-search">查询</el-button>
         <el-tag type="info" v-if="this.procdefs.length==0">如果没有找到流程，请将业务编码【{{this.filters.params.bizKey}}】与流程进行关联
         </el-tag>
       </el-row>
-      <el-row style="padding-top:20px;">
+      <el-row class="page-main">
         <!--列表 Procdef act_re_procdef-->
-        <el-table ref="procdefsTable" :max-height="tableHeight" :data="procdefs" highlight-current-row
+        <el-table ref="procdefsTable" :height="tableHeight" :data="procdefs" highlight-current-row
           v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
           <el-table-column type="selection" width="40"></el-table-column>
           <el-table-column type="index" width="40"></el-table-column>
@@ -326,7 +324,7 @@
       this.$nextTick(() => {
 
         var clientRect = this.$refs.procdefsTable.$el.getBoundingClientRect();
-        var subHeight = 70 / 1000 * window.innerHeight;
+        var subHeight = 60 / 1000 * window.innerHeight;
         this.tableHeight = window.innerHeight - clientRect.y - this.$refs.procdefsTable.$el.offsetTop - subHeight;
       })
 
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
index c65db1fc..d410ac12 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
@@ -1,16 +1,13 @@
 <template>
   <section>
-    <el-row class="app-container"> 
-      <el-col>
-        <el-row>
+    <el-row class="page-container border">
+        <el-row class="page-header">
           <el-select v-model="filters.procCategory" clearable filterable placeholder="请选择分类">
             <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
           </el-select>
           <el-input v-model="filters.key" style="width:270px;" placeholder="模糊查询">
-            <template slot="append">
-              <el-button type="primary" v-on:click="searchProcdefs" icon="el-icon-search">查询</el-button>
-            </template>
           </el-input>
+          <el-button type="primary" v-on:click="searchProcdefs" icon="el-icon-search">查询</el-button>
           <el-button @click.native="showTagSelect(false)" icon="el-icon-search" class="hidden-md-and-down">标签</el-button>
           <el-button @click.native="showTagSelect(true)" icon="el-icon-plus" class="hidden-md-and-down">标签</el-button>
 
@@ -26,9 +23,9 @@
               v-on:check-change="handleCategoryCheckChange"></category-tree>
           </el-drawer>
         </el-row>
-        <el-row style="padding-top:20px;">
+        <el-row class="page-main">
           <!--列表 Procdef act_re_procdef-->
-          <el-table ref="procdefsTable" :max-height="tableHeight" :data="procdefs" highlight-current-row
+          <el-table ref="procdefsTable" :height="tableHeight" :data="procdefs" highlight-current-row
             v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
             <el-table-column type="selection" width="40"></el-table-column>
             <el-table-column type="index" width="40"></el-table-column>
@@ -86,7 +83,6 @@
               @select-confirm="onTagSelected"></tag-mng>
           </el-dialog>
         </el-row>
-      </el-col>
     </el-row>
   </section>
 </template>
@@ -600,7 +596,7 @@
 
       this.$nextTick(() => {
         var clientRect = this.$refs.procdefsTable.$el.getBoundingClientRect();
-        var subHeight = 70 / 1000 * window.innerHeight;
+        var subHeight = 60 / 1000 * window.innerHeight;
         this.tableHeight = window.innerHeight - clientRect.y - this.$refs.procdefsTable.$el.offsetTop - subHeight;
       })
       this.searchProcdefs();
@@ -614,34 +610,6 @@
 </script>
 
 <style scoped>
-  .filters-show {
-    margin-left: 20px;
-    margin-top: 10px;
-    margin-bottom: 0px;
-  }
-
-  .filters-label {
-    font-size: 14px;
-    color: black;
-    font-weight: bold;
-  }
-
-  .el-button+.el-button {
-    margin-left: 0px;
-  }
-</style>
-
-<style>
-  .el-input-group__append,
-  .el-input-group__prepend {
-    background-color: #409EFF !important;
-    color: #ffffff !important;
-    vertical-align: middle;
-    display: table-cell;
-    position: relative;
-    border: 1px solid #409EFF !important;
-    padding: 0 20px;
-    width: 1px;
-    white-space: nowrap;
-  }
+   
 </style>
+ 
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefMng.vue b/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
index 84ff81fa..0f1ecab8 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row  class="app-container">  
+	<section class="page-container border">
+		<el-row   class="page-header">  
 			<el-input v-model="filters.key"  style="width:20%;" placeholder="模糊查询">
 				<template slot="append"> 
 					<el-button type="primary"   v-on:click="searchProcdefs" icon="el-icon-search">查询</el-button> 
@@ -17,14 +17,14 @@
 			<el-button   @click.native="showTagSelect(false)"  >标签查找</el-button>
 			<el-button   @click.native="showTagSelect(true)"  >打标签</el-button>
 	    </el-row> 
-		<el-row class="app-container">
+		<el-row class="page-main">
 			<el-col :xs="4" :sm="4" :md="4" :lg="4" :xl="4" class="hidden-sm-and-down">
 				<category-tree ref="categoryTree" multiple :expandOnClickNode="false" :defaultExpandAll="true" show-checkbox  :current-key="addForm.categoryId"  v-on:check-change="handleCategoryCheckChange" ></category-tree> 
 			</el-col>
 			<el-col :xs="24" :sm="24" :md="20" :lg="20" :xl="20"> 
 			
 			<!--列表 Procdef act_re_procdef-->
-			<el-table  ref="table" :max-height="tableHeight"  :data="procdefs"    highlight-current-row v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table  ref="table" :height="tableHeight"  :data="procdefs"    highlight-current-row v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column type="selection" width="40"></el-table-column>
 				<el-table-column type="index" width="40"></el-table-column> 
 				<el-table-column prop="category" label="分类" min-width="80" ></el-table-column>
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue b/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
index ed51e298..86c8c019 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
@@ -1,8 +1,7 @@
 <template>
   <section>
-    <el-row class="app-container">
-        <el-col>
-          <el-row>
+    <el-row class="page-container border"> 
+          <el-row class="page-header" >
             <el-select v-model="filters.procCategory" clearable filterable placeholder="请选择分类">
               <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
             </el-select>
@@ -16,9 +15,9 @@
             <el-button @click="handleDownload" icon="el-icon-download" class="hidden-md-and-down">导出数据</el-button>
           </el-row>
           <!--列表 Procdef act_re_procdef-->
-          <el-row style="padding-top:20px;">
+          <el-row class="page-main">
           <el-table
-            ref="table" :max-height="tableHeight"
+            ref="table" :height="tableHeight"
             :data="procdefs"
             highlight-current-row
             v-loading="listLoading"
@@ -120,8 +119,7 @@
               @select-confirm="onTagSelected"
             ></tag-mng>
           </el-dialog>
-          </el-row>
-        </el-col>
+          </el-row> 
       </el-row>
   </section>
 </template>
diff --git a/src/views/mdp/workflow/re/procdefParames/ActQxCodeSet.vue b/src/views/mdp/workflow/re/procdefParames/ActQxCodeSet.vue
index 2f14a1ca..618df9ce 100644
--- a/src/views/mdp/workflow/re/procdefParames/ActQxCodeSet.vue
+++ b/src/views/mdp/workflow/re/procdefParames/ActQxCodeSet.vue
@@ -1,7 +1,6 @@
 <template>
 	<section>
-		<el-row class="app-container"> 
-			<el-form label-position="top" label-width="80px" :model="addForm" ref="addForm">
+		<el-row class="page-container border padding"> <el-form label-position="top" label-width="80px" :model="addForm" ref="addForm">
 				<el-form-item label="正文"> 
 					<el-checkbox v-model="qxCodeArr[0]" true-label="1" false-label="0">可看正文</el-checkbox>
 					<el-checkbox v-if="qxCodeArr[0]=='1'" v-model="qxCodeArr[1]" true-label="1" false-label="0">可修改正文</el-checkbox> 
diff --git a/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue b/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue
index 7702b04d..ef943583 100644
--- a/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue
+++ b/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue
@@ -1,7 +1,6 @@
 <template>
 	<section>
-		<el-row class="app-container">
-			<!--新增界面 ProcinstParames 流程实例参数设置表-->
+		 <el-row class="page-container border padding">
 			<el-col :span="24">
 			<!--新增界面 ProcdefParames 流程定义参数设置表-->
 			<el-form :model="addForm"   label-width="120px" label-position="left" :rules="addFormRules" ref="addForm" v-loading="listLoading">
diff --git a/src/views/mdp/workflow/re/procdefParamesTemplate/ProcdefParamesTemplateMng.vue b/src/views/mdp/workflow/re/procdefParamesTemplate/ProcdefParamesTemplateMng.vue
index 2ad143c0..8b242b71 100644
--- a/src/views/mdp/workflow/re/procdefParamesTemplate/ProcdefParamesTemplateMng.vue
+++ b/src/views/mdp/workflow/re/procdefParamesTemplate/ProcdefParamesTemplateMng.vue
@@ -1,15 +1,15 @@
 <template>
 	<section>
-		<el-row class="app-container">
+		<el-row class="page-container border">
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
 				<template slot="append"> 
 					<el-button type="primary"   v-on:click="searchProcdefParamesTemplates" icon="el-icon-search">查询</el-button> 
 				</template>
 			</el-input>  
 		</el-row>
-		<el-row class="app-container"> 
+		<el-row class="page-container border"> 
 			<!--列表 ProcdefParamesTemplate mdp_re_procdef_parames_template-->
-			<el-table  ref="table" :max-height="tableHeight"  :data="procdefParamesTemplates"   highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table  ref="table" :height="tableHeight"  :data="procdefParamesTemplates"   highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				 
 				<el-table-column type="index" width="40"></el-table-column>  
 				<el-table-column sortable prop="mainTitle" label="流程标题" min-width="150" ></el-table-column> 
diff --git a/src/views/mdp/workflow/ru/execution/ExecutionMng.vue b/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
index ef21e743..757a0acb 100644
--- a/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
+++ b/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
@@ -1,8 +1,7 @@
 <template>
   <section>
-    <el-row class="app-container"> 
-      <el-col v-if="showCalendar==false">
-        <el-row>
+    <el-row class="page-container">  
+        <el-row class="page-header">
           <el-select v-model="filters.filterType" clearable placeholder="查询范围" class="hidden-md-and-down">
             <el-option value="" label="全部"> </el-option>
             <el-option value="startUserId" label="我发起"> </el-option>
@@ -13,30 +12,30 @@
           <el-select v-model="filters.procCategory" clearable filterable placeholder="选择分类" >
             <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
           </el-select>
-          <el-date-picker v-model="filters.startTimeRanger" class="" type="daterange" align="right"
+          <el-date-picker v-model="filters.startTimeRanger"  type="daterange" align="right"
             unlink-panels range-separator="-" start-placeholder="创建日期" end-placeholder="创建日期" value-format="yyyy-MM-dd"
             :default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions">
           </el-date-picker>
-          <el-input v-model="filters.key" style="width:270px;" placeholder="模糊查询">
-            <template slot="append">
-
-              <el-button v-on:click="searchExecutions" icon="el-icon-search">查询</el-button>
-            </template>
+          <el-input v-model="filters.key"  placeholder="模糊查询"> 
           </el-input>
+          <el-button type="primary" v-on:click="searchExecutions"  icon="el-icon-search">查询</el-button>
+           <el-button  @click="moreFilterVisible=true" icon="el-icon-more" circle></el-button>
           <el-popover placement="top" width="375" trigger="manual" v-model="weixinContentVisible">
             <p>{{weixinContent}}</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="doCopyWeixinUrl">拷贝链接</el-button>
               <el-button type="primary" size="mini" @click="doCopyWeixinContent">拷贝内容</el-button>
             </div>
-            <el-button slot="reference" style="margin-left: 13px;" class="hidden-lg-and-down" icon="el-icon-alarm-clock " v-on:click="showWeixin">
+            <el-button slot="reference" class="hidden-lg-and-down" icon="el-icon-alarm-clock " v-on:click="showWeixin">
               微信催办</el-button>
           </el-popover>
+          
+          <el-drawer title="更多查询条件" :visible.sync="moreFilterVisible"   append-to-body :size="400">
+            <el-row class="page-container more-filter">
+              <el-divider content-position="left">查询条件</el-divider>
+              <el-row>
 
-          <el-popover title="更多查询条件" placement="top-start" width="400" trigger="click">
-            <el-row class="more-filter-item">
-              <el-col :span="24">
-                <font class="more-label-font">
+                <font>
                   查询范围
                 </font>
                 <el-select size="mini" v-model="filters.filterType" placeholder="查询范围">
@@ -46,17 +45,17 @@
                   <el-option value="sponsors" label="我主办"> </el-option>
                   <el-option value="monitors" label="我监控"> </el-option>
                 </el-select>
-              </el-col> 
-              <el-col :span="24">
-                <font class="more-label-font">
+              </el-row> 
+              <el-row >
+                <font>
                   流程分类
                 </font>
                 <el-select v-model="filters.procCategory" clearable filterable placeholder="选择分类">
                   <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
                 </el-select>
-              </el-col>
-              <el-col :span="24">
-                <font class="more-label-font">
+              </el-row>
+              <el-row >
+                <font>
                   标签查找
                 </font>
                 <el-row v-show="filters.tags && filters.tags.length>0">
@@ -67,9 +66,9 @@
                 </el-row>
                 <el-button v-if="filters.tags==null || filters.tags.length==0" size="mini"
                   @click.native="showTagSelect(false)">选择标签</el-button>
-              </el-col>
-              <el-col :span="24">
-                <font class="more-label-font">
+              </el-row>
+              <el-row >
+                <font>
                   任务执行
                 </font>
                 <el-tag v-if="filters.assignee" :type="'success'" closable :disable-transitions="false"
@@ -77,62 +76,58 @@
                   {{filters.assignee.username}}
                 </el-tag>
                 <el-button v-else size="mini" @click.native="userSelectVisible=true">选择执行人</el-button>
-              </el-col>
-              <el-col :span="24">
-                <font class="more-label-font">
+              </el-row>
+              <el-row >
+                <font>
                   流程状态
                 </font>
                 <el-button size="mini" :type="filters.suspensionState=='2'?'success':''"
                   v-on:click="filters.suspensionState='2'">挂起的</el-button>
                 <el-button size="mini" :type="filters.suspensionState=='1'?'success':''"
-                  v-on:click="filters.suspensionState='1'">活动的</el-button>
-
-
-              </el-col>
-              <el-col :span="24">
-                <font class="more-label-font">
+                  v-on:click="filters.suspensionState='1'">活动的</el-button> 
+              </el-row>
+              <el-row >
+                <font>
                   开始日期
                 </font>
                 <el-date-picker v-model="filters.startTimeRanger" type="daterange" align="right" unlink-panels
                   range-separator="-" start-placeholder="创建日期" end-placeholder="创建日期" value-format="yyyy-MM-dd"
                   :default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions">
                 </el-date-picker>
-              </el-col>
-              <el-col :span="24">
+              </el-row>
+              <el-row >
 
-                <font class="more-label-font">
+                <font>
                   计划完成日期
                 </font>
                 <el-date-picker v-model="filters.planFinishTimeRanger" type="daterange" align="right" unlink-panels
                   range-separator="-" start-placeholder="计划完成日期" end-placeholder="计划完成日期" value-format="yyyy-MM-dd"
                   :default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions">
                 </el-date-picker>
-              </el-col> 
-              <el-col :span="24">
-                <el-checkbox size="mini" v-model="showCalendar">按日历风格显示</el-checkbox>
-              </el-col>
-
-
-
-              <el-col :span="24" style="margin-top: 11px;">
+              </el-row>  
+              <el-row >
                 <el-button size="mini" type="primary" v-on:click="searchExecutions" icon="el-icon-search">查询</el-button>
-              </el-col>
+              </el-row>
 
-              <el-col :span="24">
+              <el-row >
                 <el-divider content-position="left">其它操作</el-divider>
+                <el-checkbox size="mini" v-model="showCalendar">按日历风格显示</el-checkbox>
                 <el-button size="mini" @click.native="showTagSelect(true)">添加标签</el-button>
-                <el-button size="mini" @click="handleDownload">导出数据</el-button>
+                <el-button size="mini" @click="handleDownload">导出数据</el-button> 
+              </el-row> 
+              <el-row >
+                <el-divider content-position="left">催办</el-divider> 
                 <el-button size="mini" v-on:click="showWeixinTask">微信催办</el-button>
                 <el-button size="mini" v-on:click="showSendSms">短信催办</el-button>
                 <el-button size="mini" v-on:click="showOaMsg">OAMSG催办</el-button>
-              </el-col>
+              </el-row>
             </el-row>
-            <el-button slot="reference" icon="el-icon-more" style="margin-left: 13px;" circle></el-button>
-          </el-popover>
+           
+          </el-drawer>
         </el-row>
         <!--列表 Execution act_ru_execution-->
-        <el-row style="padding-top:20px;">
-          <el-table ref="table" :max-height="tableHeight" :data="executions" highlight-current-row
+        <el-row v-if="showCalendar==false" class="page-main">
+          <el-table ref="table" :height="tableHeight" :data="executions" highlight-current-row
             v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
             <el-table-column type="selection" width="40"></el-table-column>
             <el-table-column type="index" width="40"></el-table-column>
@@ -163,8 +158,7 @@
             <el-table-column prop="suspensionState" label="状态" min-width="80" :formatter="formatterSuspensionState">
             </el-table-column>
             <el-table-column label="操作" :width="screenWidth<500?80:160" fixed="right">
-              <template slot-scope="scope">
-                <el-button type="primary" @click="showTasksInfo( scope.row,scope.$index)">详情</el-button>
+              <template slot-scope="scope"> 
                 <el-dropdown @command="handleCommand" class="hidden-sm-and-down">
                   <span class="el-dropdown-link">
                     更多<i class="el-icon-arrow-down el-icon--right"></i>
@@ -185,12 +179,10 @@
           <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>
-        </el-row>
-      </el-col>
+        </el-row> 
+ 
 
-      <el-col v-if="showCalendar==true">
-
-        <el-calendar v-loading="listLoading" v-model="filters.calendarDate">
+        <el-calendar v-if="showCalendar==true" v-loading="listLoading" v-model="filters.calendarDate" class="page-main">
           <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
           <template slot="dateCell" slot-scope="{date, data}">
             <div :class="data.isSelected ? 'is-selected' : ''">
@@ -247,8 +239,7 @@
               </div>
             </div>
           </template>
-        </el-calendar>
-      </el-col>
+        </el-calendar> 
       <el-dialog append-to-body title="选择员工" :visible.sync="userSelectVisible" width="60%">
         <users-select :select-userids="filters.assignee?[filters.assignee.userid]:[]" @confirm="onUserSelected">
         </users-select>
@@ -265,13 +256,12 @@
           :visible="sendSmsVisible" @cancel="sendSmsVisible=false"></send-sms>
       </el-dialog>
       <!--编辑 Execution act_ru_execution界面-->
-      <el-dialog title="任务详情" :visible.sync="editFormVisible" fullscreen :width="dialogWidth()"
-        :close-on-click-modal="false">
+      <el-drawer title="任务详情" :visible.sync="editFormVisible"  :size="dialogWidth()" :withHeader="false">
         <procinst-parames-execution-set :companyEmployees="companyEmployees" :companyDepts="companyDepts"
           :taskInfo='editForm' :isArchive="isArchive" :procDefId="editForm.procDefId" :procInstId="editForm.procInstId"
           :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit">
         </procinst-parames-execution-set>
-      </el-dialog>
+      </el-drawer>
     </el-row>
   </section>
 </template>
@@ -500,6 +490,7 @@
         userSelectVisible: false,
         showCalendar: true,
         tableHeight: 300,
+        moreFilterVisible:false,
         /**end 自定义属性请在上面加 请加备注**/
       }
     }, //end data
@@ -630,7 +621,8 @@
         console.log("xxxxxxxxxxxxxx进来了");
         var task = Object.assign({}, row);
         this.editForm = task;
-
+        this.editFormVisible=true;
+        /**
         this.editForm = Object.assign({}, row);
         this.$router.push({
           name: 'ProcinstParamesExecutionSetRoute',
@@ -638,6 +630,7 @@
             taskInfo: task
           }
         });
+        */
       },
       //显示新增界面 Execution act_ru_execution
       showAdd: function() {
@@ -684,10 +677,10 @@
       },
 
       dialogWidth: function() {
-        if (screen.width > 500) {
-          return "80%";
+        if (screen.width > 600) {
+          return "60%";
         } else {
-          return "100%";
+          return "80%";
         }
       },
       //选择行execution
@@ -1244,10 +1237,10 @@
       this.$nextTick(() => {
         if (!this.showCalendar) {
           var clientRect = this.$refs.table.$el.getBoundingClientRect();
-          var subHeight = 70 / 1000 * window.innerHeight;
+          var subHeight = 60 / 1000 * window.innerHeight;
           this.tableHeight = window.innerHeight - clientRect.y - this.$refs.table.$el.offsetTop - subHeight;
         } else {
-          var subHeight = 70 / 1000 * window.innerHeight;
+          var subHeight = 60 / 1000 * window.innerHeight;
           this.tableHeight = window.innerHeight - subHeight;
         } 
       });
@@ -1272,94 +1265,5 @@
 </script>
 
 <style scoped>
-  .el-dropdown-link {
-    cursor: pointer;
-    color: #409EFF;
-  }
-
-  .el-icon-arrow-down {
-    font-size: 12px;
-  }
-
-  .filters-show {
-    margin-left: 20px;
-    margin-top: 10px;
-    margin-bottom: 0px;
-  }
-
-  .filters-label {
-    font-size: 14px;
-    color: black;
-    font-weight: bold;
-  }
-
-  .more-filter-item {
-    margin: 20px 0px;
-
-  }
-
-  .more-filter-item .el-col {
-    margin: 2px 2px;
-
-  }
-
-  .more-filter-item button {
-    margin: 2px 0px;
-  }
-
-  .more-label-font {
-    text-align: center;
-    float: left;
-    height: 28px;
-    line-height: 28px;
-    margin-right: 10px;
-  }
-
-  .el-divider--horizontal {
-    display: block;
-    height: 1px;
-    width: 100%;
-    margin: 24px 0;
-    padding-top: 20px;
-    margin-left: 0px;
-    background: #fff;
-  }
-
-  .el-divider__text.is-left {
-    left: 0px;
-  }
-
-  .el-divider__text {
-    padding: 0px 0px;
-  }
-</style>
-
-<style>
-  .el-input-group__append,
-  .el-input-group__prepend {
-    background-color: #409EFF !important;
-    color: #ffffff !important;
-    vertical-align: middle;
-    display: table-cell;
-    position: relative;
-    border: 1px solid #409EFF !important;
-    padding: 0 20px;
-    width: 1px;
-    white-space: nowrap;
-  }
-  .el-calendar__header {
-      display: -webkit-box;
-      display: -ms-flexbox;
-      display: flex;
-      -webkit-box-pack: justify;
-      -ms-flex-pack: justify;
-      justify-content: space-between;
-      padding: 20px 0px;
-      padding-top: 0px;
-      border: none;
-  }
-  .el-calendar__body {
-      padding: 12px 20px 35px;
-      border: 1px solid #EBEEF5;
-  }
 </style>
+   
diff --git a/src/views/mdp/workflow/ru/execution/ExecutionMngForFormData.vue b/src/views/mdp/workflow/ru/execution/ExecutionMngForFormData.vue
index fd0bd775..8475bcf9 100644
--- a/src/views/mdp/workflow/ru/execution/ExecutionMngForFormData.vue
+++ b/src/views/mdp/workflow/ru/execution/ExecutionMngForFormData.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row  class="app-container">  
+		<el-row  class="page-container border">  
 			<el-row>
 			<el-col :xs="22" :sm="22" :md="23" :lg="23" :xl="23"> 
 				<el-col :xs="8" :sm="8" :md="14" :lg="16" :xl="16">
@@ -47,7 +47,7 @@
 			</el-col>
 			</el-row>
 	    </el-row>  
-		<el-row class="app-container"> 
+		<el-row class="page-container border"> 
 			<el-col   :span="24" v-if="executions.length==0"> 
 				<el-button  type="primary"  v-if="executions.length==0" v-loading="listLoading"  v-on:click="startProc">还没有发起审核或者流程已结束，点击发起流程</el-button> 
 			</el-col>
diff --git a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
index 75314ae6..45eb9a8f 100644
--- a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
+++ b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
@@ -1,15 +1,13 @@
 <template>
-	<section>
-		<el-row   style="margin-left:-20px;">   
-			<el-row>
-				<el-button  type="text"  @click.native="handleCancel" icon="el-icon-back">取消</el-button>  
+	<section class="page-container page-full-height padding">
+		<el-row class="page-header">    
+				<el-button class="hidden-md-and-down"   type="text"  @click.native="handleCancel" icon="el-icon-back">取消</el-button>  
 				<el-button   type="text"  v-if="screenWidth>=500"  @click.native="handlePrint" icon="el-icon-printer">打印</el-button>    
-				<el-button   type="text"  v-if="isArchive"  @click.native="handleArchive"  icon="el-icon-s-grid">归档</el-button> 
-				<el-button   type="text"  v-if="task.taskId"   @click.native="addComment" :loading="addLoading" icon="el-icon-finished">只存办理意见</el-button>  
+				<el-button   type="text"  v-if="isArchive"  @click.native="handleArchive"  icon="el-icon-s-grid">归档</el-button>   
 				<el-button  type="text"   @click.native="tagSelectVisible=true" :loading="tagSetLoading"  icon="el-icon-finished">打标签</el-button> 
-				<el-button  type="text" v-if="displayDiagram==false" @click="showDiagram()" icon="el-icon-picture-outline">查看流程图</el-button>   
-				<el-button  type="text"  @click="showNodeInfoDialog"  icon="el-icon-s-check">配置审批人</el-button>
-				<el-button   type="text"  @click="showComment=!showComment"  icon="el-icon-document">{{showComment==false?"显示流转信息":"隐藏流转信息"}}</el-button>
+				<el-button  type="text" v-if="displayDiagram==false" @click="showDiagram()" icon="el-icon-picture-outline">流程图</el-button>   
+				<el-button  type="text"  @click="showNodeInfoDialog"  icon="el-icon-s-check">审批人</el-button>
+				<el-button class="hidden-md-and-down"  type="text"  @click="showComment=!showComment"  icon="el-icon-document">{{showComment==false?"显示流转信息":"隐藏流转信息"}}</el-button>
 				<el-button   type="text"  @click="showMainContext=!showMainContext"  icon="el-icon-document" class=" hidden-md-and-down">{{showMainContext==false?"显示正文":"隐藏正文"}}</el-button>
 				<el-button   type="text"  @click="showMainContextOnly=!showMainContextOnly"  icon="el-icon-finished" class=" hidden-sm-and-down">{{showMainContextOnly==false?"只看正文":"显示全部"}}</el-button>
 				<el-popover 
@@ -31,235 +29,229 @@
 							<attachment-upload  :branch-id="userInfo.branchId" :deptid="userInfo.deptid" :archive-id="taskInfo.paramsId" :category-id="taskInfo.categoryId"></attachment-upload>
 					</div> 
 					<el-button slot="reference"   type="text"    class="hidden-sm-and-down"  v-on:click="modelFilesVisible=!modelFilesVisible"  icon="el-icon-document-copy">流程附件</el-button>
-				</el-popover>
-			</el-row>
-	    </el-row>
-		<el-row v-show="showMainContextOnly==true">
-			<div style="padding: 20px;" v-html="addForm.mainContext"></div>
+				</el-popover> 
+	    </el-row> 
+		<el-row class="page-title padding-top"> 
+			<el-row  class="hidden-md-and-down"> 
+				<el-col class="wf-sub-title"> {{addForm.mainTitle}}</el-col> 
+			</el-row>   
+			<el-row  class="hidden-lg-and-up">
+				<el-col class="wf-title" v-if="addForm.mainTitle.length<30"> {{addForm.mainTitle}}</el-col> 
+				<el-col class="wf-sub-title" v-if="addForm.mainTitle.length>30"> {{addForm.mainTitle}}</el-col> 
+			</el-row>  
+			<el-row style="padding-top:10px;"> 
+				<el-col :span="24" class="wf-sub-sub-title">  
+					<font  v-if="addForm.tagNames" >
+					<el-tag v-for="tag in (addForm.tagNames.split(','))" :key="tag"
+						:type="'warning'"
+						:disable-transitions="false" >
+						{{tag}}
+					</el-tag>
+					</font>
+					发起部门: {{addForm.startDeptName}} &nbsp;&nbsp;&nbsp;
+					由&nbsp;{{addForm.startUsername}}&nbsp;于&nbsp;
+					{{addForm.startDate}} &nbsp;发起
+					</el-col>   
+			</el-row> 
 		</el-row>
-		<el-row v-show="showMainContextOnly==false">
-			 
-			<el-row> 
-			    <!--新增界面 ProcinstParames 流程实例参数设置表-->  
-					<el-form :model="addForm"  :label-width="labelWidth()" label-position="left" :rules="addFormRules" ref="addForm" > 
-						<el-row class=" hidden-sm-and-down">
-							<el-col class="wf-title"> {{addForm.mainTitle}}</el-col> 
-						</el-row> 
-						<el-row class="hidden-md-and-up">
-							<el-col class="wf-sub-title"> {{addForm.mainTitle}}</el-col> 
-						</el-row> 
-						<el-row> 
-							<el-col :span="24" class="wf-sub-title">  
-								<font  v-if="addForm.tagNames" >
-								<el-tag v-for="tag in (addForm.tagNames.split(','))" :key="tag"
-									:type="'warning'"
-									:disable-transitions="false" >
-									{{tag}}
-								</el-tag>
-								</font>
-								 发起部门: {{addForm.startDeptName}} &nbsp;&nbsp;&nbsp;
-								  由&nbsp;{{addForm.startUsername}}&nbsp;于&nbsp;
-								 {{addForm.startDate}} &nbsp;发起
-								 </el-col>   
-						</el-row>   
-						<el-row>   
-								预计
-								<el-date-picker style="width:20%;"
-									v-model="addForm.planFinishTime"
-									type="date" value-format="yyyy-MM-dd HH:mm:ss" 
-									:picker-options="pickerOptions"
-									placeholder="选择计划完成日期" >
-								</el-date-picker>
-								完成  <el-button   @click.native="updateFlowPlanFinishTime" :loading="addLoading" icon="el-icon-finished">保存日期</el-button>  
-								<el-popover
-									placement="top-start"
-									title="设置主办监控人"
-									width="400"
-									trigger="manual" v-model="sponsorsAndMonitorsVisible"> 
-									<el-row> 
-										<el-col :span="24" style="padding-top:5px;">
-											<font class="more-label-font">主办人:</font> 
-											<el-select disabled   value-key="userid"    v-model="sponsors" multiple placeholder="请选择">
-												<el-option
-												v-for="item in baseUserList"
-												:key="item.userid"
-												:label="item.username"
-												:value="item">
-												<span style="float: left">{{ item.username }}</span>
-												<span style="float: right; color: #8492a6; font-size: 14px">{{ item.shortName }}</span>
-												</el-option>
-											</el-select> 
-										</el-col> 
-										<el-col :span="24" style="padding-top:5px;">
-											<font class="more-label-font">监控人:</font>  
-											<el-select disabled   value-key="userid"   v-model="monitors" multiple placeholder="请选择">
-												<el-option
-												v-for="item in baseUserList"
-												:key="item.userid"
-												:label="item.username"
-												:value="item">
-												<span style="float: left">{{ item.username }}</span>
-												<span style="float: right; color: #8492a6; font-size: 13px">{{ item.shortName }}</span>
-												</el-option>
-											</el-select> 
-										</el-col> 
-									</el-row>
-									<el-button  slot="reference" icon="el-icon-s-check" @click="showSponsorsAndMonitors">主办人、监控人查询</el-button>
-								</el-popover>  
-						</el-row>   
-						<el-row  v-if="addForm.isRefForm=='1' && addForm.formId && addForm.formShowType!='table'" style="padding-top:10px;">
-							<form-data-mng-for-flow-form :formShowType="addForm.formShowType"  :companyDepts="companyDepts" :companyEmployees="companyEmployees" :formId="addForm.formId"  :qxCode="qxCode"  :procInstId="procInstId" :flowStartUserid="addForm.userid" :submitEvent="formDataSubmitEvent" @submit="startSubmit"><div></div></form-data-mng-for-flow-form> 
-						</el-row>
-						<el-row  v-if="actAssignee&&actAssignee.formId?true:false"  style="padding-top:10px;">
-							<form-data-for-flow-node :visible="actAssignee&&actAssignee.formId?true:false" :form-id="actAssignee.formId" :form-fields-json="actAssignee.formFieldsJson"  :submit-event="formDataSubmitEvent" @submit="startSubmit"><div></div></form-data-for-flow-node> 
-						</el-row>						
+		<el-row class="page-context" style="padding-top:10px;">
+			<el-row v-show="showMainContextOnly==true">
+				<div style="padding: 20px;" v-html="addForm.mainContext"></div>
+			</el-row>
+			<el-row v-show="showMainContextOnly==false">
+				
+				<el-row> 
+					<!--新增界面 ProcinstParames 流程实例参数设置表-->  
+						<el-form :model="addForm"  :label-width="labelWidth()" label-position="top" :rules="addFormRules" ref="addForm" >  
+							<el-row>   
+									预计
+									<el-date-picker style="width:20%;"
+										v-model="addForm.planFinishTime"
+										type="date" value-format="yyyy-MM-dd HH:mm:ss" 
+										:picker-options="pickerOptions"
+										placeholder="选择计划完成日期" >
+									</el-date-picker>
+									完成  <el-button   @click.native="updateFlowPlanFinishTime" :loading="addLoading" icon="el-icon-finished">保存日期</el-button>  
+									<el-popover
+										placement="top-start"
+										title="设置主办监控人"
+										width="400"
+										trigger="manual" v-model="sponsorsAndMonitorsVisible"> 
+										<el-row> 
+											<el-col :span="24" style="padding-top:5px;">
+												<font class="more-label-font">主办人:</font> 
+												<el-select disabled   value-key="userid"    v-model="sponsors" multiple placeholder="请选择">
+													<el-option
+													v-for="item in baseUserList"
+													:key="item.userid"
+													:label="item.username"
+													:value="item">
+													<span style="float: left">{{ item.username }}</span>
+													<span style="float: right; color: #8492a6; font-size: 14px">{{ item.shortName }}</span>
+													</el-option>
+												</el-select> 
+											</el-col> 
+											<el-col :span="24" style="padding-top:5px;">
+												<font class="more-label-font">监控人:</font>  
+												<el-select disabled   value-key="userid"   v-model="monitors" multiple placeholder="请选择">
+													<el-option
+													v-for="item in baseUserList"
+													:key="item.userid"
+													:label="item.username"
+													:value="item">
+													<span style="float: left">{{ item.username }}</span>
+													<span style="float: right; color: #8492a6; font-size: 13px">{{ item.shortName }}</span>
+													</el-option>
+												</el-select> 
+											</el-col> 
+										</el-row>
+										<el-button  slot="reference" icon="el-icon-s-check" @click="showSponsorsAndMonitors">主办人、监控人查询</el-button>
+									</el-popover>  
+							</el-row>   
+							<el-row  v-if="addForm.isRefForm=='1' && addForm.formId && addForm.formShowType!='table'" style="padding-top:10px;">
+								<form-data-mng-for-flow-form :formShowType="addForm.formShowType"  :companyDepts="companyDepts" :companyEmployees="companyEmployees" :formId="addForm.formId"  :qxCode="qxCode"  :procInstId="procInstId" :flowStartUserid="addForm.userid" :submitEvent="formDataSubmitEvent" @submit="startSubmit"><div></div></form-data-mng-for-flow-form> 
+							</el-row>
+							<el-row  v-if="actAssignee&&actAssignee.formId?true:false"  style="padding-top:10px;">
+								<form-data-for-flow-node :visible="actAssignee&&actAssignee.formId?true:false" :form-id="actAssignee.formId" :form-fields-json="actAssignee.formFieldsJson"  :submit-event="formDataSubmitEvent" @submit="startSubmit"><div></div></form-data-for-flow-node> 
+							</el-row>						
 
-						<el-row  v-if="addForm.mainContext && addForm.mainContext.length>0 && showMainContext"> 
-								<div  class="wf-main-context-box" v-if="screenWidth>=500">
-									<div style="padding: 20px;" class="wf-main-context" v-html="addForm.mainContext"></div>
-								</div>  
-							<div   class="wf-main-context-box" v-if="screenWidth<500">
-									<div style="padding: 20px;" v-html="addForm.mainContext"></div>
+							<el-row  v-if="addForm.mainContext && addForm.mainContext.length>0 && showMainContext"> 
+									<div  class="wf-main-context-box" v-if="screenWidth>=500">
+										<div style="padding: 20px;" class="wf-main-context" v-html="addForm.mainContext"></div>
+									</div>  
+								<div   class="wf-main-context-box" v-if="screenWidth<500">
+										<div style="padding: 20px;" v-html="addForm.mainContext"></div>
+								</div> 
+							</el-row>   
+							<el-row v-show="showComment">
+								<comment-step :task="task"  :procInstId="procInstId" :refresh="refreshCommentList"   @get-comments="getComments"></comment-step>  
+							</el-row> 
+							<div v-if="task.taskId"> 
+								<el-form-item :label="'办理意见'" prop="commentMsg">
+									<el-row class=" hidden-md-and-down">
+										<el-radio-group v-model="task.action">
+											<div v-if="task.action!='claim'">
+												<el-radio min-width="60px" v-show="taskInfo && taskInfo.delegation!='PENDING'" label="agree">同意&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
+												<el-radio v-show="taskInfo && taskInfo.delegation!='PENDING'" label="disAgree">不同意&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
+												<el-radio label="rejectToActivity">驳回&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
+												<el-radio label="sponsors">转主办&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
+												<el-radio label="rejectToStartUser">转发起人</el-radio>
+												<el-radio v-show="taskInfo && taskInfo.delegation!='RESOLVED'" label="transfer">请人代办</el-radio>
+												<el-radio label="delegate">请人协办,完成后返回给我</el-radio>
+												<el-radio v-show="taskInfo && taskInfo.delegation!='RESOLVED' && taskInfo.delegation=='PENDING'" label="resolve">返回给原执行人</el-radio>
+												<el-radio label="over">结束流程</el-radio>
+											</div>
+											<div v-else>
+												<el-radio label="claim">领取任务</el-radio>
+											</div>
+										</el-radio-group>
+									</el-row>
+									<el-row class=" hidden-lg-and-up"> 
+										<el-select   v-model="task.action" placeholder="请选择办理意见" >
+											<div v-if="task.action!='claim'">
+												<el-option  v-show="taskInfo && taskInfo.delegation!='PENDING'" label="同意" value="agree">  </el-option>
+												<el-option  v-show="taskInfo && taskInfo.delegation!='PENDING'" label="不同意" value="disAgree">  </el-option>
+												<el-option  label="驳回" value="rejectToActivity">  </el-option>
+												<el-option label="转主办" value="sponsors">  </el-option>
+												<el-option   label="转发起人" value="rejectToStartUser">  </el-option>
+												<el-option  v-show="taskInfo && taskInfo.delegation!='RESOLVED'" label="请人代办" value="transfer">  </el-option>
+												<el-option   label="请人协办,完成后返回给我" value="delegate">  </el-option>
+												<el-option v-show="taskInfo && taskInfo.delegation!='RESOLVED' && taskInfo.delegation=='PENDING'"  label="返回给原执行人" value="resolve">  </el-option>
+												<el-option label="结束流程" value="over">  </el-option>
+											</div>
+											<div v-else>
+												<el-radio label="claim">领取任务</el-radio>
+											</div>
+										</el-select> 
+									</el-row>
+									<el-row style="padding-top:10px;">
+										<el-input  type="textarea" :rows="3" v-model="task.commentMsg" auto-complete="off" ></el-input>
+									</el-row> 
+								</el-form-item>   
+								<el-form-item v-show="task.action=='rejectToActivity'" label="驳回节点" prop="rejectToActivity"> 
+									<el-col :span="10">
+										<el-select   style="width:100%" value-key="taskId" v-model="task.rejectActivity" @change="rejectToActivitySelectChange" placeholder="请选择">
+										<el-option
+										v-for="item in comments"
+										:key="item.taskId"
+										:label="item.name"
+										:value="item">
+										<span style="float: left">{{ item.name }}</span>
+										<span style="float: right; color: #8492a6; font-size: 13px">{{ item.username }}-{{item.message}}</span>
+										</el-option>
+									</el-select>
+									</el-col>
+								</el-form-item> 
+								<el-form-item v-show="task.action=='transfer'||task.action=='delegate'||needAssignee!=''||(actAssignee&&actAssignee.showNextAssignees=='1')"  :label="nextAssigneeListLabel" prop="needAssignee"> 
+									<el-col :xs="24" :sm="18" :md="16" :lg="14" :xl="12">
+										<el-select    value-key="userid"  v-model="task.nextAssigneeList" multiple @change="nextAssigneeListSelectChange"  placeholder="如果不选则系统自动判断">
+										<el-option
+										v-for="item in baseUserList"
+										:key="item.userid"
+										:label="item.username"
+										:value="item">
+										<span style="float: left">{{ item.username }}</span>
+										<span style="float: right; color: #8492a6; font-size: 13px">{{ item.shortName }}</span>
+										</el-option>
+									</el-select>
+									<el-button   @click.native="showCommonUserSelectDialog" :loading="addLoading">更多人员</el-button>  
+									</el-col>
+								</el-form-item> 
 							</div> 
-						</el-row>   
-						<el-row>
-							<comment-step :task="task"  :procInstId="procInstId" :refresh="refreshCommentList"   @get-comments="getComments"></comment-step>  
-						</el-row> 
-						<div v-if="task.taskId"> 
-							<el-form-item :label="'办理意见'" prop="commentMsg">
-								<el-row class=" hidden-md-and-down" style="padding-top:10px;">
-									<el-radio-group v-model="task.action">
-										<div v-if="task.action!='claim'">
-											<el-radio min-width="60px" v-show="taskInfo && taskInfo.delegation!='PENDING'" label="agree">同意&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
-											<el-radio v-show="taskInfo && taskInfo.delegation!='PENDING'" label="disAgree">不同意&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
-											<el-radio label="rejectToActivity">驳回&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
-											<el-radio label="sponsors">转主办&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
-											<el-radio label="rejectToStartUser">转发起人</el-radio>
-											<el-radio v-show="taskInfo && taskInfo.delegation!='RESOLVED'" label="transfer">请人代办</el-radio>
-											<el-radio label="delegate">请人协办,完成后返回给我</el-radio>
-											<el-radio v-show="taskInfo && taskInfo.delegation!='RESOLVED' && taskInfo.delegation=='PENDING'" label="resolve">返回给原执行人</el-radio>
-											<el-radio label="over">结束流程</el-radio>
-										</div>
-										<div v-else>
-											<el-radio label="claim">领取任务</el-radio>
-										</div>
-									</el-radio-group>
-								</el-row>
-								<el-row class=" hidden-lg-and-up" style="padding-top:10px;"> 
-									<el-select   v-model="task.action" placeholder="请选择办理意见" >
-										<div v-if="task.action!='claim'">
-											<el-option  v-show="taskInfo && taskInfo.delegation!='PENDING'" label="同意" value="agree">  </el-option>
-											<el-option  v-show="taskInfo && taskInfo.delegation!='PENDING'" label="不同意" value="disAgree">  </el-option>
-											<el-option  label="驳回" value="rejectToActivity">  </el-option>
-											<el-option label="转主办" value="sponsors">  </el-option>
-											<el-option   label="转发起人" value="rejectToStartUser">  </el-option>
-											<el-option  v-show="taskInfo && taskInfo.delegation!='RESOLVED'" label="请人代办" value="transfer">  </el-option>
-											<el-option   label="请人协办,完成后返回给我" value="delegate">  </el-option>
-											<el-option v-show="taskInfo && taskInfo.delegation!='RESOLVED' && taskInfo.delegation=='PENDING'"  label="返回给原执行人" value="resolve">  </el-option>
-											<el-option label="结束流程" value="over">  </el-option>
-										</div>
-										<div v-else>
-											<el-radio label="claim">领取任务</el-radio>
-										</div>
-									</el-select> 
-								</el-row>
-								<el-row style="padding-top:10px;">
-									<el-input  type="textarea" :rows="3" v-model="task.commentMsg" auto-complete="off" ></el-input>
-								</el-row> 
-							</el-form-item>   
-							<el-form-item v-show="task.action=='rejectToActivity'" label="驳回节点" prop="rejectToActivity"> 
-								<el-col :span="10">
-									<el-select   style="width:100%" value-key="taskId" v-model="task.rejectActivity" @change="rejectToActivitySelectChange" placeholder="请选择">
-									<el-option
-									v-for="item in comments"
-									:key="item.taskId"
-									:label="item.name"
-									:value="item">
-									<span style="float: left">{{ item.name }}</span>
-									<span style="float: right; color: #8492a6; font-size: 13px">{{ item.username }}-{{item.message}}</span>
-									</el-option>
-								</el-select>
-								</el-col>
-							</el-form-item> 
-							<el-form-item v-show="task.action=='transfer'||task.action=='delegate'||needAssignee!=''||(actAssignee&&actAssignee.showNextAssignees=='1')"  :label="nextAssigneeListLabel" prop="needAssignee"> 
-								<el-col :xs="24" :sm="18" :md="16" :lg="14" :xl="12">
-									<el-select    value-key="userid" style="width:80%" v-model="task.nextAssigneeList" multiple @change="nextAssigneeListSelectChange"  placeholder="如果不选则系统自动判断">
-									<el-option
-									v-for="item in baseUserList"
-									:key="item.userid"
-									:label="item.username"
-									:value="item">
-									<span style="float: left">{{ item.username }}</span>
-									<span style="float: right; color: #8492a6; font-size: 13px">{{ item.shortName }}</span>
-									</el-option>
-								</el-select>
-								<el-button   @click.native="showCommonUserSelectDialog" :loading="addLoading">更多人员</el-button>  
-								</el-col>
-							</el-form-item> 
-						</div> 
-						<el-row v-if="screenWidth<500" v-loading="listLoading" style="padding-top:10px;">
-							<el-col :span="24">
-									<el-button    @click.native="handleCancel">取消</el-button>  
-									<el-button  v-if="screenWidth>=500"  @click.native="handlePrint" >打印</el-button>    
-									<el-button  v-if="isArchive"  @click.native="handleArchive" >归档</el-button> 
-									<el-button  v-if="task.taskId"   @click.native="addComment" :loading="addLoading">只存意见</el-button>  
-									<el-button  v-if="task.action!='claim' && task.taskId"  @click.native="completeHandle" :loading="addLoading">提交任务</el-button>  
-									<el-button  v-if="task.action=='claim'"  @click.native="completeHandle" :loading="addLoading">领取任务</el-button>  
-									<el-button  v-if="task.action=='claim' && task.taskId  && sponsors.some(i=>i.userid==userInfo.userid)"  @click.native="addCandidateUsers" :loading="addLoading">添加候选人</el-button> 
-							</el-col>
-						</el-row>  
-						<el-form-item v-if="screenWidth>=500" v-loading="listLoading" style="padding-top:10px;">
-									<el-button    @click.native="handleCancel" icon="el-icon-back">取消</el-button>  
-									<el-button   v-if="screenWidth>=500"  @click.native="handlePrint" icon="el-icon-printer">打印</el-button>    
-									<el-button   v-if="isArchive"  @click.native="handleArchive" icon="el-icon-s-grid">归档</el-button> 
-									<el-button   v-if="task.taskId"   @click.native="addComment" :loading="addLoading" icon="el-icon-finished">只存办理意见</el-button>  
-									<el-button   v-if="task.action!='claim' && task.taskId" type="primary" @click.native="completeHandle" :loading="addLoading"  icon="el-icon-finished">提交任务</el-button>  
-									<el-button  v-if="task.action=='claim' && task.taskId"  @click.native="completeHandle" :loading="addLoading"  icon="el-icon-finished">领取任务</el-button>  
-									<el-button  v-if="task.action=='claim' && task.taskId  && sponsors.some(i=>i.userid==userInfo.userid)"  @click.native="showTaskCandidateSet" :loading="addLoading"  icon="el-icon-s-check">添加候选人</el-button> 
-						</el-form-item>  
-					</el-form> 
+						</el-form> 
+				</el-row>
+				<el-dialog 
+					title="流程图"
+					:visible.sync="displayDiagram"
+					width="80%" append-to-body	> 
+					<el-image   :fit="'contain'" :src="diagramUrl">
+						<div slot="error" class="image-slot">
+							<i class="el-icon-picture-outline"></i>
+						</div>
+						<div slot="placeholder" class="image-slot">
+							正在全力加载中。。。。。。。。。。<i class="el-icon-loading"></i>
+						</div>
+					</el-image>  
+					<span slot="footer" class="dialog-footer"> 
+						<el-button type="primary" @click="displayDiagram = false">关闭</el-button>
+					</span>
+				</el-dialog> 
+				<el-dialog append-to-body
+					title="查看审批人"
+					:visible.sync="nodeInfoVisible"
+					width="60%"> 
+					<procinst-node-info-set   :node-infos="nodeInfos"   :visible="nodeInfoVisible"   @cancel="onNodeInfosCancel"   @confirm="onNodeInfosConfirm"></procinst-node-info-set> 
+				</el-dialog>
+				<el-dialog append-to-body
+					title="设置标签"
+					:visible.sync="tagSelectVisible"
+					width="60%"> 
+					<tag-mng :tagIds="addForm.tagIds==null?null:addForm.tagIds.split(',')"  :jump="true" @select-confirm="onTagSelected"></tag-mng> 
+				</el-dialog>
+				
+				<el-dialog append-to-body
+					title="选择员工"
+					:visible.sync="userSelectVisible"
+					width="60%">  
+					<users-select :select-userids="task.nextAssigneeList.map(i=>i.userid)"   @confirm="onUserSelected"></users-select> 
+				</el-dialog> 
+				<el-dialog append-to-body
+					title="候选人/候选部门/候选岗位配置"
+					:visible.sync="selectCandidateSetVisible"
+					width="60%"> 
+					<task-candidate-set :taskId="taskInfo.taskId" :procInstId="taskInfo.procInstId" @confirm="selectCandidateSetVisible=false"></task-candidate-set> 
+				</el-dialog> 
 			</el-row>
-			<el-dialog 
-				title="流程图"
-				:visible.sync="displayDiagram"
-				width="80%" append-to-body	> 
-				<el-image   :fit="'contain'" :src="diagramUrl">
-					<div slot="error" class="image-slot">
-						<i class="el-icon-picture-outline"></i>
-					</div>
-					<div slot="placeholder" class="image-slot">
-						正在全力加载中。。。。。。。。。。<i class="el-icon-loading"></i>
-					</div>
-				</el-image>  
-				<span slot="footer" class="dialog-footer"> 
-					<el-button type="primary" @click="displayDiagram = false">关闭</el-button>
-				</span>
-			</el-dialog> 
-			<el-dialog append-to-body
-				title="查看审批人"
-				:visible.sync="nodeInfoVisible"
-				width="60%"> 
-				<procinst-node-info-set   :node-infos="nodeInfos"   :visible="nodeInfoVisible"   @cancel="onNodeInfosCancel"   @confirm="onNodeInfosConfirm"></procinst-node-info-set> 
-			</el-dialog>
-			<el-dialog append-to-body
-				title="设置标签"
-				:visible.sync="tagSelectVisible"
-				width="60%"> 
-				<tag-mng :tagIds="addForm.tagIds==null?null:addForm.tagIds.split(',')"  :jump="true" @select-confirm="onTagSelected"></tag-mng> 
-			</el-dialog>
-			
-			<el-dialog append-to-body
-				title="选择员工"
-				:visible.sync="userSelectVisible"
-				width="60%">  
-				<users-select :select-userids="task.nextAssigneeList.map(i=>i.userid)"   @confirm="onUserSelected"></users-select> 
-			</el-dialog> 
-			<el-dialog append-to-body
-				title="候选人/候选部门/候选岗位配置"
-				:visible.sync="selectCandidateSetVisible"
-				width="60%"> 
-				<task-candidate-set :taskId="taskInfo.taskId" :procInstId="taskInfo.procInstId" @confirm="selectCandidateSetVisible=false"></task-candidate-set> 
-			</el-dialog> 
+		</el-row>
+		<el-row class="page-bottom">  
+			<el-button    @click.native="handleCancel" icon="el-icon-back">取消</el-button>  
+			<el-button   v-if="screenWidth>=500"  @click.native="handlePrint" icon="el-icon-printer">打印</el-button>    
+			<el-button   v-if="isArchive"  @click.native="handleArchive" icon="el-icon-s-grid">归档</el-button> 
+			<el-button   v-if="task.taskId"   @click.native="addComment" :loading="addLoading" icon="el-icon-finished">只存办理意见</el-button>  
+			<el-button   v-if="task.action!='claim' && task.taskId" type="primary" @click.native="completeHandle" :loading="addLoading"  icon="el-icon-finished">提交任务</el-button>  
+			<el-button  v-if="task.action=='claim' && task.taskId"  @click.native="completeHandle" :loading="addLoading"  icon="el-icon-finished">领取任务</el-button>  
+			<el-button  v-if="task.action=='claim' && task.taskId  && sponsors.some(i=>i.userid==userInfo.userid)"  @click.native="showTaskCandidateSet" :loading="addLoading"  icon="el-icon-s-check">添加候选人</el-button> 
+ 
 		</el-row>
 	</section>
 </template>
@@ -1143,18 +1135,23 @@
 
 </script>
 
-<style> 
+<style scoped> 
 .wf-title {
-	text-align: center;
-	font: outline;
-	font-size:2.5em; 
+	text-align: center; 
+	font-size:2.5em;  
+	overflow-x:auto;
+	overflow-y:auto;
+	
 }
 .wf-sub-title {
-	text-align: center;
-	font: outline; 
-	margin-top: 0.875em;
-	margin-bottom: 0.875em;
+	text-align: center;  
+	font-size:1.5em;  
+	overflow-x:auto;
+	overflow-y:auto;
 }  
+.wf-sub-sub-title{ 
+	text-align: center;  
+}
  .wf-main-context-box {  
 	border:1px dashed #000;
 	margin-bottom: 10px;
@@ -1171,5 +1168,17 @@
 	text-align:center;
 	float:left;
 	padding-top:5px;
+} 
+.page-title{
+	height: calc(10vh);
+	overflow-x:auto;
+	overflow-y:auto;
+}
+.page-context{
+	height: calc(70vh);
+	overflow: auto;
+}
+.page-bottom{
+	height: calc(5vh); 
 }
 </style>
\ No newline at end of file
diff --git a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue
index 73e96ed1..8edf1264 100644
--- a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue
+++ b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row class="app-container">
+		<el-row class="page-container border">
 			
 			<!--新增界面 ProcinstParames 流程实例参数设置表--> 
 			<el-col :span="24"> 
diff --git a/src/views/mdp/workflow/ru/task/TaskMng.vue b/src/views/mdp/workflow/ru/task/TaskMng.vue
index 0f7c3088..4a1dc23a 100644
--- a/src/views/mdp/workflow/ru/task/TaskMng.vue
+++ b/src/views/mdp/workflow/ru/task/TaskMng.vue
@@ -1,19 +1,13 @@
 <template>
   <section>
-    <el-row class="app-container"> 
-      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-        <el-row>
-          
+    <el-row class="page-container page-height">  
+        <el-row class="page-header"> 
           <el-select v-model="filters.procCategory" clearable filterable placeholder="选择分类">
             <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
           </el-select>
-          <el-input v-model="filters.key" style="width:270px;" placeholder="模糊查询">
-            <template slot="append">
-              <div class="search">
-                <el-button @click="searchAssigneeToMeTasks" icon="el-icon-search">查询</el-button>
-              </div>
-            </template>
-          </el-input>
+          <el-input v-model="filters.key" class="input-width"  placeholder="模糊查询"> 
+          </el-input> 
+          <el-button type="primary"  @click="searchAssigneeToMeTasks" icon="el-icon-search">查询</el-button>
           <el-popover placement="top" width="375" trigger="manual" v-model="weixinContentVisible">
             <p>{{weixinContent}}</p>
             <div style="text-align: right; margin: 0">
@@ -28,23 +22,24 @@
           <el-button v-show="assigneeToMe===false" class="hidden-sm-and-down" v-on:click="showOaMsg">OAMSG催办</el-button>
 
           <el-button @click.native="showTagSelect(false)" icon="el-icon-plus">标签</el-button>
-          <el-button @click="drawer = true" circle icon="el-icon-more"></el-button>
-
+          <el-button @click="moreFilterVisible = true" circle icon="el-icon-more"></el-button>
 
-          <el-drawer title="更多查询条件" :visible.sync="drawer" :with-header="false" append-to-body>
-            <el-row class="more-filter-item">
 
-              <el-col :span="24">
-                <font class="more-label-font" style="margin-right: 13px;">
+          <el-drawer title="更多查询条件" :visible.sync="moreFilterVisible"   append-to-body :size="400">
+            <el-row class="page-container more-filter"> 
+              
+              <el-divider content-position="left">查询条件</el-divider>
+              <el-row>
+                <font>
                   流程分类
                 </font>
-                <el-select v-model="filters.procCategory" clearable filterable placeholder="选择分类">
+                <el-select size="small" v-model="filters.procCategory" clearable filterable placeholder="选择分类">
                   <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
                 </el-select>
-              </el-col>
+              </el-row>
 
-              <el-col :span="24">
-                <font class="more-label-font">
+              <el-row>
+                <font >
                   标签查找
                 </font>
                 <el-row v-show="filters.tags && filters.tags.length>0">
@@ -55,50 +50,43 @@
                 </el-row>
                 <el-button v-if="filters.tags==null || filters.tags.length==0" size="mini"
                   @click.native="showTagSelect(false)">选择标签</el-button>
-              </el-col>
-
-
-              <el-col :span="24">
-                <font class="more-label-font">
+              </el-row>
+              <el-row>
+                <font >
                   开始日期
                 </font>
                 <el-date-picker v-model="filters.startTimeRanger" type="daterange" align="right" unlink-panels
                   range-separator="-" start-placeholder="创建日期" end-placeholder="创建日期" value-format="yyyy-MM-dd HH:mm:ss"
                   :default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions"></el-date-picker>
-              </el-col>
-              <el-col :span="24">
-                <font class="more-label-font">
+              </el-row>
+              <el-row>
+                <font >
                   计划完成日期
                 </font>
                 <el-date-picker v-model="filters.planFinishTimeRanger" type="daterange" align="right" unlink-panels
                   range-separator="-" start-placeholder="计划完成日期" end-placeholder="计划完成日期"
                   value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00','23:59:59']"
                   :picker-options="pickerOptions"></el-date-picker>
-              </el-col> 
-              <el-col :span="24">
-                <el-checkbox v-model="showCalendar">按日历风格显示</el-checkbox>
-              </el-col>
-
-              <el-col :span="24">
+              </el-row> 
+              <el-row> 
                 <el-button type="primary" @click="searchAssigneeToMeTasks" icon="el-icon-search"
                   style="margin-top: 11px;">查询</el-button>
-              </el-col>
-
-
-
-              <el-col :span="24">
+              </el-row> 
+              <el-row>
                 <el-divider content-position="left">其它操作</el-divider>
+                 <el-checkbox v-model="showCalendar">按日历风格显示</el-checkbox>
                 <el-button @click.native="showTagSelect(true)">添加标签</el-button>
                 <el-button @click="handleDownload">导出数据</el-button>
-              </el-col>
+              </el-row>
             </el-row>
 
           </el-drawer>
+          <el-row class="page-tips"><span></span></el-row>
         </el-row>
-        <el-row style="padding-top:20px;" v-if="showCalendar==false">
+        <el-row v-if="showCalendar==false" class="page-main">
           <!--列表 Task act_ru_task-->
           <el-table ref="table" :data="tasks" highlight-current-row v-loading="listLoading" border
-            @selection-change="selsChange" @row-click="rowClick" style="width: 100%;" :max-height="tableHeight">
+            @selection-change="selsChange" @row-click="rowClick" style="width: 100%;" :height="tableHeight">
             <el-table-column type="selection" width="40" v-if="screenWidth>=500" :class="'hidden-sm-and-down'">
             </el-table-column>
             <el-table-column type="index" width="40" :class="'hidden-sm-and-down'"></el-table-column>
@@ -137,20 +125,20 @@
             </el-table-column>
             <el-table-column sortable v-if="assigneeToMe===false" prop="dueDate" label="处理时长" min-width="80"
               show-overflow-tooltip></el-table-column>
+              <!--
             <el-table-column label="操作" width="100" fixed="right">
               <template slot-scope="scope">
                 <el-button type="primary" @click="showTaskDetail( scope.row,scope.$index)">详情</el-button>
               </template>
             </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>
           <!--编辑 Execution act_ru_execution界面-->
-        </el-row>
-      </el-col>
-      <el-col v-if="showCalendar==true">
-        <el-calendar v-loading="listLoading" v-model="filters.calendarDate">
+        </el-row>  
+        <el-calendar  v-if="showCalendar==true" v-loading="listLoading" v-model="filters.calendarDate">
           <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
           <template slot="dateCell" scope="{date, data}">
             <div :class="data.isSelected ? 'is-selected' : ''">
@@ -207,20 +195,19 @@
               </div>
             </div>
           </template>
-        </el-calendar>
-      </el-col>
+        </el-calendar> 
 
       <el-dialog title="短信催办" :visible.sync="sendSmsVisible" :width="dialogWidth()" :close-on-click-modal="false">
         <send-sms :sms-body-params="smsBodyParams" :sms-user-list="smsUserList" :load-phoneno-by-userid="true"
           :visible="sendSmsVisible" @cancel="sendSmsVisible=false"></send-sms>
       </el-dialog>
-      <el-dialog fullscreen title="任务详情" :visible.sync="editFormVisible" :width="dialogWidth()"
+      <el-drawer fullscreen title="任务详情" :visible.sync="editFormVisible" :size="dialogWidth()" :withHeader="false"
         :close-on-click-modal="false">
         <procinst-parames-execution-set :companyEmployees="companyEmployees" :companyDepts="companyDepts"
           :taskInfo="editForm" :procDefId="editForm.procDefId" :procInstId="editForm.procInstId"
           :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit">
         </procinst-parames-execution-set>
-      </el-dialog>
+      </el-drawer>
       <el-dialog append-to-body title="标签条件" :visible.sync="tagSelectVisible" class="dialog-body" width="60%">
         <tag-mng :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]" :jump="true" @select-confirm="onTagSelected">
         </tag-mng>
@@ -453,7 +440,7 @@
         myBranchDepts: [],
         categorys: [],
         tagSelectVisible: false,
-        drawer: false,
+        moreFilterVisible: false,
         showCalendar: true,
         tableHeight: 300,
         /** end 自定义属性请在上面加 请加备注**/
@@ -496,10 +483,10 @@
         this.getTasks();
       },
       dialogWidth: function() {
-        if (screen.width > 500) {
-          return "80%";
+        if (screen.width > 600) {
+          return "60%";
         } else {
-          return "100%";
+          return "80%";
         }
       },
 
@@ -1015,14 +1002,17 @@
 
       // 显示编辑界面 Task act_ru_task
       showTaskDetail: function(row, index) {
-        // this.editFormVisible = true;
+        
         this.editForm = Object.assign({}, row);
+        this.editFormVisible = true;
+        /**
         this.$router.push({
           name: "ProcinstParamesExecutionSetRoute",
           params: {
             taskInfo: row
           }
         });
+         */
       },
       // 显示新增界面 Task act_ru_task
       showAdd: function() {
@@ -1401,10 +1391,10 @@
       this.$nextTick(() => {
         if (!this.showCalendar) {
           var clientRect = this.$refs.table.$el.getBoundingClientRect();
-          var subHeight = 70 / 1000 * window.innerHeight;
+          var subHeight = 60 / 1000 * window.innerHeight;
           this.tableHeight = window.innerHeight - clientRect.y - this.$refs.table.$el.offsetTop - subHeight;
         } else {
-          var subHeight = 70 / 1000 * window.innerHeight;
+          var subHeight = 60 / 1000 * window.innerHeight;
           this.tableHeight = window.innerHeight - subHeight;
         }
       })
@@ -1431,131 +1421,7 @@
   };
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .filters-show {
-    margin-left: 20px;
-    margin-top: 10px;
-    margin-bottom: 0px;
-  }
-
-  .filters-label {
-    font-size: 14px;
-    color: black;
-    font-weight: bold;
-  }
-
-  .dialog-body {
-    padding: 0px 0px;
-  }
-
-  .more-filter-item {
-    margin: 20px 20px;
-  }
-
-  .more-filter-item .el-col {
-    margin: 2px 2px;
-  }
-
-  .more-filter-item button {
-    margin: 2px 2px;
-  }
-
-  .calendar-cell-data {
-    flex: 1;
-    display: inline-block;
-    align-items: left;
-    justify-content: space-between;
-    font-size: 14px;
-    color: #4386c6;
-
-    i，span {
-      margin-left: 0px;
-      font-size: 18px;
-      font-weight: 600;
-    }
-  }
-
-  .el-ic {
-    display: none;
-
-    i,
-    span {
-      padding: 0 0px;
-      font-size: 18px;
-      font-weight: 600;
-    }
-  }
-
-  .calendar-cell-data:hover .el-ic {
-    color: #428bca !important;
-    display: inline-block;
-    margin-left: 20px;
-  }
-
-  .calendar-cell-datat:hover {
-    font-weight: bold;
-  }
-
-  .more-label-font {
-    text-align: center;
-    float: left;
-    height: 28px;
-    line-height: 28px;
-    margin-right: 10px;
-    margin-top: 2px;
-  }
-
-  .el-input--medium .el-input__inner {
-    height: 36px;
-    line-height: 36px;
-    margin-left: 2px;
-  }
-
-  .el-divider--horizontal {
-    display: block;
-    height: 1px;
-    width: 100%;
-    margin: 24px 0;
-    padding-top: 20px;
-    margin-left: 0px;
-    background: #fff;
-  }
-
-  .el-divider__text.is-left {
-    left: 0px;
-  }
-</style>
-
-<style>
-  .el-input-group__append, .el-input-group__prepend {
-      background-color: #409EFF!important;
-      color: #ffffff!important;
-      vertical-align: middle;
-      display: table-cell;
-      position: relative;
-      border: 1px solid #409EFF!important;
-      padding: 0 20px;
-      width: 1px;
-      white-space: nowrap;
-  }
-  .el-calendar__header {
-      display: -webkit-box;
-      display: -ms-flexbox;
-      display: flex;
-      -webkit-box-pack: justify;
-      -ms-flex-pack: justify;
-      justify-content: space-between;
-      padding: 20px 0px;
-      border: none;
-  }
-  .el-calendar__body {
-      padding: 12px 20px 35px;
-      border: 1px solid #EBEEF5;
-  }
-  .el-divider__text {
-      position: absolute;
-      background-color: #FFF;
-      padding: 0px 0px;
-      color: #303133;
-  }
+<style rel="stylesheet/scss" lang="scss" scoped> 
+   
 </style>
+