diff --git a/src/views/emis/emisSpecialZone/index.vue b/src/views/emis/emisSpecialZone/index.vue
index 77042c0f..214dc502 100644
--- a/src/views/emis/emisSpecialZone/index.vue
+++ b/src/views/emis/emisSpecialZone/index.vue
@@ -249,9 +249,6 @@ export default {
},
handleBatchImport() {
this.openUploadForm = true;
- },
- batchImpDataForm() {
-
},
cancel() {
this.openUploadForm = false;
@@ -324,24 +321,34 @@ export default {
this.$modal.msgError('表格中没有数据');
return;
}
-
+
let len = this.tmpDataList.length;
+ //loader
+ let errMsgs = []
+ this.loading = true;
for (let i = 0; i < len; i++) {
let itemData = this.tmpDataList[i];
try {
- let res = await importEmisSpecialZone(itemData)
+ let res = await importEmisSpecialZone(itemData)
+ if(res.data.result == 'fail'){
+ errMsgs.push(res.data.msg)
+ }
} catch (e) {
console.warn(e)
}
}
-
- this.$modal.msgSuccess("新增成功");
+ if(errMsgs.length > 0){
+ this.$confirm(`${errMsgs.join('\n')}`, '提示', {
+ confirmButtonText: '确定',
+ showCancelButton: false,
+ type: 'warning',
+ }).then(() => {})
+ }else{
+ this.$modal.msgSuccess("新增成功");
+ }
this.getList();
-
this.tmpDataList = [];
-
this.openUploadForm = false;
-
},
handleSuccess() {
this.openForm = false;
diff --git a/src/views/emis/emisWaybill/batchWaybillRecord.vue b/src/views/emis/emisWaybill/batchWaybillRecord.vue
index f2bf70da..bb19321d 100644
--- a/src/views/emis/emisWaybill/batchWaybillRecord.vue
+++ b/src/views/emis/emisWaybill/batchWaybillRecord.vue
@@ -55,6 +55,7 @@
下单成功
待下单
下单异常
+ 特区提醒
@@ -62,6 +63,7 @@
{{ scope.row.errorInfo }}
下单成功
待下单
+ {{ scope.row.errorInfo }}
@@ -159,6 +161,7 @@