Merge remote-tracking branch 'origin/master'

# Conflicts:
#	vue.config.js

src/App.vue

@@ -7,11 +7,11 @@
 <script>
 export default {
   name: "app",
-  data() {
+  data () {
     return {};
   },
   watch: {},
-  created() {
+  created () {
 
   },
   methods: {},
@@ -24,7 +24,7 @@ export default {
   height: 100%;
   overflow: hidden;
 }
-.avue--detail .el-col{
+.avue--detail .el-col {
   margin-bottom: 0;
 }
 </style>

src/api/exctab/excelmodel.js

@@ -117,4 +117,13 @@ export const saveLinkTab = (params) => {
         method: 'get',
         params
     })
+}
+
+//清表生成html
+export const getExcelHtml = (params) => {
+    return request({
+        url: ' /api/blade-manager/exceltab/get-excel-html',
+        method: 'get',
+        params
+    })
 }

src/api/formula/formula.js

@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+
+export const getTypeMap = (params) => {
+  return request({
+    url: '/api/blade-manager/fb/getTypeMap',
+    method: 'get',
+    params: {
+      ...params,
+    }
+  })
+}
+
+

src/api/manager/contractinfo.js

@@ -1,130 +1,148 @@
 import request from '@/router/axios';
 
 export const submitContractInfo = (contractInfo) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/submit',
-    method: 'post',
-    data: contractInfo
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/submit',
+        method: 'post',
+        data: contractInfo
+    })
 }
 export const findContractByProjectId = (pid) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/findContractInfoByPid',
-    method: 'get',
-    params: {
-      pid
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/findContractInfoByPid',
+        method: 'get',
+        params: {
+            pid
+        }
+    })
 }
 export const getContractInfo = (id) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/detail',
-    method: 'get',
-    params: {
-      id
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/detail',
+        method: 'get',
+        params: {
+            id
+        }
+    })
 }
 export const delFileFromUrl = (url) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/deleteFile',
-    method: 'get',
-    params: {
-      url
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/deleteFile',
+        method: 'get',
+        params: {
+            url
+        }
+    })
 }
 
 export const saveUserInfoByProject = (list) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/saveUserInfoByProject',
-    method: 'post',
-    data: list
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/saveUserInfoByProject',
+        method: 'post',
+        data: list
+    })
 }
 
 export const findAllUserByCondition = (info) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/findAllUserByCondition',
-    method: 'post',
-    data: info
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/findAllUserByCondition',
+        method: 'post',
+        data: info
+    })
 }
 export const findUserListByCondition = (info) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/findUserListByCondition',
-    method: 'post',
-    data: info
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/findUserListByCondition',
+        method: 'post',
+        data: info
+    })
 }
 
 export const findUserByName = (name) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/findUserByName',
-    method: 'get',
-    params: {
-      name
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/findUserByName',
+        method: 'get',
+        params: {
+            name
+        }
+    })
 }
 
 export const removeUsersByIds = (ids) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/removeUsersByIds',
-    method: 'post',
-    params: {
-      ids
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/removeUsersByIds',
+        method: 'post',
+        params: {
+            ids
+        }
+    })
 }
 
 export const removeContractInfo = (ids) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/remove',
-    method: 'post',
-    params: {
-      ids
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/remove',
+        method: 'post',
+        params: {
+            ids
+        }
+    })
 }
 
 export const findJobByRoleId = (id) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/findJobByRoleId',
-    method: 'get',
-    params: {
-      id
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/findJobByRoleId',
+        method: 'get',
+        params: {
+            id
+        }
+    })
 }
 
 export const resetPasswordByUserId = (userId) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/resetPasswordByUserId',
-    method: 'post',
-    params: {
-      userId
-    }
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/resetPasswordByUserId',
+        method: 'post',
+        params: {
+            userId
+        }
+    })
 }
 
 export const submitWbsTreeInContract = (obj) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/submitWbsTreeInContract',
-    method: 'post',
-    data: obj
-  })
+    return request({
+        url: '/api/blade-manager/contractInfo/submitWbsTreeInContract',
+        method: 'post',
+        data: obj
+    })
 }
 
-export const getContractInfoTree = (wbsId,projectId,contractId) => {
-  return request({
-    url: '/api/blade-manager/contractInfo/tree',
-    method: 'get',
-    params: {
-      wbsId,
-      projectId,
-      contractId,
-    }
-  })
+export const getContractInfoTree = (wbsId, projectId, contractId) => {
+    return request({
+        url: '/api/blade-manager/contractInfo/tree',
+        method: 'get',
+        params: {
+            wbsId,
+            projectId,
+            contractId,
+        }
+    })
 }
 
+//新 通过角色方获取岗位
+export const findPostByType = (id) => {
+        return request({
+            url: '/api/blade-system/post/findPostByType',
+            method: 'get',
+            params: {
+                category: id
+            }
+        })
+    }
+    //
+export const saveUserInfoByProjectTow = (list) => {
+    return request({
+        url: '/api/blade-manager/contractInfo/saveUserInfoByProjectTow',
+        method: 'post',
+        data: list
+    })
+}

src/api/system/role.js

@@ -1,89 +1,89 @@
 import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
-  return request({
-    url: '/api/blade-system/role/list',
-    method: 'get',
-    params: {
-      ...params,
-      current,
-      size,
-    }
-  })
+    return request({
+        url: '/api/blade-system/role/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size,
+        }
+    })
 }
 export const grantTree = () => {
-  return request({
-    url: '/api/blade-system/menu/grant-tree',
-    method: 'get',
-  })
+    return request({
+        url: '/api/blade-system/menu/grant-tree',
+        method: 'get',
+    })
 }
 
 export const grant = (roleIds, menuIds, dataScopeIds, apiScopeIds) => {
-  return request({
-    url: '/api/blade-system/role/grant',
-    method: 'post',
-    data: {
-      roleIds,
-      menuIds,
-      dataScopeIds,
-      apiScopeIds
-    }
-  })
+    return request({
+        url: '/api/blade-system/role/grant',
+        method: 'post',
+        data: {
+            roleIds,
+            menuIds,
+            dataScopeIds,
+            apiScopeIds
+        }
+    })
 }
 
 export const remove = (ids) => {
-  return request({
-    url: '/api/blade-system/role/remove',
-    method: 'post',
-    params: {
-      ids,
-    }
-  })
+    return request({
+        url: '/api/blade-system/role/remove',
+        method: 'post',
+        params: {
+            ids,
+        }
+    })
 }
 
 export const add = (row) => {
-  return request({
-    url: '/api/blade-system/role/submit',
-    method: 'post',
-    data: row
-  })
+    return request({
+        url: '/api/blade-system/role/submit',
+        method: 'post',
+        data: row
+    })
 }
 
 export const update = (row) => {
-  return request({
-    url: '/api/blade-system/role/submit',
-    method: 'post',
-    data: row
-  })
+    return request({
+        url: '/api/blade-system/role/submit',
+        method: 'post',
+        data: row
+    })
 }
 
 
 export const getRole = (roleIds) => {
-  return request({
-    url: '/api/blade-system/menu/role-tree-keys',
-    method: 'get',
-    params: {
-      roleIds,
-    }
-  })
+    return request({
+        url: '/api/blade-system/menu/role-tree-keys',
+        method: 'get',
+        params: {
+            roleIds,
+        }
+    })
 }
 
-export const getRoleTree = (tenantId) => {
-  return request({
-    url: '/api/blade-system/role/tree',
-    method: 'get',
-    params: {
-      tenantId,
-    }
-  })
+export const getRoleTree = () => {
+    return request({
+        url: '/api/blade-system/dict-biz/dictionary',
+        method: 'get',
+        params: {
+            code: 'maintainer_role',
+        }
+    })
 }
 
 export const getRoleTreeById = (roleId) => {
-  return request({
-    url: '/api/blade-system/role/tree-by-id',
-    method: 'get',
-    params: {
-      roleId,
-    }
-  })
-}
+    return request({
+        url: '/api/blade-system/role/tree-by-id',
+        method: 'get',
+        params: {
+            roleId,
+        }
+    })
+}

src/main.js

@@ -5,14 +5,15 @@ import App from './App';
 import router from './router/router';
 import './permission'; // 权限
 import './error'; // 日志
-import './cache';//页面缓存
+import './cache'; //页面缓存
 import store from './store';
-import {loadStyle} from './util/util'
+import { loadStyle } from './util/util'
 import * as urls from '@/config/env';
 import Element from 'element-ui';
+import '@/styles/xiaoyu.scss'
 import {
-  iconfontUrl,
-  iconfontVersion
+    iconfontUrl,
+    iconfontVersion
 } from '@/config/env';
 
 import i18n from './lang'; // Internationalization
@@ -36,13 +37,13 @@ window.$crudCommon = crudCommon;
 Vue.use(router);
 Vue.use(VueAxios, axios);
 Vue.use(Element, {
-  i18n: (key, value) => i18n.t(key, value)
+    i18n: (key, value) => i18n.t(key, value)
 });
 Vue.use(window.AVUE, {
-  size: 'small',
-  tableSize: 'small',
-  calcHeight: 65,
-  i18n: (key, value) => i18n.t(key, value)
+    size: 'small',
+    tableSize: 'small',
+    calcHeight: 65,
+    i18n: (key, value) => i18n.t(key, value)
 });
 // 注册全局容器
 Vue.component('basicContainer', basicContainer);
@@ -53,7 +54,7 @@ Vue.component('flowDesign', flowDesign);
 Vue.component('tenantPackage', tenantPackage);
 // 加载相关url地址
 Object.keys(urls).forEach(key => {
-  Vue.prototype[key] = urls[key];
+    Vue.prototype[key] = urls[key];
 });
 // 加载NutFlow
 Vue.use(window.WfDesignBase);
@@ -61,14 +62,14 @@ Vue.use(window.WfDesignBase);
 Vue.prototype.website = website;
 // 动态加载阿里云字体库
 iconfontVersion.forEach(ele => {
-  loadStyle(iconfontUrl.replace('$key', ele));
+    loadStyle(iconfontUrl.replace('$key', ele));
 });
 
 Vue.config.productionTip = false;
 
 new Vue({
-  router,
-  store,
-  i18n,
-  render: h => h(App)
-}).$mount('#app');
+    router,
+    store,
+    i18n,
+    render: h => h(App)
+}).$mount('#app');

src/router/views/index.js

@@ -157,5 +157,18 @@ export default [{
             component: () =>
                 import ( /* webpackChunkName: "views" */ '@/views/manager/projectinfo/tree')
         }]
+    },{
+        path: '/formula',
+        component: Layout,
+        redirect: '/formula/edit',
+        children: [{
+            path: 'edit',
+            name: '编辑公式',
+            meta: {
+                i18n: 'formula'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/formula/edit')
+        }]
     },
 ]

src/styles/xiaoyu.scss

@@ -0,0 +1,117 @@
+.flexStar {
+    display: flex;
+    justify-content: flex-start;
+}
+
+.· {
+    display: flex;
+    justify-content: flex-end;
+}
+
+.flexCenter {
+    display: flex;
+    justify-content: center;
+}
+
+.flexBetween {
+    display: flex;
+    justify-content: space-between;
+}
+
+.flexColumn {
+    display: flex;
+    flex-direction: column;
+}
+
+.flexItemsC {
+    display: flex;
+    align-items: center;
+}
+
+.martop5 {
+    margin-top: 5px;
+}
+
+.martop10 {
+    margin-top: 10px;
+}
+
+.martop15 {
+    margin-top: 15px;
+}
+
+.martop20 {
+    margin-top: 20px;
+}
+
+.martop25 {
+    margin-top: 25px;
+}
+
+.marbottom5 {
+    margin-bottom: 5px;
+}
+
+.marbottom10 {
+    margin-bottom: 10px;
+}
+
+.marbottom15 {
+    margin-bottom: 15px;
+}
+
+.marbottom20 {
+    margin-bottom: 20px;
+}
+
+.marbottom25 {
+    margin-bottom: 25px;
+}
+
+.marright5 {
+    margin-right: 5px;
+}
+
+.marright10 {
+    margin-right: 10px;
+}
+
+.marright15 {
+    margin-right: 15px;
+}
+
+.marright20 {
+    margin-right: 20px;
+}
+
+.marright25 {
+    margin-right: 25px;
+}
+
+.marright30 {
+    margin-right: 30px;
+}
+
+.marleft5 {
+    margin-left: 5px;
+}
+
+.marleft10 {
+    margin-left: 10px;
+}
+
+.marleft15 {
+    margin-left: 15px;
+}
+
+.marleft20 {
+    margin-left: 20px;
+}
+
+.marleft25 {
+    margin-left: 25px;
+}
+
+.marleft30 {
+    margin-left: 30px;
+}

src/views/authority/role.vue

@@ -1,402 +1,420 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               ref="crud"
-               v-model="form"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               @row-del="rowDel"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      ref="crud"
+      v-model="form"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      @row-del="rowDel"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
       <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   v-if="permission.role_delete"
-                   plain
-                   @click="handleDelete">删 除
+        <el-button
+          type="danger"
+          size="small"
+          icon="el-icon-delete"
+          v-if="permission.role_delete"
+          plain
+          @click="handleDelete"
+        >删 除
         </el-button>
-        <el-button size="small"
-                   icon="el-icon-setting"
-                   @click="handleRole"
-                   v-if="userInfo.role_name.includes('admin')"
-                   plain>权限设置
+        <el-button
+          size="small"
+          icon="el-icon-setting"
+          @click="handleRole"
+          v-if="userInfo.role_name.includes('admin')"
+          plain
+        >权限设置
         </el-button>
       </template>
     </avue-crud>
-    <el-dialog title="角色权限配置"
-               append-to-body
-               :visible.sync="box"
-               width="345px">
+    <el-dialog
+      title="角色权限配置"
+      append-to-body
+      :visible.sync="box"
+      width="345px"
+    >
       <el-tabs type="border-card">
         <el-tab-pane label="菜单权限">
-          <el-tree :data="menuGrantList"
-                   show-checkbox
-                   node-key="id"
-                   ref="treeMenu"
-                   :default-checked-keys="menuTreeObj"
-                   :props="props">
+          <el-tree
+            :data="menuGrantList"
+            show-checkbox
+            node-key="id"
+            ref="treeMenu"
+            :default-checked-keys="menuTreeObj"
+            :props="props"
+          >
           </el-tree>
         </el-tab-pane>
         <el-tab-pane label="数据权限">
-          <el-tree :data="dataScopeGrantList"
-                   show-checkbox
-                   node-key="id"
-                   ref="treeDataScope"
-                   :default-checked-keys="dataScopeTreeObj"
-                   :props="props">
+          <el-tree
+            :data="dataScopeGrantList"
+            show-checkbox
+            node-key="id"
+            ref="treeDataScope"
+            :default-checked-keys="dataScopeTreeObj"
+            :props="props"
+          >
           </el-tree>
         </el-tab-pane>
         <el-tab-pane label="接口权限">
-          <el-tree :data="apiScopeGrantList"
-                   show-checkbox
-                   node-key="id"
-                   ref="treeApiScope"
-                   :default-checked-keys="apiScopeTreeObj"
-                   :props="props">
+          <el-tree
+            :data="apiScopeGrantList"
+            show-checkbox
+            node-key="id"
+            ref="treeApiScope"
+            :default-checked-keys="apiScopeTreeObj"
+            :props="props"
+          >
           </el-tree>
         </el-tab-pane>
       </el-tabs>
 
-      <span slot="footer"
-            class="dialog-footer">
+      <span
+        slot="footer"
+        class="dialog-footer"
+      >
         <el-button @click="box = false">取 消</el-button>
-        <el-button type="primary"
-                   @click="submit">确 定</el-button>
+        <el-button
+          type="primary"
+          @click="submit"
+        >确 定</el-button>
       </span>
     </el-dialog>
   </basic-container>
 </template>
 
 <script>
-  import {add, getList, getRole, getRoleTreeById, grant, grantTree, remove, update} from "@/api/system/role";
-  import {getPostList} from "@/api/system/post";
-  import {mapGetters} from "vuex";
-  import website from '@/config/website';
+import { add, getList, getRole, getRoleTreeById, grant, grantTree, remove, update } from "@/api/system/role";
+import { getPostList } from "@/api/system/post";
+import { mapGetters } from "vuex";
+import website from '@/config/website';
 
