From 968fc8d3c22c69cd6ff8bfa0860dac1d81c19b58 Mon Sep 17 00:00:00 2001
From: wuyize <wuyize25@163.com>
Date: Fri, 8 Jul 2022 09:33:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C=E9=A1=B9?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=97=B6=E5=8F=AF=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Project.vue         |  7 +++++--
 src/views/ProjectWorkitem.vue | 25 +++++++++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/views/Project.vue b/src/views/Project.vue
index f016f8e..b78938a 100644
--- a/src/views/Project.vue
+++ b/src/views/Project.vue
@@ -57,7 +57,10 @@
         </div>
       </el-header>
       <el-main style="overflow: unset">
-        <router-view :projectAccessLevel="projectAccessLevel"></router-view>
+        <router-view
+            :projectAccessLevel="projectAccessLevel"
+            :projectGroup="projectGroup"
+        ></router-view>
       </el-main>
     </el-container>
   </el-container>
@@ -135,7 +138,7 @@ export default {
 
       }).then(response => {
         if (response.data.code === 200) {
-          that.projectGroup = response.data.data
+          that.projectGroup = response.data.data.records
         }
       }).catch(function (error) {
         console.log(error)
diff --git a/src/views/ProjectWorkitem.vue b/src/views/ProjectWorkitem.vue
index 5a3c16b..9ec5269 100644
--- a/src/views/ProjectWorkitem.vue
+++ b/src/views/ProjectWorkitem.vue
@@ -195,7 +195,21 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="负责人">
-            <el-input v-model="form.taskHolderId" :disabled="form.disabled"/>
+
+            <el-select style="width: 100%" v-model="form.taskHolderId" filterable :disabled="form.disabled">
+              <el-option
+                  v-for="member in projectGroup"
+                  :key="member.staffId"
+                  :label="member.staffFullname"
+                  :value="member.staffId"
+              >
+                <span style="float: left">{{ member.staffFullname }}</span>
+                <span
+                    style="float: right;color: var(--el-text-color-secondary);font-size: 13px;"
+                >{{ member.staffUsername }}</span
+                >
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -323,19 +337,23 @@ export default {
   name: "ProjectWorkitem",
   props: {
     projectAccessLevel: Number,
+    projectGroup: []
   },
   data() {
     return {
       dialogVisible: false,
       form: {},
       workitems: [],
-      defaultTime: new Date(1870, 1, 1, 12, 0, 0),
+      defaultTime: new Date(1970, 1, 1, 12, 0, 0),
       maps: new Map()
     }
   },
   watch: {
     projectAccessLevel: function (val) {
       this.getWorkitems() // 接收父组件的值
+    },
+    projectGroup: function (val) {
+
     }
   },
   created() {
@@ -585,8 +603,7 @@ export default {
             that.getWorkitems()
           } else {
             //console.log(that.$refs.tableRef.store.states.lazyTreeNodeMap)
-            if(that.$refs.tableRef.store.states.lazyTreeNodeMap.value[row.taskFatherId].length===1)
-            {
+            if (that.$refs.tableRef.store.states.lazyTreeNodeMap.value[row.taskFatherId].length === 1) {
               that.$refs.tableRef.store.states.lazyTreeNodeMap.value[row.taskFatherId] = []
             }
             let rtr = that.maps.get(row.taskFatherId);