修改发起流程时跳转的路由

oa-ui/src/views/flowable/form/cwTable.vue

@@ -60,7 +60,7 @@
       </tr>
       <tr>
         <td class="table-title">入职年月</td>
-        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate }}</td>
+        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate != null ? tableForm.entryDate.substring(0,10):tableForm.entryDate }}</td>
         <td class="table-title">年龄</td>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.age }}</td>
       </tr>
@@ -518,7 +518,7 @@
       </tr>
     </table>
     <el-row justify="center" type="flex" style="margin-top:20px;"
-      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工修改'">
+      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工填报'">
       <el-button type="primary" @click="submit">提交</el-button>
       <el-button @click="$emit('close')">取消</el-button>
     </el-row>
@@ -535,6 +535,9 @@ export default {
       type: Object,
       required: true
     },
+    taskName:{
+      type:String
+    }
   },
   watch: {
     tableForm: function (newval, oldval) {
@@ -562,25 +565,26 @@ export default {
   },
   methods: {
     initForm() {
-
+      console.log(this.tableForm);
     },
     formatForm() {
-      if (this.tableForm.taskName == '项目负责人审核') {
+      debugger
+      if (this.taskName == '负责人审核') {
         this.isPiLeader = true;
         this.isDeptLeader = false;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '部门审核') {
+      } else if (this.taskName == '部门审核') {
         this.isPiLeader = false;
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '分管领导审核') {
+      } else if (this.taskName == '分管领导审核') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = true;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '员工修改') {
+      } else if (this.taskName == '员工填报') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = false;
@@ -588,12 +592,7 @@ export default {
       }
     },
     submit() {
-      if (!this.isStaff) {
-        this.$emit('submit', this.tableForm);
-      } else {
-        this.$emit('submit', this.tableForm);
-      }
-
+      this.$emit('submit', this.tableForm);
     },
     cancelSelect(value, name) {
       debugger

oa-ui/src/views/flowable/form/jsTable.vue

@@ -588,7 +588,7 @@
       </tr>
     </table>
     <el-row justify="center" type="flex" style="margin-top:20px;"
-      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工修改'">
+      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工填报'">
       <el-button type="primary" @click="submit">提交</el-button>
       <el-button @click="$emit('close')">取消</el-button>
     </el-row>
@@ -635,7 +635,7 @@ export default {
 
     },
     formatForm() {
-      if (this.tableForm.taskName == '项目负责人审核') {
+      if (this.tableForm.taskName == '负责人审核') {
         this.isPiLeader = true;
         this.isDeptLeader = false;
         this.isManager = false;
@@ -650,7 +650,7 @@ export default {
         this.isDeptLeader = false;
         this.isManager = true;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '员工修改') {
+      } else if (this.tableForm.taskName == '员工填报') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = false;

oa-ui/src/views/flowable/form/jyTable.vue

@@ -303,7 +303,7 @@
       </tr>
     </table>
     <el-row justify="center" type="flex" style="margin-top:20px;"
-      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工修改'">
+      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工填报'">
       <el-button type="primary" @click="submit">提交</el-button>
       <el-button @click="$emit('close')">取消</el-button>
     </el-row>
@@ -350,7 +350,7 @@ export default {
 
     },
     formatForm() {
-      if (this.tableForm.taskName == '项目负责人审核') {
+      if (this.tableForm.taskName == '负责人审核') {
         this.isPiLeader = true;
         this.isDeptLeader = false;
         this.isManager = false;
@@ -365,7 +365,7 @@ export default {
         this.isDeptLeader = false;
         this.isManager = true;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '员工修改') {
+      } else if (this.tableForm.taskName == '员工填报') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = false;

oa-ui/src/views/flowable/form/scTable.vue

@@ -1639,7 +1639,7 @@ export default {
         this.isStaff = true;
       }
     },
-    // 员工修改之后传值
+    // 员工填报之后传值
     assignmentToTableForm() {
       debugger
       for(let i in this.tableForm){

oa-ui/src/views/flowable/form/xmTable.vue

@@ -323,7 +323,7 @@
       </tr>
     </table>
     <el-row justify="center" type="flex" style="margin-top:20px;"
-      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工修改'">
+      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工填报'">
       <el-button type="primary" @click="submit">提交</el-button>
       <el-button @click="$emit('close')">取消</el-button>
     </el-row>
@@ -370,7 +370,7 @@ export default {
 
     },
     formatForm() {
-      if (this.tableForm.taskName == '项目负责人审核') {
+      if (this.tableForm.taskName == '负责人审核') {
         this.isPiLeader = true;
         this.isDeptLeader = false;
         this.isManager = false;
@@ -385,7 +385,7 @@ export default {
         this.isDeptLeader = false;
         this.isManager = true;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '员工修改') {
+      } else if (this.tableForm.taskName == '员工填报') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = false;

oa-ui/src/views/flowable/form/zhTable.vue

@@ -743,7 +743,7 @@
       </tr>
     </table>
     <el-row justify="center" type="flex" style="margin-top:20px;"
-      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工修改'">
+      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工填报'">
       <el-button type="primary" @click="submit">提交</el-button>
       <el-button @click="$emit('close')">取消</el-button>
     </el-row>
@@ -790,7 +790,7 @@ export default {
 
     },
     formatForm() {
-      if (this.tableForm.taskName == '项目负责人审核') {
+      if (this.tableForm.taskName == '负责人审核') {
         this.isPiLeader = true;
         this.isDeptLeader = false;
         this.isManager = false;
@@ -805,7 +805,7 @@ export default {
         this.isDeptLeader = false;
         this.isManager = true;
         this.isStaff = false;
-      } else if (this.tableForm.taskName == '员工修改') {
+      } else if (this.tableForm.taskName == '员工填报') {
         this.isPiLeader = false;
         this.isDeptLeader = false;
         this.isManager = false;

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -49,8 +49,8 @@
       <el-table-column label="当前节点" align="center" prop="taskName" />
       <el-table-column label="办理人" align="center">
         <template slot-scope="scope">
-          <label v-if="scope.row.assigneeName">{{ scope.row.assigneeName }} <el-tag type="info"
-              size="mini">{{ scope.row.assigneeDeptName }}</el-tag></label>
+          <label v-if="scope.row.assigneeName">{{ scope.row.assigneeName }} <el-tag type="info" size="mini">{{
+            scope.row.assigneeDeptName }}</el-tag></label>
           <!--          <label v-if="scope.row.candidate">{{scope.row.candidate}}</label>-->
         </template>
       </el-table-column>
@@ -99,7 +99,7 @@
     </el-dialog>
     <el-dialog title="流程详情" :visible.sync="detailsOpen" append-to-body width="600px">
       <el-scrollbar style="height: 600px;">
-      <RowDetail :rows="clickRow"></RowDetail>
+        <RowDetail :rows="clickRow"></RowDetail>
       </el-scrollbar>
     </el-dialog>
   </div>
@@ -114,9 +114,13 @@ import {
   exportDeployment,
   flowRecord
 } from "@/api/flowable/finished";
+import { todoList } from "@/api/flowable/todo";
 import { myProcessList, stopProcess } from "@/api/flowable/process";
 import { listDefinition } from "@/api/flowable/definition";
-import  RowDetail  from './send/rowDetail.vue'
+import { getNextFlowNodeByStart } from "@/api/flowable/todo";
+import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
+import { Snowflake } from '@/utils/snowFlake.js'
+import RowDetail from './send/rowDetail.vue'
 export default {
   name: "Deploy",
   components: {
@@ -182,7 +186,7 @@ export default {
       rules: {
       },
       // 当前点击的行数据
-      clickRow:{}
+      clickRow: {}
     };
   },
   created() {
@@ -260,15 +264,78 @@ export default {
     },
     /**  发起流程申请 */
     handleStartProcess(row) {
-      console.log(row);
-      this.$router.push({
-        path: '/flowable/task/myProcess/send/index',
-        query: {
-          deployId: row.deploymentId,
-          procDefId: row.id,
-          name: row.name
-        }
-      })
+      if (row.category == "assess") {
+        getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: {} }).then(res => {
+          let data = res.data
+          if (data.dataType === 'dynamic') {
+            if (data.type === 'assignee') { // 指定人员
+              this.checkSendUser = true;
+              this.checkType = "single";
+            } else if (data.type === 'candidateUsers') {  // 候选人员(多个)
+              this.checkSendUser = true;
+              this.checkType = "multiple";
+            } else if (data.type === 'candidateGroups') { // 指定组(所属角色接收任务)
+              this.checkSendRole = true;
+            } else { // 会签
+              // 流程设计指定的 elementVariable 作为会签人员列表
+              this.multiInstanceVars = data.vars;
+              this.checkSendUser = true;
+              this.checkType = "multiple";
+            }
+            this.taskOpen = true;
+            this.taskTitle = "选择任务接收";
+          } else {
+            const variables = {};
+            const formData = {};
+            formData.disabled = true;
+            formData.formBtns = false;
+            if (row.id) {
+              variables.variables = formData;
+              // 启动流程并将表单数据加入流程变量
+              definitionStart(row.id, JSON.stringify(variables)).then(res => {
+                debugger
+                this.$modal.msgSuccess(res.msg);
+                let procInstanceId = res.data;
+                todoList({
+                  pageNum: 1,
+                  pageSize: 99999999, processInsId: procInstanceId
+                }).then(toDoRes => {
+                  let records = toDoRes.data.records;
+                  if(records.length == 1){
+                    records = records[0]
+                  }
+                  console.log(records);
+                  this.$router.push({
+                    path: '/flowable/task/todo/detail/index',
+                    query: {
+                      procInsId: records.procInsId,
+                      executionId: records.executionId,
+                      deployId: records.deployId,
+                      taskId: records.taskId,
+                      taskName: records.taskName,
+                      startUser: records.startUserName + '-' + records.startDeptName,
+                      formId: new Snowflake(1n, 1n, 0n).nextId().toString(),
+                      procDefName: records.procDefName
+                    }
+                  })
+                })
+                // this.goBack();
+                // this.$router.push({
+                //   path: '/flowable/task/myProcess/send/index',
+                //   query: {
+                //     deployId: row.deploymentId,
+                //     procDefId: row.id,
+                //     name: row.name
+                //   }
+                // })
+              })
+            }
+          }
+        })
+      }else{
+        
+      }
+
     },
     /**  取消流程申请 */
     handleStop(row) {
@@ -290,7 +357,6 @@ export default {
       //     taskId: row.taskId
       //   }
       // })
-      console.log(row);
       this.clickRow = row;
       this.detailsOpen = true;
     },

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -10,7 +10,18 @@
       <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
         <el-tab-pane label="表单信息" name="1">
-          <ScTable :tableForm="tableForm" @submit="handleComplete"></ScTable>
+          <sc-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
+            v-if="taskForm.procDefName == '生产部门考核'"></sc-table>
+          <jy-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
+            v-else-if="taskForm.procDefName == '经营发展部考核'"></jy-table>
+          <js-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
+            v-else-if="taskForm.procDefName == '技术质量部考核'"></js-table>
+          <xm-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
+            v-else-if="taskForm.procDefName == '项目管理部考核'"></xm-table>
+          <cw-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
+            v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
+          <zh-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
+            v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
           <el-row type="flex" justify="center" v-if="taskName != '员工填报'">
             <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
               @click="handleComplete">审核通过
@@ -140,8 +151,13 @@ import {
 import flow from '@/views/flowable/task/todo/detail/flow'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { listUser } from "@/api/system/user";
-import { getAssess, modifyAssess, submitAssess } from '@/api/oa/assess/assess';
+import { getAssess, modifyAssess, submitAssess, listAssess } from '@/api/oa/assess/assess';
 import ScTable from "../../../form/scTable.vue";
+import JyTable from "../../../form/jyTable.vue";
+import ZhTable from "../../../form/zhTable.vue";
+import JsTable from "../../../form/jsTable.vue";
+import XmTable from "../../../form/xmTable.vue";
+import CwTable from "../../../form/cwTable.vue";
 
 export default {
   name: "Record",
@@ -150,7 +166,12 @@ export default {
     flow,
     FlowUser,
     FlowRole,
-    ScTable
+    ScTable,
+    ZhTable,
+    JsTable,
+    XmTable,
+    CwTable,
+    JyTable
   },
   props: {},
   data() {
@@ -227,10 +248,12 @@ export default {
       this.taskForm.executionId = this.$route.query.executionId;
       this.taskForm.instanceId = this.$route.query.procInsId;
       this.taskForm.formId = this.$route.query.formId;
+      this.taskForm.procDefName = this.$route.query.procDefName;
       // 流程任务获取变量信息
       if (this.taskForm.taskId) {
         this.processVariables(this.taskForm.taskId)
         this.getFlowTaskForm(this.taskForm.taskId)
+        console.log(this.taskForm.formId);
         this.getAssessByAssessId(this.taskForm.formId)
       }
       this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
@@ -326,12 +349,15 @@ export default {
     getAssessByAssessId(formId) {
       getAssess(formId).then(res => {
         let data = res.data;
+        debugger
         for (let d in data) {
           if (d.includes('role')) {
-            data[d] = data[d].split(',')
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = data[d].split(',')
           }
           if (d.includes('familiar')) {
-            data[d] = parseInt(data[d])
+            if (data[d] != "" && data[d] != undefined && data[d] != null)
+              data[d] = parseInt(data[d])
           }
         }
         this.tableForm = data;
@@ -344,10 +370,12 @@ export default {
       // this.completeOpen = true;
       // this.completeTitle = "流程审批";
       // this.submitForm(null);
+      debugger
       let formData = new FormData();
+      this.tableForm.formId = this.tableForm.assessId;
       let form = JSON.stringify(this.tableForm);
       formData.append("form", form);
-      this.submitForm(formData);
+      this.submitForm(formData, this.tableForm.assessId);
     },
     /** 用户审批任务 */
     taskComplete() {
@@ -456,9 +484,18 @@ export default {
       this.returnTaskList = [];
     },
     /** 申请流程表单数据提交 */
-    submitForm(formData) {
-      modifyAssess(formData).then(res => {
-      });
+    submitForm(formData, assessId) {
+      debugger
+      listAssess({ assessId }).then(result => {
+        let list = result;
+        if (list.total != 0) {
+          modifyAssess(formData).then(res => {
+          });
+        }else{
+          submitAssess(formData)
+        }
+      })
+
       if (this.taskForm.variables === null) {
         this.taskForm.variables = {};
       }

oa-ui/src/views/flowable/task/todo/index.vue

@@ -120,6 +120,7 @@ export default {
     handleProcess(row) {
       getProcessVariables(row.taskId).then(res => {
         console.log(row);
+        console.log(res);
         this.$router.push({
           path: '/flowable/task/todo/detail/index',
           query: {
@@ -129,7 +130,8 @@ export default {
             taskId: row.taskId,
             taskName: row.taskName,
             startUser: row.startUserName + '-' + row.startDeptName,
-            formId: res.data.formId
+            formId: res.data.formId,
+            procDefName: row.procDefName
           }
         })
       })

oa-ui/src/views/system/user/index.vue

@@ -4,75 +4,35 @@
       <!--部门数据-->
       <el-col :span="4" :xs="24">
         <div class="head-container">
-          <el-input
-            v-model="deptName"
-            placeholder="请输入部门名称"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
+            style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
-          <el-tree
-            :data="deptOptions"
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            node-key="id"
-            default-expand-all
-            highlight-current
-            @node-click="handleNodeClick"
-          />
+          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+            :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+            @node-click="handleNodeClick" />
         </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="用户名称" prop="userName">
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入用户名称"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
+            <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="手机号码" prop="phonenumber">
-            <el-input
-              v-model="queryParams.phonenumber"
-              placeholder="请输入手机号码"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
+            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="状态" prop="status">
-            <el-select
-              v-model="queryParams.status"
-              placeholder="用户状态"
-              clearable
-              style="width: 240px"
-            >
-              <el-option
-                v-for="dict in dict.type.sys_normal_disable"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+            <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
+              <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="dateRange"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
+            <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -82,56 +42,24 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['system:user:add']"
-            >新增</el-button>
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+              v-hasPermi="['system:user:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
-            >修改</el-button>
+            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+              v-hasPermi="['system:user:edit']">修改</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-            >删除</el-button>
+            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+              v-hasPermi="['system:user:remove']">删除</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              type="info"
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-              v-hasPermi="['system:user:import']"
-            >导入</el-button>
+            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
+              v-hasPermi="['system:user:import']">导入</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['system:user:export']"
-            >导出</el-button>
+            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+              v-hasPermi="['system:user:export']">导出</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
@@ -139,18 +67,18 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"
+            width="120" />
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.status"
-                active-value="0"
-                inactive-value="1"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
+              <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+                @change="handleStatusChange(scope.row)"></el-switch>
             </template>
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
@@ -158,28 +86,14 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="操作"
-            align="center"
-            width="160"
-            class-name="small-padding fixed-width"
-          >
+          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
-              >修改</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
-              >删除</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:user:edit']">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['system:user:remove']">删除</el-button>
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+                v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
@@ -192,13 +106,8 @@
           </el-table-column>
         </el-table>
 
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          @pagination="getList" />
       </el-col>
     </el-row>
 
@@ -242,7 +151,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
             </el-form-item>
           </el-col>
         </el-row>
@@ -250,23 +159,16 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择性别">
-                <el-option
-                  v-for="dict in dict.type.sys_user_sex"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
+                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value"
+                  :label="dict.value">{{ dict.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -275,12 +177,8 @@
           <el-col :span="12">
             <el-form-item label="技术职称">
               <el-select v-model="form.titles" multiple placeholder="请输入技术职称">
-                <el-option
-                  v-for="dict in dict.type.sys_user_titles"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
+                <el-option v-for="dict in dict.type.sys_user_titles" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -294,28 +192,19 @@
           <el-col :span="12">
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
-                <el-option
-                  v-for="item in postOptions"
-                  :key="item.postId"
-                  :label="item.postName"
-                  :value="item.postId"
-                  :disabled="item.status == 1"
-                ></el-option>
+                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
+                  :disabled="item.status == 1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="岗级" prop="engineerLevel">
               <el-select v-model="form.engineerLevel" placeholder="请输入岗级">
-                <el-option
-                  v-for="dict in dict.type.sys_user_engineerlevel"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
+                <el-option v-for="dict in dict.type.sys_user_engineerlevel" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
-          </el-col>          
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -326,16 +215,12 @@
           <el-col :span="12" v-if="pm">
             <el-form-item label="等级" prop="pmLevel">
               <el-select v-model="form.pmLevel" placeholder="请输入项目经理等级">
-                <el-option
-                  v-for="dict in dict.type.sys_user_pmlevel"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
+                <el-option v-for="dict in dict.type.sys_user_pmlevel" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="角色">
               <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
                 <el-option
@@ -347,7 +232,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col> -->
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -365,18 +250,9 @@
 
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
@@ -384,7 +260,8 @@
             <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+            @click="importTemplate">下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -527,10 +404,10 @@ export default {
     getList() {
       this.loading = true;
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.userList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
+        this.userList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      }
       );
     },
     /** 查询部门下拉树结构 */
@@ -552,11 +429,11 @@ export default {
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function () {
         return changeUserStatus(row.userId, row.status);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
+      }).catch(function () {
         row.status = row.status === "0" ? "1" : "0";
       });
     },
@@ -636,9 +513,12 @@ export default {
         this.roleOptions = response.roles;
         this.$set(this.form, "postIds", response.postIds);
         this.$set(this.form, "roleIds", response.roleIds);
-        for (let i = 0; i < response.data.titles.split(",").length; i++)
-          this.titles[i] = response.data.titles.split(",")[i]
-        this.$set(this.form, "titles", this.titles);
+        debugger
+        if (response.data.titles != "" && response.data.titles != undefined && response.data.titles != null) {
+          for (let i = 0; i < response.data.titles.split(",").length; i++)
+            this.titles[i] = response.data.titles.split(",")[i]
+          this.$set(this.form, "titles", this.titles);
+        }
         this.open = true;
         this.title = "修改用户";
         this.form.password = "";
@@ -653,18 +533,18 @@ export default {
         inputPattern: /^.{5,20}$/,
         inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
       }).then(({ value }) => {
-          resetUserPwd(row.userId, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
-          });
-        }).catch(() => {});
+        resetUserPwd(row.userId, value).then(response => {
+          this.$modal.msgSuccess("修改成功，新密码是：" + value);
+        });
+      }).catch(() => { });
     },
     /** 分配角色操作 */
-    handleAuthRole: function(row) {
+    handleAuthRole: function (row) {
       const userId = row.userId;
       this.$router.push("/system/user-auth/role/" + userId);
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
@@ -687,12 +567,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
         return delUser(userIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {