From efc0b77542dc21e7786992f4f6a5df86c72ebaf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Thu, 30 Jun 2022 17:42:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E6=94=BE=E5=88=B0?=
 =?UTF-8?q?=E5=A4=96=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../companyFront/peopleManage/peopleManage.vue   |  1 +
 src/views/projectAdmin/projectIndex.vue          |  1 -
 .../laborManage/personModule/administration.vue  |  7 ++++---
 .../laborManage/personModule/laborComponent.vue  | 16 +++++++++++++---
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/views/companyFront/peopleManage/peopleManage.vue b/src/views/companyFront/peopleManage/peopleManage.vue
index b10ce227..dfcf1fae 100644
--- a/src/views/companyFront/peopleManage/peopleManage.vue
+++ b/src/views/companyFront/peopleManage/peopleManage.vue
@@ -762,6 +762,7 @@ export default {
         sn: sn,
         projectName: this.formInline.projectName,
       }).then((res) => {
+        console.log('培训人数',res)
         if (res.result) {
           this.statictisData = res.result;
           console.log(this.statictisData, '列表数据')
diff --git a/src/views/projectAdmin/projectIndex.vue b/src/views/projectAdmin/projectIndex.vue
index 97ef40e5..222b9b46 100644
--- a/src/views/projectAdmin/projectIndex.vue
+++ b/src/views/projectAdmin/projectIndex.vue
@@ -116,7 +116,6 @@ import {
 import {
   getDockingUrlApi
 } from "@/assets/js/api/configManage";
-import Axios from "axios";
 export default {
   name: "projectIndex",
   components: { vhead },
diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index 68221608..e95a84c4 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -452,7 +452,7 @@
                     <img src="@/assets/images/icon-edit.png" style="margin-right:5px" />
                     <span>{{$t('message.laborMange.edit')}}</span>
                   </div> -->
-
+                  <!-- 再次进场 -->
                   <el-button
                     class="operationText"
                     type="text"
@@ -1684,6 +1684,7 @@
 </template>
 
 <script>
+import axios from 'axios'
 import {
   deleteTeamInfo,
   editTeamInfo,
@@ -2514,8 +2515,7 @@ export default {
           return false;
         }
       });
-    },
-
+    },     
     //编辑 人员信息
     editWorkerInfo(value, type) {
       this.personDialogTitle = this.$t(
@@ -2554,6 +2554,7 @@ export default {
         personSerial: "",
       };
       this.getUfaceDevList();
+      this.goTwo();
       this.addPersonDialog = true;
       this.personForm = JSON.parse(JSON.stringify(value));
       this.personForm.sex = Number(value.sex);
diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue
index e5a85d7f..f792f3fe 100644
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@@ -336,7 +336,7 @@
                 type="primary"
                 :disabled="checkedWorker.length == 0"
                 @click="issuePersonFn"
-                v-if="!key"
+                v-if="key"
                 >{{ $t("message.laborMange.aKeyIssued") }}</el-button
               >
             </el-form-item>
@@ -477,7 +477,7 @@
                     type="primary"
                     size="mini"
                     @click="issuePersonOneFn(scope.row.id)"
-                    v-if="!key"
+                    v-if="key"
                     >{{ $t("message.laborMange.aKeyIssued") }}</el-button
                   >
                 </div>
@@ -497,7 +497,7 @@
                 </div> -->
                 <div
                   class="personItemBottom"
-                  v-if="!key"
+                  v-if="key"
                 >
                   <el-checkbox
                     v-model="scope.row.isUploadHousing"
@@ -2260,6 +2260,7 @@ import {
   updateByIdWorkerInfo,
   sendBatchWokerApi
 } from "@/assets/js/api/laborPerson";
+import axios from 'axios'
 import {
   selectUserDevAuthorityByUserIdApi,
   exporExcelWorkerTemplateApi,
@@ -3326,6 +3327,15 @@ export default {
     },
     //编辑 人员信息 按钮
     editWorkerInfo(value, type) {
+      console.log('当前行',value)
+      // 点击再次进场同时再发一个请求
+            axios({
+               method:"GET",
+               originId : value.id,
+               url:'http://192.168.34.148:8080/workerReEntry'
+              }).then((res)=>{
+            console.log('调用成功了吗',res)
+          })
       this.personDialogTitle = this.$t("message.laborMange.editCrewInfo");
       this.titleType = "edit";
       this.personForm = {