From 6e9a85f8b9be0f06a148a36306e135785e227a6a Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 13 八月 2025 16:28:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_huangjin' into dev_huangjin
---
src/views/personnelManagement/contractManagement/index.vue | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/views/personnelManagement/contractManagement/index.vue b/src/views/personnelManagement/contractManagement/index.vue
index b52e083..98f0272 100644
--- a/src/views/personnelManagement/contractManagement/index.vue
+++ b/src/views/personnelManagement/contractManagement/index.vue
@@ -12,7 +12,7 @@
</div>
<div>
<!-- <el-button type="primary" @click="openForm('add')">鏂板鍏ヨ亴</el-button>-->
- <el-button type="info" @click="handleImport">瀵煎叆</el-button>
+<!-- <el-button type="info" @click="handleImport">瀵煎叆</el-button>-->
<el-button @click="handleOut">瀵煎嚭</el-button>
<!-- <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>-->
</div>
@@ -65,6 +65,7 @@
</div>
</template>
</el-dialog>
+ <files-dia ref="filesDia"></files-dia>
</div>
</template>
@@ -76,7 +77,7 @@
import { staffOnJobListPage } from "@/api/personnelManagement/employeeRecord.js";
import dayjs from "dayjs";
import { getToken } from "@/utils/auth.js";
-
+import FilesDia from "./filesDia.vue";
const data = reactive({
searchForm: {
staffName: "",
@@ -190,6 +191,7 @@
label: "鎿嶄綔",
align: "center",
fixed: 'right',
+ width: 120,
operation: [
{
name: "璇︽儏",
@@ -198,9 +200,17 @@
openForm("edit", row);
},
},
+ {
+ name: "闄勪欢",
+ type: "text",
+ clickFun: (row) => {
+ openFilesFormDia(row);
+ },
+ },
],
},
]);
+const filesDia = ref()
const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
@@ -221,6 +231,13 @@
}
getList();
};
+// 鎵撳紑闄勪欢寮规
+const openFilesFormDia = (row) => {
+ console.log(row)
+ nextTick(() => {
+ filesDia.value?.openDialog( row,'鍚堝悓')
+ })
+};
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
--
Gitblit v1.9.3