From a3a626292e35e4a022b07c1cca14e5161015bec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Thu, 18 Jul 2024 10:23:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A2=9E=E5=8A=A0=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scImport/index.vue   | 48 ++++++++++++++++++++++++-----
 src/views/setting/company/index.vue |  8 ++++-
 src/views/setting/company/save.vue  |  4 +--
 3 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/components/scImport/index.vue b/src/components/scImport/index.vue
index d7640e8..bfeff17 100644
--- a/src/components/scImport/index.vue
+++ b/src/components/scImport/index.vue
@@ -43,7 +43,12 @@
 						<div class="name">导入进度</div>
 						<el-progress class="exportPopover" :text-inside="true" :stroke-width="12" :percentage="importInfo.rate" />
 					</div>
-					<div class="errText"></div>
+					<div class="errText" v-if="errorShow">
+						<div class="deleteErr" @click="errorShow=false"><el-icon class="icon"><el-icon-Close/></el-icon></div>
+						<el-scrollbar max-height="120px">
+							<p v-for="item in errorList" :key="item">{{item.msg}}</p>
+						</el-scrollbar>
+					</div>
 				</template>
 			</el-upload>
 		</div>
@@ -77,7 +82,9 @@ export default {
 			importDis:false,
 			importTrue:false,
 			progressShow:false,
+			errorShow:false,
 			importInfo:{},
+			errorList:[]
 		}
 	},
 	watch:{
@@ -96,7 +103,11 @@ export default {
 			if(res.data && (res.data.type == 5)){
 				this.importInfo = res.data;
 				this.progressShow = true;
-				if(res.data.status == 1){
+				if(res.data.status == 0){
+					this.errorShow = true;
+					this.errorList.push(res.data);
+				}
+				if(res.data.rate == 100){
 					this.progressShow = false;
 					this.$emit('importSuccess');
 				}
@@ -173,10 +184,10 @@ export default {
 		}
 		.deleteFile{
 			position: absolute;
-			right: -4px;
-			top: -12px;
-			width: 20px;
-			height: 20px;
+			right: -6px;
+			top: -10px;
+			width: 16px;
+			height: 16px;
 			border-radius: 50%;
 			background: var(--el-color-danger);
 			display: flex;
@@ -193,7 +204,8 @@ export default {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		margin-top: 15px;color: var(--el-text-color-placeholder);
+		margin-top: 15px;
+		color: var(--el-text-color-placeholder);
 		.btn{
 			color: var(--el-color-primary);
 			cursor: pointer;
@@ -211,4 +223,26 @@ export default {
 			font-size: 10px;
 		}
 	}
+	.errText{
+		margin: 15px 0 0 0;
+		padding: 10px;
+		border-radius: 6px;
+		background: var(--el-color-danger-light-9);
+		position: relative;
+		p{
+			color: var(--el-color-danger);
+			font-size: 12px;
+			padding: 3px 0;
+		}
+		.deleteErr{
+			position: absolute;
+			right: 4px;
+			top: 4px;
+			z-index: 20;
+			cursor: pointer;
+			.icon{
+				font-size: 16px;
+			}
+		}
+	}
 </style>
diff --git a/src/views/setting/company/index.vue b/src/views/setting/company/index.vue
index 1d04f85..1d0bdd1 100644
--- a/src/views/setting/company/index.vue
+++ b/src/views/setting/company/index.vue
@@ -25,7 +25,13 @@
 				<el-table-column type="selection" align="center" width="40"></el-table-column>
 				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
 				<template #logo="scope">
-					<el-image class="logoCell" :src="scope.row.logo" preview-teleported :preview-src-list="[scope.row.logo]" fit="contain"></el-image>
+					<el-image class="logoCell" :src="scope.row.logo" preview-teleported :preview-src-list="[scope.row.logo]" fit="contain">
+						<template #error>
+							<div class="image-slot" style="text-align: center;font-size: 20px;">
+								<el-icon><el-icon-Picture /></el-icon>
+							</div>
+						</template>
+					</el-image>
 				</template>
 				<template #active_status="scope">
 					<el-switch :size="size" v-model="scope.row.active_status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>
diff --git a/src/views/setting/company/save.vue b/src/views/setting/company/save.vue
index 9247fd2..bcb4e23 100644
--- a/src/views/setting/company/save.vue
+++ b/src/views/setting/company/save.vue
@@ -132,10 +132,10 @@ export default {
 					{required: true, message: '请填写联系方式', trigger: 'blur'}
 				],
 				logo:[
-					{required: true, message: '公司LOGO不能为空'}
+					{required: false, message: '公司LOGO不能为空'}
 				],
 				doc_url:[
-					{required: true, message: '证件照不能为空'}
+					{required: false, message: '证件照不能为空'}
 				],
 				owner:[
 					{required: true, message: '负责人不能为空', trigger: 'blur'}