修改bug提交及电签区部分页面

src/api/certificate/list.js

@@ -0,0 +1,38 @@
+import request from '@/router/axios';
+
+
+//获取所有有效项目
+export const queryProjectList = (params) => {
+    return request({
+        url: '/api/blade-manager/signPfxFile/queryProjectList',
+        method: 'get',
+        params
+    })
+}
+
+//分页获取证书列表数据
+export const listpage = (params) => {
+    return request({
+        url: '/api/blade-manager/signPfxFile/page',
+        method: 'get',
+        params
+    })
+}
+
+//注册
+export const goRegister = (data) => {
+    return request({
+        url: '/api/blade-manager/signPfxFile/goRegister',
+        method: 'post',
+        data
+    })
+}
+
+//获取详情数据
+export const getById = (data) => {
+    return request({
+        url: '/api/blade-manager/signPfxFile/getById',
+        method: 'post',
+        data
+    })
+}

src/router/views/index.js

@@ -1,10 +1,37 @@
 import Layout from '@/page/index/'
 
 export default [{
-        path: '/wel',
-        component: Layout,
-        redirect: '/wel/index',
-        children: [{
+    path: '/wel',
+    component: Layout,
+    redirect: '/wel/index',
+    children: [{
+            path: '/certificate/list',
+            name: '电签列表',
+            meta: {
+                i18n: 'ElectricSignaturelist'
+            },
+            children: [{
+                path: '/certificate/list/addList',
+                name: '新增电签',
+                meta: {
+                    i18n: 'ElectricSignaturelist'
+                },
+                component: () =>
+                    import ( /* webpackChunkName: "views" */ '@/views/certificate/lists/addList')
+            }, ],
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/certificate/list')
+        },
+        {
+            path: '/certificate/management',
+            name: '电签管理',
+            meta: {
+                i18n: 'ElectricitySignManagement'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/certificate/management')
+        },
+        {
             path: 'index',
             name: '首页',
             meta: {
@@ -12,7 +39,8 @@ export default [{
             },
             component: () =>
                 import ( /* webpackChunkName: "views" */ '@/views/wel/index')
-        }, {
+        },
+        {
             path: 'dashboard',
             name: '控制台',
             meta: {
@@ -21,164 +49,162 @@ export default [{
             },
             component: () =>
                 import ( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
-        }]
+        }
+    ]
+}, {
+    path: '/test',
+    component: Layout,
+    redirect: '/test/index',
+    children: [{
+        path: 'index',
+        name: '测试页',
+        meta: {
+            i18n: 'test'
+        },
+        component: () =>
+            import ( /* webpackChunkName: "views" */ '@/views/util/test')
+    }]
+}, {
+    path: '/dict-horizontal',
+    component: Layout,
+    redirect: '/dict-horizontal/index',
+    children: [{
+        path: 'index',
+        name: '字典管理',
+        meta: {
+            i18n: 'dict'
+        },
+        component: () =>
+            import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
+    }]
+}, {
+    path: '/dict-vertical',
+    component: Layout,
+    redirect: '/dict-vertical/index',
+    children: [{
+        path: 'index',
+        name: '字典管理',
+        meta: {
+            i18n: 'dict'
+        },
+        component: () =>
+            import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
+    }]
+}, {
+    path: '/info',
+    component: Layout,
+    redirect: '/info/index',
+    children: [{
+        path: 'index',
+        name: '个人信息',
+        meta: {
+            i18n: 'info'
+        },
+        component: () =>
+            import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
+    }]
+}, {
+    path: '/work/process/leave',
+    component: Layout,
+    redirect: '/work/process/leave/form',
+    children: [{
+        path: 'form/:processDefinitionId',
+        name: '请假流程',
+        meta: {
+            i18n: 'work'
+        },
+        component: () =>
+            import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
     }, {
-        path: '/test',
-        component: Layout,
-        redirect: '/test/index',
-        children: [{
-            path: 'index',
-            name: '测试页',
-            meta: {
-                i18n: 'test'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/util/test')
-        }]
+        path: 'handle/:taskId/:processInstanceId/:businessId',
+        name: '处理请假流程',
+        meta: {
+            i18n: 'work'
+        },
+        component: () =>
+            import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
     }, {
-        path: '/dict-horizontal',
-        component: Layout,
-        redirect: '/dict-horizontal/index',
-        children: [{
-            path: 'index',
-            name: '字典管理',
+        path: 'detail/:processInstanceId/:businessId',
+        name: '请假流程详情',
+        meta: {
+            i18n: 'work'
+        },
+        component: () =>
+            import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
+    }]
+}, {
+    path: '/wbs',
+    component: Layout,
+    redirect: '/wbs/edit',
+    children: [{
+        path: 'edit/:id',
+        name: '编辑WBS树',
+        meta: {
+            i18n: 'edit'
+        },
+        component: () =>
+            import ( /* webpackChunkName: "views" */ '@/views/manager/wbsinfo/edit')
+    }]
+}, {
+    path: '/contract',
+    component: Layout,
+    redirect: '/contract/detail',
+    children: [{
+        path: 'detail',
+        name: '创建合同段',
+        meta: {
+            i18n: 'edit'
+        },
+        component: () =>
+            import ( /* webpackChunkName: "views" */ '@/views/manager/contractinfo/detail')
+    }]
+}, {
+    path: '/excel',
+    component: Layout,
+    redirect: '/excel/excelmodel',
+    children: [{
+        path: 'excelmodel/:id',
+        name: '清表模板',
+        meta: {
+            i18n: 'excelmodel'
+        },
+        component: () =>
+            import ( /* webpackChunkName: "views" */ '@/views/exctab/excelmodel/excelmodel')
+    }]
+}, {
+    path: '/project',
+    component: Layout,
+    redirect: '/project/tree',
+    children: [{
+            path: 'tree',
+            name: '私有WBS',
             meta: {
-                i18n: 'dict'
+                i18n: 'privateTree'
             },
             component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
-        }]
-    }, {
-        path: '/dict-vertical',
-        component: Layout,
-        redirect: '/dict-vertical/index',
-        children: [{
-            path: 'index',
-            name: '字典管理',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
-        }]
-    }, {
-        path: '/info',
-        component: Layout,
-        redirect: '/info/index',
-        children: [{
-            path: 'index',
-            name: '个人信息',
-            meta: {
-                i18n: 'info'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
-        }]
-    }, {
-        path: '/work/process/leave',
-        component: Layout,
-        redirect: '/work/process/leave/form',
-        children: [{
-            path: 'form/:processDefinitionId',
-            name: '请假流程',
-            meta: {
-                i18n: 'work'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
-        }, {
-            path: 'handle/:taskId/:processInstanceId/:businessId',
-            name: '处理请假流程',
-            meta: {
-                i18n: 'work'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
-        }, {
-            path: 'detail/:processInstanceId/:businessId',
-            name: '请假流程详情',
-            meta: {
-                i18n: 'work'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
-        }]
-    }, {
-        path: '/wbs',
-        component: Layout,
-        redirect: '/wbs/edit',
-        children: [{
-            path: 'edit/:id',
-            name: '编辑WBS树',
-            meta: {
-                i18n: 'edit'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/manager/wbsinfo/edit')
-        }]
-    }, {
-        path: '/contract',
-        component: Layout,
-        redirect: '/contract/detail',
-        children: [{
-            path: 'detail',
-            name: '创建合同段',
-            meta: {
-                i18n: 'edit'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/manager/contractinfo/detail')
-        }]
-    },
-    {
-        path: '/excel',
-        component: Layout,
-        redirect: '/excel/excelmodel',
-        children: [{
-            path: 'excelmodel/:id',
-            name: '清表模板',
-            meta: {
-                i18n: 'excelmodel'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/exctab/excelmodel/excelmodel')
-        }]
-    },
-    {
-        path: '/project',
-        component: Layout,
-        redirect: '/project/tree',
-        children: [{
-                path: 'tree',
-                name: '私有WBS',
-                meta: {
-                    i18n: 'privateTree'
-                },
-                component: () =>
-                    import ( /* webpackChunkName: "views" */ '@/views/manager/projectinfo/tree')
-            },
-            {
-                path: 'editElement',
-                name: '编辑元素',
-                meta: {
-                    i18n: 'editElement'
-                },
-                component: () =>
-                    import ( /* webpackChunkName: "views" */ '@/views/manager/projectinfo/editElement/editElement')
-            }
-        ]
-    }, {
-        path: '/formula',
-        component: Layout,
-        redirect: '/formula/edit',
-        children: [{
-            path: 'edit',
-            name: '编辑公式',
+                import ( /* webpackChunkName: "views" */ '@/views/manager/projectinfo/tree')
+        },
+        {
+            path: 'editElement',
+            name: '编辑元素',
             meta: {
-                i18n: 'formula'
+                i18n: 'editElement'
             },
             component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/formula/edit')
-        }]
-    },
-]
+                import ( /* webpackChunkName: "views" */ '@/views/manager/projectinfo/editElement/editElement')
+        }
+    ]
+}, {
+    path: '/formula',
+    component: Layout,
+    redirect: '/formula/edit',
+    children: [{
+        path: 'edit',
+        name: '编辑公式',
+        meta: {
+            i18n: 'formula'
+        },
+        component: () =>
+            import ( /* webpackChunkName: "views" */ '@/views/formula/edit')
+    }]
+}, ]

src/views/certificate/list.vue

@@ -0,0 +1,168 @@
+<template>
+  <basic-container class="list">
+    <div class="flexBetween">
+      <el-button
+        type="primary"
+        size="mini"
+        class="el-icon-plus"
+        @click="pushRouter()"
+      >新增</el-button>
+      <el-select
+        v-model="value"
+        filterable
+        placeholder="请选择"
+        @change="projectChange"
+      >
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.projectName"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+
+    <el-table
+      class="martop20"
+      :data="tableData"
+      header-color='red'
+      style="width: 100%"
+    >
+      <el-table-column
+        type="index"
+        label="序号"
+        width="180"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        label="证书所有者"
+        width="180"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="证书ID"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="证书类型"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="注册"
+      >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="register(scope.row)"
+          >注册</el-button>
+          <el-button
+            type="text"
+            disabled
+          >已注册</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="操作"
+      >
+        <template slot-scope="scope">
+          <el-button type="text">编辑</el-button>
+          <el-button
+            type="text"
+            @click="deleteList(scope.row)"
+            style="color:rgba(240, 99, 10, 1);"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+
+    </el-table>
+    <el-pagination
+      style="float:right"
+      background
+      class="martop20 marbottom20"
+      layout="prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page.sync="pageindex"
+      :page-size="pagesize"
+    >
+    </el-pagination>
+  </basic-container>
+</template>
+
+<script>
+import { queryProjectList, listpage, goRegister } from "@/api/certificate/list";
+
+export default {
+  data () {
+    return {
+      value: '',
+      options: [],
+      tableData: [{}],
+      total: 0,
+      pageindex: 1,
+      pagesize: 20,
+    }
+  },
+  methods: {
+    //#region 页码
+    handleSizeChange (val) {
+      this.pagesize = val
+      this.listpage()
+    },
+    handleCurrentChange (val) {
+      this.pageindex = val
+      this.listpage()
+    },
+    //#endregion
+
+    //#region 列表接口
+    projectChange () {
+      this.listpage()
+    },
+    register () {//注册按钮
+
+    },
+    deleteList () {//删除按钮
+
+    },
+    async queryProjectList () {//获取所有项目
+      const { data: res } = await queryProjectList()
+      console.log(res);
+      if (res.code == 200) {
+        this.options = res.data
+      }
+    },
+    async listpage () {//分页获取证书列表数据
+      const { data: res } = await listpage({
+        current: this.pageindex,
+        size: this.pagesize,
+        projectId: this.value,
+      })
+      console.log(res);
+      if (res.code == 200) {
+        this.tableData = res.data.records
+        this.total = res.data.total
+      }
+    },
+    async goRegister () {//注册
+      const { data: res } = await goRegister({ id: '' })
+    },
+    //#endregion
+  },
+  created () {
+    // this.queryProjectList()
+    this.listpage()
+  },
+}
+</script>
+
+
+<style lang="scss" scoped>
+</style>

src/views/certificate/lists/addList.vue

@@ -0,0 +1,35 @@
+<template>
+  <basic-container class="addList">
+    <el-form
+      ref="form"
+      :model="form"
+      rules="reles"
+      label-width="80px"
+    >
+      <el-form-item label="活动名称">
+        <el-radio-group v-model="form.resource">
+          <el-radio label="1">个人证书</el-radio>
+          <el-radio label="2">企业证书</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+  </basic-container>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      form: {
+
+      },
+      reles: {
+
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/certificate/management.vue

@@ -0,0 +1,3 @@
+<template>
+  <div>电签管理</div>
+</template>

src/views/exctab/excelmodel/excelmodel.vue

@@ -557,7 +557,7 @@ export default {
     async addExcel (data) {//添加
       this.dialogTapType = '新增'
       console.log(data);
-      if (data.fileType != 3 && data.hasChildren) {
+      if (data.fileType == 3) {
         this.wbsmiddle = false
       } else {
         this.wbsmiddle = true

src/views/manager/projectinfo/tree.vue

@@ -1940,11 +1940,9 @@ export default {
         }
       }
       return cellValue;
-      //console.log(cellValue)
     },
 
     filterNode (value, data) {
-      //console.log(value)
       if (!value) return true;
       return data.title.indexOf(value) !== -1;
     },
@@ -2077,7 +2075,7 @@ export default {
         })
       }
     },
-    filterNode222 (GLExcelFromvalue, dataAssociationlist) {
+    filterNode222 (value, data) {
       if (!value) return true;
       return data.name.indexOf(value) !== -1;
     },
@@ -2227,7 +2225,10 @@ export default {
   },
   watch: {
     'GLExcelFrom.search' (val) {
-      this.$refs.tree.filter(val);
+      console.log(val);
+      if (this.exceldata) {
+        this.$refs.tree.filter(val);
+      }
     }
   },
   components: {

src/views/manager/wbsinfo.vue

@@ -1,259 +1,272 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @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"
+      :page.sync="page"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      v-model="form"
+      ref="crud"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @row-del="rowDel"
+      @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"
-                   plain
-                   v-if="permission.wbsinfo_delete"
-                   @click="handleDelete">删 除
+        <el-button
+          type="danger"
+          size="small"
+          icon="el-icon-delete"
+          plain
+          v-if="permission.wbsinfo_delete"
+          @click="handleDelete"
+        >删 除
         </el-button>
       </template>
-      <template slot-scope="{row,index}" slot="menu">
-        <el-button type="text" icon="el-icon-edit" size="mini" v-if="permission.wbsinfo_tree_edit" @click="toEdit(row,index)">编辑wbs库</el-button>
+      <template
+        slot-scope="{row,index}"
+        slot="menu"
+      >
+        <el-button
+          type="text"
+          icon="el-icon-edit"
+          size="mini"
+          v-if="permission.wbsinfo_tree_edit"
+          @click="toEdit(row,index)"
+        >编辑wbs库</el-button>
       </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/manager/wbsinfo";
-  import {mapGetters} from "vuex";
+import { getList, getDetail, add, update, remove } from "@/api/manager/wbsinfo";
+import { mapGetters } from "vuex";
 
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 20,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          menuWidth:300,
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "创建时间",
-              prop: "createTime",
-              editDetail:true,
-              addDisabled:true,
-            },
-            {
-              label: "wsb名称",
-              prop: "wbsName",
-              rules: [{
-                required: true,
-                message: "请输入wsb名称",
-                trigger: "blur"
-              }]
+export default {
+  data () {
+    return {
+      form: {},
+      query: {},
+      loading: true,
+      page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0
+      },
+      selectionList: [],
+      option: {
+        menuWidth: 300,
+        height: 'auto',
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        viewBtn: true,
+        selection: true,
+        dialogClickModal: false,
+        column: [
+          {
+            label: "创建时间",
+            prop: "createTime",
+            editDetail: true,
+            addDisabled: true,
+          },
+          {
+            label: "wbs名称",
+            prop: "wbsName",
+            rules: [{
+              required: true,
+              message: "请输入wbs名称",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "划分类型",
+            type: "select",
+            dicUrl: "/api/blade-system/dict/dictionary?code=wbs_type",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
             },
-            {
-              label: "划分类型",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=wbs_type",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
+            dataType: "number",
+            prop: "wbsType",
+            rules: [{
+              required: true,
+              message: "请选择划分类型",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "是否启用",
+            prop: "status",
+            rules: [{
+              required: true,
+              message: "是否启用",
+              trigger: "blur"
+            }],
+            type: "radio",
+            dicData: [
+              {
+                label: "否",
+                value: 0
               },
-              dataType: "number",
-              prop: "wbsType",
-              rules: [{
-                required: true,
-                message: "请选择划分类型",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否启用",
-              prop: "status",
-              rules: [{
-                required: true,
-                message: "是否启用",
-                trigger: "blur"
-              }],
-              type: "radio",
-              dicData: [
-                {
-                  label: "否",
-                  value: 0
-                },
-                {
-                  label: "是",
-                  value: 1
-                }
-              ],
-            },
-          ]
-        },
-        data: [],
+              {
+                label: "是",
+                value: 1
+              }
+            ],
+          },
+        ]
+      },
+      data: [],
+    };
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList () {
+      return {
+        addBtn: this.vaildData(this.permission.wbsinfo_add, false),
+        viewBtn: this.vaildData(this.permission.wbsinfo_view, false),
+        delBtn: this.vaildData(this.permission.wbsinfo_delete, false),
+        editBtn: this.vaildData(this.permission.wbsinfo_edit, false)
       };
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.wbsinfo_add, false),
-          viewBtn: this.vaildData(this.permission.wbsinfo_view, false),
-          delBtn: this.vaildData(this.permission.wbsinfo_delete, false),
-          editBtn: this.vaildData(this.permission.wbsinfo_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(",");
+    }
+  },
+  methods: {
+    rowSave (row, done, loading) {
+      add(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-        return ids.join(",");
-      }
+        done();
+      }, error => {
+        loading();
+        window.console.log(error);
+      });
     },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
+    rowUpdate (row, index, done, loading) {
+      update(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        console.log(error);
+      });
+    },
+    rowDel (row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
         });
-      },
-      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 => {
-          loading();
-          console.log(error);
+          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: "操作成功!"
-            });
-          });
-      },
-      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();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      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();
-      },
-      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 => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
+    },
+    beforeOpen (done, type) {
+      if (["edit", "view"].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
         });
-      },
-
-      toEdit(row){
-        //console.log(row,index);
-        this.$router.push('/wbs/edit/'+row.id);
       }
+      done();
+    },
+    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();
+    },
+    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 => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+
+    toEdit (row) {
+      //console.log(row,index);
+      this.$router.push('/wbs/edit/' + row.id);
     }
-  };
+  }
+};
 </script>
 
 <style>

src/views/system/user.vue

@@ -150,6 +150,7 @@
               <el-select
                 :disabled="type=='view'"
                 v-model="fromss.roleIds"
+                filterable
                 placeholder="请选择"
               >
                 <el-option
@@ -637,13 +638,14 @@ export default {
                 label: "所属部门",
                 prop: "deptId",
                 type: "tree",
-                multiple: true,
+                // multiple: true,
                 dicData: [],
                 props: {
-                  label: "title"
+                  label: "title",
+                  value: 'value',
                 },
-                checkStrictly: true,
-                slot: true,
+                checkStrictly: false,
+                // slot: true,
                 rules: [{
                   required: true,
                   message: "请选择所属部门",
@@ -1006,18 +1008,18 @@ export default {
         contractName: tas.contractName,
         roleName: tas.roleName
       })
-      this.fromss.projectId = ''
-      this.fromss.contractId = ''
-      this.fromss.roleIds = ''
+      // this.fromss.projectId = ''
+      // this.fromss.contractId = ''
+      // this.fromss.roleIds = ''
     },
-    editKJ (row, index) {//编辑用户
+    async editKJ (row, index) {//编辑用户
       console.log(row);
       this.fromss.userId = row.id  //用户ID
       this.fromss.contractId = ''  //合同段Id
       this.contractData = []       //合同段枚举
-      this.getProjectList()
-      this.treeUser()
-      this.findProjectAndContractList(row.id)
+      this.getProjectList()  //项目类型
+      this.treeUser()  //用户类型枚举
+      this.findProjectAndContractList(row.id)  //编辑获取参建项目
       this.$refs.crud.rowEdit(row, index)
     },
     deleteProject (key, type) {//删除参建项目按钮
@@ -1132,7 +1134,6 @@ export default {
       });
     },
     rowUpdate (row, index, done, loading) {//修改按钮
-      row.deptId = row.deptId.join(",");
       // row.roleId = row.roleId.join(",");
       row.postId = row.postId.join(",");
       let ks = { ...row }
@@ -1296,9 +1297,6 @@ export default {
       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(",");
           }
@@ -1308,7 +1306,6 @@ export default {
         });
       } else {
         this.form.tenantId = this.addData.tenantId
-        this.form.deptId = this.addData.deptId
       }
 
       this.initFlag = true;

vue.config.js

@@ -27,10 +27,10 @@ module.exports = {
             '/api': {
                 //本地服务接口地址
                 // target: 'http://localhost',
-                // target: 'http://192.168.4.6',
+                target: 'http://192.168.4.6',
                 // target: 'http://47.110.251.215:8090',
                 // target: 'http://192.168.4.12',
-                target: 'http://192.168.4.44',
+                // target: 'http://192.168.4.44',
                 //远程演示服务地址,可用于直接启动项目
                 //target: 'https://saber.bladex.vip/api',
                 ws: true,