From 077a9af4717bed36efcf1a6fc420de2b679cf467 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 12 三月 2025 15:39:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelInformation/index.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelInformation/index.vue b/src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelInformation/index.vue
index 7b60dff..a6cd688 100644
--- a/src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelInformation/index.vue
+++ b/src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelInformation/index.vue
@@ -787,17 +787,15 @@
})
},
beforeAvatarUpload(file) {
- const isJPGorPNG = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif';
- const isLt2MB = file.size / 1024 / 1024 < 2;
- if (!isJPGorPNG) {
- this.$message.error('涓婁紶鍥剧墖鍙兘鏄� JPG/PNG 鏍煎紡!');
- return false;
+ let flag = true
+ if (file.size > 1024 * 1024 * 10) {
+ this.$message.error('涓婁紶鏂囦欢涓嶈秴杩�10M');
+ this.$refs.upload.clearFiles()
+ flag = false
}
- // if (!isLt2MB) {
- // this.$message.error('涓婁紶鍥剧墖澶у皬涓嶈兘瓒呰繃 2MB!');
- // }
- // 鏍￠獙閫氳繃鎵嶈繑鍥� true锛屽厑璁告枃浠朵笂浼�
- return isJPGorPNG && isLt2MB;
+ if (!flag) {
+ return Promise.reject(flag); //姝ｇ‘鐨勭粓姝�
+ }
},
downloadFile(fileName) {
this.$download.saveAs(fileName, fileName)
@@ -849,8 +847,11 @@
},
// 鍙栦汉鍛樺垎绫荤殑瀛楀吀
getComparisonList() {
- tthis.personnelClassification = this.dict.type.personnl_type;
- this.checkList = this.form.personnelClassification.split('锛�')
+ // 鏂囦欢鐘舵��
+ this.getDicts("personnl_type").then((response) => {
+ this.personnelClassification = this.dictToValue(response.data);
+ this.checkList = this.form.personnelClassification ? this.form.personnelClassification.split('锛�') : []
+ });
},
clickPersonnelClassificationSure() {
this.dialogVisible = false
--
Gitblit v1.9.3