diff --git a/src/api/ecss/ecss.js b/src/api/ecss/ecss.js
index df87e9c..8eeb8a4 100644
--- a/src/api/ecss/ecss.js
+++ b/src/api/ecss/ecss.js
@@ -44,8 +44,6 @@ export const deleteSubPropertiesValueForAlone= data => createAPI(`/ecss/coDel/de
export const deleteHsCode= data => createAPI(`/ecss/coDel/deleteHsCode`,'post',data)
-export const searchCoDelPalletData= data => createAPI(`/ecss/coDel/searchCoDelPalletData`,'post',data)
-
export const searchCoDelPalletDataNew= data => createAPI(`/ecss/coDel/searchCoDelPalletDataNew`,'post',data)
export const selectBoxList = data => createAPI(`/ecss/coDel/selectBoxList`,'post',data)
diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue
index a45295c..870d9a1 100644
--- a/src/views/modules/ecss/codelnotify.vue
+++ b/src/views/modules/ecss/codelnotify.vue
@@ -85,6 +85,7 @@
修改
下达
取消下达
+ 一键结单
废弃
删除
@@ -158,9 +159,9 @@
-
@@ -653,7 +654,6 @@
changeEcssDelStatus,
updateEcssDelDetail,
deleteEcssDelDetail,
- searchCoDelPalletData,
searchCoDelPalletDataNew,
queryPartListAll,
searchTemplateList,
@@ -1871,6 +1871,31 @@
})
})
},
+ declarationCompleted(row){
+ let inData={
+ site:row.site,
+ delNo:row.delNo,
+ walMartOrderFlag:row.walMartOrderFlag,
+ notifyStatus:'已报关'
+ }
+ this.$confirm('确认一键结单吗?', '提示').then(() => {
+ changeEcssDelStatus(inData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.searchTable()
+ this.$message({
+ message: '操作成功',
+ type: 'success',
+ duration: 1500,
+ onClose: () => {}
+ })
+ } else {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ })
+ }
+ })
+ })
+ },
// 每页数
sizeChangeHandle3 (val) {
this.pageSize3 = val
diff --git a/src/views/modules/ecss/createDeclaration.vue b/src/views/modules/ecss/createDeclaration.vue
index f6d6dbd..d8e23dd 100644
--- a/src/views/modules/ecss/createDeclaration.vue
+++ b/src/views/modules/ecss/createDeclaration.vue
@@ -132,9 +132,9 @@
-
@@ -482,7 +482,6 @@
import {
searchEcssCoDelNotifyHeaderForDanZheng,
searchEcssCoDelNotifyDetail,
- searchCoDelPalletData,
searchCoDelPalletDataNew,
getDeclarationDefaultData,
saveDeclaration,
diff --git a/src/views/modules/ecss/del_upload_excel.vue b/src/views/modules/ecss/del_upload_excel.vue
index d74f7c9..ebfa35b 100644
--- a/src/views/modules/ecss/del_upload_excel.vue
+++ b/src/views/modules/ecss/del_upload_excel.vue
@@ -262,7 +262,7 @@
if (this.cacheTimer) {
clearTimeout(this.cacheTimer);
}
-
+
// 设置新的定时器,500ms后执行保存
this.cacheTimer = setTimeout(() => {
try {
@@ -315,7 +315,7 @@
init () {
this.fileList = []
this.cacheKey = this.generateCacheKey();
-
+
let tempData = {
username: this.$store.state.user.name,
}
@@ -329,14 +329,14 @@
// 在获取BU列表后尝试加载缓存
this.loadFromCache();
})
-
+
getCustomerList({}).then(({data}) => {
//区分请求成功和失败的状况
if (data && data.code === 0) {
this.customerList=data.rows
}
});
-
+
// 如果没有缓存数据,则初始化为空
if (!this.loadFromCache()) {
this.pageData.customerName=''
@@ -346,7 +346,7 @@
this.pageData.overseasAddress='',
this.pageData.salesArea=''
}
-
+
this.customerPersons=[]
this.customerAddrs=[]
// 打开页面
@@ -481,20 +481,63 @@
formData.append("overseasAddress", this.pageData.overseasAddress)
formData.append("cnative", this.pageData.cnative)
formData.append("salesArea", this.pageData.salesArea)
- saveEcssCoDelNotifyByExcel(formData).then(({data}) => {
+ saveEcssCoDelNotifyByExcel(formData).then(({ data }) => {
if (data.code === 0) {
- this.$message.success(data.msg)
- // 保存成功后清除缓存
- this.clearCache()
- // 关闭窗口并刷新页面
- this.closeDialog()
+ const { resultMap } = data;
+ const successList = resultMap.success || [];
+ const failList = resultMap.fail || [];
+
+ // 紧凑样式
+ let html = `
+
+ `;
+
+ if (successList.length > 0) {
+ html += `
+
+ ✅ 成功(${successList.length})
+
+
+ `;
+ successList.forEach(item => {
+ html += `| ${item} |
`;
+ });
+ html += `
`;
+ }
+
+ if (failList.length > 0) {
+ html += `
+
+ ❌ 失败(${failList.length})
+
+
+ `;
+ failList.forEach(item => {
+ html += `| ${item} |
`;
+ });
+ html += `
`;
+ }
+
+ html += `
`;
+
+ this.$alert(html, '导入结果', {
+ confirmButtonText: '确定',
+ dangerouslyUseHTMLString: true,
+ callback: () => {
+ this.clearCache();
+ this.closeDialog();
+ }
+ });
} else {
- //this.$message.error(data.msg)
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
- })
+ });
}
- })
+ });
+
+
},
// 下载