From c3eca54fe45772b32de252a8329a105f44beaf85 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 06 三月 2025 10:04:25 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue | 17 ++++++++++++-----
src/router/index.js | 2 +-
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 180cdb2..11b0dad 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -125,7 +125,7 @@
path: "/productOrder",
component: Layout,
hidden: true,
- permissions: ["productOrder:order"],
+ permissions: ["business:productOrder"],
children: [
{
// 鎴愬搧涓嬪崟璇︽儏
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
index 7df2ab0..eac1bed 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
@@ -397,7 +397,7 @@
</el-row>
<el-row style="margin-top: 15px">
<el-col :span="16">
- <el-form-item label="绾у埆">
+ <el-form-item label="绾у埆" prop="level">
<el-input v-model="annex.level" clearable size="small"></el-input>
</el-form-item>
</el-col>
@@ -414,7 +414,7 @@
</el-row>
<el-row style="margin-top: 15px">
<el-col :span="16">
- <el-form-item label="澶嶅嵃浠�">
+ <el-form-item label="澶嶅嵃浠�" prop="copy">
<el-input v-model="annex.copy" clearable size="small"></el-input>
</el-form-item>
</el-col>
@@ -422,7 +422,7 @@
<el-row style="margin-top: 15px">
<el-col :span="16">
- <el-form-item label="鍘熶欢">
+ <el-form-item label="鍘熶欢" prop="original">
<el-input v-model="annex.original" clearable size="small"></el-input>
</el-form-item>
</el-col>
@@ -431,6 +431,7 @@
<el-col :span="16">
<el-form-item label="鏂囦欢">
<el-upload :action="action" :before-upload="beforeAvatarUpload" :headers="uploadHeader"
+ ref="fileName"
:on-success="(response, file, fileList) => onSuccess(response, file, fileList, 'fileName')"
:show-file-list="false">
<span v-if="annex.fileName">{{ annex.fileName }}</span>
@@ -878,6 +879,8 @@
if (res.code == 200) {
getAnnexByUserId({ userId: this.clickNodeVal.userId }).then(res => {
this.imageUrl = ''
+ this.$refs.fileName.clearFiles()
+ this.annex.fileName = ''
this.resetForm('annex')
this.annexList = res.data
this.dialogVisible1 = false
@@ -891,6 +894,8 @@
if (res.code == 200) {
getAnnexByUserId({ userId: this.clickNodeVal.userId }).then(res => {
this.imageUrl = ''
+ this.$refs.fileName.clearFiles()
+ this.annex.fileName = ''
this.resetForm('annex')
this.annexList = res.data
this.dialogVisible1 = false
@@ -1001,9 +1006,11 @@
})
},
cancellation() {
- this.dialogVisible1 = false
- this.imageUrl = ''
this.resetForm('annex')
+ this.$refs.fileName.clearFiles()
+ this.annex.fileName = ''
+ this.imageUrl = ''
+ this.dialogVisible1 = false
},
handleClose(done) {
this.imageUrl = ''
--
Gitblit v1.9.3