From 981e8a2edf62b91bafab7191db7058e2f6921b6b Mon Sep 17 00:00:00 2001
From: chiyilin <2449182606@qq.com>
Date: Mon, 9 Oct 2023 15:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ea/electronicContracts/index.vue | 15 +-
src/views/ea/electronicEmployee/index.vue | 589 ++++++++++++++-------
2 files changed, 403 insertions(+), 201 deletions(-)
diff --git a/src/views/ea/electronicContracts/index.vue b/src/views/ea/electronicContracts/index.vue
index c88a4cfc..fa104aa6 100644
--- a/src/views/ea/electronicContracts/index.vue
+++ b/src/views/ea/electronicContracts/index.vue
@@ -152,22 +152,22 @@
-
- {{dateArray(scope.row.signDate) }}
+ {{ parseTime(scope.row.signDate) }}
+
-
- {{dateArray(scope.row.effectiveDate) }}
+ {{ parseTime(scope.row.effectiveDate) }}
+
-
- {{dateArray(scope.row.expiryDate) }}
+ {{ parseTime(scope.row.expiryDate) }}
+
@@ -652,6 +652,9 @@ export default {
const id = row.id;
getElectronicContracts(id).then(response => {
this.form = response.data;
+ this.form.signDate =
+ this.form.effectiveDate
+ this.form.expiryDate
this.open = true;
this.title = "修改合同档案";
});
diff --git a/src/views/ea/electronicEmployee/index.vue b/src/views/ea/electronicEmployee/index.vue
index ce4a107c..d1f7d7ed 100644
--- a/src/views/ea/electronicEmployee/index.vue
+++ b/src/views/ea/electronicEmployee/index.vue
@@ -2,19 +2,21 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -26,39 +28,62 @@
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
@@ -71,51 +96,61 @@
新增
+ v-hasPermi="['ea:electronic-employee:create']">新增
+
- 导出
+ 导出
+
-
+
{{ parseTime(scope.row.createTime) }}
-
-
-
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
修改
+ v-hasPermi="['ea:electronic-employee:update']">修改
+
删除
+ v-hasPermi="['ea:electronic-employee:delete']">删除
+
@@ -124,145 +159,288 @@
@pagination="getList"/>
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- {{dict.label}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 请选择字典生成
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+