From 4cc27f93a1901e12eb12a198029911c483dd991f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 27 八月 2025 14:30:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_JLMY' into dev_JLMY
---
src/views/personnelManagement/contractManagement/components/formDia.vue | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/views/personnelManagement/contractManagement/components/formDia.vue b/src/views/personnelManagement/contractManagement/components/formDia.vue
index 6538273..1770ad3 100644
--- a/src/views/personnelManagement/contractManagement/components/formDia.vue
+++ b/src/views/personnelManagement/contractManagement/components/formDia.vue
@@ -18,6 +18,14 @@
<el-button @click="closeDia">鍙栨秷</el-button>
</div>
</template>
+ <fileUpload
+ ref="fileUploadRef"
+ :fileSize="1024"
+ :fileType="['pdf', 'docx', 'txt', 'xlsx', 'pptx....']"
+ :limit="10"
+ :drag="false"
+ v-model:modelValue="modelValue"
+ />
</el-dialog>
</div>
</template>
@@ -25,6 +33,8 @@
<script setup>
import {ref} from "vue";
import {staffOnJobInfo} from "@/api/personnelManagement/employeeRecord.js";
+import PIMTable from "@/components/PIMTable/PIMTable.vue";
+import fileUpload from "@/components/FileUpload/index.vue";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
@@ -56,6 +66,19 @@
tableData.value = res.data
})
}
+
+ // if (operationType.value === 'edit') {
+ // tableLoading.value = true; // 娣诲姞鍔犺浇鐘舵��
+ // staffOnJobInfo({staffNo: row.staffNo}).then(res => {
+ // tableLoading.value = false;
+ // // 灏嗗璞℃暟鎹浆鎹负鏁扮粍鏍煎紡
+ // tableData.value = [res.data];
+ // }).catch(err => {
+ // tableLoading.value = false;
+ // console.error('鑾峰彇璇︽儏澶辫触:', err);
+ // proxy.$modal.msgError('鑾峰彇璇︽儏鏁版嵁澶辫触');
+ // })
+ // }
}
// 鍏抽棴寮规
--
Gitblit v1.9.3