From dea1172cddd271ba8aee1494c3f36dcc45ff4c09 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Sat, 15 Jun 2024 13:48:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=92=8C=E8=BD=A6=E8=BE=86=E9=BB=91=E7=99=BD=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E4=B8=8B=E5=8F=91=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectFront/carManage/carManage.vue | 9 + .../laborManage/dataValidation.vue | 670 ++--- .../personModule/administration.vue | 2171 ++++++++++++----- .../personModule/laborComponent.vue | 104 +- .../projectFront/laborManage/rosterNew.vue | 22 +- 5 files changed, 2088 insertions(+), 888 deletions(-) diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue index 024aceff..4f56de5a 100644 --- a/src/views/projectFront/carManage/carManage.vue +++ b/src/views/projectFront/carManage/carManage.vue @@ -249,6 +249,8 @@ ? 'red' : row.sendSuccessStatus === 3 ? 'yellow' + : row.sendSuccessStatus === 4 + ? 'red' : '', ]" > @@ -259,6 +261,8 @@ ? "失败" : row.sendSuccessStatus === 3 ? "部分成功" + : row.sendSuccessStatus === 4 + ? '未下发' : "" }} @@ -1075,6 +1079,8 @@ ? 'red' : entityDetail.sendSuccessStatus === 3 ? 'yellow' + : entityDetail.sendSuccessStatus === 4 + ? 'red' : '', ]" > @@ -1085,6 +1091,8 @@ ? "失败" : entityDetail.sendSuccessStatus === 3 ? "部分成功" + : entityDetail.sendSuccessStatus === 4 + ? '未下发' : "" }} @@ -1310,6 +1318,7 @@ export default { }; return { sendStatusArr: [ + { name: "未下发", value: 4 }, { name: "成功", value: 1 }, { name: "失败", value: 2 }, { name: "部分成功", value: 3 }, diff --git a/src/views/projectFront/laborManage/dataValidation.vue b/src/views/projectFront/laborManage/dataValidation.vue index 7ecb904e..3db5a386 100644 --- a/src/views/projectFront/laborManage/dataValidation.vue +++ b/src/views/projectFront/laborManage/dataValidation.vue @@ -1,331 +1,415 @@ diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index f9664de7..6e6bb196 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -4,18 +4,37 @@
- - + + - - + +
@@ -50,8 +69,15 @@ />
--> - + {{ data.enterpriseName }}
- {{ $t("message.laborMange.newDepartment") }} -
-
+ {{ $t("message.laborMange.newDepartment") }} +
+
{{ $t("message.laborMange.allDepartments") }}
-
({{ teamListData.totalWorkerNum }})
+
+ ({{ teamListData.totalWorkerNum }}) +
-
- +
+ {{ item.departmentName }}
{{ item.departmentName }}
@@ -140,19 +195,33 @@
-
- +
+ {{ $t("message.laborMange.edit") }}
-
- +
+ {{ $t("message.laborMange.delete") }}
@@ -161,94 +230,226 @@
- + position: absolute; + right: 10px; + top: 35%; + font-size: 26px; + cursor: pointer; + color: #999; + " + >
- + style="font-size: 26px; cursor: pointer; color: #999" + >
-
+ +
- {{ - $t("message.laborMange.personnelEntry") }} - - {{ - $t("message.laborMange.export") + $t("message.laborMange.template") -}} - - - {{ $t("message.laborMange.bulkImport") }} + }" + type="primary" + size="medium" + @click="personnelEntry" + :disabled="checkedTeamId == 0" + >{{ $t("message.laborMange.personnelEntry") }} + + {{ + $t("message.laborMange.export") + + $t("message.laborMange.template") + }} + + + {{ $t("message.laborMange.bulkImport") }} - 导入照片 - 下发通行设备 - - + 导入照片 + 下发通行设备 + 全选 +
+ + + + + + - - - - + + + + - + - - - - - + + + + + - + - + - + - {{ $t("message.laborMange.inquire") }} + {{ $t("message.laborMange.inquire") }} - {{ scope.row.workerName - }} - {{ parseCode(scope.row.codeState)[1] }} + {{ scope.row.workerName }} + {{ parseCode(scope.row.codeState)[1] }}
{{ scope.row.sex == 1 - ? $t("message.laborMange.man") - : $t("message.laborMange.female") + ? $t("message.laborMange.man") + : $t("message.laborMange.female") }} - {{ scope.row.age }}{{ $t("message.laborMange.age") }} + {{ scope.row.age + }}{{ $t("message.laborMange.age") }} {{ scope.row.nation }}
@@ -318,8 +558,8 @@ {{ $t("message.laborMange.workingState") }}: {{ scope.row.inserviceType == 1 - ? $t("message.laborMange.onJob") - : $t("message.laborMange.dimission") + ? $t("message.laborMange.onJob") + : $t("message.laborMange.dimission") }}
@@ -329,25 +569,32 @@