添加变量"创建者负责人"

src/components/wfd/components/DetailPanel/HandleNodeDetail.vue

@@ -155,7 +155,10 @@ export default {
     return {
     return {
       variableOptions: [{
       variableOptions: [{
         value: 1,
         value: 1,
-        label: '创建人'
+        label: '创建者'
+      }, {
+        value: 1,
+        label: '创建者负责人'
       }]
       }]
     }
     }
   }
   }

src/components/wfd/components/DetailPanel/UserTaskDetail.vue

@@ -147,7 +147,10 @@ export default {
     return {
     return {
       variableOptions: [{
       variableOptions: [{
         value: 1,
         value: 1,
-        label: '创建人'
+        label: '创建者'
+      }, {
+        value: 2,
+        label: '创建者负责人'
       }]
       }]
     }
     }
   }
   }

src/views/system/dept/index.vue

@@ -109,7 +109,14 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
             <el-form-item label="负责人" prop="leader">
-              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
+              <el-select v-model="form.leader" clearable filterable placeholder="请选择负责人">
+                <el-option
+                  v-for="item in users"
+                  :key="item.userId"
+                  :label="item.nickName"
+                  :value="item.userId"
+                />
+              </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
@@ -133,6 +140,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
+import { listUser } from '@/api/system/sysuser'
 import { getDeptList, getDept, delDept, addDept, updateDept } from '@/api/system/dept'
 import { getDeptList, getDept, delDept, addDept, updateDept } from '@/api/system/dept'
 import Treeselect from '@riophae/vue-treeselect'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -158,6 +166,7 @@ export default {
         deptName: undefined,
         deptName: undefined,
         status: undefined
         status: undefined
       },
       },
+      users: [],
       // 表单参数
       // 表单参数
       form: {},
       form: {},
       // 表单校验
       // 表单校验
@@ -168,6 +177,9 @@ export default {
         deptName: [
         deptName: [
           { required: true, message: '部门名称不能为空', trigger: 'blur' }
           { required: true, message: '部门名称不能为空', trigger: 'blur' }
         ],
         ],
+        leader: [
+          { required: true, message: '部门负责人不能为空', trigger: 'blur' }
+        ],
         sort: [
         sort: [
           { required: true, message: '菜单顺序不能为空', trigger: 'blur' }
           { required: true, message: '菜单顺序不能为空', trigger: 'blur' }
         ],
         ],
@@ -200,6 +212,14 @@ export default {
         this.loading = false
         this.loading = false
       })
       })
     },
     },
+    // 查询用户
+    getUsers() {
+      listUser({
+        pageSize: 999999
+      }).then(response => {
+        this.users = response.data.list
+      })
+    },
     /** 转换部门数据结构 */
     /** 转换部门数据结构 */
     normalizer(node) {
     normalizer(node) {
       if (node.children && !node.children.length) {
       if (node.children && !node.children.length) {
@@ -251,6 +271,7 @@ export default {
     },
     },
     /** 新增按钮操作 */
     /** 新增按钮操作 */
     handleAdd(row) {
     handleAdd(row) {
+      this.getUsers()
       this.reset()
       this.reset()
       this.getTreeselect('add')
       this.getTreeselect('add')
       if (row !== undefined) {
       if (row !== undefined) {
@@ -262,11 +283,15 @@ export default {
     },
     },
     /** 修改按钮操作 */
     /** 修改按钮操作 */
     handleUpdate(row) {
     handleUpdate(row) {
+      this.getUsers()
       this.reset()
       this.reset()
       this.getTreeselect('update')
       this.getTreeselect('update')
 
 
       getDept(row.deptId).then(response => {
       getDept(row.deptId).then(response => {
         this.form = response.data
         this.form = response.data
+        if (this.form.leader === 0) {
+          this.form.leader = ''
+        }
         this.open = true
         this.open = true
         this.title = '修改部门'
         this.title = '修改部门'
         this.isEdit = true
         this.isEdit = true