From b41df1de52beaabfc5b9aca50839fe6cc7fcb2b6 Mon Sep 17 00:00:00 2001
From: wuyize <wuyize25@163.com>
Date: Tue, 12 Jul 2022 10:00:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=A1=B9=E7=9B=AE=E4=B8=AD?=
 =?UTF-8?q?=E6=B6=89=E5=8F=8A=E6=97=A5=E6=9C=9F=E7=9A=84=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CreateProjectDialog.vue | 50 +++++++++++++-------------
 src/components/TransferDialog.vue      | 23 +++++++++++-
 src/views/ProjectGroup.vue             | 14 ++++++++
 src/views/ProjectWorkitem.vue          |  2 +-
 4 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/src/components/CreateProjectDialog.vue b/src/components/CreateProjectDialog.vue
index 54958ca..fcaac68 100644
--- a/src/components/CreateProjectDialog.vue
+++ b/src/components/CreateProjectDialog.vue
@@ -79,11 +79,11 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="项目启动日期" required>
-            <el-form-item prop="projectStartTime">
+            <el-form-item prop="projectStartDate">
               <el-date-picker
                   type="date"
                   placeholder="选择日期"
-                  v-model="ruleForm.projectStartTime"
+                  v-model="ruleForm.projectStartDate"
                   style="width: 100%;"
               ></el-date-picker>
             </el-form-item>
@@ -94,11 +94,11 @@
       <el-row>
         <el-col :span="6">
           <el-form-item label="计划上线日期" required>
-            <el-form-item prop="projectOnlineTime">
+            <el-form-item prop="projectOnlineDate">
               <el-date-picker
                   type="date"
                   placeholder="选择日期"
-                  v-model="ruleForm.projectOnlineTime"
+                  v-model="ruleForm.projectOnlineDate"
                   style="width: 100%;"
               ></el-date-picker>
             </el-form-item>
@@ -106,11 +106,11 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="计划初验日期" required>
-            <el-form-item prop="projectFirstTestTime">
+            <el-form-item prop="projectFirstTestDate">
               <el-date-picker
                   type="date"
                   placeholder="选择日期"
-                  v-model="ruleForm.projectFirstTestTime"
+                  v-model="ruleForm.projectFirstTestDate"
                   style="width: 100%;"
               ></el-date-picker>
             </el-form-item>
@@ -118,11 +118,11 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="计划终验日期" required>
-            <el-form-item prop="projectFinalTestTime">
+            <el-form-item prop="projectFinalTestDate">
               <el-date-picker
                   type="date"
                   placeholder="选择日期"
-                  v-model="ruleForm.projectFinalTestTime"
+                  v-model="ruleForm.projectFinalTestDate"
                   style="width: 100%;"
               ></el-date-picker>
             </el-form-item>
@@ -130,11 +130,11 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="计划结项日期" required>
-            <el-form-item prop="projectEndTime">
+            <el-form-item prop="projectEndDate">
               <el-date-picker
                   type="date"
                   placeholder="选择日期"
-                  v-model="ruleForm.projectEndTime"
+                  v-model="ruleForm.projectEndDate"
                   style="width: 100%;"
               ></el-date-picker>
             </el-form-item>
@@ -239,12 +239,12 @@ export default {
         contractAmount: '',//合同额
         expectedCompletion: '',//预期完成度
         projectManMonth: '',//计划总人月
-        projectStartTime: '',//项目启动日期
+        projectStartDate: '',//项目启动日期
 
-        projectOnlineTime: '',//计划上线日期
-        projectFirstTestTime: '',//计划初验日期
-        projectFinalTestTime: '',//计划终验日期
-        projectEndTime: '',//计划结项日期
+        projectOnlineDate: '',//计划上线日期
+        projectFirstTestDate: '',//计划初验日期
+        projectFinalTestDate: '',//计划终验日期
+        projectEndDate: '',//计划结项日期
 
         financialCode: '',//财务编码
         projectDepartment: '',//所属部门
@@ -302,19 +302,19 @@ export default {
             }, trigger: 'blur'
           },
         ],