-  export default {
-    data() {
-      return {
-        form: {},
-        box: false,
-        props: {
-          label: "title",
-          value: "key"
-        },
-        menuGrantList: [],
-        dataScopeGrantList: [],
-        apiScopeGrantList: [],
-        apiGrantList: [],
-        menuTreeObj: [],
-        dataScopeTreeObj: [],
-        apiScopeTreeObj: [],
-        selectionList: [],
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        option: {
-          tip: false,
-          simplePage: true,
-          searchShow: true,
-          searchMenuSpan: 6,
-          tree: true,
-          border: true,
-          index: true,
-          selection: true,
-          viewBtn: true,
-          dialogWidth: 900,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "角色名称",
-              prop: "roleName",
-              search: true,
-              span: 24,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入角色名称",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: "所属租户",
-              prop: "tenantId",
-              type: "tree",
-              dicUrl: "/api/blade-system/tenant/select",
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: website.tenantMode,
-              span: 24,
-              props: {
-                label: "tenantName",
-                value: "tenantId"
-              },
-              hide: !website.tenantMode,
-              search: website.tenantMode,
-              rules: [{
+export default {
+  data () {
+    return {
+      form: {},
+      box: false,
+      props: {
+        label: "title",
+        value: "key"
+      },
+      menuGrantList: [],
+      dataScopeGrantList: [],
+      apiScopeGrantList: [],
+      apiGrantList: [],
+      menuTreeObj: [],
+      dataScopeTreeObj: [],
+      apiScopeTreeObj: [],
+      selectionList: [],
+      query: {},
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      option: {
+        tip: false,
+        simplePage: true,
+        searchShow: true,
+        searchMenuSpan: 6,
+        tree: true,
+        border: true,
+        index: true,
+        selection: true,
+        viewBtn: true,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        column: [
+          {
+            label: "角色名称",
+            prop: "roleName",
+            search: true,
+            span: 24,
+            rules: [
+              {
                 required: true,
-                message: "请输入所属租户",
-                trigger: "click"
-              }]
+                message: "请输入角色名称",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
+            label: "所属租户",
+            prop: "tenantId",
+            type: "tree",
+            dicUrl: "/api/blade-system/tenant/select",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: website.tenantMode,
+            span: 24,
+            props: {
+              label: "tenantName",
+              value: "tenantId"
             },
-            {
-              label: "角色别名",
-              prop: "roleAlias",
-              search: true,
-              span: 24,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入角色别名",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: "所属岗位",
-              prop: "pId",
-              type: "tree",
-              hide: true,
-              dicData: [],
-              props: {
-                label: "postName",
-                value: "id"
-              },
-              rules: [{
+            hide: !website.tenantMode,
+            search: website.tenantMode,
+            rules: [{
+              required: true,
+              message: "请输入所属租户",
+              trigger: "click"
+            }]
+          },
+          {
+            label: "角色别名",
+            prop: "roleAlias",
+            search: true,
+            span: 24,
+            rules: [
+              {
                 required: true,
-                message: "请选择所属岗位",
-                trigger: "click"
-              }],
-            },
-            {
-              label: "上级角色",
-              prop: "parentId",
-              dicData: [],
-              type: "tree",
-              hide: true,
-              span: 24,
-              props: {
-                label: "title"
-              },
-              rules: [
-                {
-                  required: false,
-                  message: "请选择上级角色",
-                  trigger: "click"
-                }
-              ]
+                message: "请输入角色别名",
+                trigger: "blur"
+              }
+            ]
+          },
+          // {
+          //   label: "所属岗位",
+          //   prop: "pId",
+          //   type: "tree",
+          //   hide: true,
+          //   dicData: [],
+          //   props: {
+          //     label: "postName",
+          //     value: "id"
+          //   },
+          //   rules: [{
+          //     required: true,
+          //     message: "请选择所属岗位",
+          //     trigger: "click"
+          //   }],
+          // },
+          {
+            label: "上级角色",
+            prop: "parentId",
+            dicData: [],
+            type: "tree",
+            hide: true,
+            span: 24,
+            props: {
+              label: "title"
             },
-            {
-              label: "角色排序",
-              prop: "sort",
-              type: "number",
-              span: 24,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入角色排序",
-                  trigger: "blur"
-                }
-              ]
-            }
-          ]
-        },
-        data: []
+            rules: [
+              {
+                required: false,
+                message: "请选择上级角色",
+                trigger: "click"
+              }
+            ]
+          },
+          {
+            label: "角色排序",
+            prop: "sort",
+            type: "number",
+            span: 24,
+            rules: [
+              {
+                required: true,
+                message: "请输入角色排序",
+                trigger: "blur"
+              }
+            ]
+          }
+        ]
+      },
+      data: []
+    };
+  },
+  computed: {
+    ...mapGetters(["userInfo", "permission"]),
+    permissionList () {
+      return {
+        addBtn: this.vaildData(this.permission.role_add, false),
+        viewBtn: this.vaildData(this.permission.role_view, false),
+        delBtn: this.vaildData(this.permission.role_delete, false),
+        editBtn: this.vaildData(this.permission.role_edit, false)
       };
     },
-    computed: {
-      ...mapGetters(["userInfo", "permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.role_add, false),
-          viewBtn: this.vaildData(this.permission.role_view, false),
-          delBtn: this.vaildData(this.permission.role_delete, false),
-          editBtn: this.vaildData(this.permission.role_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
 
+      });
+      return ids.join(",");
+    },
+    idsArray () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids;
+    }
+  },
+  methods: {
+    initData (roleId) {
+      getRoleTreeById(roleId).then(res => {
+        const column = this.findObject(this.option.column, "parentId");
+        column.dicData = res.data.data;
+      });
+      let tenantId = website.tenantId;
+      getPostList(tenantId).then(res => {
+        const column = this.findObject(this.option.column, "pId");
+        column.dicData = res.data.data;
+      });
+    },
+    submit () {
+      const menuList = this.$refs.treeMenu.getCheckedKeys();
+      const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
+      const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
+      grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => {
+        this.box = false;
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-        return ids.join(",");
-      },
-      idsArray() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids;
-      }
+        this.onLoad(this.page);
+      });
     },
-    methods: {
-      initData(roleId){
-        getRoleTreeById(roleId).then(res => {
-          const column = this.findObject(this.option.column, "parentId");
-          column.dicData = res.data.data;
+    rowSave (row, done, loading) {
+      add(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-        let tenantId = website.tenantId;
-        getPostList(tenantId).then(res => {
-          const column = this.findObject(this.option.column, "pId");
-          column.dicData = res.data.data;
+        done();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    rowUpdate (row, index, done, loading) {
+      update(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
-      submit() {
-        const menuList = this.$refs.treeMenu.getCheckedKeys();
-        const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
-        const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
-        grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => {
-          this.box = false;
+        done();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    rowDel (row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          this.onLoad(this.page);
         });
-      },
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
+    },
+
+    searchReset () {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange (params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange (list) {
+      this.selectionList = list;
+    },
+    selectionClear () {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    beforeOpen (done, type) {
+      if (["add", "edit"].includes(type)) {
+        this.initData(this.form.id);
+      }
+      done();
+    },
+    handleRole () {
+      if (this.selectionList.length !== 1) {
+        this.$message.warning("只能选择一条数据");
+        return;
+      }
+      this.menuTreeObj = [];
+      this.dataScopeTreeObj = [];
+      this.apiScopeTreeObj = [];
+      grantTree()
+        .then(res => {
+          this.menuGrantList = res.data.data.menu;
+          this.dataScopeGrantList = res.data.data.dataScope;
+          this.apiScopeGrantList = res.data.data.apiScope;
+          getRole(this.ids).then(res => {
+            this.menuTreeObj = res.data.data.menu;
+            this.dataScopeTreeObj = res.data.data.dataScope;
+            this.apiScopeTreeObj = res.data.data.apiScope;
+            this.box = true;
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
         });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
+    },
+    handleDelete () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
+          this.$refs.crud.toggleSelection();
         });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      beforeOpen(done, type) {
-        if (["add", "edit"].includes(type)) {
-          this.initData(this.form.id);
-        }
-        done();
-      },
-      handleRole() {
-        if (this.selectionList.length !== 1) {
-          this.$message.warning("只能选择一条数据");
-          return;
-        }
-        this.menuTreeObj = [];
-        this.dataScopeTreeObj = [];
-        this.apiScopeTreeObj = [];
-        grantTree()
-          .then(res => {
-            this.menuGrantList = res.data.data.menu;
-            this.dataScopeGrantList = res.data.data.dataScope;
-            this.apiScopeGrantList = res.data.data.apiScope;
-            getRole(this.ids).then(res => {
-              this.menuTreeObj = res.data.data.menu;
-              this.dataScopeTreeObj = res.data.data.dataScope;
-              this.apiScopeTreeObj = res.data.data.apiScope;
-              this.box = true;
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          this.data = res.data.data;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
+    },
+    currentChange (currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange (pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange () {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad (page, params = {}) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        this.data = res.data.data;
+        this.loading = false;
+        this.selectionClear();
+      });
     }
-  };
+  }
+};
 </script>

src/views/exctab/excelmodel/excelmodel.vue

@@ -8,6 +8,7 @@
             <basic-container>
               <!-- 树结构 -->
               <avue-tree
+                :permission="getPermission"
                 :loading="loading"
                 :option="option"
                 :data="data"
@@ -15,10 +16,29 @@
               >
                 <span
                   class="el-tree-node__label"
-                  slot-scope="{ node, data }"
+                  slot-scope="{ data }"
                 >
                   <div>
                     <span> {{ data.name }} </span>
+                    <!-- <span> {{ node}} </span> -->
+                    <!-- 添加 -->
+                    <i
+                      class="el-icon-circle-plus-outline marleft10"
+                      @click.stop="addExcel(data)"
+                      v-if="data.fileType!=3"
+                    ></i>
+                    <!-- 编辑 -->
+                    <i
+                      class="el-icon-edit marleft10"
+                      @click.stop="editExcel(data)"
+                      v-if="data.fileType!=3"
+                    ></i>
+                    <!-- 删除 -->
+                    <i
+                      class="el-icon-delete marleft10"
+                      @click.stop="deleteExcelM(data)"
+                      v-if="!data.hasChildren&&data.fileType!=1"
+                    ></i>
                   </div>
                 </span>
               </avue-tree>
@@ -111,7 +131,7 @@
 
     <!-- 弹出框 -->
     <el-dialog
-      :title="!excelForm.id?'添加':'编辑'"
+      title="新增编辑"
       class="dialogModel"
       :visible.sync="dialogTap"
       width="800px"
@@ -179,6 +199,7 @@
             </div>
             <div class="leftscroll">
               <avue-tree
+                :permission="getPermission"
                 :loading="loading"
                 :option="option2"
                 :data="wbsdata"
@@ -186,7 +207,7 @@
               >
                 <span
                   class="el-tree-node__label"
-                  slot-scope="{ node, data }"
+                  slot-scope="{ data }"
                 >
                   <div>
                     <span> {{ data.deptName }} </span>
@@ -217,7 +238,7 @@
                   <td style="width:50%;">{{val.tableName}}</td>
                   <td style="text-align: center;height:30px;">
                     <el-button
-                      v-if="val.isLinkTable!==2"
+                      v-if="val.isLinkTable==1"
                       type="info"
                       size="small"
                       @click="relation(index)"
@@ -262,8 +283,9 @@ export default {
         lazy: true,
         treeLoad: (async (node, resolve) => {
           console.log(node);
+          console.log(resolve);
           if (node.data.hasChildren) {
-            const { data: res } = await tabLazytree({ modeId: node.data.id })
+            const { data: res } = await tabLazytree({ parentId: node.data.id, modeId: this.$route.params.id })
             console.log(res);
             if (res.code === 200) {
               if (Array.isArray(res.data)) {
@@ -303,7 +325,7 @@ export default {
             const { data: res } = await wbstree({ parentId: node.data.id, wbsId: this.excelForm.wbsId, wbsType: this.excelForm.wbsType })
             console.log(res);
             if (res.code === 200) {
-              if (res.msg != '未查询到信息') {
+              if (Array.isArray(res.data)) {
                 res.data.forEach((val) => {
                   if (!val.hasChildren) {
                     val.leaf = true
@@ -348,8 +370,8 @@ export default {
   },
   methods: {
     //#region 接口
-    async tabLazytree (modeId) {//清表树
-      const { data: res } = await tabLazytree({ modeId })
+    async tabLazytree (parentId, modeId) {//清表树
+      const { data: res } = await tabLazytree({ parentId, modeId })
       console.log(res);
       if (res.code === 200) {
         if (Array.isArray(res.data)) {
@@ -392,31 +414,31 @@ export default {
       const { data: res } = await wbstree({ parentId: 0, wbsId: this.excelForm.wbsId, wbsType: this.excelForm.wbsType })
       console.log(res);
       if (res.code === 200) {
-        if (res.msg != "未查询到信息") {
-          res.data.forEach((val) => {
-            if (!val.hasChildren) {
-              val.leaf = true
-            }
-          })
-          this.wbsdata = res.data
-        }
+        res.data.forEach((val) => {
+          if (!val.hasChildren) {
+            val.leaf = true
+          }
+        })
+        this.wbsdata = res.data
       }
     },
     async selectByNodeTable (id, wbsType) {//wbs树获取表
       const { data: res } = await selectByNodeTable({ id, wbsType })
       console.log(res);
       if (res.code === 200) {
-        if (res.msg == "未查询到信息") {
-          this.tableData = []
-        } else {
+        console.log(Array.isArray(res.data));
+        if (Array.isArray(res.data)) {
           this.tableData = res.data
           this.tableData.forEach(val => {
             val.changeTable = val.isLinkTable
           })
+        } else {
+          this.tableData = []
         }
       }
     },
     async deleteExcelshu (ids) {//删除清表
+      // console.log(ids);
       const { data: res } = await deleteExcelshu(ids)
       console.log(res);
       if (res.code === 200) {
@@ -424,8 +446,7 @@ export default {
           message: '删除清表树成功',
           type: 'success'
         });
-        // this.tabLazytree(0)
-        this.tabLazytree(this.$route.params.id)//获取清表树
+        this.tabLazytree(0, this.$route.params.id)//获取清表树
         this.from = {
           checkd: false,//判断是否可以进行上传、重新上传excel
           id: '',//清表树ID
@@ -439,8 +460,7 @@ export default {
       const { data: res } = await Excelmodify(wbsExclTabParmVO)
       console.log(res);
       if (res.code === 200) {
-        // await this.tabLazytree(0)
-        await this.tabLazytree(this.$route.params.id)//获取清表树
+        await this.tabLazytree(0, this.$route.params.id)//获取清表树
         this.dialogTap = false
       }
     },
@@ -677,8 +697,7 @@ export default {
   },
   created () {
     this.excelType()//清表类型
-    // this.tabLazytree(0)
-    this.tabLazytree(this.$route.params.id)//获取清表树
+    this.tabLazytree(0, this.$route.params.id)//获取清表树
   }
 }
 </script>

src/views/formula/component/formulaItem.vue

@@ -0,0 +1,50 @@
+<template>
+  <span :class="getItemClass(item)" @click="itemClick(item)">
+    {{item.name}}
+  </span>
+</template>
+
+<script>
+export default {
+  name: "formulaItem",
+  props: {
+    item: {
+      type: Object,
+      default: function () {
+        return {};
+      }
+    },
+  },
+  data(){
+    return{
+
+    }
+  },
+  methods:{
+    itemClick(item){
+      item.selected = !item.selected;
+      this.$emit('click',{
+        selected:item.selected,
+        item
+      })
+    },
+    getItemClass(item){
+      let obj = {};
+      obj[item.type.toLocaleLowerCase()+'-class']=true;
+      if(item.selected){
+        obj.selected = true;
+      }
+      return obj;
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+  .element-class{
+    cursor: pointer;
+    padding: 0 3px;
+    &.selected{
+      color: #f0720a;
+    }
+  }
+</style>

src/views/formula/edit.vue

@@ -0,0 +1,410 @@
+<template>
+  <basic-container>
+    <div class="box-dashed flex">
+      <div class="retain-box">
+        <el-checkbox v-model="isRetain"></el-checkbox>
+        <span>保留</span>
+        <el-input-number
+          v-model="retainNum"
+          :step="1"
+          :disabled="!isRetain"
+          size="small"
+        ></el-input-number>
+        <span class="retain">位</span>
+      </div>
+      <div>
+        <el-menu
+          :default-active="activeIndex"
+          class="el-menu-demo"
+          mode="horizontal"
+          @select="handleSelect"
+        >
+          <el-submenu v-for="(value,key,index) in formulaList" :key="key" :index="key">
+            <template slot="title">
+              <span>{{key}}</span>
+            </template>
+            <el-menu-item v-for="(item2,index2) in value" :key="index2" :index="(index+1) +'-' + (index2+1)">{{item2.name}}</el-menu-item>
+          </el-submenu>
+        </el-menu>
+      </div>
+    </div>
+    <div class="box-dashed">
+      <div class="mg-b-20">函数公式</div>
+      <div class="edit-text">
+        <span>默认A</span>
+        <span>=</span>
+        <span>元素B</span>
+      </div>
+      <div class="flex jc-sb">
+        <div></div>
+        <div><el-button type="info" size="small" @click="operationVisible = true">重置函数</el-button></div>
+      </div>
+    </div>
+    <div v-show="operationVisible" class="operation-box">
+      <div>选择参数设置</div>
+      <div>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-card shadow="never">
+              <el-scrollbar style="height: 460px">
+                <el-tree
+                  class="filter-tree"
+                  lazy
+                  :load="loadNode"
+                  @node-click="getNodeDetail"
+                  :props="defaultProps"
+                  :expand-on-click-node="false"
+                  highlight-current
+                  node-key="id"
+                  ref="tree"
+                >
+                </el-tree>
+              </el-scrollbar>
+            </el-card>
+          </el-col>
+          <el-col :span="16">
+            <el-select v-model="eleTableId" @change="getTableEle" placeholder="请选择元素表">
+              <el-option  v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.id"></el-option>
+            </el-select>
+            <div class="mg-t-10 mg-b-10 no-mb-col">
+              <el-scrollbar style="height: 210px">
+                <el-row>
+                  <el-col :span="6" v-for="item in eleList" :key="item.id">
+                    <div class="ele-box">
+                      <span>{{item.eName}}</span>
+                      <el-checkbox v-model="item.checked" @change="value => eleCheckHandle(value,item)"></el-checkbox>
+                    </div>
+                  </el-col>
+                </el-row>
+              </el-scrollbar>
+            </div>
+            <div class="flex jc-sb">
+              <div>定位数据位置:</div>
+              <div>
+                <el-link :underline="false" type="primary" class="mg-r-20" @click="eleAddFormula">元素添加到公式</el-link>
+                <el-link :underline="false" type="primary" class="mg-r-10" @click="addBrackets('(',false)">(</el-link>
+                <el-link :underline="false" type="primary" class="mg-r-10" @click="addBrackets(')',true)">)</el-link>
+                <el-link :underline="false" type="primary" class="mg-r-10" @click="addBrackets('[',false)">【</el-link>
+                <el-link :underline="false" type="primary" class="mg-r-10" @click="addBrackets(']',true)">】</el-link>
+                <el-link :underline="false" type="primary">输入值</el-link>
+              </div>
+            </div>
+            <div class="border-grey sele-ele-box">
+              <div>
+                <formula-item 
+                  v-for="(item,index) in selectEleFormula" :key="index" 
+                  :item="item" @click="obj => eleFormulaClick(obj,index)"
+                >
+                </formula-item>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+        <div class="text-align-c">
+          <el-button size="small" type="primary">保存</el-button>
+          <el-button size="small" @click="operationVisible = false">取消</el-button>
+        </div>
+      </div>
+    </div>
+    <div v-show="!operationVisible">
+      <div class="box-dashed">
+        <div class="mg-b-20">函数公式运算执行溯源</div>
+        <div>
+          <el-select
+            v-model="projectId"
+            @change="projectChange"
+            placeholder="请选择项目"
+            style="width: 380px"
+          >
+            <el-option
+              v-for="item in projectList"
+              :key="item.id"
+              :label="item.projectName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+          <el-select v-model="contractId" placeholder="请选择合同段">
+            <el-option
+              v-for="item in contractList"
+              :key="item.id"
+              :label="item.contractName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+          <el-button type="info">查询</el-button>
+        </div>
+      </div>
+      <div class="text-align-c">
+        <el-button type="warning">取消</el-button>
+        <el-button type="primary">保存</el-button>
+      </div>
+    </div>
+  </basic-container>
+</template>
+
+<script>
+import { getLazytree,selectByNodeTable,selectFormElements} from "@/api/manager/wbstree";
+import { getProjectList } from "@/api/manager/projectinfo";
+import { findContractByProjectId } from "@/api/manager/contractinfo";
+import { getTypeMap } from "@/api/formula/formula";
+import {mapGetters} from "vuex";
+import formulaItem from "./component/formulaItem"
+export default {
+  components: {
+    formulaItem
+  },
+  data() {
+    return {
+      wbsid: "", //从哪个wbs树过来的
+
+      isRetain: false, //是否保留小数
+      retainNum: 2, //保留几位小数
+      formulaList:{},
+      activeIndex: "1-1", //当前选择的公式
+
+      projectList: [], //项目备选列表
+      projectId: "", //溯源的项目ID
+      curProjiect: {}, //当前项目对象
+      contractList: [], //合同段备选列表
+      contractId: "", //合同段id
+
+      operationVisible: false, //基础运算弹窗
+      defaultProps: {
+        children: "children",
+        label: "title",
+        isLeaf: function (data) {
+          return !data.hasChildren;
+        },
+      },
+      eleTableId:'',//选中的元素表id
+      eleTableList:[],
+      eleList:[],
+      selectEleFormula:[],
+      curSeleEleIndex:0,//公式文字里面选中的元素索引
+
+      symbolReg:/(\+|-|\*|\/)（.+）/,
+    };
+  },
+  computed: {
+    ...mapGetters(["userInfo"]),
+
+    // selectEleFormulaText:function(){
+    //   let text = '';
+    //   this.selectEleFormula.forEach((Element)=>{
+    //     text+=Element.name;
+    //   })
+    //   return text
+    // }
+  },
+  created() {
+    this.wbsid = this.$route.query.wbsid;
+    this.init();
+  },
+  methods: {
+    init() {
+      this.getProjectList();
+      this.getTypeMap();
+    },
+
+    //懒加载树
+    loadNode(node, resolve) {
+      let pid = 0;
+      if (node.level != 0) {
+        pid = node.data.id;
+      }
+      getLazytree(this.wbsid, pid, this.userInfo.tenant_id).then((res) => {
+        let arr = [];
+        if (Array.isArray(res.data.data)) {
+          arr = res.data.data;
+        }
+        return resolve(arr);
+      });
+    },
+
+    //获取项目列表
+    getProjectList() {
+      getProjectList(1, 999).then((res) => {
+        this.projectList = res.data.data.records;
+      });
+    },
+
+    //选择公式处理
+    handleSelect(index,indexPath) {
+      //console.log(index,'index')
+      //console.log(indexPath,'indexPath')
+      if(this.operationVisible){
+        this.openerationSelect(index,indexPath)
+      }
+    },
+
+    //在选择元素模式下点选公式
+    openerationSelect(index,indexPath){
+      if(indexPath[0]!='基础运算'){
+        this.$message({
+          type: "warning",
+          message: "当前只能使用基础运算"
+        });
+        return;
+      }
+      let formulaindex = Number(indexPath[1].split('-')[1])-1;
+      this.eleAddFormulaHandle(this.formulaList[indexPath[0]][formulaindex]);
+    },
+
+    //溯源项目id切换
+    projectChange(id) {
+      for (let i = 0; i < this.projectList.length; i++) {
+        if (id == this.projectList[i].id) {
+          this.curProjiect = this.projectList[i];
+          //根据项目id获取合同段列表
+          findContractByProjectId(this.curProjiect.id).then((res) => {
+            this.contractList = res.data.data;
+            this.contractId = "";
+          });
+          return;
+        }
+      }
+    },
+
+    eleAddFormula(){
+      for (let i = 0; i < this.eleList.length; i++) {
+        if (this.eleList[i].checked) {
+          this.eleAddFormulaHandle(this.eleList[i]);
+          break;
+        }
+      }
+    },
+
+    //把元素加到公式里
+    eleAddFormulaHandle(ele){
+      if(ele.tableElementKey){
+        //元素
+        this.selectEleFormula.push({
+          type:'Element',
+          name:ele.eName,
+          id:ele.id,
+          selected:false,
+          tableElementKey:ele.tableElementKey
+        })
+      }else if(ele.template && ele.example){
+        //运算符号
+        this.selectEleFormula.push({
+          type:'Operator',
+          name:this.symbolReg.exec(ele.name)[1],
+          selected:false,
+          template:ele.template
+        })
+      }else if(ele.type == 'Brackets'){
+        //括号
+        this.selectEleFormula.splice(ele.selectIndex,0,{
+          type:'Brackets',
+          name:ele.name,
+          selected:false,
+        })
+      }
+    },
+
+    //添加括号
+    addBrackets(text,type){
+      //type 是true 表示在元素右边插入
+      if(this.curSeleEleIndex == Number(this.curSeleEleIndex)){
+        this.eleAddFormulaHandle({
+          type:'Brackets',
+          name:text,
+          selectIndex:type?Number(this.curSeleEleIndex)+1:this.curSeleEleIndex
+        })
+        //如果在左边插入index要增1
+        if(!type){
+          this.curSeleEleIndex = Number(this.curSeleEleIndex)+1;
+        }
+      }
+    },
+
+    //勾选元素
+    eleCheckHandle(checked,item){
+      if(checked){
+        this.eleList.forEach((ele)=>{
+          this.$set(ele,'checked',false);
+          //ele.checked = false;
+        })
+        item.checked = true;
+      }
+    },
+
+    //点选公式中的元素
+    eleFormulaClick({selected,item},index){
+      if(selected){
+        this.selectEleFormula.forEach((ele)=>{
+          ele.selected = false;
+        })
+        item.selected = true;
+        this.curSeleEleIndex = index;
+      }else{
+        this.curSeleEleIndex = 0;
+      }
+    },
+
+    getNodeDetail(data) {
+      selectByNodeTable(data.id).then((res)=>{
+        if(res.data.data.length){
+          this.eleTableList = res.data.data;
+        }else{
+          this.eleTableList = [];
+        }
+      })
+    },
+
+    getTableEle(tableId){
+      selectFormElements(tableId).then((res)=>{
+        this.eleList = res.data.data;
+      })
+    },
+
+    getTypeMap(){
+      getTypeMap().then((res)=>{
+        //console.log(res)
+        this.formulaList = res.data.data;
+      })
+    }
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.box-dashed {
+  border: 1px dashed #bbbbbb;
+  border-radius: 6px;
+  padding: 10px;
+  margin-bottom: 10px;
+}
+.retain-box {
+  border-right: 1px dashed #bbbbbb;
+}
+.retain {
+  line-height: 50px;
+  margin-right: 10px;
+}
+.edit-text {
+  font-size: 26px;
+  margin-left: 20px;
+}
+
+.el-menu--popup .el-menu-item.is-active {
+  background-color: #fff;
+}
+.ele-box{
+  border: 1px solid #bbb;
+  height: 26px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 6px;
+}
+.no-mb-col .el-col{
+  margin-bottom: 0px;
+}
+.sele-ele-box{
+  height: 160px;
+  padding: 20px;
+  margin-top: 10px;;
+}
+</style>

src/views/manager/contractinfo/detail.vue

@@ -1,71 +1,154 @@
 <template>
   <basic-container>
     <div>
-      <el-tabs v-model="activeType" :before-leave="beforeLeave">
-        <el-tab-pane label="合同段信息" name="1">
+      <el-tabs
+        v-model="activeType"
+        :before-leave="beforeLeave"
+      >
+        <el-tab-pane
+          label="合同段信息"
+          name="1"
+        >
           <div>
-            <el-form :model="contractForm" :rules="contractRules" ref="contractForm" label-width="120px">
+            <el-form
+              :model="contractForm"
+              :rules="contractRules"
+              ref="contractForm"
+              label-width="120px"
+            >
               <el-form-item label="项目名称">
-                <el-input v-model="projectInfo.projectName" disabled></el-input>
+                <el-input
+                  v-model="projectInfo.projectName"
+                  disabled
+                ></el-input>
               </el-form-item>
               <el-row>
                 <el-col :span="12">
-                  <el-form-item label="合同段类型" prop="contractType">
-                    <el-select v-model="contractForm.contractType" placeholder="请选择" class="w-100p">
-                      <el-option v-for="item in contractTypeList" :key="item.id" :label="item.dictValue"  :value="item.dictKey"></el-option>
+                  <el-form-item
+                    label="合同段类型"
+                    prop="contractType"
+                  >
+                    <el-select
+                      v-model="contractForm.contractType"
+                      placeholder="请选择"
+                      class="w-100p"
+                    >
+                      <el-option
+                        v-for="item in contractTypeList"
+                        :key="item.id"
+                        :label="item.dictValue"
+                        :value="item.dictKey"
+                      ></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="合同段编号" prop="contractNumber">
+                  <el-form-item
+                    label="合同段编号"
+                    prop="contractNumber"
+                  >
                     <el-input v-model="contractForm.contractNumber"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="12">
-                  <el-form-item label="合同段名称" prop="contractName">
+                  <el-form-item
+                    label="合同段名称"
+                    prop="contractName"
+                  >
                     <el-input v-model="contractForm.contractName"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="参与方进场日期" prop="contractorJoinTime">
-                    <el-date-picker  v-model="contractForm.contractorJoinTime"  type="date" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd HH:mm:ss"  placeholder="选择日期"></el-date-picker>
+                  <el-form-item
+                    label="参与方进场日期"
+                    prop="contractorJoinTime"
+                  >
+                    <el-date-picker
+                      v-model="contractForm.contractorJoinTime"
+                      type="date"
+                      format="yyyy 年 MM 月 dd 日"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期"
+                    ></el-date-picker>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="12">
-                  <el-form-item label="计划开工日期" prop="planStartTime">
-                    <el-date-picker  v-model="contractForm.planStartTime"  type="date" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
+                  <el-form-item
+                    label="计划开工日期"
+                    prop="planStartTime"
+                  >
+                    <el-date-picker
+                      v-model="contractForm.planStartTime"
+                      type="date"
+                      format="yyyy 年 MM 月 dd 日"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期"
+                    ></el-date-picker>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="计划完工日期" prop="planEndTime">
-                    <el-date-picker  v-model="contractForm.planEndTime"  type="date" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
+                  <el-form-item
+                    label="计划完工日期"
+                    prop="planEndTime"
+                  >
+                    <el-date-picker
+                      v-model="contractForm.planEndTime"
+                      type="date"
+                      format="yyyy 年 MM 月 dd 日"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期"
+                    ></el-date-picker>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="12">
-                  <el-form-item label="实际开工日期" prop="actualStartTime">
-                    <el-date-picker  v-model="contractForm.actualStartTime"  type="date" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
+                  <el-form-item
+                    label="实际开工日期"
+                    prop="actualStartTime"
+                  >
+                    <el-date-picker
+                      v-model="contractForm.actualStartTime"
+                      type="date"
+                      format="yyyy 年 MM 月 dd 日"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期"
+                    ></el-date-picker>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="实际完工日期" prop="actualEndTime">
-                    <el-date-picker  v-model="contractForm.actualEndTime"  type="date" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
+                  <el-form-item
+                    label="实际完工日期"
+                    prop="actualEndTime"
+                  >
+                    <el-date-picker
+                      v-model="contractForm.actualEndTime"
+                      type="date"
+                      format="yyyy 年 MM 月 dd 日"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期"
+                    ></el-date-picker>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="12">
-                  <el-form-item label="业主单位名称" prop="contractorUnitName">
+                  <el-form-item
+                    label="业主单位名称"
+                    prop="contractorUnitName"
+                  >
                     <el-input v-model="contractForm.contractorUnitName"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="合同金额" prop="contractAmount">
+                  <el-form-item
+                    label="合同金额"
+                    prop="contractAmount"
+                  >
                     <el-input v-model="contractForm.contractAmount">
                       <template slot="append">万元</template>
                     </el-input>
@@ -74,25 +157,45 @@
               </el-row>
               <el-row>
                 <el-col :span="12">
-                  <el-form-item label="施工单位名称" prop="constructionUnitName">
+                  <el-form-item
+                    label="施工单位名称"
+                    prop="constructionUnitName"
+                  >
                     <el-input v-model="contractForm.constructionUnitName"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="上传开工令" prop="startFileUrl">
+                  <el-form-item
+                    label="上传开工令"
+                    prop="startFileUrl"
+                  >
                     <template v-if="isBackShow">
-                      <el-link type="primary" @click="downloadFile">开工令</el-link>
-                      <el-button @click="delFile" class="mg-l-10" style="color:red" type="text" icon="el-icon-circle-close"></el-button>
+                      <el-link
+                        type="primary"
+                        @click="downloadFile"
+                      >开工令</el-link>
+                      <el-button
+                        @click="delFile"
+                        class="mg-l-10"
+                        style="color:red"
+                        type="text"
+                        icon="el-icon-circle-close"
+                      ></el-button>
                     </template>
                     <template v-else>
                       <el-upload
                         action="/api/blade-resource/oss/endpoint/put-file-attach"
                         :on-remove="handleRemove"
-                        :limit="1" :headers=headers
+                        :limit="1"
+                        :headers=headers
                         :on-exceed="handleExceed"
                         :on-success="handleSuccess"
-                        :file-list="fileList">
-                        <el-button size="small" type="primary">点击上传</el-button>
+                        :file-list="fileList"
+                      >
+                        <el-button
+                          size="small"
+                          type="primary"
+                        >点击上传</el-button>
                       </el-upload>
                     </template>
 
@@ -101,132 +204,270 @@
               </el-row>
               <el-row>
                 <el-col :span="12">
-                  <el-form-item label="监理单位名称" prop="supervisionUnitName">
+                  <el-form-item
+                    label="监理单位名称"
+                    prop="supervisionUnitName"
+                  >
                     <el-input v-model="contractForm.supervisionUnitName"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
+                  <el-form-item
+                    label="试验室名称"
+                    prop="laboratoryName"
+                  >
+                    <el-input v-model="contractForm.laboratoryName"></el-input>
+                  </el-form-item>
                 </el-col>
               </el-row>
               <el-divider></el-divider>
               <el-row :gutter="20">
                 <el-col :span="12">
                   <div class="head-font">组卷归档默认信息</div>
-                    <el-row>
-                      <el-col :span="12">
-                        <el-form-item label="立卷人" prop="filer">
-                          <el-input v-model="contractForm.filer"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="保管期限" prop="storagePeriod">
-                          <el-select v-model="contractForm.storagePeriod" placeholder="请选择" class="w-100p">
-                            <el-option label="10年"  value="10年"></el-option>
-                            <el-option label="30年"  value="30年"></el-option>
-                            <el-option label="永久"  value="永久"></el-option>
-                          </el-select>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                    <el-row>
-                      <el-col :span="12">
-                        <el-form-item label="审核人" prop="reviewer">
-                          <el-input v-model="contractForm.reviewer"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="保管密级" prop="securityLevel">
-                          <el-select v-model="contractForm.securityLevel" placeholder="请选择" class="w-100p">
-                            <el-option label="机密"  value="机密"></el-option>
-                            <el-option label="绝密"  value="绝密"></el-option>
-                            <el-option label="秘密"  value="秘密"></el-option>
-                            <el-option label="公开"  value="公开"></el-option>
-                          </el-select>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                    <el-row>
-                      <el-col :span="12">
-                        <el-form-item label="档案前缀" prop="prefix">
-                          <el-input v-model="contractForm.prefix"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-
-                      </el-col>
-                    </el-row>
+                  <el-row>
+                    <el-col :span="12">
+                      <el-form-item
+                        label="立卷人"
+                        prop="filer"
+                      >
+                        <el-input v-model="contractForm.filer"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item
+                        label="保管期限"
+                        prop="storagePeriod"
+                      >
+                        <el-select
+                          v-model="contractForm.storagePeriod"
+                          placeholder="请选择"
+                          class="w-100p"
+                        >
+                          <el-option
+                            v-for="item in storagePeriodList"
+                            :key="item.id"
+                            :label="item.dictValue"
+                            :value="item.dictKey"
+                          ></el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="12">
+                      <el-form-item
+                        label="审核人"
+                        prop="reviewer"
+                      >
+                        <el-input v-model="contractForm.reviewer"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item
+                        label="保管密级"
+                        prop="securityLevel"
+                      >
+                        <el-select
+                          v-model="contractForm.securityLevel"
+                          placeholder="请选择"
+                          class="w-100p"
+                        >
+                          <el-option
+                            v-for="item in securityLevelList"
+                            :key="item.id"
+                            :label="item.dictValue"
+                            :value="item.dictKey"
+                          ></el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="12">
+                      <el-form-item
+                        label="档案前缀"
+                        prop="prefix"
+                      >
+                        <el-input v-model="contractForm.prefix"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+
+                    </el-col>
+                  </el-row>
                 </el-col>
                 <el-col :span="12">
                   <div class="head-font">附加信息</div>
-                    <el-form-item label="项目地址" prop="projectPlace">
-                      <!-- <el-input v-model="contractForm.projectPlace" placeholder="点击后面地图选取地址">
+                  <el-form-item
+                    label="项目地址"
+                    prop="projectPlace"
+                  >
+                    <!-- <el-input v-model="contractForm.projectPlace" placeholder="点击后面地图选取地址">
                         <el-button slot="append" icon="el-icon-map-location" @click="mapDialogVisible = true"></el-button>
                       </el-input> -->
-                      <avue-input-map  :params="params" placeholder="请选择地图" v-model="flageData" @change="mapChange"></avue-input-map>
-                    </el-form-item>
-                    <el-form-item label="起始桩号" prop="startStation">
-                      <el-input v-model="contractForm.startStation"></el-input>
-                    </el-form-item>
-                    <el-form-item label="结束桩号" prop="endStation">
-                      <el-input v-model="contractForm.endStation"></el-input>
-                    </el-form-item>
+                    <avue-input-map
+                      :params="params"
+                      placeholder="请选择地图"
+                      v-model="flageData"
+                      @change="mapChange"
+                    ></avue-input-map>
+                  </el-form-item>
+                  <el-form-item
+                    label="起始桩号"
+                    prop="startStation"
+                  >
+                    <el-input v-model="contractForm.startStation"></el-input>
+                  </el-form-item>
+                  <el-form-item
+                    label="结束桩号"
+                    prop="endStation"
+                  >
+                    <el-input v-model="contractForm.endStation"></el-input>
+                  </el-form-item>
                 </el-col>
               </el-row>
             </el-form>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="分配WBS" name="2">
+        <el-tab-pane
+          label="分配WBS"
+          name="2"
+        >
           <div>
-            <div v-if="!wbsId" class="text-align-c">项目暂未分配wbs树</div>
-            <tree-tree :left-tree-data="leftTreeData" ref="treetotree" @onAddTree="treeChang" @onDelTree="treeChang" ></tree-tree>
+            <div
+              v-if="!wbsId"
+              class="text-align-c"
+            >项目暂未分配wbs树</div>
+            <tree-tree
+              :left-tree-data="leftTreeData"
+              ref="treetotree"
+              @onAddTree="treeChang"
+              @onDelTree="treeChang"
+            ></tree-tree>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="分配项目人员" name="3">
+        <el-tab-pane
+          label="分配项目人员"
+          name="3"
+        >
           <div>
             <div class="flex jc-al-c">
               <span class="mg-r-10">项目名称</span>
-              <el-input v-model="projectInfo.projectName" disabled style="width:300px;margin-right:30px;"></el-input>
+              <el-input
+                v-model="projectInfo.projectName"
+                disabled
+                style="width:300px;margin-right:30px;"
+              ></el-input>
               <span class="mg-r-10">合同段名称</span>
-              <el-input v-model="contractForm.contractName" disabled style="width:300px;"></el-input>
+              <el-input
+                v-model="contractForm.contractName"
+                disabled
+                style="width:300px;"
+              ></el-input>
             </div>
             <el-divider></el-divider>
             <div class="flex jc-al-c mg-b-10">
               <div>
                 <span class="mg-r-10">角色方</span>
                 <el-radio-group v-model="rId">
-                  <el-radio-button v-for="(item) in roleList" :label="item.id" :key="item.key">{{item.title}}</el-radio-button>
+                  <el-radio-button
+                    v-for="(item,key) in roleList"
+                    :label="item.id"
+                    :key="key"
+                  >{{item.title}}</el-radio-button>
                 </el-radio-group>
               </div>
               <div>
                 <span class="mg-r-10 mg-l-20">请选择岗位</span>
-                <el-select v-model="postId" filterable placeholder="请输入搜索">
-                  <el-option v-for="item in postList" :key="item.id" :label="item.postName"  :value="item.id"></el-option>
+                <el-select
+                  v-model="postId"
+                  filterable
+                  placeholder="请输入搜索"
+                >
+                  <el-option
+                    v-for="item in postList"
+                    :key="item.id"
+                    :label="item.postName"
+                    :value="item.id"
+                  ></el-option>
                 </el-select>
               </div>
             </div>
             <div>
-              <el-table  :data="contractUserList" border height="500" style="width: 100%">
-                <el-table-column prop="name" label="姓名" align="center"></el-table-column>
-                <el-table-column prop="account" label="登录账号" align="center"></el-table-column>
-                <el-table-column prop="password" label="密码" align="center"></el-table-column>
-                <el-table-column label="操作" align="center">
+              <el-table
+                :data="contractUserList"
+                border
+                height="500"
+                style="width: 100%"
+              >
+                <el-table-column
+                  prop="name"
+                  label="姓名"
+                  align="center"
+                ></el-table-column>
+                <el-table-column
+                  prop="account"
+                  label="登录账号"
+                  align="center"
+                ></el-table-column>
+                <el-table-column
+                  prop="password"
+                  label="密码"
+                  align="center"
+                ></el-table-column>
+                <el-table-column
+                  label="操作"
+                  align="center"
+                >
                   <template slot-scope="scope">
-                    <el-link class="mg-r-20" type="primary" @click="copyAccPas(scope.row)">复制</el-link>
-                    <el-link class="mg-r-20" type="primary" @click="resetPassword(scope.row)">重置密码</el-link>
-                    <el-link type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-link>
+                    <el-link
+                      class="mg-r-20"
+                      type="primary"
+                      @click="copyAccPas(scope.row)"
+                    >复制</el-link>
+                    <el-link
+                      class="mg-r-20"
+                      type="primary"
+                      @click="resetPassword(scope.row)"
+                    >重置密码</el-link>
+                    <el-link
+                      type="danger"
+                      @click="handleDelete(scope.$index, scope.row)"
+                    >删除</el-link>
                   </template>
                 </el-table-column>
               </el-table>
-               <el-input v-model="copyText" ref="copyInput" type="textarea" style='opacity: 0;position: absolute;height:1px;overflow:hidden;'></el-input>
+              <el-input
+                v-model="copyText"
+                ref="copyInput"
+                type="textarea"
+                style='opacity: 0;position: absolute;height:1px;overflow:hidden;'
+              ></el-input>
             </div>
             <div class="flex jc-al-c mg-t-20">
               <span>添加项目人员</span>
-              <el-select v-model="userId" filterable placeholder="请输入搜索">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name"  :value="item.id"></el-option>
+              <el-select
+                v-model="userId"
+                filterable
+                placeholder="请输入搜索"
+              >
+                <el-option
+                  v-for="item in userList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
               </el-select>
-              <el-button type="success" @click="addUserToProject">添加</el-button>
+              <el-button
+                class="marleft10"
+                type="success"
+                @click="addUserToProject"
+              >添加</el-button>
               <el-button type="primary">创建新用户</el-button>
-              <el-button type="danger" @click="handleDeletes">全部删除</el-button>
+              <el-button
+                type="danger"
+                @click="handleDeletes"
+              >全部删除</el-button>
             </div>
             <el-divider></el-divider>
           </div>
@@ -236,9 +477,26 @@
       <div class="flex jc-sb">
         <div></div>
         <div>
-          <el-button type="success" size="medium" :loading="btnLoad" @click="saveQuit">保存并退出</el-button>
-          <el-button type="info" size="medium" :loading="btnLoad" v-if="activeType != 1" @click="saveNext('p')">保存并返回上一步</el-button>
-          <el-button type="info" size="medium" :loading="btnLoad" v-if="activeType != 3" @click="saveNext('n')">保存并进入下一步</el-button>
+          <el-button
+            type="success"
+            size="medium"
+            :loading="btnLoad"
+            @click="saveQuit"
+          >保存并退出</el-button>
+          <el-button
+            type="info"
+            size="medium"
+            :loading="btnLoad"
+            v-if="activeType != 1"
+            @click="saveNext('p')"
+          >保存并返回上一步</el-button>
+          <el-button
+            type="info"
+            size="medium"
+            :loading="btnLoad"
+            v-if="activeType != 3"
+            @click="saveNext('n')"
+          >保存并进入下一步</el-button>
         </div>
       </div>
     </div>
@@ -247,587 +505,601 @@
 </template>
 
 <script>
-  import {getProjectDeatil,findProjectTree} from "@/api/manager/projectinfo";
-  import {submitContractInfo,getContractInfo,delFileFromUrl,
-          findJobByRoleId,findAllUserByCondition,findUserByName,
-          saveUserInfoByProject,removeUsersByIds,resetPasswordByUserId,
-          submitWbsTreeInContract,getContractInfoTree} from "@/api/manager/contractinfo";
-  import {getRoleTree} from "@/api/system/role";
-  import {getDictionary} from "@/api/system/dict";
-  import {remove as removeFile} from "@/api/resource/attach";
-  import website from '@/config/website';
-  import {Base64} from 'js-base64';
-  import {getToken} from '@/util/auth';
-  import {mapGetters} from "vuex";
-
-  import treeTree from "@/components/tree-tree/main"
-  export default {
-    components: {
-      treeTree
-    },
-    data() {
-      var checkPlace = (rule, value, callback) => {
-        if (this.flageData && this.flageData.length >2 && this.flageData[2]) {
-          callback();
-        } else {
-          callback(new Error('请选取项目地址'));
-        }
-      }
-      var checkDate = (rule, value, callback) => {
-        if (value && this.contractForm.planStartTime) {
-          if(Date.parse(value) < Date.parse(this.contractForm.planStartTime)){
-            callback(new Error('计划完工日期不能小于开工日期'));
-          }
-        }
+import { getProjectDeatil, findProjectTree } from "@/api/manager/projectinfo";
+import {
+  submitContractInfo, getContractInfo, delFileFromUrl,
+  findPostByType, findAllUserByCondition, findUserByName,
+  saveUserInfoByProjectTow, removeUsersByIds, resetPasswordByUserId,
+  submitWbsTreeInContract, getContractInfoTree
+} from "@/api/manager/contractinfo";
+import { getDictionary } from "@/api/system/dict";
+import { getDictionary as getDictbiz } from "@/api/system/dictbiz";
+import { remove as removeFile } from "@/api/resource/attach";
+import website from '@/config/website';
+import { Base64 } from 'js-base64';
+import { getToken } from '@/util/auth';
+import { mapGetters } from "vuex";
+
+import treeTree from "@/components/tree-tree/main"
+export default {
+  components: {
+    treeTree
+  },
+  data () {
+    var checkPlace = (rule, value, callback) => {
+      if (this.flageData && this.flageData.length > 2 && this.flageData[2]) {
         callback();
-      };
-      var checkDate2 = (rule, value, callback) => {
-        if (value && this.contractForm.actualStartTime) {
-          if(Date.parse(value) < Date.parse(this.contractForm.actualStartTime)){
-            callback(new Error('实际完工日期不能小于开工日期'));
-          }
+      } else {
+        callback(new Error('请选取项目地址'));
+      }
+    }
+    var checkDate = (rule, value, callback) => {
+      if (value && this.contractForm.planStartTime) {
+        if (Date.parse(value) < Date.parse(this.contractForm.planStartTime)) {
+          callback(new Error('计划完工日期不能小于开工日期'));
         }
-        callback();
-      };
-      var checkIsNumber = (rule, value, callback) => {
-        if (value != Number(value)) {
-          callback(new Error('金额必须是数字'));
+      }
+      callback();
+    };
+    var checkDate2 = (rule, value, callback) => {
+      if (value && this.contractForm.actualStartTime) {
+        if (Date.parse(value) < Date.parse(this.contractForm.actualStartTime)) {
+          callback(new Error('实际完工日期不能小于开工日期'));
         }
-        callback();
-      };
-
-      return {
-        activeType:'1',
-        typeChang:{
-          1:false,
-          2:false,
-          3:false,
-        },
-        btnLoad:false,
-
-        pid:'',
-        cid:'',
-        projectInfo:{},
-
-        contractTypeList:[],
-        fileList:[],
-        headers:{},
-        isBackShow:false,
-
-        contractForm:{
-          contractAmount:0
-        },
-        contractRules:{
-          contractName: [
-            { required: true, message: '请输入合同段名称', trigger: 'blur' },
-          ],
-          contractType: [
-            { required: true, message: '请选择合同段类型', trigger: 'change' }
-          ],
-          contractNumber: [
-            { required: true, message: '请输入合同段编号', trigger: 'blur' },
-          ],
-          contractorUnitName: [
-            { required: true, message: '请输入业主单位名称', trigger: 'blur' },
-          ],
-          constructionUnitName: [
-            { required: true, message: '请输入施工单位名称', trigger: 'blur' },
-          ],
-          supervisionUnitName: [
-            { required: true, message: '请输入监理单位名称', trigger: 'blur' },
-          ],
-          startStation: [
-            { required: true, message: '请输入起始桩号', trigger: 'blur' },
-          ],
-          endStation: [
-            { required: true, message: '请输入结束桩号', trigger: 'blur' },
-          ],
-          projectPlace: [
-            { required: true,validator: checkPlace, trigger: 'blur' },
-          ],
-          planEndTime:[
-            {validator: checkDate,trigger: 'blur'},
-          ],
-          actualEndTime:[
-            {validator: checkDate2,trigger: 'blur'},
-          ],
-          contractAmount:[
-            {validator: checkIsNumber,trigger: 'blur'}
-          ]
-        },
-
-        mapDialogVisible:false,
-        params:{
-          zoom: 10,
-          // zoomEnable: false,
-          // dragEnable: false,
-        },
-        flageData:[],
-
-        rId:'',
-        roleList:[],
-        postId:'',
-        postList:[],
-        contractUserList:[],
-        userId:'',
-        userList:[],
-        copyText:'',
-
-        wbsId:'',
-        leftTreeData:[],
       }
-    },
-    computed: {
-      ...mapGetters(["userInfo"]),
-    },
-    watch:{
-      contractForm:{
-        handler: function() { // 此处注意，handler函数不能为箭头函数，this会取上下文，而不是组件里的this,此外，深度监听，必须为handler函数名，否则会无效果
-          this.typeChang['1'] = true;
-        },
-        deep: true
+      callback();
+    };
+    var checkIsNumber = (rule, value, callback) => {
+      if (value != Number(value)) {
+        callback(new Error('金额必须是数字'));
+      }
+      callback();
+    };
+
+    return {
+      activeType: '1',
+      typeChang: {
+        1: false,
+        2: false,
+        3: false,
       },
-      activeType: async function (newValue) {
-        if(newValue == '3'){
-          this.getRoleList();
-          this.getUserByName();
-        }else if(newValue == '2'){
-          await this.getLeftTree();
-          this.getRightTree();
-        }
+      btnLoad: false,
+
+      pid: '',
+      cid: '',
+      projectInfo: {},
+
+      contractTypeList: [],
+      storagePeriodList: [],//保管期限
+      securityLevelList: [],//保管密级
+      fileList: [],
+      headers: {},
+      isBackShow: false,
+
+      contractForm: {
+        contractAmount: 0
       },
-      rId:function(newValue){
-        findJobByRoleId(newValue).then((res)=>{
-          this.postList = res.data.data;
-        }).catch(()=>{
-          this.postList = [];
-        }).finally(()=>{
-          this.postId = '';
-        })
+      contractRules: {
+        contractName: [
+          { required: true, message: '请输入合同段名称', trigger: 'blur' },
+        ],
+        contractType: [
+          { required: true, message: '请选择合同段类型', trigger: 'change' }
+        ],
+        contractNumber: [
+          { required: true, message: '请输入合同段编号', trigger: 'blur' },
+        ],
+        contractorUnitName: [
+          { required: true, message: '请输入业主单位名称', trigger: 'blur' },
+        ],
+        constructionUnitName: [
+          { required: true, message: '请输入施工单位名称', trigger: 'blur' },
+        ],
+        supervisionUnitName: [
+          { required: true, message: '请输入监理单位名称', trigger: 'blur' },
+        ],
+        laboratoryName: [
+          { required: true, message: '请输入实验室名称', trigger: 'blur' },
+        ],
+        startStation: [
+          { required: true, message: '请输入起始桩号', trigger: 'blur' },
+        ],
+        endStation: [
+          { required: true, message: '请输入结束桩号', trigger: 'blur' },
+        ],
+        projectPlace: [
+          { required: true, validator: checkPlace, trigger: 'blur' },
+        ],
+        planEndTime: [
+          { validator: checkDate, trigger: 'blur' },
+        ],
+        actualEndTime: [
+          { validator: checkDate2, trigger: 'blur' },
+        ],
+        contractAmount: [
+          { validator: checkIsNumber, trigger: 'blur' }
+        ]
       },
-      postId:function(newValue){
-        if(newValue){
-          this.findAllUserByCondition();
-        }else{
-          this.contractUserList = [];
-        }
-      }
+
+      mapDialogVisible: false,
+      params: {
+        zoom: 10,
+        // zoomEnable: false,
+        // dragEnable: false,
+      },
+      flageData: [],
+
+      rId: '',
+      roleList: [
+        { title: '施工方人员', id: '1', },
+        { title: '监理方人员', id: '2', },
+        { title: '业主方人员', id: '3', }
+      ],
+      postId: '',
+      postList: [],
+      contractUserList: [],
+      userId: '',
+      userList: [],
+      copyText: '',
+
+      wbsId: '',
+      leftTreeData: [],
+    }
+  },
+  computed: {
+    ...mapGetters(["userInfo"]),
+  },
+  watch: {
+    contractForm: {
+      handler: function () { // 此处注意，handler函数不能为箭头函数，this会取上下文，而不是组件里的this,此外，深度监听，必须为handler函数名，否则会无效果
+        this.typeChang['1'] = true;
+      },
+      deep: true
     },
-    created() {
-      this.init();
-      //console.log(this.userInfo)
+    activeType: async function (newValue) {
+      if (newValue == '3') {
+        this.getUserByName();
+      } else if (newValue == '2') {
+        await this.getLeftTree();
+        this.getRightTree();
+      }
     },
-    mounted(){
-      this.$nextTick(()=>{
-        this.typeChang = {
-          1:false,
-          2:false,
-          3:false,
-        }
+    rId: function (newValue) {
+      findPostByType(newValue).then((res) => {
+        this.postList = res.data.data;
+      }).catch(() => {
+        this.postList = [];
+      }).finally(() => {
+        this.postId = '';
       })
     },
-    methods: {
-      async init(){
-        this.pid = this.$route.query.pid;
-        this.cid = this.$route.query.cid;
-        if(!this.cid){
-          this.contractForm.pid = this.pid;
-        }else{
-          await this.getContractInfo();
-        }
-        await this.getProjectDeatil();
-        if(this.$route.query.type){
-          this.activeType = this.$route.query.type;
-        }
+    postId: function (newValue) {
+      if (newValue) {
+        this.findAllUserByCondition();
+      } else {
+        this.contractUserList = [];
+      }
+    }
+  },
+  created () {
+    this.rId = '1'
+    this.init();
+    //console.log(this.userInfo)
+  },
+  mounted () {
+    this.$nextTick(() => {
+      this.typeChang = {
+        1: false,
+        2: false,
+        3: false,
+      }
+    })
+  },
+  methods: {
+    async init () {
+      this.pid = this.$route.query.pid;
+      this.cid = this.$route.query.cid;
+      if (!this.cid) {
+        this.contractForm.pid = this.pid;
+      } else {
+        await this.getContractInfo();
+      }
+      await this.getProjectDeatil();
+      if (this.$route.query.type) {
+        this.activeType = this.$route.query.type;
+      }
 
-        this.getContractTypeList();
-        this.setHeaders();
-      },
-      beforeLeave(activeName, oldActiveName){
-        return new Promise((resolve,reject)=>{
-          if(oldActiveName == '1' && !this.contractForm.id){
-            this.$message({
-              type: "warning",
-              message: "请先保存合同段后，再进行合同段的分配"
-            });
-            reject();
-          }
+      this.getContractTypeList();
+      this.getStoragePeriodList();
+      this.getSecurityLevelList();
+      this.setHeaders();
+    },
+    beforeLeave (activeName, oldActiveName) {
+      return new Promise((resolve, reject) => {
+        if (oldActiveName == '1' && !this.contractForm.id) {
+          this.$message({
+            type: "warning",
+            message: "请先保存合同段后，再进行合同段的分配"
+          });
+          reject();
+        }
 
-          if(this.typeChang[oldActiveName]){
-            this.$confirm('检测到新编辑内容, 是否保存?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '不用',
-              type: 'warning'
-            }).then(() => {
-              switch (oldActiveName) {
-                case '1':
-                  this.savecontract().then((res)=>{
-                    this.contractForm.id = res.data.data.id;
-                    resolve();
-                    this.$message({
-                      type: "success",
-                      message: "保存成功!"
-                    });
+        if (this.typeChang[oldActiveName]) {
+          this.$confirm('检测到新编辑内容, 是否保存?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '不用',
+            type: 'warning'
+          }).then(() => {
+            switch (oldActiveName) {
+              case '1':
+                this.savecontract().then((res) => {
+                  this.contractForm.id = res.data.data.id;
+                  resolve();
+                  this.$message({
+                    type: "success",
+                    message: "保存成功!"
                   });
-                  break;
-                case '2':
-                  this.saveWbsTree().then(()=>{
-                    resolve();
-                    this.$message({
-                      type: "success",
-                      message: "保存成功!"
-                    });
-                  })
-                  break;
-              }
-            }).catch(()=>{
-              this.typeChang[oldActiveName] = false;
-              resolve();
-            })
-          }else{
-            resolve();
-          }
-        })
-      },
-
-      getProjectDeatil(){
-        return new Promise((resolve)=>{
-          getProjectDeatil(this.pid).then((res)=>{
-            this.projectInfo = res.data.data;
-            this.wbsId = this.projectInfo.referenceWbsTemplateId;
-            resolve();
-          }).finally(()=>{
+                });
+                break;
+              case '2':
+                this.saveWbsTree().then(() => {
+                  resolve();
+                  this.$message({
+                    type: "success",
+                    message: "保存成功!"
+                  });
+                })
+                break;
+            }
+          }).catch(() => {
+            this.typeChang[oldActiveName] = false;
             resolve();
           })
+        } else {
+          resolve();
+        }
+      })
+    },
+
+    getProjectDeatil () {
+      return new Promise((resolve) => {
+        getProjectDeatil(this.pid).then((res) => {
+          this.projectInfo = res.data.data;
+          this.wbsId = this.projectInfo.referenceWbsTemplateId;
+          resolve();
+        }).finally(() => {
+          resolve();
         })
-      },
-      getContractInfo(){
-        return new Promise((resolve)=>{
-          getContractInfo(this.cid).then((res)=>{
-            this.contractForm = res.data.data;
-            if(this.contractForm.startFileUrl){
-              this.isBackShow = true;
-            }
-            if(this.contractForm.projectPlace){
-              this.flageData = ['','',this.contractForm.projectPlace]
-            }
-            if(Number(this.contractForm.contractAmount) < 0){
-              this.contractForm.contractAmount = 0;
-            }
-            this.$nextTick(()=>{
-              this.typeChang['1'] = false;
-            })
-          }).finally(()=>{
-            resolve();
+      })
+    },
+    getContractInfo () {
+      return new Promise((resolve) => {
+        getContractInfo(this.cid).then((res) => {
+          this.contractForm = res.data.data;
+          if (this.contractForm.startFileUrl) {
+            this.isBackShow = true;
+          }
+          if (this.contractForm.projectPlace) {
+            this.flageData = ['', '', this.contractForm.projectPlace]
+          }
+          if (Number(this.contractForm.contractAmount) < 0) {
+            this.contractForm.contractAmount = 0;
+          }
+          this.$nextTick(() => {
+            this.typeChang['1'] = false;
           })
+        }).finally(() => {
+          resolve();
         })
-      },
+      })
+    },
 
-      async saveQuit(){
-        this.btnLoad = true;
-        try {
-          if(this.activeType == '1'){
-            await this.savecontract();
-          }else if(this.activeType == '2'){
-            await this.saveWbsTree();
-          }
-        } catch (error) {
-          this.btnLoad = false;
-          return;
+    async saveQuit () {
+      this.btnLoad = true;
+      try {
+        if (this.activeType == '1') {
+          await this.savecontract();
+        } else if (this.activeType == '2') {
+          await this.saveWbsTree();
         }
-
-        this.$message({
-          type: "success",
-          message: "保存成功!"
-        });
+      } catch (error) {
         this.btnLoad = false;
-        this.$router.go(-1);
-      },
-      async saveNext(type){
-        this.btnLoad = true;
-        try {
-          if(this.activeType == '1'){
-            let res = await this.savecontract();
-            this.contractForm.id = res.data.data.id;
-          }else if(this.activeType == '2'){
-            await this.saveWbsTree();
-          }
-        } catch (error) {
-          this.btnLoad = false;
-          return;
-        }
+        return;
+      }
 
-        this.$message({
-          type: "success",
-          message: "保存成功!"
-        });
-        this.typeChang[this.activeType] = false;
-        let num = Number(this.activeType);
-        if(type == 'n'){
-            num++;
-        }else if(type == 'p'){
-            num--;
+      this.$message({
+        type: "success",
+        message: "保存成功!"
+      });
+      this.btnLoad = false;
+      this.$router.go(-1);
+    },
+    async saveNext (type) {
+      this.btnLoad = true;
+      try {
+        if (this.activeType == '1') {
+          let res = await this.savecontract();
+          this.contractForm.id = res.data.data.id;
+        } else if (this.activeType == '2') {
+          await this.saveWbsTree();
         }
-
-        this.activeType = num.toString();
+      } catch (error) {
         this.btnLoad = false;
-      },
+        return;
+      }
 
-      savecontract(){
-        return new Promise((resolve, reject) => {
-          this.$refs['contractForm'].validate((valid) => {
+      this.$message({
+        type: "success",
+        message: "保存成功!"
+      });
+      this.typeChang[this.activeType] = false;
+      let num = Number(this.activeType);
+      if (type == 'n') {
+        num++;
+      } else if (type == 'p') {
+        num--;
+      }
+
+      this.activeType = num.toString();
+      this.btnLoad = false;
+    },
+
+    savecontract () {
+      return new Promise((resolve, reject) => {
+        this.$refs['contractForm'].validate((valid) => {
           if (valid) {
-            if(this.flageData.length ==3){
+            if (this.flageData.length == 3) {
               this.contractForm.projectPlace = this.flageData[2];
             }
             resolve(submitContractInfo(this.contractForm))
-          }else{
+          } else {
             reject('验证失败')
           }
         })
-        })
-      },
+      })
+    },
 
-      handleRemove(file) {
-        //console.log(file, fileList);
-        removeFile(file.response.data.attachId).then(()=>{
+    handleRemove (file) {
+      //console.log(file, fileList);
+      removeFile(file.response.data.attachId).then(() => {
+        this.contractForm.startFileUrl = '';
+      })
+    },
+    handleExceed () {
+      this.$message.warning(`当前限制选择 1 个文件，请先移除后，再次上传`);
+    },
+    handleSuccess (res) {
+      this.contractForm.startFileUrl = res.data.link;
+    },
+    setHeaders () {
+      this.headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`;
+      this.headers[website.tokenHeader] = 'bearer ' + getToken()
+    },
+
+    downloadFile () {
+      window.open(this.contractForm.startFileUrl);
+    },
+    delFile () {
+      this.$confirm('是否删除该文件?', '删除开工令', {
+        distinguishCancelAndClose: true,
+        confirmButtonText: '删除',
+        cancelButtonText: '取消'
+      }).then(() => {
+        delFileFromUrl(this.contractForm.startFileUrl).then(() => {
+          this.isBackShow = false;
           this.contractForm.startFileUrl = '';
         })
-      },
-      handleExceed() {
-        this.$message.warning(`当前限制选择 1 个文件，请先移除后，再次上传`);
-      },
-      handleSuccess(res){
-        this.contractForm.startFileUrl = res.data.link;
-      },
-      setHeaders(){
-        this.headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`;
-        this.headers[website.tokenHeader] = 'bearer ' + getToken()
-      },
+      })
+    },
 
-      downloadFile(){
-        window.open(this.contractForm.startFileUrl);
-      },
-      delFile(){
-        this.$confirm('是否删除该文件?', '删除开工令', {
-          distinguishCancelAndClose: true,
-          confirmButtonText: '删除',
-          cancelButtonText: '取消'
-        }).then(() => {
-          delFileFromUrl(this.contractForm.startFileUrl).then(()=>{
-            this.isBackShow = false;
-            this.contractForm.startFileUrl = '';
-          })
-        })
-      },
+    addUserToProject () {
+      if (!this.userId) {
+        this.$message({
+          type: "warning",
+          message: "请先选择用户再进行添加"
+        });
+        return;
+      }
+      if (!this.postId) {
+        this.$message({
+          type: "warning",
+          message: "请先选择岗位再进行添加"
+        });
+        return;
+      }
+      let list = [{
+        projectId: this.pid,
+        contractId: this.contractForm.id,
+        userId: this.userId,
+        postId: this.postId,
+      }];
+      saveUserInfoByProjectTow(list).then(() => {
+        // this.findAllUserByCondition();
+      })
+    },
 
-      addUserToProject(){
-        if(!this.userId){
-          this.$message({
-              type: "warning",
-              message: "请先选择用户再进行添加"
-            });
-          return;
-        }
-        if(!this.postId){
-          this.$message({
-              type: "warning",
-              message: "请先选择岗位再进行添加"
-            });
-          return;
-        }
-        if(!this.rId){
-          this.$message({
-              type: "warning",
-              message: "请先选择角色再进行添加"
-            });
-          return;
-        }
-        let list = [{
-          projectId:this.pid,
-          contractId:this.contractForm.id,
-          userId:this.userId,
-          postId:this.postId,
-          roleId:this.rId
-        }];
-        saveUserInfoByProject(list).then(()=>{
-          this.findAllUserByCondition();
-        })
-      },
+    findAllUserByCondition () {
 
-      findAllUserByCondition(){
-        findAllUserByCondition({
-          "cId": this.contractForm.id,
-          "pId": this.pid,
-          "postId": this.postId,
-          "rId": this.rId
-        }).then((res)=>{
-          this.contractUserList = res.data.data;
-        })
-      },
+      findAllUserByCondition({
+        "cId": this.contractForm.id,
+        "pId": this.pid,
+        "postId": this.postId,
+        "rId": this.rId
+      }).then((res) => {
+        this.contractUserList = res.data.data;
+      })
+    },
 
-      handleDelete(index,row){
-        this.$confirm('是否将该用户移除出合同段', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          removeUsersByIds(row.id).then(()=>{
-            this.contractUserList.splice(index,1);
-            this.$message({
-              type: "success",
-              message: "删除成功!"
-            });
-          })
+    handleDelete (index, row) {
+      this.$confirm('是否将该用户移除出合同段', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        removeUsersByIds(row.id).then(() => {
+          this.contractUserList.splice(index, 1);
+          this.$message({
+            type: "success",
+            message: "删除成功!"
+          });
         })
-      },
-      handleDeletes(){
-        this.$confirm('是否将所有用户移除出合同段', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          let ids = [];
-          this.contractUserList.forEach((element)=>{
-            ids.push(element.id);
-          })
-          removeUsersByIds(ids.join(',')).then(()=>{
-            this.contractUserList = [];
-            this.$message({
-              type: "success",
-              message: "删除成功!"
-            });
-          })
+      })
+    },
+    handleDeletes () {
+      this.$confirm('是否将所有用户移除出合同段', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let ids = [];
+        this.contractUserList.forEach((element) => {
+          ids.push(element.id);
         })
-      },
-
-      copyAccPas(row){
-        this.copyText = `姓名：${row.name}
-账号：${row.account}
-密码：${row.password}`;
-        this.$nextTick(()=>{
-          this.$refs.copyInput.select()
-          document.execCommand('copy')
+        removeUsersByIds(ids.join(',')).then(() => {
+          this.contractUserList = [];
           this.$message({
             type: "success",
-            message: "成功复制在剪贴板!"
+            message: "删除成功!"
           });
         })
+      })
+    },
 
-      },
+    copyAccPas (row) {
+      this.copyText = `姓名：${row.name}
+账号：${row.account}
+密码：${row.password}`;
+      this.$nextTick(() => {
+        this.$refs.copyInput.select()
+        document.execCommand('copy')
+        this.$message({
+          type: "success",
+          message: "成功复制在剪贴板!"
+        });
+      })
 
-      resetPassword(row){
-        this.$confirm('是否将用户【'+row.name+'】密码重置为123456', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          resetPasswordByUserId(row.uId).then(()=>{
-            row.password = '123456';
-            this.$message({
-              type: "success",
-              message: "重置成功!"
-            });
-          })
-        })
-      },
+    },
 
-      getContractTypeList(){
-        if(this.contractTypeList.length >1){
-          return;
-        }
-        getDictionary({
-          code:'contract_type'
-        }).then((res)=>{
-          res.data.data.forEach(element => {
-            element.dictKey = Number(element.dictKey)
+    resetPassword (row) {
+      this.$confirm('是否将用户【' + row.name + '】密码重置为123456', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        resetPasswordByUserId(row.uid).then(() => {
+          row.password = '123456';
+          this.$message({
+            type: "success",
+            message: "重置成功!"
           });
-          this.contractTypeList = res.data.data;
         })
-      },
+      })
+    },
 
-      getRoleList(){
-        if(this.roleList.length > 1){
-          return;
-        }
+    getContractTypeList () {
+      if (this.contractTypeList.length > 1) {
+        return;
+      }
+      getDictionary({
+        code: 'contract_type'
+      }).then((res) => {
+        res.data.data.forEach(element => {
+          element.dictKey = Number(element.dictKey)
+        });
+        this.contractTypeList = res.data.data;
+      })
+    },
 
-        getRoleTree().then((res)=>{
-          let list = [];
-          res.data.data.forEach((element)=>{
-            if(element.title == '监理方'||
-               element.title == '业主方'){
-                 list.push(element);
-            }else if(element.title == '施工方'){
-              //给个默认
-              this.rId = element.id;
-              list.push(element);
-            }
-          })
-          this.roleList = list;
-        })
-      },
-      getUserByName(){
-       findUserByName('').then((res)=>{
-         this.userList = res.data.data;
-       })
-     },
-
-    getLeftTree(){
-      return new Promise((resolve)=>{
-        if(!this.leftTreeData.length){
-          findProjectTree(this.projectInfo.id,this.wbsId).then((res)=>{
-            if(Array.isArray(res.data.data)){
+
+    getUserByName () {
+      findUserByName('').then((res) => {
+        this.userList = res.data.data;
+      })
+    },
+
+    getLeftTree () {
+      return new Promise((resolve) => {
+        if (!this.leftTreeData.length) {
+          findProjectTree(this.projectInfo.id, this.wbsId).then((res) => {
+            if (Array.isArray(res.data.data)) {
               this.leftTreeData = res.data.data;
-            }else{
+            } else {
               this.leftTreeData = [];
             }
             resolve();
-          }).finally(()=>{
+          }).finally(() => {
             resolve();
           })
         }
         resolve();
       })
     },
-    getRightTree(){
-      getContractInfoTree(this.wbsId,this.projectInfo.id,this.contractForm.id).then((res)=>{
-        if(Array.isArray(res.data.data)){
+    getRightTree () {
+      getContractInfoTree(this.wbsId, this.projectInfo.id, this.contractForm.id).then((res) => {
+        if (Array.isArray(res.data.data)) {
           this.$refs.treetotree.setRightTree(res.data.data);
         }
       })
     },
 
-    saveWbsTree(){
+    saveWbsTree () {
       let obj = {};
       let ids = this.$refs.treetotree.getTreeAllId('rightTree');
       obj = {
-        wbsId:this.wbsId,
-        projectId:this.projectInfo.id,
-        contractId:this.contractForm.id,
-        wbsTreeIds:ids
+        wbsId: this.wbsId,
+        projectId: this.projectInfo.id,
+        contractId: this.contractForm.id,
+        wbsTreeIds: ids
       }
       return submitWbsTreeInContract(obj);
-     },
+    },
 
-     treeChang(){
+    treeChang () {
       this.typeChang[2] = true;
     },
 
-    mapChange(){
+    mapChange () {
       this.$refs['contractForm'].validateField('projectPlace');
-    }
+    },
 
+    getStoragePeriodList () {
+      if (this.storagePeriodList.length > 1) {
+        return;
+      }
+      getDictbiz({
+        code: 'storage_period'
+      }).then((res) => {
+        res.data.data.forEach(element => {
+          element.dictKey = Number(element.dictKey)
+        });
+        this.storagePeriodList = res.data.data;
+      })
+    },
+    getSecurityLevelList () {
+      if (this.securityLevelList.length > 1) {
+        return;
+      }
+      getDictbiz({
+        code: 'security_level'
+      }).then((res) => {
+        res.data.data.forEach(element => {
+          element.dictKey = Number(element.dictKey)
+        });
+        this.securityLevelList = res.data.data;
+      })
     }
-  };
+
+  }
+};
 </script>
 
 <style scoped lang="scss">
-  .bm-view {
-    width: 100%;
-    height: 300px;
-  }
-  .head-font{
-    font-size: 20px;
-    font-weight:bold;
-  }
+.bm-view {
+  width: 100%;
+  height: 300px;
+}
+.head-font {
+  font-size: 20px;
+  font-weight: bold;
+}
 </style>

src/views/manager/projectinfo/tree.vue

@@ -9,7 +9,6 @@
               placeholder="输入关键字进行过滤"
               v-model="filterText"
               @input="filterChange"
-              clearable
             ></el-input>
             <!-- <el-button type="info" class="mg-l-20">导入划分</el-button> -->
           </div>
@@ -49,7 +48,6 @@
                         <el-dropdown-item
                           @click.native="setLeftType(1,data,node)"
                           icon="el-icon-circle-plus-outline"
-                          v-if="data.deptCategory != 6"
                         >新增子级</el-dropdown-item>
                         <el-dropdown-item
                           @click.native="setLeftType(2,data,node)"
@@ -115,7 +113,6 @@
                         <el-dropdown-item
                           @click.native="setLeftType(1,data,node)"
                           icon="el-icon-circle-plus-outline"
-                          v-if="data.deptCategory != 6"
                         >新增子级</el-dropdown-item>
                         <el-dropdown-item
                           @click.native="setLeftType(2,data,node)"
@@ -283,6 +280,7 @@
                 <el-link
                   class="mg-l-10"
                   type="primary"
+                  @click="adjustExcel"
                 >调整表单</el-link>
                 <el-link
                   class="mg-l-10"
@@ -298,6 +296,14 @@
         </template>
       </el-col>
     </el-row>
+    <!-- 调整表单模板 -->
+    <div
+      v-if="excelHtml"
+      class="excelHtml"
+    >
+      <dynamicExcel @remove="removeExcel" />
+    </div>
+
     <!-- 关联清表 -->
     <el-dialog
       title="关联清表"
@@ -316,7 +322,7 @@
           @change="changetherr()"
         >
           <el-option
-            v-for="(item,key) in  GLExcelData"
+            v-for="(item,key) in GLExcelData"
             :key="key"
             :label="item.name"
             :value="item.id"
@@ -327,20 +333,19 @@
           <el-input
             style="width:400px;"
             v-model.trim="GLExcelFrom.search"
-            @input="searchInput"
             placeholder="请输入需要选择的内容"
           ></el-input>
           <el-tree
+            :filter-node-method="filterNode222"
+            ref="tree"
+            class="filter-tree"
             style="margin-top:10px;"
             :props="GLExcelProps"
-            :load="loadNodess"
-            lazy
             :data="exceldata"
             node-key="id"
-            :default-checked-keys="xuanzhong"
             accordion
             show-checkbox
-            @check-change="checkchange"
+            @check="checkchange"
           >
           </el-tree>
         </el-scrollbar>
@@ -615,16 +620,6 @@
                   placeholder="请选择"
                   style="width:120px"
                 >
-                  <el-option
-                    :key="5"
-                    label=">"
-                    value=">"
-                  ></el-option>
-                  <el-option
-                    :key="6"
-                    label="<"
-                    value="<"
-                  ></el-option>
                   <el-option
                     :key="1"
                     label="≥"
@@ -860,16 +855,6 @@
                 placeholder="请选择"
                 style="width:120px"
               >
-                <el-option
-                  :key="5"
-                  label=">"
-                  value=">"
-                ></el-option>
-                <el-option
-                  :key="6"
-                  label="<"
-                  value="<"
-                ></el-option>
                 <el-option
                   :key="1"
                   label="≥"
@@ -1263,7 +1248,7 @@
 </template>
 
 <script>
-let setTimeout22
+import dynamicExcel from "./treeTemplate/dynamicExcel.vue";
 import {
   saveFormAndElement, selectFormElements,
   importWbsTree
@@ -1277,7 +1262,7 @@ import { findProjectTree as getAlltree } from "@/api/manager/projectinfo";
 import { getList as getAttchFromOriginalName } from "@/api/resource/attach";
 import { getDictionary } from "@/api/system/dict";
 import { mapGetters } from "vuex";
-import { getList, tabLazytreeAll, saveLinkTab } from '@/api/exctab/excelmodel'
+import { getList, tabLazytreeAll, saveLinkTab, getExcelHtml } from '@/api/exctab/excelmodel'
 export default {
   data () {
     return {
@@ -1293,12 +1278,17 @@ export default {
       GLExcelProps: {
         label: 'name',
         children: 'children',
-        isLeaf: 'hasChildren',
+        disabled: 'hasChildren',
+        // isLeaf: !'hasChildren',
       },
-      xuanzhong: [],//选中值得ID
       exceldata: [],//清表模板
       //#endregion
 
+      //#region 调整表单
+      adjustmentExcel: '',
+      excelHtml: false,
+      //#endregion
+
       //#region 
       id: '',
       projectid: '',
@@ -1357,7 +1347,7 @@ export default {
       curEleTable: {},
       editEleVisible: false,
       editEleList: [],
-      eleReg: /(>|<|≥|≤|±|【】)?([^≥≤±【】]*)/,
+      eleReg: /(≥|≤|±|【】)?([^≥≤±【】]*)/,
 
       editEleFormulaVisible: false,
       formulaInput: '',
@@ -1564,10 +1554,7 @@ export default {
     },
 
     updateTreeNewNode () {
-      getLazytree(this.id, this.nodeDetail.parentId,this.userInfo.tenant_id, this.projectid).then((res) => {
-        let node = this.$refs.tree.getNode(this.nodeDetail.parentId);
-        node.isLeaf = false;
-        node.isLeafByUser = false;
+      getLazytree(this.id, this.nodeDetail.parentId, this.userInfo.tenant_id, this.projectid).then((res) => {
         this.$refs.tree.updateKeyChildren(this.nodeDetail.parentId, res.data.data)
       })
     },
@@ -1713,7 +1700,22 @@ export default {
     },
 
     importTemplate (data) {
+      this.importTemplateVisible = true;
       this.curTreeData = data;
+
+      if (!this.fileUrl) {
+        getAttchFromOriginalName(1, 20, {
+          originalName: 'WBS划分模板.xls'
+        }).then((res) => {
+          if (res.data.data.records.length) {
+            this.fileUrl = res.data.data.records[0].link;
+          } else {
+            this.fileUrl = '';
+          }
+
+        })
+      }
+
     },
 
     importTemplateHandle () {
@@ -1952,7 +1954,7 @@ export default {
     //#endregion
 
 
-    //#region 
+    //#region 关联清表
     async getList (da) {//获取清表模板信息
       const { data: res } = await getList(da)
       console.log(res);
@@ -1967,13 +1969,6 @@ export default {
       })
       console.log(res);
       if (res.code === 200 && res.msg === '操作成功') {
-        res.data.forEach(val => {
-          if (val.hasChildren) {
-            val.disabled = false
-          } else {
-            val.disabled = true
-          }
-        })
         this.exceldata = res.data
       }
     },
@@ -1985,7 +1980,7 @@ export default {
         size: 100000,
         parentId: 0
       })
-      this.GLExcelFrom.id = scope.row.id
+      this.GLExcelFrom.id = scope.row.pkeyId
     },
     changetherr () {//清表类型选择框change事件
       if (this.GLExcelFrom.name != "") {
@@ -1997,47 +1992,20 @@ export default {
       this.GLExcelFrom.name = ""
       this.GLExcelFrom.search = ''
       this.GLExcelFrom.id
-      this.xuanzhong = []
+      this.$refs.tree.setCheckedKeys([])
       this.GLExcel = false
     },
-    async loadNodess (node, resolve) {//check事件
-      console.log(node);
-      if (this.GLExcelFrom.name) {
-        console.log(node.data.id);
-        console.log(resolve);
-        const { data: res } = await tabLazytreeAll({
-          modeId: node.data.id,
-          name: '',
-        })
-        if (res.code === 200 && res.msg === '操作成功') {
-          res.data.forEach(val => {
-            if (val.hasChildren) {
-              val.disabled = false
-            } else {
-              val.disabled = true
-            }
-          })
-          resolve(res.data)
-        }
-      }
-    },
-    checkchange (data, checked,) {//节点选中回调
-      if (checked) {
-        this.xuanzhong = [data.id]
+    checkchange (data) {//节点选中回调
+      if (this.$refs.tree.getCheckedNodes().length == 0) {
+        this.$refs.tree.setCheckedKeys([])
       } else {
-        this.xuanzhong = []
+        this.$refs.tree.setCheckedKeys([data.id])
       }
     },
-    searchInput () {//输入回调
-      window.clearTimeout(setTimeout22)
-      setTimeout22 = window.setTimeout(() => {
-        this.tabLazytreeAll()
-      }, 500)
-    },
-    async saveLinkTab () {
+    async saveLinkTab () {//保存按钮
       const { data: res } = await saveLinkTab({
-        exceTabId: this.GLExcelFrom.id,
-        tabId: this.xuanzhong[0]
+        exceTabId: this.$refs.tree.getCheckedNodes()[0].id,
+        tabId: this.GLExcelFrom.id,
       })
       console.log(res);
       if (res.code === 200) {
@@ -2046,11 +2014,43 @@ export default {
           message: '关联清表成功',
         })
         this.GLExcel = false
+        this.GLExcelMD()
       }
     },
+    filterNode222 (value, data) {
+      if (!value) return true;
+      return data.name.indexOf(value) !== -1;
+    },
     //#endregion
 
-  }
+    //#region 调整表单
+    async adjustExcel () {//调整表单
+      await this.getExcelHtml()
+      this.excelHtml = true
+      // console.log();
+      // this.$router.push('/ceshi/trees')
+    },
+    async getExcelHtml () {
+      const { data: res } = await getExcelHtml()
+      console.log(res);
+      if (res.code === 200) {
+        localStorage.setItem('excelHtnl', res.data)
+        this.adjustmentExcel = res.data
+      }
+    },
+    removeExcel () {
+      this.excelHtml = false
+    },
+    //#endregion
+  },
+  watch: {
+    'GLExcelFrom.search' (val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  components: {
+    dynamicExcel,
+  },
 };
 </script>
 
@@ -2085,4 +2085,13 @@ export default {
     padding: 20px;
   }
 }
+//调整表单样式
+.excelHtml {
+  position: absolute;
+  z-index: 999999;
+  top: 50px;
+  left: 0px;
+  width: 100%;
+  height: 100%;
+}
 </style>

src/views/manager/projectinfo/treeTemplate/dynamicExcel.vue

@@ -0,0 +1,119 @@
+<template>
+  <div class="excelHtnl">
+    <div class="header">
+      <div
+        class="GoBack"
+        @click="GoBack()"
+      >
+        返回上一级
+      </div>
+      <div>
+        <el-button
+          type="info"
+          size="small"
+        >设置输入框</el-button>
+        <el-button
+          type="info"
+          size="small"
+        >电签位置配置</el-button>
+        <el-button
+          type="success"
+          size="small"
+        >设置公式开放条件</el-button>
+        <el-button
+          type="primary"
+          size="small"
+        >编辑默认信息</el-button>
+      </div>
+    </div>
+    <div class="excelBox">
+      <div
+        class='parent'
+        id='parent'
+      ></div>
+      <div class="excelRight">
+        <setInputTPT v-if="setUptype===0" />
+        <electronicSignature v-if="setUptype===1" />
+        <setFormula v-if="setUptype===2" />
+        <editDefault v-if="setUptype===3" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import setInputTPT from './template/setInputTPT.vue'
+import electronicSignature from './template/electronicSignature.vue'
+import setFormula from './template/setFormula.vue'
+import editDefault from './template/editDefault.vue'
+let tem = localStorage.getItem('excelHtnl')
+import Vue from 'vue'
+
+var MyComponent = Vue.extend({
+
+  data () {
+    return {
+    }
+  },
+  template: tem,
+})
+let component = new MyComponent().$mount()
+export default {
+  data () {
+    return {
+      setUptype: 3,//右侧显示的类型
+    }
+  },
+  methods: {
+    GoBack () {//返回上一级
+      this.$emit('remove')
+    },
+  },
+  mounted () {
+    document.getElementById('parent').appendChild(component.$el);
+  },
+  components: {
+    setInputTPT,
+    electronicSignature,
+    setFormula,
+    editDefault
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.excelHtnl {
+  margin: 0 0 0 10px;
+  background-color: #fff;
+  box-sizing: border-box;
+  padding: 0 20px 100px 20px;
+  height: 100%;
+  overflow: scroll;
+  .header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    align-items: center;
+    .GoBack {
+      color: rgba(0, 82, 216, 1);
+      text-decoration: underline;
+      font-family: SourceHanSansSC;
+      cursor: pointer;
+    }
+  }
+  .excelBox {
+    margin-top: 10px;
+    display: flex;
+    justify-content: flex-start;
+    .excelRight {
+      flex-grow: 1;
+      box-sizing: border-box;
+      padding: 20px 0px 0px 30px;
+    }
+  }
+}
+</style>
+
+
+
+ 

src/views/manager/projectinfo/treeTemplate/template/editDefault.vue

@@ -0,0 +1,67 @@
+<template>
+  <div class="editDefault">
+    <el-select
+      v-model="value"
+      clearable
+      placeholder="请选择"
+    >
+      <el-option
+        v-for="item in options"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value"
+      >
+      </el-option>
+    </el-select>
+    <el-input
+      class="martop15"
+      style="width:100%;"
+      type="textarea"
+      :rows="5"
+      placeholder="请输入内容"
+      v-model="textarea"
+    >
+    </el-input>
+
+    <div class="flexEnd martop20">
+      <el-button
+        type="info"
+        size="mini"
+      >重置</el-button>
+      <el-button
+        type="info"
+        size="mini"
+      >确定</el-button>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      options: [{
+        value: '选项1',
+        label: '黄金糕'
+      }, {
+        value: '选项2',
+        label: '双皮奶'
+      }, {
+        value: '选项3',
+        label: '蚵仔煎'
+      }, {
+        value: '选项4',
+        label: '龙须面'
+      }, {
+        value: '选项5',
+        label: '北京烤鸭'
+      }],
+      value: '',
+      textarea: '',
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.editDefault {
+}
+</style>

src/views/manager/projectinfo/treeTemplate/template/electronicSignature.vue

@@ -0,0 +1,111 @@
+<template>
+  <div class="dianqian martop20">
+    <el-radio-group v-model="radio">
+      <el-radio :label="3">施工</el-radio>
+      <el-radio :label="6">监理</el-radio>
+      <el-radio :label="9">专家</el-radio>
+      <el-radio :label="12">业主</el-radio>
+    </el-radio-group>
+    <div class="flexBetween martop20">
+      <el-select
+        size='mini'
+        v-model="value"
+        clearable
+        placeholder="请选择"
+      >
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <el-select
+        size='mini'
+        v-model="value"
+        clearable
+        placeholder="请选择"
+      >
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <el-button size="mini">保存</el-button>
+    </div>
+
+    <table
+      class="table martop20"
+      width='100%'
+      border='1px '
+      bordercolor="#E5E5E5"
+      cellpadding='2px'
+    >
+      <thead
+        cellpadding='2px'
+        height='40px'
+      >
+        <tr>
+          <th width='40%'>元素位置</th>
+          <th width='40%'>签字岗位</th>
+          <th width='20%'>操作</th>
+        </tr>
+      </thead>
+      <tbody height='36px'>
+        <tr
+          v-for="(item,key) in setInputTable"
+          :key="key"
+        >
+          <td>{{item.id}}</td>
+          <td>{{item.id}}</td>
+          <td align="center"><span style="color:red;cursor: pointer;">删除</span></td>
+        </tr>
+      </tbody>
+    </table>
+    <el-button
+      class="martop25"
+      style="float:right;"
+      type="info"
+      size="mini"
+    >保存设置</el-button>
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      radio: '',//
+      options: [{
+        value: '选项1',
+        label: '黄金糕'
+      }, {
+        value: '选项2',
+        label: '双皮奶'
+      }, {
+        value: '选项3',
+        label: '蚵仔煎'
+      }, {
+        value: '选项4',
+        label: '龙须面'
+      }, {
+        value: '选项5',
+        label: '北京烤鸭'
+      }],
+      value: '',
+      setInputTable: [{}],
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.dianqian {
+  table {
+    color: #101010;
+    font-size: 14px;
+  }
+}
+</style>

src/views/manager/projectinfo/treeTemplate/template/setFormula.vue

@@ -0,0 +1,88 @@
+<template>
+  <div class="setFormula">
+    <el-select
+      v-model="value"
+      clearable
+      placeholder="请选择"
+    >
+      <el-option
+        v-for="item in options"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value"
+      >
+      </el-option>
+    </el-select>
+    <div class="martop15 maoshu">
+      22
+    </div>
+    <div
+      style="float:right"
+      class="martop20 flexColumn marright10 switch"
+    >
+      <el-switch
+        v-model="value1"
+        inactive-color="#ADBCF9"
+        inactive-text="默认开放"
+      >
+      </el-switch>
+      <el-switch
+        class="martop10"
+        v-model="value1"
+        inactive-color="#00E065"
+        inactive-text="VIP开放"
+      >
+      </el-switch>
+    </div>
+    <div
+      style="width:100%;"
+      class="flexEnd martop20"
+    >
+      <el-button
+        class="martop15"
+        type="info"
+        size="mini"
+      >保存设置</el-button>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  daat () {
+    return {
+      options: [{
+        value: '选项1',
+        label: '黄金糕'
+      }, {
+        value: '选项2',
+        label: '双皮奶'
+      }, {
+        value: '选项3',
+        label: '蚵仔煎'
+      }, {
+        value: '选项4',
+        label: '龙须面'
+      }, {
+        value: '选项5',
+        label: '北京烤鸭'
+      }],
+      value: '',
+      value1: true,
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.setFormula {
+  .maoshu {
+    border: 1px solid #c6c6c6;
+    border-radius: 5px;
+    padding: 15px 20px;
+  }
+  .switch {
+    /deep/.el-switch__label.is-active {
+      width: 60px;
+    }
+  }
+}
+</style>

src/views/manager/projectinfo/treeTemplate/template/setInputTPT.vue

@@ -0,0 +1,113 @@
+<template>
+  <div class="setInput">
+    <div class="flexBetween ">
+      <el-select
+        v-model="value"
+        clearable
+        placeholder="请选择"
+      >
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <el-select
+        v-model="value"
+        clearable
+        placeholder="请选择"
+      >
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <!-- 添加框 -->
+    <div
+      style="border: 1px dotted rgb(187, 187, 187);box-sizing: border-box;padding: 0px 15px;"
+      class="martop20"
+    >
+      <table
+        class="table"
+        width='100%'
+        border='1px'
+        cellpadding='2px'
+        bordercolor="#E5E5E5"
+      >
+        <thead
+          cellpadding='2px'
+          height='40px'
+        >
+          <tr>
+            <th width='15%'>序号</th>
+            <th width='55%'>默认值</th>
+          </tr>
+        </thead>
+        <tbody height='36px'>
+          <tr
+            v-for="(item,key) in setInputTable"
+            :key="key"
+          >
+            <td>{{item.id}}</td>
+            <td></td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="martop20 flexEnd marbottom10"><i
+          style="color:rgb(10, 134, 217);font-size:24px;"
+          class="el-icon-circle-plus"
+        ></i></div>
+    </div>
+
+    <el-button
+      class="martop15"
+      style="float:right;"
+      type="info"
+      size="mini"
+    >保存设置</el-button>
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      options: [{
+        value: '选项1',
+        label: '黄金糕'
+      }, {
+        value: '选项2',
+        label: '双皮奶'
+      }, {
+        value: '选项3',
+        label: '蚵仔煎'
+      }, {
+        value: '选项4',
+        label: '龙须面'
+      }, {
+        value: '选项5',
+        label: '北京烤鸭'
+      }],
+      value: '',
+      setInputTable: [{ id: 11 }],//数据体
+    }
+  },
+  methods: {
+
+  },
+}
+</script>
+<style lang="scss" scoped>
+.table {
+  margin-top: 20px;
+  border-radius: 5px;
+
+  color: #101010;
+  font-size: 14px;
+}
+</style>

src/views/system/user.vue

@@ -4,158 +4,212 @@
       <div class="box">
         <el-scrollbar>
           <basic-container>
-            <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/>
+            <avue-tree
+              :option="treeOption"
+              :data="treeData"
+              @node-click="nodeClick"
+            />
           </basic-container>
         </el-scrollbar>
       </div>
     </el-col>
     <el-col :span="19">
       <basic-container>
-        <avue-crud :option="option"
-                   :search.sync="search"
-                   :table-loading="loading"
-                   :data="data"
-                   ref="crud"
-                   v-model="form"
-                   :permission="permissionList"
-                   @row-del="rowDel"
-                   @row-update="rowUpdate"
-                   @row-save="rowSave"
-                   :before-open="beforeOpen"
-                   :page.sync="page"
-                   @search-change="searchChange"
-                   @search-reset="searchReset"
-                   @selection-change="selectionChange"
-                   @current-change="currentChange"
-                   @size-change="sizeChange"
-                   @refresh-change="refreshChange"
-                   @on-load="onLoad">
+        <avue-crud
+          :option="option"
+          :search.sync="search"
+          :table-loading="loading"
+          :data="data"
+          ref="crud"
+          v-model="form"
+          :permission="permissionList"
+          @row-del="rowDel"
+          @row-update="rowUpdate"
+          @row-save="rowSave"
+          :before-open="beforeOpen"
+          :page.sync="page"
+          @search-change="searchChange"
+          @search-reset="searchReset"
+          @selection-change="selectionChange"
+          @current-change="currentChange"
+          @size-change="sizeChange"
+          @refresh-change="refreshChange"
+          @on-load="onLoad"
+        >
           <template slot="menuLeft">
-            <el-button type="danger"
-                       size="small"
-                       plain
-                       icon="el-icon-delete"
-                       v-if="permission.user_delete"
-                       @click="handleDelete">删 除
+            <el-button
+              type="danger"
+              size="small"
+              plain
+              icon="el-icon-delete"
+              v-if="permission.user_delete"
+              @click="handleDelete"
+            >删 除
             </el-button>
-            <el-button type="info"
-                       size="small"
-                       plain
-                       v-if="permission.user_role"
-                       icon="el-icon-user"
-                       @click="handleGrant">角色配置
+            <el-button
+              type="info"
+              size="small"
+              plain
+              v-if="permission.user_role"
+              icon="el-icon-user"
+              @click="handleGrant"
+            >角色配置
             </el-button>
-            <el-button type="info"
-                       size="small"
-                       plain
-                       v-if="permission.user_reset"
-                       icon="el-icon-refresh"
-                       @click="handleReset">密码重置
+            <el-button
+              type="info"
+              size="small"
+              plain
+              v-if="permission.user_reset"
+              icon="el-icon-refresh"
+              @click="handleReset"
+            >密码重置
             </el-button>
-            <el-button type="info"
-                       size="small"
-                       plain
-                       v-if="userInfo.role_name.includes('admin')"
-                       icon="el-icon-setting"
-                       @click="handlePlatform">平台配置
+            <el-button
+              type="info"
+              size="small"
+              plain
+              v-if="userInfo.role_name.includes('admin')"
+              icon="el-icon-setting"
+              @click="handlePlatform"
+            >平台配置
             </el-button>
-            <el-button type="info"
-                       size="small"
-                       plain
-                       v-if="userInfo.role_name.includes('admin')"
-                       icon="el-icon-coordinate"
-                       @click="handleLock">账号解封
+            <el-button
+              type="info"
+              size="small"
+              plain
+              v-if="userInfo.role_name.includes('admin')"
+              icon="el-icon-coordinate"
+              @click="handleLock"
+            >账号解封
             </el-button>
-            <el-button type="success"
-                       size="small"
-                       plain
-                       v-if="userInfo.role_name.includes('admin')"
-                       icon="el-icon-upload2"
-                       @click="handleImport">导入
+            <el-button
+              type="success"
+              size="small"
+              plain
+              v-if="userInfo.role_name.includes('admin')"
+              icon="el-icon-upload2"
+              @click="handleImport"
+            >导入
             </el-button>
-            <el-button type="warning"
-                       size="small"
-                       plain
-                       v-if="userInfo.role_name.includes('admin')"
-                       icon="el-icon-download"
-                       @click="handleExport">导出
+            <el-button
+              type="warning"
+              size="small"
+              plain
+              v-if="userInfo.role_name.includes('admin')"
+              icon="el-icon-download"
+              @click="handleExport"
+            >导出
             </el-button>
           </template>
-          <template slot-scope="{row}"
-                    slot="tenantName">
+          <template
+            slot-scope="{row}"
+            slot="tenantName"
+          >
             <el-tag>{{row.tenantName}}</el-tag>
           </template>
-          <template slot-scope="{row}"
-                    slot="roleName">
+          <template
+            slot-scope="{row}"
+            slot="roleName"
+          >
             <el-tag>{{row.roleName}}</el-tag>
           </template>
-          <template slot-scope="{row}"
-                    slot="deptName">
+          <template
+            slot-scope="{row}"
+            slot="deptName"
+          >
             <el-tag>{{row.deptName}}</el-tag>
           </template>
-          <template slot-scope="{row}"
-                    slot="userTypeName">
+          <template
+            slot-scope="{row}"
+            slot="userTypeName"
+          >
             <el-tag>{{row.userTypeName}}</el-tag>
           </template>
         </avue-crud>
-        <el-dialog title="用户角色配置"
-                   append-to-body
-                   :visible.sync="roleBox"
-                   width="345px">
+        <el-dialog
+          title="用户角色配置"
+          append-to-body
+          :visible.sync="roleBox"
+          width="345px"
+        >
 
-          <el-tree :data="roleGrantList"
-                   show-checkbox
-                   check-strictly
-                   default-expand-all
-                   node-key="id"
-                   ref="treeRole"
-                   :default-checked-keys="roleTreeObj"
-                   :props="props">
+          <el-tree
+            :data="roleGrantList"
+            show-checkbox
+            check-strictly
+            default-expand-all
+            node-key="id"
+            ref="treeRole"
+            :default-checked-keys="roleTreeObj"
+            :props="props"
+          >
           </el-tree>
 
-          <span slot="footer" class="dialog-footer">
+          <span
+            slot="footer"
+            class="dialog-footer"
+          >
             <el-button @click="roleBox = false">取 消</el-button>
-            <el-button type="primary"
-                       @click="submitRole">确 定</el-button>
+            <el-button
+              type="primary"
+              @click="submitRole"
+            >确 定</el-button>
           </span>
         </el-dialog>
-        <el-dialog title="用户数据导入"
-                   append-to-body
-                   :visible.sync="excelBox"
-                   width="555px">
-          <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+        <el-dialog
+          title="用户数据导入"
+          append-to-body
+          :visible.sync="excelBox"
+          width="555px"
+        >
+          <avue-form
+            :option="excelOption"
+            v-model="excelForm"
+            :upload-after="uploadAfter"
+          >
             <template slot="excelTemplate">
-              <el-button type="primary" @click="handleTemplate">
+              <el-button
+                type="primary"
+                @click="handleTemplate"
+              >
                 点击下载<i class="el-icon-download el-icon--right"></i>
               </el-button>
             </template>
           </avue-form>
         </el-dialog>
-        <el-dialog title="用户平台配置"
-                   append-to-body
-                   :visible.sync="platformBox">
-          <avue-crud :option="platformOption"
-                     :table-loading="platformLoading"
-                     :data="platformData"
-                     ref="platformCrud"
-                     v-model="platformForm"
-                     :before-open="platformBeforeOpen"
-                     :page.sync="platformPage"
-                     :permission="platformPermissionList"
-                     @row-update="platformRowUpdate"
-                     @search-change="platformSearchChange"
-                     @search-reset="platformSearchReset"
-                     @selection-change="platformSelectionChange"
-                     @current-change="platformCurrentChange"
-                     @size-change="platformSizeChange"
-                     @refresh-change="platformRefreshChange"
-                     @on-load="platformOnLoad">
-            <template slot-scope="{row}"
-                      slot="tenantName">
+        <el-dialog
+          title="用户平台配置"
+          append-to-body
+          :visible.sync="platformBox"
+        >
+          <avue-crud
+            :option="platformOption"
+            :table-loading="platformLoading"
+            :data="platformData"
+            ref="platformCrud"
+            v-model="platformForm"
+            :before-open="platformBeforeOpen"
+            :page.sync="platformPage"
+            :permission="platformPermissionList"
+            @row-update="platformRowUpdate"
+            @search-change="platformSearchChange"
+            @search-reset="platformSearchReset"
+            @selection-change="platformSelectionChange"
+            @current-change="platformCurrentChange"
+            @size-change="platformSizeChange"
+            @refresh-change="platformRefreshChange"
+            @on-load="platformOnLoad"
+          >
+            <template
+              slot-scope="{row}"
+              slot="tenantName"
+            >
               <el-tag>{{row.tenantName}}</el-tag>
             </template>
-            <template slot-scope="{row}"
-                      slot="userTypeName">
+            <template
+              slot-scope="{row}"
+              slot="userTypeName"
+            >
               <el-tag>{{row.userTypeName}}</el-tag>
             </template>
           </avue-crud>
@@ -166,867 +220,867 @@
 </template>
 
 <script>
-  import {
-    getList,
-    getUser,
-    getUserPlatform,
-    remove,
-    update,
-    updatePlatform,
-    add,
-    grant,
-    resetPassword, unlock
-  } from "@/api/system/user";
-  import {exportBlob} from "@/api/common";
-  import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
-  import {getRoleTree} from "@/api/system/role";
-  import {getPostList} from "@/api/system/post";
-  import {mapGetters} from "vuex";
-  import website from '@/config/website';
-  import {getToken} from '@/util/auth';
-  import {downloadXls} from "@/util/util";
-  import {dateNow} from "@/util/date";
-  import NProgress from 'nprogress';
-  import 'nprogress/nprogress.css';
+import {
+  getList,
+  getUser,
+  getUserPlatform,
+  remove,
+  update,
+  updatePlatform,
+  add,
+  grant,
+  resetPassword, unlock
+} from "@/api/system/user";
+import { exportBlob } from "@/api/common";
+import { getDeptTree, getDeptLazyTree } from "@/api/system/dept";
+import { getRoleTree } from "@/api/system/role";
+import { getPostList } from "@/api/system/post";
+import { mapGetters } from "vuex";
+import website from '@/config/website';
+import { getToken } from '@/util/auth';
+import { downloadXls } from "@/util/util";
+import { dateNow } from "@/util/date";
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
 
-  export default {
-    data() {
-      const validatePass = (rule, value, callback) => {
-        if (value === '') {
-          callback(new Error('请输入密码'));
-        } else {
-          callback();
-        }
-      };
-      const validatePass2 = (rule, value, callback) => {
-        if (value === '') {
-          callback(new Error('请再次输入密码'));
-        } else if (value !== this.form.password) {
-          callback(new Error('两次输入密码不一致!'));
-        } else {
-          callback();
-        }
-      };
-      return {
-        form: {},
-        search:{},
-        roleBox: false,
-        excelBox: false,
-        platformBox: false,
-        initFlag: true,
-        selectionList: [],
-        query: {},
-        loading: true,
-        platformLoading: false,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        platformPage: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        init: {
-          roleTree: [],
-          deptTree: [],
+export default {
+  data () {
+    const validatePass = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入密码'));
+      } else {
+        callback();
+      }
+    };
+    const validatePass2 = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请再次输入密码'));
+      } else if (value !== this.form.password) {
+        callback(new Error('两次输入密码不一致!'));
+      } else {
+        callback();
+      }
+    };
+    return {
+      form: {},
+      search: {},
+      roleBox: false,
+      excelBox: false,
+      platformBox: false,
+      initFlag: true,
+      selectionList: [],
+      query: {},
+      loading: true,
+      platformLoading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      platformPage: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      init: {
+        roleTree: [],
+        deptTree: [],
+      },
+      props: {
+        label: "title",
+        value: "key"
+      },
+      roleGrantList: [],
+      roleTreeObj: [],
+      treeDeptId: '',
+      treeData: [],
+      treeOption: {
+        nodeKey: 'id',
+        lazy: true,
+        treeLoad: function (node, resolve) {
+          const parentId = (node.level === 0) ? 0 : node.data.id;
+          getDeptLazyTree(parentId).then(res => {
+            resolve(res.data.data.map(item => {
+              return {
+                ...item,
+                leaf: !item.hasChildren
+              }
+            }))
+          });
         },
+        addBtn: false,
+        menu: false,
+        size: 'small',
         props: {
-          label: "title",
-          value: "key"
-        },
-        roleGrantList: [],
-        roleTreeObj: [],
-        treeDeptId: '',
-        treeData: [],
-        treeOption: {
-          nodeKey: 'id',
-          lazy: true,
-          treeLoad: function (node, resolve) {
-            const parentId = (node.level === 0) ? 0 : node.data.id;
-            getDeptLazyTree(parentId).then(res => {
-              resolve(res.data.data.map(item => {
-                return {
-                  ...item,
-                  leaf: !item.hasChildren
-                }
-              }))
-            });
+          labelText: '标题',
+          label: 'title',
+          value: 'value',
+          children: 'children'
+        }
+      },
+      option: {
+        height: 'auto',
+        calcHeight: 80,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        selection: true,
+        viewBtn: true,
+        dialogType: 'drawer',
+        dialogClickModal: false,
+        column: [
+          {
+            label: "登录账号",
+            prop: "account",
+            search: true,
+            display: false
           },
-          addBtn: false,
-          menu: false,
-          size: 'small',
-          props: {
-            labelText: '标题',
-            label: 'title',
-            value: 'value',
-            children: 'children'
-          }
-        },
-        option: {
-          height: 'auto',
-          calcHeight: 80,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          selection: true,
-          viewBtn: true,
-          dialogType: 'drawer',
-          dialogClickModal: false,
-          column: [
-            {
-              label: "登录账号",
-              prop: "account",
-              search: true,
-              display: false
-            },
-            {
-              label: "所属租户",
-              prop: "tenantName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "用户姓名",
-              prop: "realName",
-              search: true,
-              display: false
-            },
-            {
-              label: "所属角色",
-              prop: "roleName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "所属部门",
-              prop: "deptName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "用户平台",
-              prop: "userTypeName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "用户平台",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              hide: true,
-              display: false,
-              prop: "userType",
-              rules: [{
-                required: true,
-                message: "请选择用户平台",
-                trigger: "blur"
-              }]
+          {
+            label: "所属租户",
+            prop: "tenantName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户姓名",
+            prop: "realName",
+            search: true,
+            display: false
+          },
+          {
+            label: "所属角色",
+            prop: "roleName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "所属部门",
+            prop: "deptName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户平台",
+            prop: "userTypeName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户平台",
+            type: "select",
+            dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
             },
-          ],
-          group: [
-            {
-              label: '基础信息',
-              prop: 'baseInfo',
-              icon: 'el-icon-user-solid',
-              column: [
-                {
-                  label: "所属租户",
-                  prop: "tenantId",
-                  type: "tree",
-                  dicUrl: "/api/blade-system/tenant/select",
-                  props: {
-                    label: "tenantName",
-                    value: "tenantId"
-                  },
-                  hide: !website.tenantMode,
-                  addDisplay: website.tenantMode,
-                  editDisplay: website.tenantMode,
-                  viewDisplay: website.tenantMode,
-                  rules: [{
-                    required: true,
-                    message: "请输入所属租户",
-                    trigger: "click"
-                  }],
-                  span: 24,
+            dataType: "number",
+            search: true,
+            hide: true,
+            display: false,
+            prop: "userType",
+            rules: [{
+              required: true,
+              message: "请选择用户平台",
+              trigger: "blur"
+            }]
+          },
+        ],
+        group: [
+          {
+            label: '基础信息',
+            prop: 'baseInfo',
+            icon: 'el-icon-user-solid',
+            column: [
+              {
+                label: "所属租户",
+                prop: "tenantId",
+                type: "tree",
+                dicUrl: "/api/blade-system/tenant/select",
+                props: {
+                  label: "tenantName",
+                  value: "tenantId"
                 },
-                {
-                  label: "登录账号",
-                  prop: "account",
-                  rules: [{
-                    required: true,
-                    message: "请输入登录账号",
-                    trigger: "blur"
-                  }],
+                hide: !website.tenantMode,
+                addDisplay: website.tenantMode,
+                editDisplay: website.tenantMode,
+                viewDisplay: website.tenantMode,
+                rules: [{
+                  required: true,
+                  message: "请输入所属租户",
+                  trigger: "click"
+                }],
+                span: 24,
+              },
+              {
+                label: "登录账号",
+                prop: "account",
+                rules: [{
+                  required: true,
+                  message: "请输入登录账号",
+                  trigger: "blur"
+                }],
+              },
+              {
+                label: "用户平台",
+                type: "select",
+                dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+                props: {
+                  label: "dictValue",
+                  value: "dictKey"
                 },
-                {
-                  label: "用户平台",
-                  type: "select",
-                  dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
-                  props: {
-                    label: "dictValue",
-                    value: "dictKey"
+                dataType: "number",
+                slot: true,
+                prop: "userType",
+                rules: [{
+                  required: true,
+                  message: "请选择用户平台",
+                  trigger: "blur"
+                }]
+              },
+              {
+                label: '密码',
+                prop: 'password',
+                hide: true,
+                editDisplay: false,
+                viewDisplay: false,
+                rules: [{ required: true, validator: validatePass, trigger: 'blur' }]
+              },
+              {
+                label: '确认密码',
+                prop: 'password2',
+                hide: true,
+                editDisplay: false,
+                viewDisplay: false,
+                rules: [{ required: true, validator: validatePass2, trigger: 'blur' }]
+              },
+            ]
+          },
+          {
+            label: '详细信息',
+            prop: 'detailInfo',
+            icon: 'el-icon-s-order',
+            column: [
+              {
+                label: "用户昵称",
+                prop: "name",
+                hide: true,
+                rules: [{
+                  required: true,
+                  message: "请输入用户昵称",
+                  trigger: "blur"
+                }]
+              },
+              {
+                label: "用户姓名",
+                prop: "realName",
+                rules: [{
+                  required: true,
+                  message: "请输入用户姓名",
+                  trigger: "blur"
+                }, {
+                  min: 2,
+                  max: 5,
+                  message: '姓名长度在2到5个字符'
+                }]
+              },
+              {
+                label: "手机号码",
+                prop: "phone",
+                overHidden: true
+              },
+              {
+                label: "电子邮箱",
+                prop: "email",
+                hide: true,
+                overHidden: true
+              },
+              {
+                label: "用户性别",
+                prop: "sex",
+                type: "select",
+                dicData: [
+                  {
+                    label: "男",
+                    value: 1
                   },
-                  dataType: "number",
-                  slot: true,
-                  prop: "userType",
-                  rules: [{
-                    required: true,
-                    message: "请选择用户平台",
-                    trigger: "blur"
-                  }]
-                },
-                {
-                  label: '密码',
-                  prop: 'password',
-                  hide: true,
-                  editDisplay: false,
-                  viewDisplay: false,
-                  rules: [{required: true, validator: validatePass, trigger: 'blur'}]
-                },
-                {
-                  label: '确认密码',
-                  prop: 'password2',
-                  hide: true,
-                  editDisplay: false,
-                  viewDisplay: false,
-                  rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
-                },
-              ]
-            },
-            {
-              label: '详细信息',
-              prop: 'detailInfo',
-              icon: 'el-icon-s-order',
-              column: [
-                {
-                  label: "用户昵称",
-                  prop: "name",
-                  hide: true,
-                  rules: [{
-                    required: true,
-                    message: "请输入用户昵称",
-                    trigger: "blur"
-                  }]
-                },
-                {
-                  label: "用户姓名",
-                  prop: "realName",
-                  rules: [{
-                    required: true,
-                    message: "请输入用户姓名",
-                    trigger: "blur"
-                  }, {
-                    min: 2,
-                    max: 5,
-                    message: '姓名长度在2到5个字符'
-                  }]
-                },
-                {
-                  label: "手机号码",
-                  prop: "phone",
-                  overHidden: true
-                },
-                {
-                  label: "电子邮箱",
-                  prop: "email",
-                  hide: true,
-                  overHidden: true
-                },
-                {
-                  label: "用户性别",
-                  prop: "sex",
-                  type: "select",
-                  dicData: [
-                    {
-                      label: "男",
-                      value: 1
-                    },
-                    {
-                      label: "女",
-                      value: 2
-                    },
-                    {
-                      label: "未知",
-                      value: 3
-                    }
-                  ],
-                  hide: true
-                },
-                {
-                  label: "用户生日",
-                  type: "date",
-                  prop: "birthday",
-                  format: "yyyy-MM-dd hh:mm:ss",
-                  valueFormat: "yyyy-MM-dd hh:mm:ss",
-                  hide: true
-                },
-                {
-                  label: "账号状态",
-                  prop: "statusName",
-                  hide: true,
-                  display: false
-                }
-              ]
-            },
-            {
-              label: '职责信息',
-              prop: 'dutyInfo',
-              icon: 'el-icon-s-custom',
-              column: [
-                {
-                  label: "用户编号",
-                  prop: "code",
-                },
-                {
-                  label: "所属角色",
-                  prop: "roleId",
-                  multiple: true,
-                  type: "tree",
-                  dicData: [],
-                  props: {
-                    label: "title"
+                  {
+                    label: "女",
+                    value: 2
                   },
-                  checkStrictly: true,
-                  slot: true,
-                  rules: [{
-                    required: true,
-                    message: "请选择所属角色",
-                    trigger: "click"
-                  }]
+                  {
+                    label: "未知",
+                    value: 3
+                  }
+                ],
+                hide: true
+              },
+              {
+                label: "用户生日",
+                type: "date",
+                prop: "birthday",
+                format: "yyyy-MM-dd hh:mm:ss",
+                valueFormat: "yyyy-MM-dd hh:mm:ss",
+                hide: true
+              },
+              {
+                label: "账号状态",
+                prop: "statusName",
+                hide: true,
+                display: false
+              }
+            ]
+          },
+          {
+            label: '职责信息',
+            prop: 'dutyInfo',
+            icon: 'el-icon-s-custom',
+            column: [
+              {
+                label: "用户编号",
+                prop: "code",
+              },
+              {
+                label: "所属角色",
+                prop: "roleId",
+                multiple: true,
+                type: "tree",
+                dicData: [],
+                props: {
+                  label: "title"
                 },
-                {
-                  label: "所属部门",
-                  prop: "deptId",
-                  type: "tree",
-                  multiple: true,
-                  dicData: [],
-                  props: {
-                    label: "title"
-                  },
-                  checkStrictly: true,
-                  slot: true,
-                  rules: [{
-                    required: true,
-                    message: "请选择所属部门",
-                    trigger: "click"
-                  }]
+                checkStrictly: true,
+                slot: true,
+                rules: [{
+                  required: true,
+                  message: "请选择所属角色",
+                  trigger: "click"
+                }]
+              },
+              {
+                label: "所属部门",
+                prop: "deptId",
+                type: "tree",
+                multiple: true,
+                dicData: [],
+                props: {
+                  label: "title"
                 },
-                {
-                  label: "所属岗位",
-                  prop: "postId",
-                  type: "tree",
-                  multiple: true,
-                  dicData: [],
-                  props: {
-                    label: "postName",
-                    value: "id"
-                  },
-                  rules: [{
-                    required: true,
-                    message: "请选择所属岗位",
-                    trigger: "click"
-                  }],
+                checkStrictly: true,
+                slot: true,
+                rules: [{
+                  required: true,
+                  message: "请选择所属部门",
+                  trigger: "click"
+                }]
+              },
+              {
+                label: "所属岗位",
+                prop: "postId",
+                type: "tree",
+                multiple: true,
+                dicData: [],
+                props: {
+                  label: "postName",
+                  value: "id"
                 },
-              ]
-            },
-          ]
-        },
-        data: [],
-        platformQuery: {},
-        platformSelectionList: [],
-        platformData: [],
-        platformForm: {},
-        platformOption: {
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          selection: true,
-          viewBtn: true,
-          dialogClickModal: false,
-          menuWidth: 120,
-          editBtnText: '配置',
-          column: [
-            {
-              label: "登录账号",
-              prop: "account",
-              search: true,
-              display: false
-            },
-            {
-              label: "所属租户",
-              prop: "tenantName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "用户姓名",
-              prop: "realName",
-              search: true,
-              display: false
+                rules: [{
+                  required: true,
+                  message: "请选择所属岗位",
+                  trigger: "click"
+                }],
+              },
+            ]
+          },
+        ]
+      },
+      data: [],
+      platformQuery: {},
+      platformSelectionList: [],
+      platformData: [],
+      platformForm: {},
+      platformOption: {
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        selection: true,
+        viewBtn: true,
+        dialogClickModal: false,
+        menuWidth: 120,
+        editBtnText: '配置',
+        column: [
+          {
+            label: "登录账号",
+            prop: "account",
+            search: true,
+            display: false
+          },
+          {
+            label: "所属租户",
+            prop: "tenantName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户姓名",
+            prop: "realName",
+            search: true,
+            display: false
+          },
+          {
+            label: "用户平台",
+            prop: "userTypeName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户平台",
+            type: "select",
+            dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
             },
-            {
-              label: "用户平台",
-              prop: "userTypeName",
-              slot: true,
-              display: false
+            dataType: "number",
+            search: true,
+            hide: true,
+            display: false,
+            prop: "userType",
+            rules: [{
+              required: true,
+              message: "请选择用户平台",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "用户拓展",
+            prop: "userExt",
+            type: "textarea",
+            minRows: 8,
+            span: 24,
+            overHidden: true,
+            row: true,
+            hide: true,
+          },
+        ],
+      },
+      excelForm: {},
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: '模板上传',
+            prop: 'excelFile',
+            type: 'upload',
+            drag: true,
+            loadText: '模板上传中，请稍等',
+            span: 24,
+            propsHttp: {
+              res: 'data'
             },
-            {
-              label: "用户平台",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
+            tip: '请上传 .xls,.xlsx 标准格式文件',
+            action: "/api/blade-user/import-user"
+          },
+          {
+            label: "数据覆盖",
+            prop: "isCovered",
+            type: "switch",
+            align: "center",
+            width: 80,
+            dicData: [
+              {
+                label: "否",
+                value: 0
               },
-              dataType: "number",
-              search: true,
-              hide: true,
-              display: false,
-              prop: "userType",
-              rules: [{
+              {
+                label: "是",
+                value: 1
+              }
+            ],
+            value: 0,
+            slot: true,
+            rules: [
+              {
                 required: true,
-                message: "请选择用户平台",
+                message: "请选择是否覆盖",
                 trigger: "blur"
-              }]
-            },
-            {
-              label: "用户拓展",
-              prop: "userExt",
-              type: "textarea",
-              minRows: 8,
-              span: 24,
-              overHidden: true,
-              row: true,
-              hide: true,
-            },
-          ],
-        },
-        excelForm: {},
-        excelOption: {
-          submitBtn: false,
-          emptyBtn: false,
-          column: [
-            {
-              label: '模板上传',
-              prop: 'excelFile',
-              type: 'upload',
-              drag: true,
-              loadText: '模板上传中，请稍等',
-              span: 24,
-              propsHttp: {
-                res: 'data'
-              },
-              tip: '请上传 .xls,.xlsx 标准格式文件',
-              action: "/api/blade-user/import-user"
-            },
-            {
-              label: "数据覆盖",
-              prop: "isCovered",
-              type: "switch",
-              align: "center",
-              width: 80,
-              dicData: [
-                {
-                  label: "否",
-                  value: 0
-                },
-                {
-                  label: "是",
-                  value: 1
-                }
-              ],
-              value: 0,
-              slot: true,
-              rules: [
-                {
-                  required: true,
-                  message: "请选择是否覆盖",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: '模板下载',
-              prop: 'excelTemplate',
-              formslot: true,
-              span: 24,
-            }
-          ]
-        }
-      };
+              }
+            ]
+          },
+          {
+            label: '模板下载',
+            prop: 'excelTemplate',
+            formslot: true,
+            span: 24,
+          }
+        ]
+      }
+    };
+  },
+  watch: {
+    'form.tenantId' () {
+      if (this.form.tenantId !== '' && this.initFlag) {
+        this.initData(this.form.tenantId);
+      }
     },
-    watch: {
-      'form.tenantId'() {
-        if (this.form.tenantId !== '' && this.initFlag) {
-          this.initData(this.form.tenantId);
-        }
-      },
-      'excelForm.isCovered'() {
-        if (this.excelForm.isCovered !== '') {
-          const column = this.findObject(this.excelOption.column, "excelFile");
-          column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
-        }
+    'excelForm.isCovered' () {
+      if (this.excelForm.isCovered !== '') {
+        const column = this.findObject(this.excelOption.column, "excelFile");
+        column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
       }
+    }
+  },
+  computed: {
+    ...mapGetters(["userInfo", "permission"]),
+    permissionList () {
+      return {
+        addBtn: this.vaildData(this.permission.user_add, false),
+        viewBtn: this.vaildData(this.permission.user_view, false),
+        delBtn: this.vaildData(this.permission.user_delete, false),
+        editBtn: this.vaildData(this.permission.user_edit, false)
+      };
     },
-    computed: {
-      ...mapGetters(["userInfo", "permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.user_add, false),
-          viewBtn: this.vaildData(this.permission.user_view, false),
-          delBtn: this.vaildData(this.permission.user_delete, false),
-          editBtn: this.vaildData(this.permission.user_edit, false)
-        };
-      },
-      platformPermissionList() {
-        return {
-          addBtn: false,
-          viewBtn: false,
-          delBtn: false,
-          editBtn: this.vaildData(this.permission.user_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      },
+    platformPermissionList () {
+      return {
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: this.vaildData(this.permission.user_edit, false)
+      };
     },
-    mounted() {
-      // 非租户模式默认加载管理组数据
-      if (!website.tenantMode) {
-        this.initData(website.tenantId);
-      }
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
     },
-    methods: {
-      nodeClick(data) {
-        this.treeDeptId = data.id;
-        this.page.currentPage = 1;
-        this.onLoad(this.page);
-      },
-      initData(tenantId) {
-        getRoleTree(tenantId).then(res => {
-          const column = this.findObject(this.option.group, "roleId");
-          column.dicData = res.data.data;
+  },
+  mounted () {
+    // 非租户模式默认加载管理组数据
+    if (!website.tenantMode) {
+      this.initData(website.tenantId);
+    }
+  },
+  methods: {
+    nodeClick (data) {
+      this.treeDeptId = data.id;
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    initData (tenantId) {
+      getRoleTree(tenantId).then(res => {
+        const column = this.findObject(this.option.group, "roleId");
+        column.dicData = res.data.data;
+      });
+      getDeptTree(tenantId).then(res => {
+        const column = this.findObject(this.option.group, "deptId");
+        column.dicData = res.data.data;
+      });
+      getPostList(tenantId).then(res => {
+        const column = this.findObject(this.option.group, "postId");
+        column.dicData = res.data.data;
+      });
+    },
+    submitRole () {
+      const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
+      grant(this.ids, roleList).then(() => {
+        this.roleBox = false;
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-        getDeptTree(tenantId).then(res => {
-          const column = this.findObject(this.option.group, "deptId");
-          column.dicData = res.data.data;
+        this.onLoad(this.page);
+      });
+    },
+    rowSave (row, done, loading) {
+      row.deptId = row.deptId.join(",");
+      row.roleId = row.roleId.join(",");
+      row.postId = row.postId.join(",");
+      add(row).then(() => {
+        this.initFlag = false;
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-        getPostList(tenantId).then(res => {
-          const column = this.findObject(this.option.group, "postId");
-          column.dicData = res.data.data;
+        done();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    rowUpdate (row, index, done, loading) {
+      row.deptId = row.deptId.join(",");
+      row.roleId = row.roleId.join(",");
+      row.postId = row.postId.join(",");
+      update(row).then(() => {
+        this.initFlag = false;
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
-      submitRole() {
-        const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
-        grant(this.ids, roleList).then(() => {
-          this.roleBox = false;
+        done();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    rowDel (row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          this.onLoad(this.page);
         });
-      },
-      rowSave(row, done, loading) {
-        row.deptId = row.deptId.join(",");
-        row.roleId = row.roleId.join(",");
-        row.postId = row.postId.join(",");
-        add(row).then(() => {
-          this.initFlag = false;
+    },
+    searchReset () {
+      this.query = {};
+      this.treeDeptId = '';
+      this.onLoad(this.page);
+    },
+    searchChange (params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange (list) {
+      this.selectionList = list;
+    },
+    selectionClear () {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    handleDelete () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
+          this.$refs.crud.toggleSelection();
         });
-      },
-      rowUpdate(row, index, done, loading) {
-        row.deptId = row.deptId.join(",");
-        row.roleId = row.roleId.join(",");
-        row.postId = row.postId.join(",");
-        update(row).then(() => {
-          this.initFlag = false;
-          this.onLoad(this.page);
+    },
+    handleReset () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择账号密码重置为123456?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return resetPassword(this.ids);
+        })
+        .then(() => {
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      searchReset() {
-        this.query = {};
-        this.treeDeptId = '';
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      handleReset() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择账号密码重置为123456?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return resetPassword(this.ids);
-          })
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      handleGrant() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.roleTreeObj = [];
-        if (this.selectionList.length === 1) {
-          this.roleTreeObj = this.selectionList[0].roleId.split(",");
-        }
-        getRoleTree().then(res => {
-          this.roleGrantList = res.data.data;
-          this.roleBox = true;
-        });
-      },
-      handlePlatform() {
-        this.platformBox = true;
-      },
-      handleLock() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择账号解封？", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return unlock(this.ids);
-          })
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleImport() {
-        this.excelBox = true;
-      },
-      uploadAfter(res, done, loading, column) {
-        window.console.log(column);
-        this.excelBox = false;
-        this.refreshChange();
-        done();
-      },
-      handleExport() {
-        this.$confirm("是否导出用户数据?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          NProgress.start();
-          exportBlob(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`).then(res => {
-            downloadXls(res.data, `用户数据表${dateNow()}.xlsx`);
-            NProgress.done();
-          })
+          this.$refs.crud.toggleSelection();
         });
-      },
-      handleTemplate() {
-        exportBlob(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
-          downloadXls(res.data, "用户数据模板.xlsx");
+    },
+    handleGrant () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.roleTreeObj = [];
+      if (this.selectionList.length === 1) {
+        this.roleTreeObj = this.selectionList[0].roleId.split(",");
+      }
+      getRoleTree().then(res => {
+        this.roleGrantList = res.data.data;
+        this.roleBox = true;
+      });
+    },
+    handlePlatform () {
+      this.platformBox = true;
+    },
+    handleLock () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择账号解封？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return unlock(this.ids);
         })
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getUser(this.form.id).then(res => {
-            this.form = res.data.data;
-            if(this.form.hasOwnProperty("deptId")){
-              this.form.deptId = this.form.deptId.split(",");
-            }
-            if(this.form.hasOwnProperty("roleId")){
-              this.form.roleId = this.form.roleId.split(",");
-            }
-            if(this.form.hasOwnProperty("postId")){
-              this.form.postId = this.form.postId.split(",");
-            }
-          });
-        }
-        this.initFlag = true;
-        done();
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      },
-      platformRowUpdate(row, index, done, loading) {
-        updatePlatform(row.id, row.userType, row.userExt).then(() => {
-          this.platformOnLoad(this.platformPage);
+        .then(() => {
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
         });
-      },
-      platformBeforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getUserPlatform(this.platformForm.id).then(res => {
-            this.platformForm = res.data.data;
-          });
-        }
-        done();
-      },
-      platformSearchReset() {
-        this.platformQuery = {};
+    },
+    handleImport () {
+      this.excelBox = true;
+    },
+    uploadAfter (res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      this.refreshChange();
+      done();
+    },
+    handleExport () {
+      this.$confirm("是否导出用户数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        NProgress.start();
+        exportBlob(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`).then(res => {
+          downloadXls(res.data, `用户数据表${dateNow()}.xlsx`);
+          NProgress.done();
+        })
+      });
+    },
+    handleTemplate () {
+      exportBlob(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
+        downloadXls(res.data, "用户数据模板.xlsx");
+      })
+    },
+    beforeOpen (done, type) {
+      if (["edit", "view"].includes(type)) {
+        getUser(this.form.id).then(res => {
+          this.form = res.data.data;
+          if (this.form.hasOwnProperty("deptId")) {
+            this.form.deptId = this.form.deptId.split(",");
+          }
+          if (this.form.hasOwnProperty("roleId")) {
+            this.form.roleId = this.form.roleId.split(",");
+          }
+          if (this.form.hasOwnProperty("postId")) {
+            this.form.postId = this.form.postId.split(",");
+          }
+        });
+      }
+      this.initFlag = true;
+      done();
+    },
+    currentChange (currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange (pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange () {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad (page, params = {}) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    platformRowUpdate (row, index, done, loading) {
+      updatePlatform(row.id, row.userType, row.userExt).then(() => {
         this.platformOnLoad(this.platformPage);
-      },
-      platformSearchChange(params, done) {
-        this.platformQuery = params;
-        this.platformPage.currentPage = 1;
-        this.platformOnLoad(this.platformPage, params);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
         done();
-      },
-      platformSelectionChange(list) {
-        this.platformSelectionList = list;
-      },
-      platformSelectionClear() {
-        this.platformSelectionList = [];
-        this.$refs.platformCrud.toggleSelection();
-      },
-      platformCurrentChange(currentPage) {
-        this.platformPage.currentPage = currentPage;
-      },
-      platformSizeChange(pageSize) {
-        this.platformPage.pageSize = pageSize;
-      },
-      platformRefreshChange() {
-        this.platformOnLoad(this.platformPage, this.platformQuery);
-      },
-      platformOnLoad(page, params = {}) {
-        this.platformLoading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
-          const data = res.data.data;
-          this.platformPage.total = data.total;
-          this.platformData = data.records;
-          this.platformLoading = false;
-          this.selectionClear();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    platformBeforeOpen (done, type) {
+      if (["edit", "view"].includes(type)) {
+        getUserPlatform(this.platformForm.id).then(res => {
+          this.platformForm = res.data.data;
         });
       }
+      done();
+    },
+    platformSearchReset () {
+      this.platformQuery = {};
+      this.platformOnLoad(this.platformPage);
+    },
+    platformSearchChange (params, done) {
+      this.platformQuery = params;
+      this.platformPage.currentPage = 1;
+      this.platformOnLoad(this.platformPage, params);
+      done();
+    },
+    platformSelectionChange (list) {
+      this.platformSelectionList = list;
+    },
+    platformSelectionClear () {
+      this.platformSelectionList = [];
+      this.$refs.platformCrud.toggleSelection();
+    },
+    platformCurrentChange (currentPage) {
+      this.platformPage.currentPage = currentPage;
+    },
+    platformSizeChange (pageSize) {
+      this.platformPage.pageSize = pageSize;
+    },
+    platformRefreshChange () {
+      this.platformOnLoad(this.platformPage, this.platformQuery);
+    },
+    platformOnLoad (page, params = {}) {
+      this.platformLoading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
+        const data = res.data.data;
+        this.platformPage.total = data.total;
+        this.platformData = data.records;
+        this.platformLoading = false;
+        this.selectionClear();
+      });
     }
-  };
+  }
+};
 </script>
 
 <style>
-  .box {
-    height: 800px;
-  }
+.box {
+  height: 800px;
+}
 
-  .el-scrollbar {
-    height: 100%;
-  }
+.el-scrollbar {
+  height: 100%;
+}
 
-  .box .el-scrollbar__wrap {
-    overflow: scroll;
-  }
+.box .el-scrollbar__wrap {
+  overflow: scroll;
+}
 </style>