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 @@
导入进度
-
+
@@ -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;
+ }
+ }
+ }
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 @@
-
+
+
+
+
+
+
+
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'}