-        projectStartTime: [//项目启动日期
+        projectStartDate: [//项目启动日期
           {type: 'date', required: true, message: '请选择计划总人月', trigger: 'change'},
         ],
-        projectOnlineTime: [//计划上线日期
+        projectOnlineDate: [//计划上线日期
           {type: 'date', required: true, message: '请选择计划上线日期', trigger: 'change'},
         ],
-        projectFirstTestTime: [//计划初验日期
+        projectFirstTestDate: [//计划初验日期
           {type: 'date', required: true, message: '请选择计划初验日期', trigger: 'change'},
         ],
-        projectFinalTestTime: [//计划终验日期
+        projectFinalTestDate: [//计划终验日期
           {type: 'date', required: true, message: '请选择计划终验日期', trigger: 'change'},
         ],
-        projectEndTime: [//计划结项日期
+        projectEndDate: [//计划结项日期
           {type: 'date', required: true, message: '请选择计划结项日期', trigger: 'change'},
         ],
         financialCode: [//财务编码
@@ -362,11 +362,11 @@ export default {
         if (valid) {
           console.log('submit')
           let { ...form} = this.ruleForm
-          form.projectFinalTestTime = form.projectFinalTestTime.getTime() / 1000
-          form.projectEndTime = form.projectEndTime.getTime() / 1000
-          form.projectFirstTestTime = form.projectFirstTestTime.getTime() / 1000
-          form.projectOnlineTime = form.projectOnlineTime.getTime() / 1000
-          form.projectStartTime = form.projectStartTime.getTime() / 1000
+          form.projectFinalTestDate = form.projectFinalTestDate.getTime() / 1000
+          form.projectEndDate = form.projectEndDate.getTime() / 1000
+          form.projectFirstTestDate = form.projectFirstTestDate.getTime() / 1000
+          form.projectOnlineDate = form.projectOnlineDate.getTime() / 1000
+          form.projectStartDate = form.projectStartDate.getTime() / 1000
           request({
             url: 'project',
             method: 'post',
diff --git a/src/components/TransferDialog.vue b/src/components/TransferDialog.vue
index a3d4884..d7c5e31 100644
--- a/src/components/TransferDialog.vue
+++ b/src/components/TransferDialog.vue
@@ -2,9 +2,28 @@
   <el-dialog
       title="交接"
       v-model="dialogVisible"
-      width="1000px"
+      width="500px"
   >
+    <el-form>
+      <p>交接会将该项目成员的所有带进行和进行中的工作项移交给交接人员，交接人员继承该项目成员所有岗位</p>
+      <el-form-item label="交接人员" prop="taskHolderId">
 
+        <el-select style="width: 100%" v-model="form.taskHolderId" filterable >
+          <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-form>
   </el-dialog>
 </template>
 
@@ -14,7 +33,9 @@ export default {
   props: {
     dialogVisible: Boolean,
     staffId: Number,
+    projectGroup: Array
   },
+
 }
 </script>
 
diff --git a/src/views/ProjectGroup.vue b/src/views/ProjectGroup.vue
index 1aca3bc..cef490f 100644
--- a/src/views/ProjectGroup.vue
+++ b/src/views/ProjectGroup.vue
@@ -80,12 +80,17 @@
       @edited="rehushTableData"
       @onCancel="editJobDialogVisible = false"
   ></EditJobDialog>
+  <TransferDialog>
+      v-model:dialogVisible="transferDialogVisible"
+      :projectGroup="projectGroup"
+  </TransferDialog>
 </template>
 
 <script setup>
 // table元素
 import {nextTick, onMounted, ref} from "vue";
 
+
 const tableRef = ref(null);
 // 总高度
 const leftRef = ref(null);
@@ -119,6 +124,7 @@ import EchartsPie from "../components/echartsPie";
 import request from "../utils/request";
 import CreatePersonDialog from "../components/CreatePersonDialog";
 import EditJobDialog from "../components/EditJobDialog";
+import TransferDialog from "../components/TransferDialog";
 
 export default {
   name: 'ProjectGroup',
@@ -135,13 +141,21 @@ export default {
       editStaffId: Number,
       editStaffPosition: String,
 
+      transferDialogVisible: false,
+      transferStaffId: Number,
+
       tableData: [],
 
     };
   },
+  props: {
+    projectAccessLevel: Number,
+    projectGroup: Array
+  },
   components: {
     CreatePersonDialog,
     EditJobDialog,
+    TransferDialog,
     EchartsPie
   },
   methods: {
diff --git a/src/views/ProjectWorkitem.vue b/src/views/ProjectWorkitem.vue
index b783ac6..367f787 100644
--- a/src/views/ProjectWorkitem.vue
+++ b/src/views/ProjectWorkitem.vue
@@ -181,7 +181,7 @@
   </div>
 
   <el-dialog
-      v-model="dialogVisible"
+      :model-value="dialogVisible"
       :title="form.title"
       width="40%"
       top="60px"